Update the OpenTelemetry SDK version to 1.50.0 (#13834)

Co-authored-by: otelbot <[email protected]>
Co-authored-by: Lauri Tulmin <[email protected]>

Author: otelbot[bot]

.fossa.yml

@@ -766,6 +766,9 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:opentelemetry-api:opentelemetry-api-1.47:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:opentelemetry-api:opentelemetry-api-1.50:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:pekko:pekko-actor-1.0:javaagent'

dependencyManagement/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 data class DependencySet(val group: String, val version: String, val modules: List<String>)
 
 // this line is managed by .github/scripts/update-sdk-version.sh
-val otelSdkVersion = "1.49.0"
+val otelSdkVersion = "1.50.0"
 val otelContribVersion = "1.46.0-alpha"
 val otelSdkAlphaVersion = otelSdkVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
 

examples/distro/build.gradle

@@ -27,7 +27,7 @@ subprojects {
   ext {
     versions = [
       // this line is managed by .github/scripts/update-sdk-version.sh
-      opentelemetrySdk           : "1.49.0",
+      opentelemetrySdk           : "1.50.0",
 
       // these lines are managed by .github/scripts/update-version.sh
       opentelemetryJavaagent     : "2.16.0-SNAPSHOT",

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.49.0",
+    opentelemetrySdk           : "1.50.0",
 
     // these lines are managed by .github/scripts/update-version.sh
     opentelemetryJavaagent     : "2.16.0-SNAPSHOT",

instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_27/ApplicationOpenTelemetry127.java

@@ -120,10 +120,22 @@ private static ApplicationMeterFactory getMeterFactory(String className) {
   }
 
   private static ApplicationLoggerFactory getLoggerFactory() {
-    // this class is defined in opentelemetry-api-1.47
+    // this class is defined in opentelemetry-api-1.50
     ApplicationLoggerFactory loggerFactory =
         getLoggerFactory(
-            "io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_47.incubator.logs.ApplicationLoggerFactory147Incubator");
+            "io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_50.incubator.logs.ApplicationLoggerFactory150Incubator");
+    if (loggerFactory == null) {
+      // this class is defined in opentelemetry-api-1.50
+      loggerFactory =
+          getLoggerFactory(
+              "io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_50.logs.ApplicationLoggerFactory150");
+    }
+    if (loggerFactory == null) {
+      // this class is defined in opentelemetry-api-1.47
+      loggerFactory =
+          getLoggerFactory(
+              "io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_47.incubator.logs.ApplicationLoggerFactory147Incubator");
+    }
     if (loggerFactory == null) {
       // this class is defined in opentelemetry-api-1.42
       loggerFactory =

instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/build.gradle.kts

@@ -19,6 +19,9 @@ configurations.configureEach {
       force("io.opentelemetry:opentelemetry-api:1.31.0")
     }
   }
+  if (name == "testRuntimeClasspath" || name == "noopTestRuntimeClasspath") {
+    exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")
+  }
 }
 
 testing {

instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/build.gradle.kts

@@ -20,7 +20,7 @@ configurations.configureEach {
       force("io.opentelemetry:opentelemetry-api:1.32.0")
     }
   }
-  if (name == "testRuntimeClasspath") {
+  if (name == "testRuntimeClasspath" || name == "incubatorTestRuntimeClasspath" || name == "noopTestRuntimeClasspath") {
     exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")
   }
 }

instrumentation/opentelemetry-api/opentelemetry-api-1.42/javaagent/build.gradle.kts

@@ -21,6 +21,10 @@ configurations.configureEach {
   if (name == "testRuntimeClasspath") {
     exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")
   }
+  resolutionStrategy {
+    // use older version of opentelemetry-sdk-testing that does not depend on opentelemetry-api-incubator
+    force("io.opentelemetry:opentelemetry-sdk-testing:1.47.0")
+  }
 }
 
 testing {

instrumentation/opentelemetry-api/opentelemetry-api-1.42/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_42/logs/ApplicationLogRecordBuilder142.java

@@ -31,7 +31,7 @@ public LogRecordBuilder setBody(Value<?> body) {
   }
 
   @SuppressWarnings("unchecked")
-  private static io.opentelemetry.api.common.Value<?> convertValue(Value<?> value) {
+  protected static io.opentelemetry.api.common.Value<?> convertValue(Value<?> value) {
     if (value == null) {
       return null;
     }

instrumentation/opentelemetry-api/opentelemetry-api-1.47/javaagent/build.gradle.kts

@@ -13,3 +13,14 @@ dependencies {
 
   testImplementation("io.opentelemetry:opentelemetry-api-incubator")
 }
+
+configurations.configureEach {
+  if (name.endsWith("testRuntimeClasspath", true) || name.endsWith("testCompileClasspath", true)) {
+    resolutionStrategy {
+      force("io.opentelemetry:opentelemetry-api:1.47.0")
+      force("io.opentelemetry:opentelemetry-api-incubator:1.47.0-alpha")
+      // use older version of opentelemetry-sdk-testing that works with opentelemetry-api-incubator:1.47.0-alpha
+      force("io.opentelemetry:opentelemetry-sdk-testing:1.47.0")
+    }
+  }
+}