Code review sweep (run 25218392073) (#18487)

otelbot[bot] · web-flow · commit f5fd99edd89f · 2026-05-01T13:44:56.000-07:00
Co-authored-by: otelbot &lt;197425009+otelbot@users.noreply.github.com&gt;
diff --git a/instrumentation/oracle-ucp-11.2/testing/src/main/java/io/opentelemetry/instrumentation/oracleucp/AbstractOracleUcpInstrumentationTest.java b/instrumentation/oracle-ucp-11.2/testing/src/main/java/io/opentelemetry/instrumentation/oracleucp/AbstractOracleUcpInstrumentationTest.java
@@ -33,7 +33,10 @@ public abstract class AbstractOracleUcpInstrumentationTest {
       LoggerFactory.getLogger(AbstractOracleUcpInstrumentationTest.class);
 
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.oracle-ucp-11.2";
-  private static OracleContainer oracle;
+  private static final OracleContainer oracle =
+      new OracleContainer("gvenzl/oracle-free:23-slim-faststart")
+          .withLogConsumer(new Slf4jLogConsumer(logger))
+          .withStartupTimeout(Duration.ofMinutes(2));
 
   protected abstract InstrumentationExtension testing();
 
@@ -43,18 +46,12 @@ public abstract class AbstractOracleUcpInstrumentationTest {
 
   @BeforeAll
   static void setUp() {
-    oracle =
-        new OracleContainer("gvenzl/oracle-free:23-slim-faststart")
-            .withLogConsumer(new Slf4jLogConsumer(logger))
-            .withStartupTimeout(Duration.ofMinutes(2));
     oracle.start();
   }
 
   @AfterAll
   static void cleanUp() {
-    if (oracle != null) {
-      oracle.stop();
-    }
+    oracle.stop();
   }
 
   @ParameterizedTest
diff --git a/instrumentation/pekko/pekko-actor-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkoactor/v1_0/PekkoActorCellInstrumentation.java b/instrumentation/pekko/pekko-actor-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkoactor/v1_0/PekkoActorCellInstrumentation.java
@@ -42,6 +42,7 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class InvokeAdvice {
 
+    @Nullable
     @Advice.OnMethodEnter(suppress = Throwable.class, inline = false)
     public static Scope enter(@Advice.Argument(0) Envelope envelope) {
       return TaskAdviceHelper.makePropagatedContextCurrent(ENVELOPE_PROPAGATED_CONTEXT, envelope);
@@ -58,6 +59,7 @@ public static void exit(@Advice.Enter @Nullable Scope scope) {
   @SuppressWarnings("unused")
   public static class SystemInvokeAdvice {
 
+    @Nullable
     @Advice.OnMethodEnter(suppress = Throwable.class, inline = false)
     public static Scope enter(@Advice.Argument(0) SystemMessage systemMessage) {
       return TaskAdviceHelper.makePropagatedContextCurrent(
diff --git a/instrumentation/pekko/pekko-actor-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkoactor/v1_0/PekkoActorTest.scala b/instrumentation/pekko/pekko-actor-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkoactor/v1_0/PekkoActorTest.scala
@@ -10,20 +10,27 @@ import io.opentelemetry.instrumentation.testing.junit.{
   InstrumentationExtension
 }
 import io.opentelemetry.sdk.testing.assertj.{SpanDataAssert, TraceAssert}
-import org.junit.jupiter.api.TestInstance
+import org.junit.jupiter.api.{AfterAll, TestInstance}
 import org.junit.jupiter.api.extension.RegisterExtension
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.ValueSource
 
 import java.util.function.Consumer
 import scala.collection.JavaConverters._
+import scala.concurrent.Await
+import scala.concurrent.duration.DurationInt
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class PekkoActorTest {
 
   @RegisterExtension val testing: InstrumentationExtension =
     AgentInstrumentationExtension.create
 
+  @AfterAll
+  def cleanup(): Unit = {
+    Await.result(PekkoActors.system.terminate(), 10.seconds)
+  }
+
   @ParameterizedTest
   @ValueSource(ints = Array(1, 150))
   def basicTell(count: Int): Unit = {
diff --git a/instrumentation/pekko/pekko-actor-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkoactor/v1_0/PekkoSchedulerTest.scala b/instrumentation/pekko/pekko-actor-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkoactor/v1_0/PekkoSchedulerTest.scala
@@ -37,7 +37,7 @@ class PekkoSchedulerTest {
     } finally {
       scope.close()
       initialSpan.end()
-      system.terminate()
+      Await.result(system.terminate(), 5.seconds)
     }
   }
 
diff --git a/instrumentation/pekko/pekko-http-1.0/javaagent/build.gradle.kts b/instrumentation/pekko/pekko-http-1.0/javaagent/build.gradle.kts
@@ -68,8 +68,9 @@ testing {
     val tapirTest by registering(JvmTestSuite::class) {
       dependencies {
         if (otelProps.testLatestDeps) {
-          implementation("com.typesafe.akka:akka-http_2.13:latest.release")
-          implementation("com.typesafe.akka:akka-stream_2.13:latest.release")
+          implementation("org.apache.pekko:pekko-http_2.13:latest.release")
+          implementation("org.apache.pekko:pekko-slf4j_2.13:latest.release")
+          implementation("org.apache.pekko:pekko-stream_2.13:latest.release")
           implementation("com.softwaremill.sttp.tapir:tapir-pekko-http-server_2.13:latest.release")
         } else {
           implementation("org.apache.pekko:pekko-http_2.12:1.0.0")
diff --git a/instrumentation/pekko/pekko-http-1.0/metadata.yaml b/instrumentation/pekko/pekko-http-1.0/metadata.yaml
@@ -10,48 +10,58 @@ semantic_conventions:
   - HTTP_SERVER_METRICS
 features:
   - HTTP_ROUTE
+  - CONTEXT_PROPAGATION
 configurations:
   - name: otel.instrumentation.http.known-methods
+    declarative_name: java.common.http.known_methods
     description: >
       Configures the instrumentation to recognize an alternative set of HTTP request methods. All
       other methods will be treated as `_OTHER`.
     type: list
     default: "CONNECT,DELETE,GET,HEAD,OPTIONS,PATCH,POST,PUT,TRACE"
   - name: otel.instrumentation.http.client.capture-request-headers
+    declarative_name: general.http.client.request_captured_headers
     description: List of HTTP request headers to capture in HTTP client telemetry.
     type: list
     default: ""
   - name: otel.instrumentation.http.client.capture-response-headers
+    declarative_name: general.http.client.response_captured_headers
     description: List of HTTP response headers to capture in HTTP client telemetry.
     type: list
     default: ""
   - name: otel.instrumentation.common.peer-service-mapping
+    declarative_name: java.common.peer_service_mapping
     description: Used to specify a mapping from host names or IP addresses to peer services.
     type: map
     default: ""
   - name: otel.instrumentation.http.client.emit-experimental-telemetry
+    declarative_name: java.common.http.client.emit_experimental_telemetry/development
     description: >
       Enable the capture of experimental HTTP client telemetry. Adds the `http.request.body.size`
       and `http.response.body.size` attributes to spans, and records `http.client.request.size` and
       `http.client.response.size` metrics.
     type: boolean
     default: false
   - name: otel.instrumentation.http.server.capture-request-headers
+    declarative_name: general.http.server.request_captured_headers
     description: List of HTTP request headers to capture in HTTP server telemetry.
     type: list
     default: ""
   - name: otel.instrumentation.http.server.capture-response-headers
+    declarative_name: general.http.server.response_captured_headers
     description: List of HTTP response headers to capture in HTTP server telemetry.
     type: list
     default: ""
   - name: otel.instrumentation.http.server.emit-experimental-telemetry
+    declarative_name: java.common.http.server.emit_experimental_telemetry/development
     description: >
       Enable the capture of experimental HTTP server telemetry. Adds the `http.request.body.size`
       and `http.response.body.size` attributes to spans, and records `http.server.request.size` and
       `http.server.response.size` metrics.
     type: boolean
     default: false
   - name: otel.instrumentation.sanitization.url.experimental.sensitive-query-parameters
+    declarative_name: general.sanitization.url.sensitive_query_parameters/development
     description: List of URL query parameter names whose values are redacted in URL attributes. See https://opentelemetry.io/docs/specs/semconv/http/http-spans.
     type: list
     default: "AWSAccessKeyId,Signature,sig,X-Goog-Signature"
diff --git a/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playmvc/v2_4/ActionInstrumentation.java b/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playmvc/v2_4/ActionInstrumentation.java
@@ -54,7 +54,7 @@ public static class AdviceScope {
       private final Context context;
       private final Scope scope;
 
-      public AdviceScope(Context context, Scope scope) {
+      private AdviceScope(Context context, Scope scope) {
         this.context = context;
         this.scope = scope;
       }
@@ -71,33 +71,34 @@ public static AdviceScope start(Context parentContext) {
 
       public void end(
           @Nullable Throwable throwable,
-          Future<Result> responseFuture,
+          @Nullable Future<Result> responseFuture,
           Action<?> thisAction,
           Request<?> req) {
         scope.close();
         updateSpan(context, req);
 
-        if (throwable == null) {
+        if (throwable != null || responseFuture == null) {
+          instrumenter().end(context, null, null, throwable);
+        } else {
           // span finished in RequestCompleteCallback
           responseFuture.onComplete(
               new RequestCompleteCallback(context), thisAction.executionContext());
-        } else {
-          instrumenter().end(context, null, null, throwable);
         }
       }
     }
 
     @Advice.OnMethodEnter(suppress = Throwable.class, inline = false)
+    @Nullable
     public static AdviceScope onEnter(@Advice.Argument(0) Request<?> req) {
       return AdviceScope.start(currentContext());
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class, inline = false)
     public static void stopTraceOnResponse(
         @Advice.This Action<?> thisAction,
-        @Advice.Thrown Throwable throwable,
+        @Advice.Thrown @Nullable Throwable throwable,
         @Advice.Argument(0) Request<?> req,
-        @Advice.Return Future<Result> responseFuture,
+        @Advice.Return @Nullable Future<Result> responseFuture,
         @Advice.Enter @Nullable AdviceScope actionScope) {
       if (actionScope == null) {
         return;
diff --git a/instrumentation/play/play-mvc/play-mvc-2.6/javaagent/build.gradle.kts b/instrumentation/play/play-mvc/play-mvc-2.6/javaagent/build.gradle.kts
@@ -79,5 +79,9 @@ configurations.configureEach {
 }
 tasks.withType<Test>().configureEach {
   systemProperty("collectMetadata", otelProps.collectMetadata)
+  systemProperty(
+    "metadataConfig",
+    "otel.instrumentation.common.experimental.controller-telemetry.enabled=true"
+  )
   jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
 }
diff --git a/instrumentation/play/play-mvc/play-mvc-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playmvc/v2_6/ActionInstrumentation.java b/instrumentation/play/play-mvc/play-mvc-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playmvc/v2_6/ActionInstrumentation.java
@@ -54,7 +54,7 @@ public static class AdviceScope {
       private final Context context;
       private final Scope scope;
 
-      public AdviceScope(Context context, Scope scope) {
+      private AdviceScope(Context context, Scope scope) {
         this.context = context;
         this.scope = scope;
       }
diff --git a/instrumentation/play/play-ws/play-ws-2.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/v2_1/PlayWsInstrumentationModule.java b/instrumentation/play/play-ws/play-ws-2.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/v2_1/PlayWsInstrumentationModule.java
@@ -49,6 +49,11 @@ public static Object[] methodEnter(
         @Advice.Argument(0) Request request,
         @Advice.Argument(1) AsyncHandler<?> originalAsyncHandler) {
       AsyncHandler<?> asyncHandler = originalAsyncHandler;
+      if (asyncHandler instanceof WebSocketUpgradeHandler) {
+        // websocket upgrade handlers aren't supported
+        return new Object[] {null, asyncHandler};
+      }
+
       Context parentContext = currentContext();
       if (!instrumenter().shouldStart(parentContext, request)) {
         return new Object[] {null, asyncHandler};
@@ -60,8 +65,7 @@ public static Object[] methodEnter(
         asyncHandler =
             new StreamedAsyncHandlerWrapper<>(
                 (StreamedAsyncHandler<?>) asyncHandler, request, context, parentContext);
-      } else if (!(asyncHandler instanceof WebSocketUpgradeHandler)) {
-        // websocket upgrade handlers aren't supported
+      } else {
         asyncHandler = new AsyncHandlerWrapper<>(asyncHandler, request, context, parentContext);
       }
       return new Object[] {context, asyncHandler};
@@ -71,7 +75,10 @@ public static Object[] methodEnter(
     public static void methodExit(
         @Advice.Argument(0) Request request,
         @Advice.Thrown @Nullable Throwable throwable,
-        @Advice.Enter Object[] enterResult) {
+        @Advice.Enter @Nullable Object[] enterResult) {
+      if (enterResult == null) {
+        return;
+      }
       Context context = (Context) enterResult[0];
       if (context != null && throwable != null) {
         instrumenter().end(context, request, null, throwable);
diff --git a/instrumentation/play/play-ws/play-ws-2.1/metadata.yaml b/instrumentation/play/play-ws/play-ws-2.1/metadata.yaml
@@ -6,31 +6,37 @@ semantic_conventions:
 library_link: https://www.playframework.com/
 configurations:
   - name: otel.instrumentation.http.known-methods
+    declarative_name: java.common.http.known_methods
     description: >
       Configures the instrumentation to recognize an alternative set of HTTP request methods. All
       other methods will be treated as `_OTHER`.
     type: list
     default: "CONNECT,DELETE,GET,HEAD,OPTIONS,PATCH,POST,PUT,TRACE"
   - name: otel.instrumentation.http.client.capture-request-headers
+    declarative_name: general.http.client.request_captured_headers
     description: List of HTTP request headers to capture in HTTP client telemetry.
     type: list
     default: ""
   - name: otel.instrumentation.http.client.capture-response-headers
+    declarative_name: general.http.client.response_captured_headers
     description: List of HTTP response headers to capture in HTTP client telemetry.
     type: list
     default: ""
   - name: otel.instrumentation.common.peer-service-mapping
+    declarative_name: java.common.peer_service_mapping
     description: Used to specify a mapping from host names or IP addresses to peer services.
     type: map
     default: ""
   - name: otel.instrumentation.http.client.emit-experimental-telemetry
+    declarative_name: java.common.http.client.emit_experimental_telemetry/development
     description: >
       Enable the capture of experimental HTTP client telemetry. Adds the `http.request.body.size`
       and `http.response.body.size` attributes to spans, and records `http.client.request.size` and
       `http.client.response.size` metrics.
     type: boolean
     default: false
   - name: otel.instrumentation.sanitization.url.experimental.sensitive-query-parameters
+    declarative_name: general.sanitization.url.sensitive_query_parameters/development
     description: List of URL query parameter names whose values are redacted in URL attributes. See https://opentelemetry.io/docs/specs/semconv/http/http-spans.
     type: list
     default: "AWSAccessKeyId,Signature,sig,X-Goog-Signature"

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class PekkoSchedulerTest {`
`37`	`37`	`} finally {`
`38`	`38`	`scope.close()`
`39`	`39`	`initialSpan.end()`
`40`		`- system.terminate()`
	`40`	`+ Await.result(system.terminate(), 5.seconds)`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -79,5 +79,9 @@ configurations.configureEach {`
`79`	`79`	`}`
`80`	`80`	`tasks.withType<Test>().configureEach {`
`81`	`81`	`systemProperty("collectMetadata", otelProps.collectMetadata)`
	`82`	`+ systemProperty(`
	`83`	`+ "metadataConfig",`
	`84`	`+ "otel.instrumentation.common.experimental.controller-telemetry.enabled=true"`
	`85`	`+ )`
`82`	`86`	`jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")`
`83`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public static class AdviceScope {`
`54`	`54`	`private final Context context;`
`55`	`55`	`private final Scope scope;`
`56`	`56`
`57`		`- public AdviceScope(Context context, Scope scope) {`
	`57`	`+ private AdviceScope(Context context, Scope scope) {`
`58`	`58`	`this.context = context;`
`59`	`59`	`this.scope = scope;`
`60`	`60`	`}`