Code review sweep (run 25128763258) (open-telemetry#18413)

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

Author: otelbot[bot]

.github/agents/knowledge/general-rules.md

@@ -375,14 +375,17 @@ ambiguous and the cast would otherwise be required). Do not flag those cases.
 
 ## [Semconv] Constants by Module Type
 
-- `library/src/main/`: incubating semconv constants (from
-  `io.opentelemetry.semconv.incubating`) must be copied locally as `private static final`
-  fields with a `// copied from <ClassName>` comment. Stable semconv constants (from
-  `io.opentelemetry.semconv`) may be imported directly.
+- `library/src/main/`: constants from `io.opentelemetry.semconv.incubating.*` must be
+  copied locally as `private static final` fields with a `// copied from <ClassName>`
+  comment. Constants from `io.opentelemetry.semconv.*` (stable) must be imported
+  directly via `import static` and must not be copied locally.
 - `javaagent/src/main/`: all semconv artifact constants (stable and incubating) may be used
   directly.
 - tests: all semconv artifact constants are allowed.
 
+The trigger for copying is the import package, not the constant name. Only convert an
+import to a local copy when it comes from `io.opentelemetry.semconv.incubating.*`.
+
 ## [NewModule] New Instrumentation Checklist
 
 If a new module is added, verify all of the following:

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

@@ -37,7 +37,7 @@ dependencies {
   testImplementation("uk.org.webcompere:system-stubs-jupiter")
 }
 
-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-lambda/aws-lambda-events-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AbstractAwsLambdaSqsEventHandlerTest.java

@@ -151,8 +151,8 @@ private static SQSEvent.SQSMessage newMessage() {
       Constructor<SQSEvent.SQSMessage> ctor = SQSEvent.SQSMessage.class.getDeclaredConstructor();
       ctor.setAccessible(true);
       return ctor.newInstance();
-    } catch (ReflectiveOperationException | SecurityException t) {
-      throw new AssertionError(t);
+    } catch (ReflectiveOperationException | SecurityException e) {
+      throw new AssertionError(e);
     }
   }
 }

instrumentation/aws-lambda/aws-lambda-events-3.11/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v3_11/AwsLambdaSqsEventWrapperTest.java

@@ -106,8 +106,8 @@ private static SQSEvent.SQSMessage newMessage() {
     try {
       Constructor<SQSEvent.SQSMessage> ctor = SQSEvent.SQSMessage.class.getDeclaredConstructor();
       return ctor.newInstance();
-    } catch (ReflectiveOperationException t) {
-      throw new LinkageError(t.getMessage(), t);
+    } catch (ReflectiveOperationException e) {
+      throw new LinkageError(e.getMessage(), e);
     }
   }
 }

instrumentation/aws-lambda/aws-lambda-events-3.11/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v3_11/AwsLambdaSqsMessageHandlerTest.java

@@ -148,8 +148,8 @@ private static SQSEvent.SQSMessage newMessage() {
     try {
       Constructor<SQSEvent.SQSMessage> ctor = SQSEvent.SQSMessage.class.getDeclaredConstructor();
       return ctor.newInstance();
-    } catch (ReflectiveOperationException t) {
-      throw new LinkageError(t.getMessage(), t);
+    } catch (ReflectiveOperationException e) {
+      throw new LinkageError(e.getMessage(), e);
     }
   }
 

instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/S3ClientTest.java

@@ -63,7 +63,7 @@ public AmazonS3ClientBuilder configureClient(AmazonS3ClientBuilder client) {
   @ParameterizedTest
   @MethodSource("provideS3Arguments")
   void testRequestHandlerIsHookedUpWithBuilder(boolean addHandler, int size, int position)
-      throws Exception {
+      throws ReflectiveOperationException {
     AmazonS3ClientBuilder builder = AmazonS3ClientBuilder.standard().withRegion(Regions.US_EAST_1);
 
     if (addHandler) {
@@ -85,7 +85,8 @@ private static Stream<Arguments> provideS3Arguments() {
   @ParameterizedTest
   @MethodSource("provideS3Arguments")
   @SuppressWarnings("deprecation") // AmazonS3Client constructor is deprecated
-  void testRequestHandlerIsHookedUpWithConstructor(boolean addHandler, int size) throws Exception {
+  void testRequestHandlerIsHookedUpWithConstructor(boolean addHandler, int size)
+      throws ReflectiveOperationException {
     BasicAWSCredentials credentials = new BasicAWSCredentials("asdf", "qwerty");
     AmazonS3Client client = new AmazonS3Client(credentials);
     if (addHandler) {

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

@@ -96,7 +96,7 @@ private static void addTracing(
       Request<?> request,
       Response<?> response,
       Instrumenter<SqsProcessRequest, Response<?>> consumerProcessInstrumenter,
-      Context receiveContext) {
+      @Nullable Context receiveContext) {
     if (messagesField == null) {
       return;
     }

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

@@ -20,7 +20,7 @@ class TracingIterator implements Iterator<Message> {
   private final Instrumenter<SqsProcessRequest, Response<?>> instrumenter;
   private final Request<?> request;
   private final Response<?> response;
-  private final Context receiveContext;
+  @Nullable private final Context receiveContext;
 
   /*
    * Note: this may potentially create problems if this iterator is used from different threads. But
@@ -35,7 +35,7 @@ private TracingIterator(
       Instrumenter<SqsProcessRequest, Response<?>> instrumenter,
       Request<?> request,
       Response<?> response,
-      Context receiveContext) {
+      @Nullable Context receiveContext) {
     this.delegateIterator = delegateIterator;
     this.instrumenter = instrumenter;
     this.request = request;
@@ -48,7 +48,7 @@ static Iterator<Message> wrap(
       Instrumenter<SqsProcessRequest, Response<?>> instrumenter,
       Request<?> request,
       Response<?> response,
-      Context receiveContext) {
+      @Nullable Context receiveContext) {
     return new TracingIterator(delegateIterator, instrumenter, request, response, receiveContext);
   }
 

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

@@ -15,22 +15,23 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.function.Consumer;
+import javax.annotation.Nullable;
 
 class TracingList extends SdkInternalList<Message> {
   private static final long serialVersionUID = 1L;
 
   private final transient Instrumenter<SqsProcessRequest, Response<?>> instrumenter;
   private final transient Request<?> request;
   private final transient Response<?> response;
-  private final transient Context receiveContext;
+  @Nullable private final transient Context receiveContext;
   private boolean firstIterator = true;
 
   private TracingList(
       List<Message> list,
       Instrumenter<SqsProcessRequest, Response<?>> instrumenter,
       Request<?> request,
       Response<?> response,
-      Context receiveContext) {
+      @Nullable Context receiveContext) {
     super(list);
     this.instrumenter = instrumenter;
     this.request = request;
@@ -43,7 +44,7 @@ static SdkInternalList<Message> wrap(
       Instrumenter<SqsProcessRequest, Response<?>> instrumenter,
       Request<?> request,
       Response<?> response,
-      Context receiveContext) {
+      @Nullable Context receiveContext) {
     return new TracingList(list, instrumenter, request, response, receiveContext);
   }