Update the OpenTelemetry SDK version to 1.61.0 (open-telemetry#17817)

Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com>
Co-authored-by: Lauri Tulmin <ltulmin@splunk.com>

Author: otelbot[bot]

.github/config/lychee.toml

@@ -20,6 +20,9 @@ exclude = [
   '^http://code.google.com/p/concurrentlinkedhashmap$',
   '^https://softwareengineering.stackexchange.com/questions/29727.*',
   '^https://central.sonatype.com/service/rest/repository/browse/maven-snapshots/io/opentelemetry/$',
+  # url in zipkin pom files points to a non-existent location
+  '^https://github.com/openzipkin/zipkin-reporter-java/zipkin-reporter$',
+  '^https://github.com/openzipkin/zipkin-reporter-java/zipkin-sender-okhttp3$',
   # flaky links
   '^http://www.slf4j.org.*',
   '^https://logback.qos.ch/.*',

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.60.1"
+val otelSdkVersion = "1.61.0"
 val otelContribVersion = "1.55.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.60.1",
+      opentelemetrySdk           : "1.61.0",
 
       // these lines are managed by .github/scripts/update-version.sh
       opentelemetryJavaagent     : "2.27.0-SNAPSHOT",

examples/extension/build.gradle.kts

@@ -24,7 +24,7 @@ version = "1.0"
 
 val versions = mapOf(
   // this line is managed by .github/scripts/update-sdk-version.sh
-  "opentelemetrySdk" to "1.60.1",
+  "opentelemetrySdk" to "1.61.0",
 
   // these lines are managed by .github/scripts/update-version.sh
   "opentelemetryJavaagent" to "2.27.0-SNAPSHOT",

instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/internal/ResourceDeclarativeConfigTest.java

@@ -46,7 +46,8 @@ void endToEnd() {
 
     boolean java8 = "1.8".equals(System.getProperty("java.specification.version"));
     OpenTelemetrySdk openTelemetrySdk =
-        DeclarativeConfiguration.parseAndCreate(new ByteArrayInputStream(yaml.getBytes(UTF_8)));
+        DeclarativeConfiguration.parseAndCreate(new ByteArrayInputStream(yaml.getBytes(UTF_8)))
+            .getSdk();
     assertThat(openTelemetrySdk.getSdkTracerProvider())
         .extracting("sharedState.resource", as(InstanceOfAssertFactories.type(Resource.class)))
         .satisfies(

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

@@ -41,6 +41,7 @@
 import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizerProvider;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Function;
@@ -166,7 +167,7 @@ public OpenTelemetry openTelemetry(
           OpenTelemetryConfigurationModel model, ApplicationContext applicationContext) {
         OpenTelemetrySdkComponentLoader componentLoader =
             new OpenTelemetrySdkComponentLoader(applicationContext);
-        OpenTelemetrySdk sdk = DeclarativeConfiguration.create(model, componentLoader);
+        OpenTelemetrySdk sdk = DeclarativeConfiguration.create(model, componentLoader).getSdk();
         Runtime.getRuntime().addShutdownHook(new Thread(sdk::close));
         logStart();
         return new SpringOpenTelemetrySdk(sdk, SpringConfigProvider.create(model, componentLoader));
@@ -270,7 +271,7 @@ public OpenTelemetrySdkComponentLoader(ApplicationContext applicationContext) {
 
     @Override
     public <T> Iterable<T> load(Class<T> spiClass) {
-      List<T> spi = spiHelper.load(spiClass);
+      List<T> spi = new ArrayList<>(spiHelper.load(spiClass));
       List<T> beans =
           applicationContext.getBeanProvider(spiClass).orderedStream().collect(toList());
       spi.addAll(beans);

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AgentStarterImpl.java

@@ -123,6 +123,10 @@ private void installTransformers() {
     // https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/10921
     InetAddressClassFileTransformer transformer = new InetAddressClassFileTransformer();
     instrumentation.addTransformer(transformer, true);
+    // transforms Thread getContextClassLoader and setContextClassLoader calls in
+    // io.opentelemetry.sdk.metrics.internal.state.CallbackRegistration to use doPrivileged so that
+    // security manager wouldn't deny these calls
+    instrumentation.addTransformer(new CallbackRegistrationClassFileTransformer(), true);
   }
 
   @SuppressWarnings("SystemOut")
@@ -245,4 +249,73 @@ public void visitMethodInsn(
       return hookInserted ? cw.toByteArray() : null;
     }
   }
+
+  private static class CallbackRegistrationClassFileTransformer implements ClassFileTransformer {
+    @Override
+    public byte[] transform(
+        ClassLoader loader,
+        String className,
+        Class<?> classBeingRedefined,
+        ProtectionDomain protectionDomain,
+        byte[] classfileBuffer) {
+      if (loader != getClass().getClassLoader()
+          || !"io/opentelemetry/sdk/metrics/internal/state/CallbackRegistration"
+              .equals(className)) {
+        return null;
+      }
+      ClassReader cr = new ClassReader(classfileBuffer);
+      ClassWriter cw = new ClassWriter(cr, 0);
+      ClassVisitor cv =
+          new ClassVisitor(AsmApi.VERSION, cw) {
+            @Override
+            public MethodVisitor visitMethod(
+                int access, String name, String descriptor, String signature, String[] exceptions) {
+              MethodVisitor mv = super.visitMethod(access, name, descriptor, signature, exceptions);
+              if (!"invokeCallback".equals(name) && !"<init>".equals(name)) {
+                return mv;
+              }
+              return new MethodVisitor(api, mv) {
+                @Override
+                public void visitMethodInsn(
+                    int opcode,
+                    String ownerClassName,
+                    String methodName,
+                    String descriptor,
+                    boolean isInterface) {
+                  if ("getContextClassLoader".equals(methodName)
+                      && Type.getInternalName(Thread.class).equals(ownerClassName)) {
+                    super.visitMethodInsn(
+                        Opcodes.INVOKESTATIC,
+                        Type.getInternalName(Utils.class),
+                        "getContextClassLoader",
+                        "("
+                            + Type.getDescriptor(Thread.class)
+                            + ")"
+                            + Type.getDescriptor(ClassLoader.class),
+                        false);
+                  } else if ("setContextClassLoader".equals(methodName)
+                      && Type.getInternalName(Thread.class).equals(ownerClassName)) {
+                    super.visitMethodInsn(
+                        Opcodes.INVOKESTATIC,
+                        Type.getInternalName(Utils.class),
+                        "setContextClassLoader",
+                        "("
+                            + Type.getDescriptor(Thread.class)
+                            + Type.getDescriptor(ClassLoader.class)
+                            + ")V",
+                        false);
+                  } else {
+                    super.visitMethodInsn(
+                        opcode, ownerClassName, methodName, descriptor, isInterface);
+                  }
+                }
+              };
+            }
+          };
+
+      cr.accept(cv, 0);
+
+      return cw.toByteArray();
+    }
+  }
 }

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/Utils.java

@@ -10,6 +10,7 @@
 import io.opentelemetry.javaagent.bootstrap.AgentClassLoader;
 import io.opentelemetry.javaagent.bootstrap.AgentClassLoader.BootstrapClassLoaderProxy;
 import io.opentelemetry.javaagent.bootstrap.AgentInitializer;
+import java.security.PrivilegedAction;
 import net.bytebuddy.description.method.MethodDescription;
 import net.bytebuddy.description.type.TypeDefinition;
 
@@ -54,5 +55,25 @@ public static MethodDescription getMethodDefinition(TypeDefinition type, String
     return type.getDeclaredMethods().filter(named(methodName)).getOnly();
   }
 
+  // used from generated bytecode in AgentStarterImpl.CallbackRegistrationClassFileTransformer
+  public static ClassLoader getContextClassLoader(Thread thread) {
+    return doPrivileged((PrivilegedAction<ClassLoader>) thread::getContextClassLoader);
+  }
+
+  // used from generated bytecode in AgentStarterImpl.CallbackRegistrationClassFileTransformer
+  public static void setContextClassLoader(Thread thread, ClassLoader classLoader) {
+    doPrivileged(
+        (PrivilegedAction<Void>)
+            () -> {
+              thread.setContextClassLoader(classLoader);
+              return null;
+            });
+  }
+
+  @SuppressWarnings("removal") // AccessController is deprecated for removal
+  private static <T> T doPrivileged(PrivilegedAction<T> action) {
+    return java.security.AccessController.doPrivileged(action);
+  }
+
   private Utils() {}
 }