Code review sweep (run 25222958420) (#18490)

Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com>
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>

Author: otelbot[bot]

instrumentation/ratpack/ratpack-1.4/testing/src/main/java/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackRoutesTest.java

@@ -48,8 +48,8 @@
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public abstract class AbstractRatpackRoutesTest {
 
-  private static RatpackServer app;
-  private static WebClient client;
+  private RatpackServer app;
+  private WebClient client;
 
   protected abstract InstrumentationExtension testing();
 

instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/internal/RatpackHttpClientAttributesGetter.java

@@ -20,13 +20,11 @@
 final class RatpackHttpClientAttributesGetter
     implements HttpClientAttributesGetter<RequestSpec, HttpResponse> {
 
-  @Nullable
   @Override
   public String getUrlFull(RequestSpec requestSpec) {
     return requestSpec.getUri().toString();
   }
 
-  @Nullable
   @Override
   public String getHttpRequestMethod(RequestSpec requestSpec) {
     return requestSpec.getMethod().getName();

instrumentation/ratpack/ratpack-1.7/metadata.yaml

@@ -66,6 +66,7 @@ configurations:
     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"

instrumentation/reactor/reactor-3.1/library/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
   // we compile against 3.4.0, so we could use reactor.util.context.ContextView
-  // instrumentation is expected it to work with 3.1.0.RELEASE
+  // instrumentation is expected to work with 3.1.0.RELEASE
   compileOnly("io.projectreactor:reactor-core:3.4.0")
   compileOnly(project(":muzzle")) // For @NoMuzzle
   implementation(project(":instrumentation-annotations-support"))

instrumentation/reactor/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/v3_1/ContextPropagationOperator.java

@@ -65,17 +65,31 @@ public final class ContextPropagationOperator {
   @Nullable
   private static final MethodHandle SCHEDULERS_RESET_HOOK_METHOD = getSchedulersResetHookMethod();
 
+  private static final Object TRACE_CONTEXT_KEY =
+      new Object() {
+        @Override
+        public String toString() {
+          return "otel-trace-context";
+        }
+      };
+
+  private static final Object lock = new Object();
+
+  private static volatile boolean enabled = false;
+
+  private final ReactorAsyncOperationEndStrategy asyncOperationEndStrategy;
+
   @Nullable
   private static MethodHandle getContextWriteMethod(Class<?> type) {
     MethodHandles.Lookup lookup = MethodHandles.publicLookup();
     try {
       return lookup.findVirtual(type, "contextWrite", methodType(type, Function.class));
-    } catch (NoSuchMethodException | IllegalAccessException e) {
+    } catch (NoSuchMethodException | IllegalAccessException ignored) {
       // ignore
     }
     try {
       return lookup.findVirtual(type, "subscriberContext", methodType(type, Function.class));
-    } catch (NoSuchMethodException | IllegalAccessException e) {
+    } catch (NoSuchMethodException | IllegalAccessException ignored) {
       // ignore
     }
     return null;
@@ -87,7 +101,7 @@ private static MethodHandle getSchedulersHookMethod() {
     try {
       return lookup.findStatic(
           Schedulers.class, "onScheduleHook", methodType(void.class, String.class, Function.class));
-    } catch (NoSuchMethodException | IllegalAccessException e) {
+    } catch (NoSuchMethodException | IllegalAccessException ignored) {
       // ignore
     }
     return null;
@@ -99,7 +113,7 @@ private static MethodHandle getSchedulersResetHookMethod() {
     try {
       return lookup.findStatic(
           Schedulers.class, "resetOnScheduleHook", methodType(void.class, String.class));
-    } catch (NoSuchMethodException | IllegalAccessException e) {
+    } catch (NoSuchMethodException | IllegalAccessException ignored) {
       // ignore
     }
     return null;
@@ -113,20 +127,6 @@ public static ContextPropagationOperatorBuilder builder() {
     return new ContextPropagationOperatorBuilder();
   }
 
-  private final ReactorAsyncOperationEndStrategy asyncOperationEndStrategy;
-
-  private static final Object TRACE_CONTEXT_KEY =
-      new Object() {
-        @Override
-        public String toString() {
-          return "otel-trace-context";
-        }
-      };
-
-  private static final Object lock = new Object();
-
-  private static volatile boolean enabled = false;
-
   /**
    * Stores Trace {@link io.opentelemetry.context.Context} in Reactor {@link
    * reactor.util.context.Context}.

instrumentation/reactor/reactor-3.1/library/src/test/java/io/opentelemetry/instrumentation/reactor/v3_1/HooksTest.java

@@ -110,7 +110,7 @@ private static boolean schedulerHooksSupported() {
       Schedulers.class.getMethod("onScheduleHook", String.class, Function.class);
       Schedulers.class.getMethod("resetOnScheduleHook", String.class);
       return true;
-    } catch (NoSuchMethodException e) {
+    } catch (NoSuchMethodException ignored) {
       return false;
     }
   }

instrumentation/reactor/reactor-3.1/library/src/test/java/io/opentelemetry/instrumentation/reactor/v3_1/ReactorCoreTest.java

@@ -54,7 +54,7 @@ private static MethodHandle getContextWriteMethod(Class<?> type) {
     MethodHandles.Lookup lookup = MethodHandles.publicLookup();
     try {
       return lookup.findVirtual(type, "contextWrite", methodType(type, Function.class));
-    } catch (NoSuchMethodException | IllegalAccessException e) {
+    } catch (NoSuchMethodException | IllegalAccessException ignored) {
       // ignore
     }
     try {

instrumentation/reactor/reactor-3.4/javaagent/build.gradle.kts

@@ -26,7 +26,6 @@ dependencies {
   testInstrumentation(project(":instrumentation:reactor:reactor-3.1:javaagent"))
   testInstrumentation(project(":instrumentation:opentelemetry-extension-annotations-1.0:javaagent"))
 
-  testLibrary("io.projectreactor:reactor-test:3.1.0.RELEASE")
   testImplementation(project(":instrumentation-annotations-support-testing"))
   testImplementation(project(":instrumentation:reactor:reactor-3.1:testing"))
   testImplementation(project(":instrumentation-annotations"))

instrumentation/reactor/reactor-kafka-1.0/javaagent/build.gradle.kts

@@ -106,6 +106,10 @@ tasks {
   test {
     systemProperty("hasConsumerGroup", otelProps.testLatestDeps)
     jvmArgs("-Dotel.instrumentation.messaging.experimental.receive-telemetry.enabled=true")
+    systemProperty(
+      "metadataConfig",
+      "otel.instrumentation.messaging.experimental.receive-telemetry.enabled=true",
+    )
   }
 
   check {