Module cleanup (run 25284985988) (#18535)

Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com>

Author: otelbot[bot]

instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaRequestHandlerInstrumentation.java

@@ -9,6 +9,7 @@
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface;
 import static io.opentelemetry.javaagent.instrumentation.awslambdaevents.v2_2.AwsLambdaSingletons.FLUSH_TIMEOUT;
 import static io.opentelemetry.javaagent.instrumentation.awslambdaevents.v2_2.AwsLambdaSingletons.functionInstrumenter;
+import static io.opentelemetry.javaagent.instrumentation.awslambdaevents.v2_2.AwsLambdaSingletons.messageInstrumenter;
 import static java.util.Collections.emptyMap;
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
 import static net.bytebuddy.matcher.ElementMatchers.isPublic;
@@ -97,10 +98,8 @@ public static AdviceScope start(Object arg, Context context) {
         io.opentelemetry.context.Context messageContext = null;
         Scope messageScope = null;
         if (arg instanceof SQSEvent) {
-          if (AwsLambdaSingletons.messageInstrumenter()
-              .shouldStart(functionContext, (SQSEvent) arg)) {
-            messageContext =
-                AwsLambdaSingletons.messageInstrumenter().start(functionContext, (SQSEvent) arg);
+          if (messageInstrumenter().shouldStart(functionContext, (SQSEvent) arg)) {
+            messageContext = messageInstrumenter().start(functionContext, (SQSEvent) arg);
             messageScope = messageContext.makeCurrent();
           }
         }
@@ -111,8 +110,7 @@ public static AdviceScope start(Object arg, Context context) {
       public void end(Object arg, @Nullable Object result, @Nullable Throwable throwable) {
         if (messageScope != null) {
           messageScope.close();
-          AwsLambdaSingletons.messageInstrumenter()
-              .end(messageContext, (SQSEvent) arg, null, throwable);
+          messageInstrumenter().end(messageContext, (SQSEvent) arg, null, throwable);
         }
         functionScope.close();
         functionInstrumenter().end(functionContext, lambdaRequest, result, throwable);

instrumentation/aws-lambda/aws-lambda-events-2.2/library/build.gradle.kts

@@ -42,4 +42,6 @@ tasks.test {
   jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
   jvmArgs("--add-opens=java.base/java.util=ALL-UNNAMED")
   jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
+
+  systemProperty("collectMetadata", otelProps.collectMetadata)
 }

instrumentation/aws-lambda/aws-lambda-events-3.11/library/build.gradle.kts

@@ -22,15 +22,11 @@ dependencies {
   testImplementation("uk.org.webcompere:system-stubs-jupiter")
 }
 
-tasks {
-  withType<Test>().configureEach {
-    // required on jdk17
-    jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
-    jvmArgs("--add-opens=java.base/java.util=ALL-UNNAMED")
-    jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
-  }
-
-  test {
-    systemProperty("collectMetadata", otelProps.collectMetadata)
-  }
+tasks.test {
+  // required on jdk17
+  jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
+  jvmArgs("--add-opens=java.base/java.util=ALL-UNNAMED")
+  jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
+
+  systemProperty("collectMetadata", otelProps.collectMetadata)
 }

instrumentation/aws-lambda/aws-lambda-events-3.11/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v3_11/TracingSqsEventWrapper.java

@@ -15,6 +15,7 @@
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import javax.annotation.Nullable;
 
 public class TracingSqsEventWrapper extends TracingSqsEventHandler {
 
@@ -35,6 +36,7 @@ public TracingSqsEventWrapper() {
   }
 
   @Override
+  @Nullable
   protected SQSBatchResponse handleEvent(SQSEvent sqsEvent, Context context) {
     Object[] parameters =
         LambdaParameters.toArray(targetMethod, sqsEvent, context, (event, clazz) -> event);

instrumentation/aws-lambda/aws-lambda-events-common-2.2/library/build.gradle.kts

@@ -33,7 +33,7 @@ dependencies {
   testLibrary("com.amazonaws:aws-lambda-java-events:3.10.0")
 }
 
-tasks.withType<Test>().configureEach {
+tasks.test {
   // required on jdk17
   jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
   jvmArgs("--add-opens=java.base/java.util=ALL-UNNAMED")

instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AwsHttpClientInstrumentation.java

@@ -18,6 +18,7 @@
 import io.opentelemetry.context.Scope;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
+import javax.annotation.Nullable;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
@@ -50,8 +51,8 @@ public static class HttpClientAdvice {
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class, inline = false)
     public static void methodExit(
         @Advice.Argument(value = 0) Request<?> request,
-        @Advice.Return Response<?> response,
-        @Advice.Thrown Throwable throwable) {
+        @Advice.Return @Nullable Response<?> response,
+        @Advice.Thrown @Nullable Throwable throwable) {
       if (throwable instanceof Exception) {
         TracingRequestHandler.tracingHandler().afterError(request, response, (Exception) throwable);
       }

instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/RequestExecutorInstrumentation.java

@@ -15,6 +15,7 @@
 import io.opentelemetry.context.Scope;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
+import javax.annotation.Nullable;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
@@ -43,8 +44,8 @@ public static class RequestExecutorAdvice {
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class, inline = false)
     public static void methodExit(
         @Advice.FieldValue("request") Request<?> request,
-        @Advice.Return Response<?> response,
-        @Advice.Thrown Throwable throwable) {
+        @Advice.Return @Nullable Response<?> response,
+        @Advice.Thrown @Nullable Throwable throwable) {
       if (throwable instanceof Exception) {
         TracingRequestHandler.tracingHandler().afterError(request, response, (Exception) throwable);
       }

instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/TracingRequestHandler.java

@@ -16,6 +16,7 @@
 import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil;
 import io.opentelemetry.instrumentation.awssdk.v1_11.AwsSdkTelemetry;
 import io.opentelemetry.javaagent.bootstrap.internal.ExperimentalConfig;
+import javax.annotation.Nullable;
 
 /**
  * A {@link RequestHandler2} for use in the agent. Unlike library instrumentation, the agent will
@@ -70,7 +71,7 @@ public void afterResponse(Request<?> request, Response<?> response) {
   }
 
   @Override
-  public void afterError(Request<?> request, Response<?> response, Exception e) {
+  public void afterError(Request<?> request, @Nullable Response<?> response, Exception e) {
     tracingHandler.afterError(request, response, e);
     finish(request);
   }

instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkTelemetry.java

@@ -23,7 +23,7 @@
  * ensure you do not register any problematic {@link RequestHandler2}s on your clients or you will
  * witness broken traces.
  */
-public class AwsSdkTelemetry {
+public final class AwsSdkTelemetry {
   private final Instrumenter<Request<?>, Response<?>> requestInstrumenter;
   private final Instrumenter<SqsReceiveRequest, Response<?>> consumerReceiveInstrumenter;
   private final Instrumenter<SqsProcessRequest, Response<?>> consumerProcessInstrumenter;

instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkTelemetryBuilder.java

@@ -14,7 +14,7 @@
 import java.util.List;
 
 /** A builder of {@link AwsSdkTelemetry}. */
-public class AwsSdkTelemetryBuilder {
+public final class AwsSdkTelemetryBuilder {
 
   private final OpenTelemetry openTelemetry;