Update to otel 1.18.0 (#6575)

dependencyManagement/build.gradle.kts

@@ -12,7 +12,7 @@ val dependencyVersions = hashMapOf<String, String>()
 rootProject.extra["versions"] = dependencyVersions
 
 // this line is managed by .github/scripts/update-sdk-version.sh
-val otelVersion = "1.17.0"
+val otelVersion = "1.18.0"
 
 rootProject.extra["otelVersion"] = otelVersion
 

examples/distro/build.gradle

@@ -27,8 +27,8 @@ subprojects {
   ext {
     versions = [
       // these lines are managed by .github/scripts/update-sdk-version.sh
-      opentelemetry              : "1.17.0",
+      opentelemetry              : "1.18.0",
-      opentelemetryAlpha         : "1.17.0-alpha",
+      opentelemetryAlpha         : "1.18.0-alpha",
 
       // these lines are managed by .github/scripts/update-version.sh
       opentelemetryJavaagent     : "1.18.0-SNAPSHOT",

examples/extension/build.gradle

@@ -23,8 +23,8 @@ version '1.0'
 ext {
   versions = [
     // these lines are managed by .github/scripts/update-sdk-version.sh
-    opentelemetry              : "1.17.0",
+    opentelemetry              : "1.18.0",
-    opentelemetryAlpha         : "1.17.0-alpha",
+    opentelemetryAlpha         : "1.18.0-alpha",
 
     // these lines are managed by .github/scripts/update-version.sh
     opentelemetryJavaagent     : "1.18.0-SNAPSHOT",

instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterTest.java

@@ -498,7 +498,7 @@ class InstrumenterTest {
 
     // see the test-instrumentation.properties file
     InstrumentationScopeInfo expectedLibraryInfo =
-        InstrumentationScopeInfo.create("test-instrumentation", "1.2.3", /* schemaUrl= */ null);
+        InstrumentationScopeInfo.builder("test-instrumentation").setVersion("1.2.3").build();
 
     otelTesting
         .assertTraces()
@@ -529,8 +529,9 @@ class InstrumenterTest {
                     span ->
                         span.hasName("span")
                             .hasInstrumentationScopeInfo(
-                                InstrumentationScopeInfo.create(
+                                InstrumentationScopeInfo.builder("test")
-                                    "test", "1.0", /* schemaUrl= */ null))));
+                                    .setVersion("1.0")
+                                    .build())));
   }
 
   @Test
@@ -547,7 +548,9 @@ class InstrumenterTest {
     instrumenter.end(context, Collections.emptyMap(), Collections.emptyMap(), null);
 
     InstrumentationScopeInfo expectedLibraryInfo =
-        InstrumentationScopeInfo.create("test", null, "https://opentelemetry.io/schemas/1.0.0");
+        InstrumentationScopeInfo.builder("test")
+            .setSchemaUrl("https://opentelemetry.io/schemas/1.0.0")
+            .build();
     otelTesting
         .assertTraces()
         .hasTracesSatisfyingExactly(

instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/MeterTest.java

@@ -69,8 +69,9 @@ class MeterTest {
                         .hasDescription("d")
                         .hasUnit("u")
                         .hasInstrumentationScope(
-                            InstrumentationScopeInfo.create(
+                            InstrumentationScopeInfo.builder(instrumentationName)
-                                instrumentationName, "1.2.3", /* schemaUrl= */ null))
+                                .setVersion("1.2.3")
+                                .build())
                         .hasLongSumSatisfying(
                             sum ->
                                 sum.isMonotonic()
@@ -102,8 +103,9 @@ class MeterTest {
                         .hasDescription("d")
                         .hasUnit("u")
                         .hasInstrumentationScope(
-                            InstrumentationScopeInfo.create(
+                            InstrumentationScopeInfo.builder(instrumentationName)
-                                instrumentationName, "1.2.3", /* schemaUrl= */ null))
+                                .setVersion("1.2.3")
+                                .build())
                         .hasLongSumSatisfying(
                             sum ->
                                 sum.isMonotonic()
@@ -142,8 +144,9 @@ class MeterTest {
                         .hasDescription("d")
                         .hasUnit("u")
                         .hasInstrumentationScope(
-                            InstrumentationScopeInfo.create(
+                            InstrumentationScopeInfo.builder(instrumentationName)
-                                instrumentationName, "1.2.3", /* schemaUrl= */ null))
+                                .setVersion("1.2.3")
+                                .build())
                         .hasDoubleSumSatisfying(
                             sum ->
                                 sum.isMonotonic()
@@ -176,8 +179,9 @@ class MeterTest {
                         .hasDescription("d")
                         .hasUnit("u")
                         .hasInstrumentationScope(
-                            InstrumentationScopeInfo.create(
+                            InstrumentationScopeInfo.builder(instrumentationName)
-                                instrumentationName, "1.2.3", /* schemaUrl= */ null))
+                                .setVersion("1.2.3")
+                                .build())
                         .hasDoubleSumSatisfying(
                             sum ->
                                 sum.isMonotonic()
@@ -216,8 +220,9 @@ class MeterTest {
                         .hasDescription("d")
                         .hasUnit("u")
                         .hasInstrumentationScope(
-                            InstrumentationScopeInfo.create(
+                            InstrumentationScopeInfo.builder(instrumentationName)
-                                instrumentationName, "1.2.3", /* schemaUrl= */ null))
+                                .setVersion("1.2.3")
+                                .build())
                         .hasLongSumSatisfying(
                             sum ->
                                 sum.isNotMonotonic()
@@ -249,8 +254,9 @@ class MeterTest {
                         .hasDescription("d")
                         .hasUnit("u")
                         .hasInstrumentationScope(
-                            InstrumentationScopeInfo.create(
+                            InstrumentationScopeInfo.builder(instrumentationName)
-                                instrumentationName, "1.2.3", /* schemaUrl= */ null))
+                                .setVersion("1.2.3")
+                                .build())
                         .hasLongSumSatisfying(
                             sum ->
                                 sum.isNotMonotonic()
@@ -289,8 +295,9 @@ class MeterTest {
                         .hasDescription("d")
                         .hasUnit("u")
                         .hasInstrumentationScope(
-                            InstrumentationScopeInfo.create(
+                            InstrumentationScopeInfo.builder(instrumentationName)
-                                instrumentationName, "1.2.3", /* schemaUrl= */ null))
+                                .setVersion("1.2.3")
+                                .build())
                         .hasDoubleSumSatisfying(
                             sum ->
                                 sum.isNotMonotonic()
@@ -323,8 +330,9 @@ class MeterTest {
                         .hasDescription("d")
                         .hasUnit("u")
                         .hasInstrumentationScope(
-                            InstrumentationScopeInfo.create(
+                            InstrumentationScopeInfo.builder(instrumentationName)
-                                instrumentationName, "1.2.3", /* schemaUrl= */ null))
+                                .setVersion("1.2.3")
+                                .build())
                         .hasDoubleSumSatisfying(
                             sum ->
                                 sum.isNotMonotonic()
@@ -363,8 +371,9 @@ class MeterTest {
                         .hasDescription("d")
                         .hasUnit("u")
                         .hasInstrumentationScope(
-                            InstrumentationScopeInfo.create(
+                            InstrumentationScopeInfo.builder(instrumentationName)
-                                instrumentationName, "1.2.3", /* schemaUrl= */ null))
+                                .setVersion("1.2.3")
+                                .build())
                         .hasHistogramSatisfying(
                             histogram ->
                                 histogram.hasPointsSatisfying(
@@ -393,8 +402,9 @@ class MeterTest {
                         .hasDescription("d")
                         .hasUnit("u")
                         .hasInstrumentationScope(
-                            InstrumentationScopeInfo.create(
+                            InstrumentationScopeInfo.builder(instrumentationName)
-                                instrumentationName, "1.2.3", /* schemaUrl= */ null))
+                                .setVersion("1.2.3")
+                                .build())
                         .hasHistogramSatisfying(
                             histogram ->
                                 histogram.hasPointsSatisfying(
@@ -426,8 +436,9 @@ class MeterTest {
                         .hasDescription("d")
                         .hasUnit("u")
                         .hasInstrumentationScope(
-                            InstrumentationScopeInfo.create(
+                            InstrumentationScopeInfo.builder(instrumentationName)
-                                instrumentationName, "1.2.3", /* schemaUrl= */ null))
+                                .setVersion("1.2.3")
+                                .build())
                         .hasLongGaugeSatisfying(
                             gauge ->
                                 gauge.hasPointsSatisfying(
@@ -467,8 +478,9 @@ class MeterTest {
                         .hasDescription("d")
                         .hasUnit("u")
                         .hasInstrumentationScope(
-                            InstrumentationScopeInfo.create(
+                            InstrumentationScopeInfo.builder(instrumentationName)
-                                instrumentationName, "1.2.3", /* schemaUrl= */ null))
+                                .setVersion("1.2.3")
+                                .build())
                         .hasDoubleGaugeSatisfying(
                             gauge ->
                                 gauge.hasPointsSatisfying(

instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts

@@ -21,10 +21,7 @@ dependencies {
   implementation(project(":instrumentation:spring:spring-web-3.1:library"))
   implementation(project(":instrumentation:spring:spring-webmvc-5.3:library"))
   implementation(project(":instrumentation:spring:spring-webflux-5.0:library"))
-  implementation("io.opentelemetry:opentelemetry-micrometer1-shim") {
+  implementation(project(":instrumentation:micrometer:micrometer-1.5:library"))
-    // just get the instrumentation, without micrometer itself
-    exclude("io.micrometer", "micrometer-core")
-  }
 
   compileOnly("org.springframework.kafka:spring-kafka:2.9.0")
   compileOnly("org.springframework.boot:spring-boot-starter-actuator:$springBootVersion")
@@ -79,7 +76,8 @@ tasks.withType<Test>().configureEach {
 
   // disable tests on openj9 18 because they often crash JIT compiler
   val testJavaVersion = gradle.startParameter.projectProperties["testJavaVersion"]?.let(JavaVersion::toVersion)
-  val testOnOpenJ9 = gradle.startParameter.projectProperties["testJavaVM"]?.run { this == "openj9" } ?: false
+  val testOnOpenJ9 = gradle.startParameter.projectProperties["testJavaVM"]?.run { this == "openj9" }
+    ?: false
   if (testOnOpenJ9 && testJavaVersion?.majorVersion == "18") {
     enabled = false
   }

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/metrics/MicrometerShimAutoConfiguration.java

@@ -8,7 +8,7 @@ package io.opentelemetry.instrumentation.spring.autoconfigure.metrics;
 import io.micrometer.core.instrument.Clock;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.opentelemetry.api.OpenTelemetry;
-import io.opentelemetry.micrometer1shim.OpenTelemetryMeterRegistry;
+import io.opentelemetry.instrumentation.micrometer.v1_5.OpenTelemetryMeterRegistry;
 import org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;

instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/metrics/MicrometerShimAutoConfigurationTest.java

@@ -8,8 +8,8 @@ package io.opentelemetry.instrumentation.spring.autoconfigure.metrics;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.micrometer.core.instrument.MeterRegistry;
+import io.opentelemetry.instrumentation.micrometer.v1_5.OpenTelemetryMeterRegistry;
 import io.opentelemetry.instrumentation.spring.autoconfigure.OpenTelemetryAutoConfiguration;
-import io.opentelemetry.micrometer1shim.OpenTelemetryMeterRegistry;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigurations;

javaagent-tooling/build.gradle.kts

@@ -27,7 +27,8 @@ dependencies {
   implementation("io.opentelemetry:opentelemetry-extension-aws")
   implementation("io.opentelemetry:opentelemetry-extension-trace-propagators")
   implementation("io.opentelemetry:opentelemetry-sdk-extension-resources")
-  implementation("io.opentelemetry:opentelemetry-sdk-extension-metric-incubator")
+  // the incubator's ViewConfigCustomizer is used to support loading yaml-based metric views
+  implementation("io.opentelemetry:opentelemetry-sdk-extension-incubator")
 
   // Exporters with dependencies
   implementation("io.opentelemetry:opentelemetry-exporter-jaeger")

licenses/licenses.md

@@ -1,7 +1,7 @@
 
 #javaagent
 ##Dependency License Report
-_2022-09-06 12:21:05 CEST_
+_2022-09-09 17:28:09 PDT_
 ## Apache License, Version 2.0
 
 **1** **Group:** `com.blogspot.mydailyjava` **Name:** `weak-lock-free` **Version:** `0.18` 
@@ -37,103 +37,103 @@ _2022-09-06 12:21:05 CEST_
 > - **POM Project URL**: [https://github.com/square/okio/](https://github.com/square/okio/)
 > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
 
-**7** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api` **Version:** `1.17.0` 
+**7** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api` **Version:** `1.18.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)
 
-**8** **Group:** `io.opentelemetry` **Name:** `opentelemetry-context` **Version:** `1.17.0` 
+**8** **Group:** `io.opentelemetry` **Name:** `opentelemetry-context` **Version:** `1.18.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)
 
-**9** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-common` **Version:** `1.17.0` 
+**9** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-common` **Version:** `1.18.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)
 
-**10** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-jaeger` **Version:** `1.17.0` 
+**10** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-jaeger` **Version:** `1.18.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)
 
-**11** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-logging` **Version:** `1.17.0` 
+**11** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-logging` **Version:** `1.18.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-exporter-logging-otlp` **Version:** `1.17.0` 
+**12** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-logging-otlp` **Version:** `1.18.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)
 
-**13** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-otlp` **Version:** `1.17.0` 
+**13** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-otlp` **Version:** `1.18.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-otlp-common` **Version:** `1.17.0` 
+**14** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-otlp-common` **Version:** `1.18.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)
 
-**15** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-otlp-logs` **Version:** `1.17.0-alpha` 
+**15** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-otlp-logs` **Version:** `1.18.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)
 
-**16** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-prometheus` **Version:** `1.17.0-alpha` 
+**16** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-prometheus` **Version:** `1.18.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)
 
-**17** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-zipkin` **Version:** `1.17.0` 
+**17** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-zipkin` **Version:** `1.18.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)
 
-**18** **Group:** `io.opentelemetry` **Name:** `opentelemetry-extension-aws` **Version:** `1.17.0` 
+**18** **Group:** `io.opentelemetry` **Name:** `opentelemetry-extension-aws` **Version:** `1.18.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)
 
-**19** **Group:** `io.opentelemetry` **Name:** `opentelemetry-extension-kotlin` **Version:** `1.17.0` 
+**19** **Group:** `io.opentelemetry` **Name:** `opentelemetry-extension-kotlin` **Version:** `1.18.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)
 
-**20** **Group:** `io.opentelemetry` **Name:** `opentelemetry-extension-trace-propagators` **Version:** `1.17.0` 
+**20** **Group:** `io.opentelemetry` **Name:** `opentelemetry-extension-trace-propagators` **Version:** `1.18.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)
 
-**21** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk` **Version:** `1.17.0` 
+**21** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk` **Version:** `1.18.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)
 
-**22** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-common` **Version:** `1.17.0` 
+**22** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-common` **Version:** `1.18.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)
 
-**23** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-autoconfigure` **Version:** `1.17.0-alpha` 
+**23** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-autoconfigure` **Version:** `1.18.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)
 
-**24** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-autoconfigure-spi` **Version:** `1.17.0` 
+**24** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-autoconfigure-spi` **Version:** `1.18.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)
 
-**25** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-jaeger-remote-sampler` **Version:** `1.17.0` 
+**25** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-incubator` **Version:** `1.18.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)
 
-**26** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-metric-incubator` **Version:** `1.17.0-alpha` 
+**26** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-jaeger-remote-sampler` **Version:** `1.18.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)
 
-**27** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-resources` **Version:** `1.17.0` 
+**27** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-resources` **Version:** `1.18.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)
 
-**28** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-logs` **Version:** `1.17.0-alpha` 
+**28** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-logs` **Version:** `1.18.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)
 
-**29** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-metrics` **Version:** `1.17.0` 
+**29** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-metrics` **Version:** `1.18.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)
 
-**30** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-trace` **Version:** `1.17.0` 
+**30** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-trace` **Version:** `1.18.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)
 
-**31** **Group:** `io.opentelemetry` **Name:** `opentelemetry-semconv` **Version:** `1.17.0-alpha` 
+**31** **Group:** `io.opentelemetry` **Name:** `opentelemetry-semconv` **Version:** `1.18.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)
 
@@ -194,7 +194,7 @@ _2022-09-06 12:21:05 CEST_
 > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
 > - **POM License**: The 3-Clause BSD License - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
 
-**43** **Group:** `org.yaml` **Name:** `snakeyaml` **Version:** `1.30` 
+**43** **Group:** `org.yaml` **Name:** `snakeyaml` **Version:** `1.31` 
 > - **Manifest License**: Apache License, Version 2.0 (Not Packaged)
 > - **POM Project URL**: [https://bitbucket.org/snakeyaml/snakeyaml](https://bitbucket.org/snakeyaml/snakeyaml)
 > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)

testing-common/src/main/java/io/opentelemetry/javaagent/testing/common/AgentTestingExporterAccess.java

@@ -188,10 +188,9 @@ public final class AgentTestingExporterAccess {
                       io.opentelemetry.sdk.resources.Resource.create(
                           fromProto(resource.getAttributesList())))
                   .setInstrumentationScopeInfo(
-                      InstrumentationScopeInfo.create(
+                      InstrumentationScopeInfo.builder(instrumentationScope.getName())
-                          instrumentationScope.getName(),
+                          .setVersion(instrumentationScope.getVersion())
-                          instrumentationScope.getVersion(),
+                          .build())
-                          /* schemaUrl= */ null))
                   .setName(span.getName())
                   .setStartEpochNanos(span.getStartTimeUnixNano())
                   .setEndEpochNanos(span.getEndTimeUnixNano())
@@ -267,10 +266,9 @@ public final class AgentTestingExporterAccess {
                   metric,
                   io.opentelemetry.sdk.resources.Resource.create(
                       fromProto(resource.getAttributesList())),
-                  InstrumentationScopeInfo.create(
+                  InstrumentationScopeInfo.builder(instrumentationScope.getName())
-                      instrumentationScope.getName(),
+                      .setVersion(instrumentationScope.getVersion())
-                      instrumentationScope.getVersion(),
+                      .build()));
-                      /* schemaUrl= */ null)));
         }
       }
     }
@@ -309,10 +307,9 @@ public final class AgentTestingExporterAccess {
                   logRecord,
                   io.opentelemetry.sdk.resources.Resource.create(
                       fromProto(resource.getAttributesList())),
-                  InstrumentationScopeInfo.create(
+                  InstrumentationScopeInfo.builder(instrumentationScope.getName())
-                      instrumentationScope.getName(),
+                      .setVersion(instrumentationScope.getVersion())
-                      instrumentationScope.getVersion(),
+                      .build()));
-                      /* schemaUrl= */ null)));
         }
       }
     }