naming nits

Author: akats7

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

@@ -186,15 +186,15 @@ Instrumenter<Request<?>, Response<?>> producerInstrumenter() {
         true);
   }
 
-  Instrumenter<Request<?>, Response<?>> dynamoInstrumenter() {
-    DynamoAttributesExtractor dynamoAttributesExtractor = new DynamoAttributesExtractor();
+  Instrumenter<Request<?>, Response<?>> dynamoDbInstrumenter() {
+    DynamoDbAttributesExtractor dynamoDbAttributesExtractor = new DynamoDbAttributesExtractor();
 
     return createInstrumenter(
         openTelemetry,
         spanName,
         SpanKindExtractor.alwaysClient(),
         attributesExtractors(),
-        singletonList(dynamoAttributesExtractor),
+        singletonList(dynamoDbAttributesExtractor),
         true);
   }
 

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

@@ -49,7 +49,7 @@ public static AwsSdkTelemetryBuilder builder(OpenTelemetry openTelemetry) {
   private final Instrumenter<SqsReceiveRequest, Response<?>> consumerReceiveInstrumenter;
   private final Instrumenter<SqsProcessRequest, Response<?>> consumerProcessInstrumenter;
   private final Instrumenter<Request<?>, Response<?>> producerInstrumenter;
-  private final Instrumenter<Request<?>, Response<?>> dynamoInstrumenter;
+  private final Instrumenter<Request<?>, Response<?>> dynamoDbInstrumenter;
 
   AwsSdkTelemetry(
       OpenTelemetry openTelemetry,
@@ -66,7 +66,7 @@ public static AwsSdkTelemetryBuilder builder(OpenTelemetry openTelemetry) {
     consumerReceiveInstrumenter = instrumenterFactory.consumerReceiveInstrumenter();
     consumerProcessInstrumenter = instrumenterFactory.consumerProcessInstrumenter();
     producerInstrumenter = instrumenterFactory.producerInstrumenter();
-    dynamoInstrumenter = instrumenterFactory.dynamoInstrumenter();
+    dynamoDbInstrumenter = instrumenterFactory.dynamoDbInstrumenter();
   }
 
   /**
@@ -79,6 +79,6 @@ public RequestHandler2 newRequestHandler() {
         consumerReceiveInstrumenter,
         consumerProcessInstrumenter,
         producerInstrumenter,
-        dynamoInstrumenter);
+        dynamoDbInstrumenter);
   }
 }

instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/DynamoAttributesExtractor.java renamed to instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/DynamoDbAttributesExtractor.java

@@ -16,7 +16,7 @@
 import java.util.List;
 import javax.annotation.Nullable;
 
-public class DynamoAttributesExtractor implements AttributesExtractor<Request<?>, Response<?>> {
+public class DynamoDbAttributesExtractor implements AttributesExtractor<Request<?>, Response<?>> {
 
   private static final AttributeKey<String> DB_SYSTEM = AttributeKey.stringKey("db.system");
   private static final AttributeKey<List<String>> AWS_TABLE_NAMES =

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

@@ -39,19 +39,19 @@ final class TracingRequestHandler extends RequestHandler2 {
   private final Instrumenter<SqsReceiveRequest, Response<?>> consumerReceiveInstrumenter;
   private final Instrumenter<SqsProcessRequest, Response<?>> consumerProcessInstrumenter;
   private final Instrumenter<Request<?>, Response<?>> producerInstrumenter;
-  private final Instrumenter<Request<?>, Response<?>> dynamoInstrumenter;
+  private final Instrumenter<Request<?>, Response<?>> dynamoDbInstrumenter;
 
   TracingRequestHandler(
       Instrumenter<Request<?>, Response<?>> requestInstrumenter,
       Instrumenter<SqsReceiveRequest, Response<?>> consumerReceiveInstrumenter,
       Instrumenter<SqsProcessRequest, Response<?>> consumerProcessInstrumenter,
       Instrumenter<Request<?>, Response<?>> producerInstrumenter,
-      Instrumenter<Request<?>, Response<?>> dynamoInstrumenter) {
+      Instrumenter<Request<?>, Response<?>> dynamoDbInstrumenter) {
     this.requestInstrumenter = requestInstrumenter;
     this.consumerReceiveInstrumenter = consumerReceiveInstrumenter;
     this.consumerProcessInstrumenter = consumerProcessInstrumenter;
     this.producerInstrumenter = producerInstrumenter;
-    this.dynamoInstrumenter = dynamoInstrumenter;
+    this.dynamoDbInstrumenter = dynamoDbInstrumenter;
   }
 
   @Override
@@ -163,7 +163,7 @@ private void finish(Request<?> request, Response<?> response, @Nullable Throwabl
   private Instrumenter<Request<?>, Response<?>> getInstrumenter(Request<?> request) {
     String className = request.getOriginalRequest().getClass().getName();
     if (className.startsWith(DYNAMODBV2)) {
-      return dynamoInstrumenter;
+      return dynamoDbInstrumenter;
     } else if (className.equals(SEND_MESSAGE_REQUEST)) {
       return producerInstrumenter;
     }

instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractS3ClientTest.java

@@ -18,6 +18,7 @@
 import static io.opentelemetry.semconv.incubating.RpcIncubatingAttributes.RPC_METHOD;
 import static io.opentelemetry.semconv.incubating.RpcIncubatingAttributes.RPC_SERVICE;
 import static io.opentelemetry.semconv.incubating.RpcIncubatingAttributes.RPC_SYSTEM;
+import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.catchThrowable;
 
@@ -34,7 +35,6 @@
 import io.opentelemetry.testing.internal.armeria.common.HttpStatus;
 import io.opentelemetry.testing.internal.armeria.common.MediaType;
 import java.time.Duration;
-import java.util.Collections;
 import java.util.List;
 import java.util.function.Function;
 import java.util.stream.Stream;
@@ -83,12 +83,12 @@ private static Stream<Arguments> provideArguments() {
             "CreateBucket",
             "PUT",
             (Function<AmazonS3, Object>) c -> c.createBucket("testbucket"),
-            Collections.singletonList(createStringKeyPair("aws.bucket.name", "testbucket"))),
+            singletonList(createStringKeyPair("aws.bucket.name", "testbucket"))),
         Arguments.of(
             "GetObject",
             "GET",
             (Function<AmazonS3, Object>) c -> c.getObject("someBucket", "someKey"),
-            Collections.singletonList(createStringKeyPair("aws.bucket.name", "someBucket"))));
+            singletonList(createStringKeyPair("aws.bucket.name", "someBucket"))));
   }
 
   @Test