Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,12 @@ class AwsComponentProviderTest {

@Test
void endToEnd() {
String yaml = "file_format: 0.3\n" + "propagator:\n" + " composite: [xray, xray-lambda]\n";
String yaml =
"file_format: 0.4\n"
+ "propagator:\n"
+ " composite:\n"
+ " - xray:\n"
+ " - xray-lambda:\n";

OpenTelemetrySdk openTelemetrySdk =
DeclarativeConfiguration.parseAndCreate(
Expand Down
2 changes: 1 addition & 1 deletion cloudfoundry-resources/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ This variable contains a JSON structure, which is parsed to fill the following a
| cloudfoundry.space.id | space_id |
| cloudfoundry.space.name | space_name |

The resource attributes follow the [CloudFoundry semantic convention.](https://github.com/open-telemetry/semantic-conventions/blob/main/docs/attributes-registry/cloudfoundry.md).
The resource attributes follow the [CloudFoundry semantic convention.](https://github.com/open-telemetry/semantic-conventions/blob/main/docs/registry/attributes/cloudfoundry.md).
A description of `VCAP_APPLICATION` is available in the [CloudFoundry documentation](https://docs.cloudfoundry.org/devguide/deploy-apps/environment-variable.html#VCAP-APPLICATION).

## Component owners
Expand Down
2 changes: 1 addition & 1 deletion dependencyManagement/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ plugins {
`java-platform`
}

val otelInstrumentationVersion = "2.15.0-alpha"
val otelInstrumentationVersion = "2.16.0-alpha"
val semconvVersion = "1.32.0"

javaPlatform {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ protected JmxScraperContainer customizeScraperContainer(
JmxScraperContainer scraper, GenericContainer<?> target, Path tempDir) {
return scraper
.withTargetSystem("jvm")
// TODO when JVM metrics will be added to instrumentation, the default "auto" source
// Since JVM metrics were be added to instrumentation, the default "auto" source
// means that the definitions in instrumentation will be used, and thus this test will fail
// due to metrics differences, adding an explicit "legacy" source is required to continue
// testing the JVM metrics defined in this project.
// https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/13392
// .withTargetSystem("legacy")
.withTargetSystemSource("legacy")
// also testing custom yaml
.withCustomYaml("custom-metrics.yaml");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class EventToSpanBridgeComponentProviderTest {
@Test
void endToEnd() {
String yaml =
"file_format: 0.3\n"
"file_format: 0.4\n"
+ "logger_provider:\n"
+ " processors:\n"
+ " - event_to_span_event_bridge:\n";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class RuleBasedRoutingSamplerComponentProviderTest {
@Test
void endToEnd() {
String yaml =
"file_format: 0.3\n"
"file_format: 0.4\n"
+ "tracer_provider:\n"
+ " sampler:\n"
+ " parent_based:\n"
Expand Down
Loading