Merge branch 'main' into jmx-unit-semconv-alignment

Author: robsunday

benchmark-overhead/build.gradle.kts

@@ -18,8 +18,8 @@ repositories {
 dependencies {
   implementation(enforcedPlatform("org.junit:junit-bom:5.12.2"))
 
-  testImplementation("org.testcontainers:testcontainers:1.20.6")
-  testImplementation("org.testcontainers:postgresql:1.20.6")
+  testImplementation("org.testcontainers:testcontainers:1.21.0")
+  testImplementation("org.testcontainers:postgresql:1.21.0")
   testImplementation("org.junit.jupiter:junit-jupiter-api")
   testImplementation("org.junit.jupiter:junit-jupiter-params")
   testImplementation("com.squareup.okhttp3:okhttp:4.12.0")

benchmark-overhead/src/test/java/io/opentelemetry/OverheadTests.java

@@ -22,6 +22,7 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.time.Duration;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -145,11 +146,11 @@ private void doWarmupPhase(TestConfig testConfig, GenericContainer<?> petclinic)
         System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(testConfig.getWarmupSeconds());
     while (System.currentTimeMillis() < deadline) {
       GenericContainer<?> k6 =
-          new GenericContainer<>(DockerImageName.parse("loadimpact/k6"))
+          new GenericContainer<>(DockerImageName.parse("grafana/k6"))
               .withNetwork(NETWORK)
               .withCopyFileToContainer(MountableFile.forHostPath("./k6"), "/app")
               .withCommand("run", "-u", "5", "-i", "200", "/app/basic.js")
-              .withStartupCheckStrategy(new OneShotStartupCheckStrategy());
+              .withStartupCheckStrategy(new OneShotStartupCheckStrategy().withTimeout(Duration.ofMinutes(5)));
       k6.start();
     }
 

benchmark-overhead/src/test/java/io/opentelemetry/containers/PetClinicRestContainer.java

@@ -87,7 +87,7 @@ private String[] buildCommandline(Optional<Path> agentJar) {
                 "-Dotel.traces.exporter=otlp",
                 "-Dotel.imr.export.interval=5000",
                 "-Dotel.exporter.otlp.insecure=true",
-                "-Dotel.exporter.otlp.endpoint=http://collector:4317",
+                "-Dotel.exporter.otlp.endpoint=http://collector:4318",
                 "-Dotel.resource.attributes=service.name=petclinic-otel-overhead"));
     result.addAll(this.agent.getAdditionalJvmArgs());
     agentJar.ifPresent(path -> result.add("-javaagent:/app/" + path.getFileName()));

dependencyManagement/build.gradle.kts

@@ -33,7 +33,7 @@ val DEPENDENCY_BOMS = listOf(
   "org.apache.groovy:groovy-bom:${groovyVersion}",
   "io.opentelemetry:opentelemetry-bom:${otelSdkVersion}",
   "io.opentelemetry:opentelemetry-bom-alpha:${otelSdkAlphaVersion}",
-  "org.testcontainers:testcontainers-bom:1.20.6"
+  "org.testcontainers:testcontainers-bom:1.21.0"
 )
 
 val autoServiceVersion = "1.1.1"

examples/distro/smoke-tests/build.gradle

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  testImplementation("org.testcontainers:testcontainers:1.20.6")
+  testImplementation("org.testcontainers:testcontainers:1.21.0")
   testImplementation("com.fasterxml.jackson.core:jackson-databind:2.18.3")
   testImplementation("com.google.protobuf:protobuf-java-util:4.30.2")
   testImplementation("com.squareup.okhttp3:okhttp:4.12.0")

examples/extension/build.gradle

@@ -97,7 +97,7 @@ dependencies {
   implementation 'org.apache.commons:commons-lang3:3.17.0'
 
   //All dependencies below are only for tests
-  testImplementation("org.testcontainers:testcontainers:1.20.6")
+  testImplementation("org.testcontainers:testcontainers:1.21.0")
   testImplementation("com.fasterxml.jackson.core:jackson-databind:2.18.3")
   testImplementation("com.google.protobuf:protobuf-java-util:4.30.2")
   testImplementation("com.squareup.okhttp3:okhttp:4.12.0")

instrumentation/aws-sdk/aws-sdk-2.2/javaagent/build.gradle.kts

@@ -97,7 +97,6 @@ muzzle {
 }
 
 dependencies {
-  implementation(project(":instrumentation:aws-sdk:aws-sdk-2.2:library-autoconfigure"))
   implementation(project(":instrumentation:aws-sdk:aws-sdk-2.2:library"))
 
   library("software.amazon.awssdk:aws-core:2.2.0")

instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/AwsSdkInstrumentationModule.java

@@ -6,7 +6,6 @@
 package io.opentelemetry.javaagent.instrumentation.awssdk.v2_2;
 
 import com.google.auto.service.AutoService;
-import io.opentelemetry.instrumentation.awssdk.v2_2.autoconfigure.TracingExecutionInterceptor;
 import io.opentelemetry.javaagent.extension.instrumentation.HelperResourceBuilder;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
@@ -32,7 +31,7 @@ public void registerHelperResources(HelperResourceBuilder helperResourceBuilder)
   public void injectClasses(ClassInjector injector) {
     injector
         .proxyBuilder(
-            "io.opentelemetry.instrumentation.awssdk.v2_2.autoconfigure.TracingExecutionInterceptor")
+            "io.opentelemetry.javaagent.instrumentation.awssdk.v2_2.TracingExecutionInterceptor")
         .inject(InjectionMode.CLASS_ONLY);
   }
 

instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/AwsSdkSingletons.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.awssdk.v2_2;
+
+import io.opentelemetry.instrumentation.awssdk.v2_2.AwsSdkTelemetry;
+import io.opentelemetry.instrumentation.awssdk.v2_2.internal.AbstractAwsSdkTelemetryFactory;
+import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;
+import io.opentelemetry.javaagent.bootstrap.internal.ExperimentalConfig;
+import java.util.List;
+
+public final class AwsSdkSingletons {
+
+  private static final AwsSdkTelemetry TELEMETRY = new AwsSdkTelemetryFactory().telemetry();
+
+  public static AwsSdkTelemetry telemetry() {
+    return TELEMETRY;
+  }
+
+  private static class AwsSdkTelemetryFactory extends AbstractAwsSdkTelemetryFactory {
+
+    @Override
+    protected List<String> getCapturedHeaders() {
+      return ExperimentalConfig.get().getMessagingHeaders();
+    }
+
+    @Override
+    protected boolean messagingReceiveInstrumentationEnabled() {
+      return ExperimentalConfig.get().messagingReceiveInstrumentationEnabled();
+    }
+
+    @Override
+    protected boolean getBoolean(String name, boolean defaultValue) {
+      return AgentInstrumentationConfig.get().getBoolean(name, defaultValue);
+    }
+  }
+
+  private AwsSdkSingletons() {}
+}

instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/DefaultBedrockRuntimeAsyncClientBuilderInstrumentation.java

@@ -7,7 +7,6 @@
 
 import static net.bytebuddy.matcher.ElementMatchers.named;
 
-import io.opentelemetry.instrumentation.awssdk.v2_2.autoconfigure.AwsSdkSingletons;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import net.bytebuddy.asm.Advice;