Code review sweep (run 24873566950) (open-telemetry#18255)

otelbot[bot] · trask · web-flow · commit fe4688bf84dd · 2026-04-24T15:30:38.000Z
Co-authored-by: otelbot &lt;197425009+otelbot@users.noreply.github.com&gt;
Co-authored-by: Trask Stalnaker &lt;trask.stalnaker@gmail.com&gt;
diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/DecoratorFunctions.java b/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/DecoratorFunctions.java
@@ -38,7 +38,7 @@ private abstract static class OnMessageDecorator<M> implements BiConsumer<M, Con
     @Override
     public final void accept(M message, Connection connection) {
       Channel channel = connection.channel();
-      // don't try to get the client span from the netty channel when forceParentSpan is true
+      // don't try to get the client span from the netty channel when forceParentContext is true
       // this way the parent context will always be propagated
       if (forceParentContext) {
         channel = null;
diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/FailedRequestWithUrlMaker.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/FailedRequestWithUrlMaker.java
@@ -11,6 +11,7 @@
 import java.lang.reflect.Proxy;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
+import javax.annotation.Nullable;
 import reactor.netty.http.client.HttpClientConfig;
 import reactor.netty.http.client.HttpClientRequest;
 
@@ -35,7 +36,7 @@ private HttpRequestInvocationHandler(HttpClientConfig config, HttpClientRequest
     }
 
     @Override
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+    public Object invoke(Object proxy, Method method, @Nullable Object[] args) throws Throwable {
       if ("resourceUrl".equals(method.getName())) {
         return computeUrlFromConfig();
       }
diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/TransportConnectorInstrumentation.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/TransportConnectorInstrumentation.java
@@ -157,7 +157,8 @@ public static AdviceScope onEnter(
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class, inline = false)
     public static void endConnect(
-        @Advice.Thrown Throwable throwable, @Advice.Enter @Nullable AdviceScope adviceScope) {
+        @Advice.Thrown @Nullable Throwable throwable,
+        @Advice.Enter @Nullable AdviceScope adviceScope) {
       if (adviceScope != null) {
         adviceScope.end(throwable);
       }
diff --git a/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonAsyncClientTest.java b/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonAsyncClientTest.java
@@ -179,8 +179,7 @@ void futureWhenComplete() throws ExecutionException, InterruptedException, Timeo
   // regression test for
   // https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/6033
   @Test
-  void scheduleCallable()
-      throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+  void scheduleCallable() throws ReflectiveOperationException {
     RScheduledExecutorService executorService = redisson.getExecutorService("EXECUTOR");
     //  Adapt different method signature:
     // `java.util.concurrent.ScheduledFuture<V> schedule(Callable,long,TimeUnit)` in 3.0.1
@@ -195,7 +194,7 @@ void scheduleCallable()
   }
 
   private static Object invokeSchedule(RScheduledExecutorService executorService)
-      throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+      throws ReflectiveOperationException {
     return executorService
         .getClass()
         .getMethod("schedule", Callable.class, long.class, TimeUnit.class)
diff --git a/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonClientTest.java b/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonClientTest.java
@@ -198,8 +198,7 @@ void stringCommand() {
   }
 
   @Test
-  void batchCommand()
-      throws InvocationTargetException, NoSuchMethodException, IllegalAccessException {
+  void batchCommand() throws ReflectiveOperationException {
     RBatch batch = createBatch(redisson);
     assertThat(batch).isNotNull();
     batch.getBucket("batch1").setAsync("v1");
@@ -222,8 +221,7 @@ void batchCommand()
                             equalTo(maybeStable(DB_STATEMENT), "SET batch1 ?;SET batch2 ?"))));
   }
 
-  private static void invokeExecute(RBatch batch)
-      throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+  private static void invokeExecute(RBatch batch) throws ReflectiveOperationException {
     batch.getClass().getMethod("execute").invoke(batch);
   }
 
@@ -367,8 +365,7 @@ void setCommand() {
   }
 
   @Test
-  void sortedSetCommand()
-      throws InvocationTargetException, NoSuchMethodException, IllegalAccessException {
+  void sortedSetCommand() throws ReflectiveOperationException {
     Map<String, Double> scores = new HashMap<>();
     scores.put("u1", 1.0d);
     scores.put("u2", 3.0d);
@@ -395,7 +392,7 @@ void sortedSetCommand()
   }
 
   private static void invokeAddAll(RScoredSortedSet<String> object, Map<String, Double> arg)
-      throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+      throws ReflectiveOperationException {
     object.getClass().getMethod("addAll", Map.class).invoke(object, arg);
   }
 
diff --git a/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/CgroupV2ContainerIdExtractorTest.java b/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/CgroupV2ContainerIdExtractorTest.java
@@ -35,7 +35,7 @@ void fileNotReadable() {
     assertThat(result).isEmpty();
   }
 
-  private void verifyContainerId(String rawFileContent, String containerId) throws Exception {
+  private void verifyContainerId(String rawFileContent, String containerId) throws IOException {
     when(filesystem.isReadable(V2_CGROUP_PATH)).thenReturn(true);
     when(filesystem.lineList(V2_CGROUP_PATH)).thenReturn(fileToListOfLines(rawFileContent));
     CgroupV2ContainerIdExtractor extractor = new CgroupV2ContainerIdExtractor(filesystem);
@@ -44,49 +44,49 @@ private void verifyContainerId(String rawFileContent, String containerId) throws
   }
 
   @Test
-  void extractSuccess_docker() throws Exception {
+  void extractSuccess_docker() throws IOException {
     verifyContainerId(
         "docker_proc_self_mountinfo",
         "be522444b60caf2d3934b8b24b916a8a314f4b68d4595aa419874657e8d103f2");
   }
 
   @Test
-  void extractSuccess_docker1() throws Exception {
+  void extractSuccess_docker1() throws IOException {
     verifyContainerId(
         "docker_proc_self_mountinfo1",
         "188329f95b930c32eeeffd34658ed2538960947e166743fa3743f5ce3d739b40");
   }
 
   @Test
-  void extractSuccess_containerd() throws Exception {
+  void extractSuccess_containerd() throws IOException {
     verifyContainerId(
         "containerd_proc_self_mountinfo",
         "f2a44bc8e090f93a2b4d7f510bdaff0615ad52906e3287ee956dcf5aa5012a91");
   }
 
   @Test
-  void extractSuccess_podman() throws Exception {
+  void extractSuccess_podman() throws IOException {
     verifyContainerId(
         "podman_proc_self_mountinfo",
         "2a33efc76e519c137fe6093179653788bed6162d4a15e5131c8e835c968afbe6");
   }
 
   @Test
-  void extractSuccess_crio() throws Exception {
+  void extractSuccess_crio() throws IOException {
     verifyContainerId(
         "crio_proc_self_mountinfo",
         "a8f62e52ed7c2cd85242dcf0eb1d727b643540ceca7f328ad7d2f31aedf07731");
   }
 
   @Test
-  void extractSuccess_crio1() throws Exception {
+  void extractSuccess_crio1() throws IOException {
     verifyContainerId(
         "crio_proc_self_mountinfo1",
         "f23ec1d4b715c6531a17e9c549222fbbe1f7ffff697a29a2212b3b4cdc37f52e");
   }
 
   @Test
-  void extractSuccess_crio2() throws Exception {
+  void extractSuccess_crio2() throws IOException {
     verifyContainerId(
         "crio_proc_self_mountinfo2",
         "b4873629b312dc1d77472aba6fb177c6ce9a8f7c205ad7a03302726805007fe6");
diff --git a/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ContainerResourceTest.java b/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ContainerResourceTest.java
@@ -14,6 +14,7 @@
 import io.opentelemetry.sdk.resources.Resource;
 import java.io.File;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.nio.charset.Charset;
 import java.util.Optional;
 import org.junit.jupiter.api.Test;
@@ -56,7 +57,7 @@ void bothVersionsFail() {
   }
 
   @Test
-  void testAlternateEncoding() throws Exception {
+  void testAlternateEncoding() throws IOException {
     String containerId = "ac679f8a8319c8cf7d38e1adf263bc08d231f2ff81abda3915f6e8ba4d64156a";
     String line = "13:name=systemd:/podruntime/docker/kubepods/" + containerId + ".aaaa";
     Charset ibmCharset = Charset.forName("Cp1047");
diff --git a/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/internal/ManifestResourceExtractorTest.java b/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/internal/ManifestResourceExtractorTest.java
@@ -11,6 +11,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.opentelemetry.sdk.resources.Resource;
+import java.io.IOException;
 import java.io.InputStream;
 import java.util.Collection;
 import java.util.Optional;
@@ -54,11 +55,14 @@ Collection<DynamicTest> extractResource() {
                                       prop -> null,
                                       JarServiceNameResourceExtractorTest::failPath),
                                   p -> {
+                                    if (t.input == null) {
+                                      return Optional.empty();
+                                    }
                                     try {
                                       Manifest manifest = new Manifest();
                                       manifest.read(t.input);
                                       return Optional.of(manifest);
-                                    } catch (Exception ignored) {
+                                    } catch (IOException ignored) {
                                       return Optional.empty();
                                     }
                                   })
diff --git a/instrumentation/restlet/restlet-1.1/metadata.yaml b/instrumentation/restlet/restlet-1.1/metadata.yaml
@@ -8,23 +8,27 @@ features:
 library_link: https://restlet.github.io/
 configurations:
   - 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.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"
+    default: "CONNECT,DELETE,GET,HEAD,OPTIONS,PATCH,POST,PUT,TRACE"

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`import java.lang.reflect.Proxy;`
`12`	`12`	`import java.net.InetSocketAddress;`
`13`	`13`	`import java.net.SocketAddress;`
	`14`	`+import javax.annotation.Nullable;`
`14`	`15`	`import reactor.netty.http.client.HttpClientConfig;`
`15`	`16`	`import reactor.netty.http.client.HttpClientRequest;`
`16`	`17`
`@@ -35,7 +36,7 @@ private HttpRequestInvocationHandler(HttpClientConfig config, HttpClientRequest`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`@Override`
`38`		`- public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {`
	`39`	`+ public Object invoke(Object proxy, Method method, @Nullable Object[] args) throws Throwable {`
`39`	`40`	`if ("resourceUrl".equals(method.getName())) {`
`40`	`41`	`return computeUrlFromConfig();`
`41`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,8 @@ public static AdviceScope onEnter(`
`157`	`157`
`158`	`158`	`@Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class, inline = false)`
`159`	`159`	`public static void endConnect(`
`160`		`- @Advice.Thrown Throwable throwable, @Advice.Enter @Nullable AdviceScope adviceScope) {`
	`160`	`+ @Advice.Thrown @Nullable Throwable throwable,`
	`161`	`+ @Advice.Enter @Nullable AdviceScope adviceScope) {`
`161`	`162`	`if (adviceScope != null) {`
`162`	`163`	`adviceScope.end(throwable);`
`163`	`164`	`}`
Original file line number	Diff line number	Diff line change
`@@ -198,8 +198,7 @@ void stringCommand() {`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`@Test`
`201`		`- void batchCommand()`
`202`		`- throws InvocationTargetException, NoSuchMethodException, IllegalAccessException {`
	`201`	`+ void batchCommand() throws ReflectiveOperationException {`
`203`	`202`	`RBatch batch = createBatch(redisson);`
`204`	`203`	`assertThat(batch).isNotNull();`
`205`	`204`	`batch.getBucket("batch1").setAsync("v1");`
`@@ -222,8 +221,7 @@ void batchCommand()`
`222`	`221`	`equalTo(maybeStable(DB_STATEMENT), "SET batch1 ?;SET batch2 ?"))));`
`223`	`222`	`}`
`224`	`223`
`225`		`- private static void invokeExecute(RBatch batch)`
`226`		`- throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {`
	`224`	`+ private static void invokeExecute(RBatch batch) throws ReflectiveOperationException {`
`227`	`225`	`batch.getClass().getMethod("execute").invoke(batch);`
`228`	`226`	`}`
`229`	`227`
`@@ -367,8 +365,7 @@ void setCommand() {`
`367`	`365`	`}`
`368`	`366`
`369`	`367`	`@Test`
`370`		`- void sortedSetCommand()`
`371`		`- throws InvocationTargetException, NoSuchMethodException, IllegalAccessException {`
	`368`	`+ void sortedSetCommand() throws ReflectiveOperationException {`
`372`	`369`	`Map<String, Double> scores = new HashMap<>();`
`373`	`370`	`scores.put("u1", 1.0d);`
`374`	`371`	`scores.put("u2", 3.0d);`
`@@ -395,7 +392,7 @@ void sortedSetCommand()`
`395`	`392`	`}`
`396`	`393`
`397`	`394`	`private static void invokeAddAll(RScoredSortedSet<String> object, Map<String, Double> arg)`
`398`		`- throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {`
	`395`	`+ throws ReflectiveOperationException {`
`399`	`396`	`object.getClass().getMethod("addAll", Map.class).invoke(object, arg);`
`400`	`397`	`}`
`401`	`398`