Code review sweep (run 25230598385) (#18493)

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

Author: otelbot[bot]

instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/HttpClientInstrumentation.java

@@ -16,6 +16,7 @@
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import java.util.function.BiConsumer;
+import javax.annotation.Nullable;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.asm.Advice.AssignReturned;
 import net.bytebuddy.asm.Advice.AssignReturned.ToArguments.ToArgument;
@@ -85,7 +86,7 @@ public static CallDepth onEnter() {
     @AssignReturned.ToReturned
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class, inline = false)
     public static HttpClient stopSpan(
-        @Advice.Thrown Throwable throwable,
+        @Advice.Thrown @Nullable Throwable throwable,
         @Advice.Return HttpClient client,
         @Advice.Enter CallDepth callDepth) {
 

instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/AbstractReactorNettyHttpClientTest.java

@@ -170,7 +170,7 @@ void shouldExposeContextToHttpClientCallbacks() throws InterruptedException {
                     })
                 .block());
 
-    latch.await(10, SECONDS);
+    assertThat(latch.await(10, SECONDS)).isTrue();
 
     testing.waitAndAssertTraces(
         trace -> {

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

@@ -58,6 +58,10 @@ tasks {
     include("**/ReactorNettyConnectionSpanTest.*", "**/ReactorNettyClientSslTest.*")
     jvmArgs("-Dotel.instrumentation.netty.ssl-telemetry.enabled=true")
     jvmArgs("-Dotel.instrumentation.reactor-netty.connection-telemetry.enabled=true")
+    systemProperty(
+      "metadataConfig",
+      "otel.instrumentation.netty.ssl-telemetry.enabled=true,otel.instrumentation.reactor-netty.connection-telemetry.enabled=true",
+    )
   }
 
   test {

instrumentation/rediscala-1.8/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/rediscala/v1_8/RediscalaClientTest.scala

@@ -6,7 +6,7 @@
 package rediscala
 
 import io.opentelemetry.api.trace.SpanKind.CLIENT
-import io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil
+import io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable
 import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension
 import io.opentelemetry.instrumentation.testing.junit.db.DbClientMetricsTestUtil.assertDurationMetric
 import io.opentelemetry.instrumentation.testing.util.ThrowingSupplier
@@ -122,8 +122,8 @@ class RediscalaClientTest {
                 .hasKind(CLIENT)
                 .hasParent(trace.getSpan(0))
                 .hasAttributesSatisfyingExactly(
-                  equalTo(SemconvStabilityUtil.maybeStable(DB_SYSTEM), REDIS),
-                  equalTo(SemconvStabilityUtil.maybeStable(DB_OPERATION), "SET")
+                  equalTo(maybeStable(DB_SYSTEM), REDIS),
+                  equalTo(maybeStable(DB_OPERATION), "SET")
                 )
             }
           }
@@ -175,8 +175,8 @@ class RediscalaClientTest {
                 .hasKind(CLIENT)
                 .hasParent(trace.getSpan(0))
                 .hasAttributesSatisfyingExactly(
-                  equalTo(SemconvStabilityUtil.maybeStable(DB_SYSTEM), REDIS),
-                  equalTo(SemconvStabilityUtil.maybeStable(DB_OPERATION), "SET")
+                  equalTo(maybeStable(DB_SYSTEM), REDIS),
+                  equalTo(maybeStable(DB_OPERATION), "SET")
                 )
             }
           },
@@ -187,8 +187,8 @@ class RediscalaClientTest {
                 .hasKind(CLIENT)
                 .hasParent(trace.getSpan(0))
                 .hasAttributesSatisfyingExactly(
-                  equalTo(SemconvStabilityUtil.maybeStable(DB_SYSTEM), REDIS),
-                  equalTo(SemconvStabilityUtil.maybeStable(DB_OPERATION), "GET")
+                  equalTo(maybeStable(DB_SYSTEM), REDIS),
+                  equalTo(maybeStable(DB_OPERATION), "GET")
                 )
             }
           }

instrumentation/redisson/redisson-3.17/javaagent/build.gradle.kts

@@ -16,9 +16,6 @@ dependencies {
 
   implementation(project(":instrumentation:redisson:redisson-common-3.0:javaagent"))
 
-  compileOnly("com.google.auto.value:auto-value-annotations")
-  annotationProcessor("com.google.auto.value:auto-value")
-
   testInstrumentation(project(":instrumentation:redisson:redisson-3.0:javaagent"))
 
   testImplementation(project(":instrumentation:redisson:redisson-common-3.0:testing"))

instrumentation/redisson/redisson-3.17/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/v3_17/RedissonSingletons.java

@@ -9,7 +9,7 @@
 import io.opentelemetry.javaagent.instrumentation.redisson.common.v3_0.RedissonInstrumenterFactory;
 import io.opentelemetry.javaagent.instrumentation.redisson.common.v3_0.RedissonRequest;
 
-public class RedissonSingletons {
+class RedissonSingletons {
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.redisson-3.17";
 
   private static final Instrumenter<RedissonRequest, Void> instrumenter =

instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ContainerResourceProvider.java

@@ -12,7 +12,7 @@
 
 /** {@link ResourceProvider} for automatically configuring {@link ContainerResource}. */
 @AutoService(ResourceProvider.class)
-public class ContainerResourceProvider implements ResourceProvider {
+public final class ContainerResourceProvider implements ResourceProvider {
   @Override
   public Resource createResource(ConfigProperties config) {
     return ContainerResource.get();

instrumentation/restlet/restlet-1.1/library/build.gradle.kts

@@ -18,6 +18,6 @@ dependencies {
   latestDepTestLibrary("org.restlet:org.restlet:1.+") // see restlet-2.0 module
 }
 
-tasks.withType<Test>().configureEach {
+tasks.test {
   systemProperty("collectMetadata", otelProps.collectMetadata)
 }

instrumentation/restlet/restlet-1.1/testing/build.gradle.kts

@@ -17,8 +17,6 @@ dependencies {
   implementation("org.restlet:org.restlet.ext.spring:1.1.5")
   implementation("org.springframework:spring:2.5.6")
 
-  implementation("io.opentelemetry:opentelemetry-api")
-
   val jettyVersion = "8.1.8.v20121106"
   api("org.eclipse.jetty:jetty-annotations:$jettyVersion")
   implementation("org.eclipse.jetty:jetty-server:$jettyVersion")

instrumentation/restlet/restlet-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/restlet/v2_0/ServerInstrumentation.java

@@ -47,9 +47,9 @@ public static class AdviceScope {
       private final Context context;
       private final Scope scope;
 
-      private AdviceScope(Context context, Scope scope) {
+      private AdviceScope(Context context) {
         this.context = context;
-        this.scope = scope;
+        this.scope = context.makeCurrent();
       }
 
       @Nullable
@@ -61,7 +61,7 @@ public static AdviceScope start(Request request) {
         }
 
         Context context = instrumenter().start(parentContext, request);
-        return new AdviceScope(context, context.makeCurrent());
+        return new AdviceScope(context);
       }
 
       public void end(@Nullable Throwable exception, Request request, Response response) {