diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 519458faf39f..6601d7294373 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -8,7 +8,7 @@ val dependencyVersions = hashMapOf() rootProject.extra["versions"] = dependencyVersions // this line is managed by .github/scripts/update-sdk-version.sh -val otelSdkVersion = "1.41.0" +val otelSdkVersion = "1.42.0" val otelContribVersion = "1.38.0-alpha" val otelSdkAlphaVersion = otelSdkVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1") diff --git a/examples/distro/build.gradle b/examples/distro/build.gradle index 6d97802b1ce6..61071cd09e77 100644 --- a/examples/distro/build.gradle +++ b/examples/distro/build.gradle @@ -27,7 +27,7 @@ subprojects { ext { versions = [ // this line is managed by .github/scripts/update-sdk-version.sh - opentelemetrySdk : "1.41.0", + opentelemetrySdk : "1.42.0", // these lines are managed by .github/scripts/update-version.sh opentelemetryJavaagent : "2.8.0-SNAPSHOT", diff --git a/examples/extension/build.gradle b/examples/extension/build.gradle index 38c5f7d4f8d2..422dc4916ce0 100644 --- a/examples/extension/build.gradle +++ b/examples/extension/build.gradle @@ -23,7 +23,7 @@ version '1.0' ext { versions = [ // this line is managed by .github/scripts/update-sdk-version.sh - opentelemetrySdk : "1.41.0", + opentelemetrySdk : "1.42.0", // these lines are managed by .github/scripts/update-version.sh opentelemetryJavaagent : "2.8.0-SNAPSHOT", diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleGaugeBuilder.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleGaugeBuilder.java index 365a6bcb5a6f..4878492c0b2d 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleGaugeBuilder.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleGaugeBuilder.java @@ -16,7 +16,7 @@ public class ApplicationDoubleGaugeBuilder implements DoubleGaugeBuilder { private final io.opentelemetry.api.metrics.DoubleGaugeBuilder agentBuilder; - public ApplicationDoubleGaugeBuilder( + protected ApplicationDoubleGaugeBuilder( io.opentelemetry.api.metrics.DoubleGaugeBuilder agentBuilder) { this.agentBuilder = agentBuilder; } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleHistogramBuilder.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleHistogramBuilder.java index f08ef581ebc1..01e534277b2f 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleHistogramBuilder.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleHistogramBuilder.java @@ -14,7 +14,7 @@ public class ApplicationDoubleHistogramBuilder implements DoubleHistogramBuilder private final io.opentelemetry.api.metrics.DoubleHistogramBuilder agentBuilder; - public ApplicationDoubleHistogramBuilder( + protected ApplicationDoubleHistogramBuilder( io.opentelemetry.api.metrics.DoubleHistogramBuilder agentBuilder) { this.agentBuilder = agentBuilder; } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongCounterBuilder.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongCounterBuilder.java index 4251c93c5396..71857a387eb0 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongCounterBuilder.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongCounterBuilder.java @@ -17,7 +17,7 @@ public class ApplicationLongCounterBuilder implements LongCounterBuilder { private final io.opentelemetry.api.metrics.LongCounterBuilder agentBuilder; - public ApplicationLongCounterBuilder( + protected ApplicationLongCounterBuilder( io.opentelemetry.api.metrics.LongCounterBuilder agentBuilder) { this.agentBuilder = agentBuilder; } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongUpDownCounterBuilder.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongUpDownCounterBuilder.java index 5471c4cddf4e..03de81fd43f3 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongUpDownCounterBuilder.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongUpDownCounterBuilder.java @@ -17,7 +17,7 @@ public class ApplicationLongUpDownCounterBuilder implements LongUpDownCounterBui private final io.opentelemetry.api.metrics.LongUpDownCounterBuilder agentBuilder; - public ApplicationLongUpDownCounterBuilder( + protected ApplicationLongUpDownCounterBuilder( io.opentelemetry.api.metrics.LongUpDownCounterBuilder agentBuilder) { this.agentBuilder = agentBuilder; } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/build.gradle.kts b/instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/build.gradle.kts index bbbb75e6da99..311de19e02c5 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/build.gradle.kts +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/build.gradle.kts @@ -14,6 +14,8 @@ configurations.configureEach { if (name == "testRuntimeClasspath" || name == "testCompileClasspath") { resolutionStrategy { force("io.opentelemetry:opentelemetry-api:1.27.0") + force("io.opentelemetry:opentelemetry-sdk-logs:1.27.0") + force("io.opentelemetry:opentelemetry-sdk-testing:1.27.0") } } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/metrics/ApplicationMeter131.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/metrics/ApplicationMeter131.java index 105b38a0aaf3..a82add2467dc 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/metrics/ApplicationMeter131.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/metrics/ApplicationMeter131.java @@ -9,10 +9,6 @@ import application.io.opentelemetry.api.metrics.DoubleHistogramBuilder; import application.io.opentelemetry.api.metrics.LongCounterBuilder; import application.io.opentelemetry.api.metrics.LongUpDownCounterBuilder; -import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationDoubleGaugeBuilder; -import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationDoubleHistogramBuilder; -import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationLongCounterBuilder; -import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationLongUpDownCounterBuilder; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_15.metrics.ApplicationMeter115; public class ApplicationMeter131 extends ApplicationMeter115 { @@ -26,39 +22,21 @@ protected ApplicationMeter131(io.opentelemetry.api.metrics.Meter agentMeter) { @Override public LongCounterBuilder counterBuilder(String name) { - io.opentelemetry.api.metrics.LongCounterBuilder builder = agentMeter.counterBuilder(name); - if (builder instanceof io.opentelemetry.api.incubator.metrics.ExtendedLongCounterBuilder) { - return new ApplicationLongCounterBuilder131(builder); - } - return new ApplicationLongCounterBuilder(builder); + return new ApplicationLongCounterBuilder131(agentMeter.counterBuilder(name)); } @Override public LongUpDownCounterBuilder upDownCounterBuilder(String name) { - io.opentelemetry.api.metrics.LongUpDownCounterBuilder builder = - agentMeter.upDownCounterBuilder(name); - if (builder - instanceof io.opentelemetry.api.incubator.metrics.ExtendedLongUpDownCounterBuilder) { - return new ApplicationLongUpDownCounterBuilder131(builder); - } - return new ApplicationLongUpDownCounterBuilder(builder); + return new ApplicationLongUpDownCounterBuilder131(agentMeter.upDownCounterBuilder(name)); } @Override public DoubleHistogramBuilder histogramBuilder(String name) { - io.opentelemetry.api.metrics.DoubleHistogramBuilder builder = agentMeter.histogramBuilder(name); - if (builder instanceof io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder) { - return new ApplicationDoubleHistogramBuilder131(builder); - } - return new ApplicationDoubleHistogramBuilder(builder); + return new ApplicationDoubleHistogramBuilder131(agentMeter.histogramBuilder(name)); } @Override public DoubleGaugeBuilder gaugeBuilder(String name) { - io.opentelemetry.api.metrics.DoubleGaugeBuilder builder = agentMeter.gaugeBuilder(name); - if (builder instanceof io.opentelemetry.api.incubator.metrics.ExtendedDoubleGaugeBuilder) { - return new ApplicationDoubleGaugeBuilder131(builder); - } - return new ApplicationDoubleGaugeBuilder(builder); + return new ApplicationDoubleGaugeBuilder131(agentMeter.gaugeBuilder(name)); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/noopTest/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/metrics/NoopTest.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/noopTest/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/metrics/NoopTest.java index bf93cb95f539..26ed6ad0db14 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/noopTest/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/metrics/NoopTest.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/noopTest/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/metrics/NoopTest.java @@ -5,6 +5,7 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.metrics; +import static java.util.Collections.emptyList; import static org.assertj.core.api.Assertions.assertThat; import io.opentelemetry.api.metrics.DoubleGaugeBuilder; @@ -29,15 +30,19 @@ void noopInstance() { Meter meter = testing.getOpenTelemetry().getMeter("test"); LongCounterBuilder counterBuilder = meter.counterBuilder("test"); - assertThat(counterBuilder).isNotInstanceOf(ExtendedLongCounterBuilder.class); + assertThat(counterBuilder).isInstanceOf(ExtendedLongCounterBuilder.class); + ((ExtendedLongCounterBuilder) counterBuilder).setAttributesAdvice(emptyList()); LongUpDownCounterBuilder upDownCounterBuilder = meter.upDownCounterBuilder("test"); - assertThat(upDownCounterBuilder).isNotInstanceOf(ExtendedLongUpDownCounterBuilder.class); + assertThat(upDownCounterBuilder).isInstanceOf(ExtendedLongUpDownCounterBuilder.class); + ((ExtendedLongUpDownCounterBuilder) upDownCounterBuilder).setAttributesAdvice(emptyList()); DoubleGaugeBuilder gaugeBuilder = meter.gaugeBuilder("test"); - assertThat(gaugeBuilder).isNotInstanceOf(ExtendedDoubleGaugeBuilder.class); + assertThat(gaugeBuilder).isInstanceOf(ExtendedDoubleGaugeBuilder.class); + ((ExtendedDoubleGaugeBuilder) gaugeBuilder).setAttributesAdvice(emptyList()); DoubleHistogramBuilder histogramBuilder = meter.histogramBuilder("test"); - assertThat(histogramBuilder).isNotInstanceOf(ExtendedDoubleHistogramBuilder.class); + assertThat(histogramBuilder).isInstanceOf(ExtendedDoubleHistogramBuilder.class); + ((ExtendedDoubleHistogramBuilder) histogramBuilder).setAttributesAdvice(emptyList()); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/incubator/metrics/ApplicationMeter132Incubator.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/incubator/metrics/ApplicationMeter132Incubator.java index d8347dc3adec..422b5c9e4c5d 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/incubator/metrics/ApplicationMeter132Incubator.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/incubator/metrics/ApplicationMeter132Incubator.java @@ -6,7 +6,6 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_32.incubator.metrics; import application.io.opentelemetry.api.metrics.DoubleHistogramBuilder; -import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationDoubleHistogramBuilder; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.incubator.metrics.ApplicationMeter131; class ApplicationMeter132Incubator extends ApplicationMeter131 { @@ -20,10 +19,6 @@ class ApplicationMeter132Incubator extends ApplicationMeter131 { @Override public DoubleHistogramBuilder histogramBuilder(String name) { - io.opentelemetry.api.metrics.DoubleHistogramBuilder builder = agentMeter.histogramBuilder(name); - if (builder instanceof io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder) { - return new ApplicationDoubleHistogramBuilder132Incubator(builder); - } - return new ApplicationDoubleHistogramBuilder(builder); + return new ApplicationDoubleHistogramBuilder132Incubator(agentMeter.histogramBuilder(name)); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/noopTest/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/incubator/metrics/NoopTest.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/noopTest/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/incubator/metrics/NoopTest.java index 91a555add5a5..52e1208d4f2a 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/noopTest/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/incubator/metrics/NoopTest.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/noopTest/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/incubator/metrics/NoopTest.java @@ -5,6 +5,7 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_32.incubator.metrics; +import static java.util.Collections.emptyList; import static org.assertj.core.api.Assertions.assertThat; import io.opentelemetry.api.metrics.DoubleGaugeBuilder; @@ -29,15 +30,19 @@ void noopInstance() { Meter meter = testing.getOpenTelemetry().getMeter("test"); LongCounterBuilder counterBuilder = meter.counterBuilder("test"); - assertThat(counterBuilder).isNotInstanceOf(ExtendedLongCounterBuilder.class); + assertThat(counterBuilder).isInstanceOf(ExtendedLongCounterBuilder.class); + ((ExtendedLongCounterBuilder) counterBuilder).setAttributesAdvice(emptyList()); LongUpDownCounterBuilder upDownCounterBuilder = meter.upDownCounterBuilder("test"); - assertThat(upDownCounterBuilder).isNotInstanceOf(ExtendedLongUpDownCounterBuilder.class); + assertThat(upDownCounterBuilder).isInstanceOf(ExtendedLongUpDownCounterBuilder.class); + ((ExtendedLongUpDownCounterBuilder) upDownCounterBuilder).setAttributesAdvice(emptyList()); DoubleGaugeBuilder gaugeBuilder = meter.gaugeBuilder("test"); - assertThat(gaugeBuilder).isNotInstanceOf(ExtendedDoubleGaugeBuilder.class); + assertThat(gaugeBuilder).isInstanceOf(ExtendedDoubleGaugeBuilder.class); + ((ExtendedDoubleGaugeBuilder) gaugeBuilder).setAttributesAdvice(emptyList()); DoubleHistogramBuilder histogramBuilder = meter.histogramBuilder("test"); - assertThat(histogramBuilder).isNotInstanceOf(ExtendedDoubleHistogramBuilder.class); + assertThat(histogramBuilder).isInstanceOf(ExtendedDoubleHistogramBuilder.class); + ((ExtendedDoubleHistogramBuilder) histogramBuilder).setAttributesAdvice(emptyList()); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/ApplicationMeter137.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/ApplicationMeter137.java index 65860afca72a..6ed769ccf49b 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/ApplicationMeter137.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/ApplicationMeter137.java @@ -6,7 +6,6 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.incubator.metrics; import application.io.opentelemetry.api.metrics.DoubleGaugeBuilder; -import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationDoubleGaugeBuilder; class ApplicationMeter137 extends BaseApplicationMeter137 { @@ -19,10 +18,6 @@ protected ApplicationMeter137(io.opentelemetry.api.metrics.Meter agentMeter) { @Override public DoubleGaugeBuilder gaugeBuilder(String name) { - io.opentelemetry.api.metrics.DoubleGaugeBuilder builder = agentMeter.gaugeBuilder(name); - if (builder instanceof io.opentelemetry.api.incubator.metrics.ExtendedDoubleGaugeBuilder) { - return new ApplicationDoubleGaugeBuilder137(builder); - } - return new ApplicationDoubleGaugeBuilder(builder); + return new ApplicationDoubleGaugeBuilder137(agentMeter.gaugeBuilder(name)); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/BaseApplicationMeter137.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/BaseApplicationMeter137.java index b3fd0b095142..3a0c0d3ff608 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/BaseApplicationMeter137.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/BaseApplicationMeter137.java @@ -8,9 +8,6 @@ import application.io.opentelemetry.api.metrics.DoubleHistogramBuilder; import application.io.opentelemetry.api.metrics.LongCounterBuilder; import application.io.opentelemetry.api.metrics.LongUpDownCounterBuilder; -import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationDoubleHistogramBuilder; -import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationLongCounterBuilder; -import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationLongUpDownCounterBuilder; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_15.metrics.ApplicationMeter115; // used by both 1.37 and 1.38 @@ -25,30 +22,16 @@ protected BaseApplicationMeter137(io.opentelemetry.api.metrics.Meter agentMeter) @Override public LongCounterBuilder counterBuilder(String name) { - io.opentelemetry.api.metrics.LongCounterBuilder builder = agentMeter.counterBuilder(name); - if (builder instanceof io.opentelemetry.api.incubator.metrics.ExtendedLongCounterBuilder) { - return new ApplicationLongCounterBuilder137(builder); - } - return new ApplicationLongCounterBuilder(builder); + return new ApplicationLongCounterBuilder137(agentMeter.counterBuilder(name)); } @Override public LongUpDownCounterBuilder upDownCounterBuilder(String name) { - io.opentelemetry.api.metrics.LongUpDownCounterBuilder builder = - agentMeter.upDownCounterBuilder(name); - if (builder - instanceof io.opentelemetry.api.incubator.metrics.ExtendedLongUpDownCounterBuilder) { - return new ApplicationLongUpDownCounterBuilder137(builder); - } - return new ApplicationLongUpDownCounterBuilder(builder); + return new ApplicationLongUpDownCounterBuilder137(agentMeter.upDownCounterBuilder(name)); } @Override public DoubleHistogramBuilder histogramBuilder(String name) { - io.opentelemetry.api.metrics.DoubleHistogramBuilder builder = agentMeter.histogramBuilder(name); - if (builder instanceof io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder) { - return new ApplicationDoubleHistogramBuilder137(builder); - } - return new ApplicationDoubleHistogramBuilder(builder); + return new ApplicationDoubleHistogramBuilder137(agentMeter.histogramBuilder(name)); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/noopTest/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/NoopTest.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/noopTest/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/NoopTest.java index 47e92b4a862b..d30501e962c5 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/noopTest/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/NoopTest.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/noopTest/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/NoopTest.java @@ -5,6 +5,7 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.incubator.metrics; +import static java.util.Collections.emptyList; import static org.assertj.core.api.Assertions.assertThat; import io.opentelemetry.api.incubator.metrics.ExtendedDoubleGaugeBuilder; @@ -29,15 +30,19 @@ void noopInstance() { Meter meter = testing.getOpenTelemetry().getMeter("test"); LongCounterBuilder counterBuilder = meter.counterBuilder("test"); - assertThat(counterBuilder).isNotInstanceOf(ExtendedLongCounterBuilder.class); + assertThat(counterBuilder).isInstanceOf(ExtendedLongCounterBuilder.class); + ((ExtendedLongCounterBuilder) counterBuilder).setAttributesAdvice(emptyList()); LongUpDownCounterBuilder upDownCounterBuilder = meter.upDownCounterBuilder("test"); - assertThat(upDownCounterBuilder).isNotInstanceOf(ExtendedLongUpDownCounterBuilder.class); + assertThat(upDownCounterBuilder).isInstanceOf(ExtendedLongUpDownCounterBuilder.class); + ((ExtendedLongUpDownCounterBuilder) upDownCounterBuilder).setAttributesAdvice(emptyList()); DoubleGaugeBuilder gaugeBuilder = meter.gaugeBuilder("test"); - assertThat(gaugeBuilder).isNotInstanceOf(ExtendedDoubleGaugeBuilder.class); + assertThat(gaugeBuilder).isInstanceOf(ExtendedDoubleGaugeBuilder.class); + ((ExtendedDoubleGaugeBuilder) gaugeBuilder).setAttributesAdvice(emptyList()); DoubleHistogramBuilder histogramBuilder = meter.histogramBuilder("test"); - assertThat(histogramBuilder).isNotInstanceOf(ExtendedDoubleHistogramBuilder.class); + assertThat(histogramBuilder).isInstanceOf(ExtendedDoubleHistogramBuilder.class); + ((ExtendedDoubleHistogramBuilder) histogramBuilder).setAttributesAdvice(emptyList()); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/incubator/metrics/ApplicationMeter138Incubator.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/incubator/metrics/ApplicationMeter138Incubator.java index f28e9f5f0ebc..396fdf9785bb 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/incubator/metrics/ApplicationMeter138Incubator.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/incubator/metrics/ApplicationMeter138Incubator.java @@ -7,7 +7,6 @@ import application.io.opentelemetry.api.metrics.DoubleGaugeBuilder; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.incubator.metrics.BaseApplicationMeter137; -import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_38.metrics.ApplicationDoubleGaugeBuilder138; class ApplicationMeter138Incubator extends BaseApplicationMeter137 { @@ -20,10 +19,6 @@ class ApplicationMeter138Incubator extends BaseApplicationMeter137 { @Override public DoubleGaugeBuilder gaugeBuilder(String name) { - io.opentelemetry.api.metrics.DoubleGaugeBuilder builder = agentMeter.gaugeBuilder(name); - if (builder instanceof io.opentelemetry.api.incubator.metrics.ExtendedDoubleGaugeBuilder) { - return new ApplicationDoubleGaugeBuilder138Incubator(builder); - } - return new ApplicationDoubleGaugeBuilder138(builder); + return new ApplicationDoubleGaugeBuilder138Incubator(agentMeter.gaugeBuilder(name)); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/metrics/ApplicationDoubleGaugeBuilder138.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/metrics/ApplicationDoubleGaugeBuilder138.java index 58e0c17c6ad2..f5bd88c9d409 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/metrics/ApplicationDoubleGaugeBuilder138.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/metrics/ApplicationDoubleGaugeBuilder138.java @@ -17,7 +17,7 @@ public class ApplicationDoubleGaugeBuilder138 extends ApplicationDoubleGaugeBuil private final io.opentelemetry.api.metrics.DoubleGaugeBuilder agentBuilder; - public ApplicationDoubleGaugeBuilder138( + protected ApplicationDoubleGaugeBuilder138( io.opentelemetry.api.metrics.DoubleGaugeBuilder agentBuilder) { super(agentBuilder); this.agentBuilder = agentBuilder; diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/noopTest/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/incubator/metrics/NoopTest.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/noopTest/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/incubator/metrics/NoopTest.java index 00406416976c..d7e5d7806b54 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/noopTest/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/incubator/metrics/NoopTest.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/noopTest/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/incubator/metrics/NoopTest.java @@ -5,6 +5,7 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_38.incubator.metrics; +import static java.util.Collections.emptyList; import static org.assertj.core.api.Assertions.assertThat; import io.opentelemetry.api.incubator.metrics.ExtendedDoubleGaugeBuilder; @@ -29,15 +30,19 @@ void noopInstance() { Meter meter = testing.getOpenTelemetry().getMeter("test"); LongCounterBuilder counterBuilder = meter.counterBuilder("test"); - assertThat(counterBuilder).isNotInstanceOf(ExtendedLongCounterBuilder.class); + assertThat(counterBuilder).isInstanceOf(ExtendedLongCounterBuilder.class); + ((ExtendedLongCounterBuilder) counterBuilder).setAttributesAdvice(emptyList()); LongUpDownCounterBuilder upDownCounterBuilder = meter.upDownCounterBuilder("test"); - assertThat(upDownCounterBuilder).isNotInstanceOf(ExtendedLongUpDownCounterBuilder.class); + assertThat(upDownCounterBuilder).isInstanceOf(ExtendedLongUpDownCounterBuilder.class); + ((ExtendedLongUpDownCounterBuilder) upDownCounterBuilder).setAttributesAdvice(emptyList()); DoubleGaugeBuilder gaugeBuilder = meter.gaugeBuilder("test"); - assertThat(gaugeBuilder).isNotInstanceOf(ExtendedDoubleGaugeBuilder.class); + assertThat(gaugeBuilder).isInstanceOf(ExtendedDoubleGaugeBuilder.class); + ((ExtendedDoubleGaugeBuilder) gaugeBuilder).setAttributesAdvice(emptyList()); DoubleHistogramBuilder histogramBuilder = meter.histogramBuilder("test"); - assertThat(histogramBuilder).isNotInstanceOf(ExtendedDoubleHistogramBuilder.class); + assertThat(histogramBuilder).isInstanceOf(ExtendedDoubleHistogramBuilder.class); + ((ExtendedDoubleHistogramBuilder) histogramBuilder).setAttributesAdvice(emptyList()); } } diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/testLogbackAppender/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/logging/LogbackAppenderTest.java b/instrumentation/spring/spring-boot-autoconfigure/src/testLogbackAppender/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/logging/LogbackAppenderTest.java index 61200b2c6465..86a366b14fce 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/testLogbackAppender/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/logging/LogbackAppenderTest.java +++ b/instrumentation/spring/spring-boot-autoconfigure/src/testLogbackAppender/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/logging/LogbackAppenderTest.java @@ -81,7 +81,7 @@ void shouldInitializeAppender() { // be added a second time by LogbackAppenderApplicationListener logRecord -> { assertThat(logRecord.getInstrumentationScopeInfo().getName()).isEqualTo("test"); - assertThat(logRecord.getBody().asString()).contains("test log message"); + assertThat(logRecord.getBodyValue().asString()).contains("test log message"); Attributes attributes = logRecord.getAttributes(); // key1 and key2, the code attributes should not be present because they are enabled diff --git a/licenses/licenses.md b/licenses/licenses.md index 8d979cb97ee1..6857b6220516 100644 --- a/licenses/licenses.md +++ b/licenses/licenses.md @@ -59,91 +59,91 @@ > - **POM Project URL**: [https://github.com/square/okio/](https://github.com/square/okio/) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**11** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api` **Version:** `1.41.0` +**11** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api` **Version:** `1.42.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) -**12** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api-incubator` **Version:** `1.41.0-alpha` +**12** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api-incubator` **Version:** `1.42.0-alpha` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) -**13** **Group:** `io.opentelemetry` **Name:** `opentelemetry-context` **Version:** `1.41.0` +**13** **Group:** `io.opentelemetry` **Name:** `opentelemetry-context` **Version:** `1.42.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) -**14** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-common` **Version:** `1.41.0` +**14** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-common` **Version:** `1.42.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**15** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-logging` **Version:** `1.41.0` +**15** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-logging` **Version:** `1.42.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**16** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-logging-otlp` **Version:** `1.41.0` +**16** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-logging-otlp` **Version:** `1.42.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**17** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-otlp` **Version:** `1.41.0` +**17** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-otlp` **Version:** `1.42.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**18** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-otlp-common` **Version:** `1.41.0` +**18** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-otlp-common` **Version:** `1.42.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**19** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-prometheus` **Version:** `1.41.0-alpha` +**19** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-prometheus` **Version:** `1.42.0-alpha` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**20** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-sender-okhttp` **Version:** `1.41.0` +**20** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-sender-okhttp` **Version:** `1.42.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**21** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-zipkin` **Version:** `1.41.0` +**21** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-zipkin` **Version:** `1.42.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**22** **Group:** `io.opentelemetry` **Name:** `opentelemetry-extension-kotlin` **Version:** `1.41.0` +**22** **Group:** `io.opentelemetry` **Name:** `opentelemetry-extension-kotlin` **Version:** `1.42.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**23** **Group:** `io.opentelemetry` **Name:** `opentelemetry-extension-trace-propagators` **Version:** `1.41.0` +**23** **Group:** `io.opentelemetry` **Name:** `opentelemetry-extension-trace-propagators` **Version:** `1.42.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**24** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk` **Version:** `1.41.0` +**24** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk` **Version:** `1.42.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**25** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-common` **Version:** `1.41.0` +**25** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-common` **Version:** `1.42.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**26** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-autoconfigure` **Version:** `1.41.0` +**26** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-autoconfigure` **Version:** `1.42.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**27** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-autoconfigure-spi` **Version:** `1.41.0` +**27** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-autoconfigure-spi` **Version:** `1.42.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**28** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-incubator` **Version:** `1.41.0-alpha` +**28** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-incubator` **Version:** `1.42.0-alpha` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**29** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-jaeger-remote-sampler` **Version:** `1.41.0` +**29** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-jaeger-remote-sampler` **Version:** `1.42.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**30** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-logs` **Version:** `1.41.0` +**30** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-logs` **Version:** `1.42.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**31** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-metrics` **Version:** `1.41.0` +**31** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-metrics` **Version:** `1.42.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**32** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-trace` **Version:** `1.41.0` +**32** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-trace` **Version:** `1.42.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) @@ -221,15 +221,15 @@ > - **POM Project URL**: [http://www.jetbrains.org](http://www.jetbrains.org) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**50** **Group:** `org.jetbrains.kotlin` **Name:** `kotlin-stdlib` **Version:** `2.0.10` +**50** **Group:** `org.jetbrains.kotlin` **Name:** `kotlin-stdlib` **Version:** `2.0.20` > - **POM Project URL**: [https://kotlinlang.org/](https://kotlinlang.org/) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**51** **Group:** `org.jetbrains.kotlin` **Name:** `kotlin-stdlib-jdk7` **Version:** `2.0.10` +**51** **Group:** `org.jetbrains.kotlin` **Name:** `kotlin-stdlib-jdk7` **Version:** `2.0.20` > - **POM Project URL**: [https://kotlinlang.org/](https://kotlinlang.org/) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**52** **Group:** `org.jetbrains.kotlin` **Name:** `kotlin-stdlib-jdk8` **Version:** `2.0.10` +**52** **Group:** `org.jetbrains.kotlin` **Name:** `kotlin-stdlib-jdk8` **Version:** `2.0.20` > - **POM Project URL**: [https://kotlinlang.org/](https://kotlinlang.org/) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) diff --git a/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractOtelSpringStarterSmokeTest.java b/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractOtelSpringStarterSmokeTest.java index 4e802dd3bccb..60a9392293d7 100644 --- a/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractOtelSpringStarterSmokeTest.java +++ b/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractOtelSpringStarterSmokeTest.java @@ -187,7 +187,7 @@ void shouldSendTelemetry() { if (System.getProperty("org.graalvm.nativeimage.imagecode") == null) { // log records differ in native image mode due to different startup timing LogRecordData firstLog = exportedLogRecords.get(0); - assertThat(firstLog.getBody().asString()) + assertThat(firstLog.getBodyValue().asString()) .as("Should instrument logs") .startsWith("Starting ") .contains(this.getClass().getSimpleName());