Add instrumentation for spring-cloud-aws SqsListener annotation (#12314)

open-telemetry · Oct 7, 2024 · 9a7f712 · 9a7f712
1 parent 6cd0715
commit 9a7f712
Show file tree

Hide file tree

Showing 61 changed files with 847 additions and 81 deletions.
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -115,7 +115,8 @@ val DEPENDENCIES = listOf(
   "org.junit-pioneer:junit-pioneer:1.9.1",
   "org.objenesis:objenesis:3.4",
   "javax.validation:validation-api:2.0.1.Final",
-  "org.snakeyaml:snakeyaml-engine:2.8"
+  "org.snakeyaml:snakeyaml-engine:2.8",
+  "org.elasticmq:elasticmq-rest-sqs_2.13:1.6.8"
 )
 
 javaPlatform {

diff --git a/docs/supported-libraries.md b/docs/supported-libraries.md
@@ -126,6 +126,7 @@ These are the supported libraries and frameworks:
 | [Spark Web Framework](/~https://github.com/perwendel/spark)                                                                                   | 2.3+                               | N/A                                                                                                                                                                                                                                                                                                                                                                                     | Provides `http.route` [2]                                                                                                               |
 | [Spring Batch](https://spring.io/projects/spring-batch)                                                                                     | 3.0+ (not including 5.0+ yet)      | N/A                                                                                                                                                                                                                                                                                                                                                                                     | none                                                                                                                                    |
 | [Spring Boot](https://spring.io/projects/spring-boot)                                                                                       |                                    | [opentelemetry-spring-boot-resources](https://opentelemetry.io/docs/zero-code/java/spring-boot/)                                                                                                                                                                                                                                                                                        | none                                                                                                                                    |
+| [Spring Cloud AWS](https://spring.io/projects/spring-cloud-aws)                                                                             | 3.0+                               | N/A                                                                                                                                                                                                                                                                                                                                                                                     | [Messaging Spans]                                                                                                                       |
 | [Spring Cloud Gateway](/~https://github.com/spring-cloud/spring-cloud-gateway)                                                                | 2.0+                               | N/A                                                                                                                                                                                                                                                                                                                                                                                     | Provides `http.route` [2]                                                                                                               |
 | [Spring Core](https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/core/package-summary.html)               | 2.0+                               | N/A                                                                                                                                                                                                                                                                                                                                                                                     | Context propagation                                                                                                                     |
 | [Spring Data](https://spring.io/projects/spring-data)                                                                                       | 1.8+                               | N/A                                                                                                                                                                                                                                                                                                                                                                                     | none                                                                                                                                    |

diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/testing/build.gradle.kts b/instrumentation/aws-sdk/aws-sdk-1.11/testing/build.gradle.kts
@@ -16,7 +16,7 @@ dependencies {
   compileOnly("com.amazonaws:aws-java-sdk-sqs:1.11.106")
 
   // needed for SQS - using emq directly as localstack references emq v0.15.7 ie WITHOUT AWS trace header propagation
-  implementation("org.elasticmq:elasticmq-rest-sqs_2.12:1.0.0")
+  implementation("org.elasticmq:elasticmq-rest-sqs_2.13")
 
   implementation("com.google.guava:guava")
 

diff --git a/...ation/awssdk/v2_2/LambdaAdviceBridge.java → ...sdk/v2_2/internal/LambdaAdviceBridge.java b/...ation/awssdk/v2_2/LambdaAdviceBridge.java → ...sdk/v2_2/internal/LambdaAdviceBridge.java
@@ -3,8 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.awssdk.v2_2;
+package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
 
+/**
+ * This class is internal and is hence not for public use. Its APIs are unstable and can change at
+ * any time.
+ */
 public final class LambdaAdviceBridge {
   private LambdaAdviceBridge() {}
 

diff --git a/...entation/awssdk/v2_2/SnsAdviceBridge.java → ...awssdk/v2_2/internal/SnsAdviceBridge.java b/...entation/awssdk/v2_2/SnsAdviceBridge.java → ...awssdk/v2_2/internal/SnsAdviceBridge.java
@@ -3,8 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.awssdk.v2_2;
+package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
 
+/**
+ * This class is internal and is hence not for public use. Its APIs are unstable and can change at
+ * any time.
+ */
 public final class SnsAdviceBridge {
   private SnsAdviceBridge() {}
 

diff --git a/...entation/awssdk/v2_2/SqsAdviceBridge.java → ...awssdk/v2_2/internal/SqsAdviceBridge.java b/...entation/awssdk/v2_2/SqsAdviceBridge.java → ...awssdk/v2_2/internal/SqsAdviceBridge.java
@@ -3,8 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.awssdk.v2_2;
+package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
 
+/**
+ * This class is internal and is hence not for public use. Its APIs are unstable and can change at
+ * any time.
+ */
 public final class SqsAdviceBridge {
   private SqsAdviceBridge() {}
 

diff --git a/...a/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/LambdaInstrumentationModule.java b/...a/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/LambdaInstrumentationModule.java
@@ -9,7 +9,7 @@
 import static net.bytebuddy.matcher.ElementMatchers.none;
 
 import com.google.auto.service.AutoService;
-import io.opentelemetry.instrumentation.awssdk.v2_2.LambdaAdviceBridge;
+import io.opentelemetry.instrumentation.awssdk.v2_2.internal.LambdaAdviceBridge;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import net.bytebuddy.asm.Advice;

diff --git a/...java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/SnsInstrumentationModule.java b/...java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/SnsInstrumentationModule.java
@@ -9,7 +9,7 @@
 import static net.bytebuddy.matcher.ElementMatchers.none;
 
 import com.google.auto.service.AutoService;
-import io.opentelemetry.instrumentation.awssdk.v2_2.SnsAdviceBridge;
+import io.opentelemetry.instrumentation.awssdk.v2_2.internal.SnsAdviceBridge;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import net.bytebuddy.asm.Advice;

diff --git a/...java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/SqsInstrumentationModule.java b/...java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/SqsInstrumentationModule.java
@@ -9,7 +9,7 @@
 import static net.bytebuddy.matcher.ElementMatchers.none;
 
 import com.google.auto.service.AutoService;
-import io.opentelemetry.instrumentation.awssdk.v2_2.SqsAdviceBridge;
+import io.opentelemetry.instrumentation.awssdk.v2_2.internal.SqsAdviceBridge;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;

diff --git a/...2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkTelemetry.java b/...2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkTelemetry.java
@@ -8,6 +8,12 @@
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.context.propagation.TextMapPropagator;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
+import io.opentelemetry.instrumentation.awssdk.v2_2.internal.AwsSdkInstrumenterFactory;
+import io.opentelemetry.instrumentation.awssdk.v2_2.internal.Response;
+import io.opentelemetry.instrumentation.awssdk.v2_2.internal.SqsImpl;
+import io.opentelemetry.instrumentation.awssdk.v2_2.internal.SqsProcessRequest;
+import io.opentelemetry.instrumentation.awssdk.v2_2.internal.SqsReceiveRequest;
+import io.opentelemetry.instrumentation.awssdk.v2_2.internal.TracingExecutionInterceptor;
 import io.opentelemetry.javaagent.tooling.muzzle.NoMuzzle;
 import java.util.List;
 import javax.annotation.Nullable;

diff --git a/...ation/awssdk/v2_2/AbstractSqsRequest.java → ...sdk/v2_2/internal/AbstractSqsRequest.java b/...ation/awssdk/v2_2/AbstractSqsRequest.java → ...sdk/v2_2/internal/AbstractSqsRequest.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.awssdk.v2_2;
+package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
 
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
 

diff --git a/...dk/v2_2/AwsJsonProtocolFactoryAccess.java → ...nternal/AwsJsonProtocolFactoryAccess.java b/...dk/v2_2/AwsJsonProtocolFactoryAccess.java → ...nternal/AwsJsonProtocolFactoryAccess.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.awssdk.v2_2;
+package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;

diff --git a/...wsSdkExperimentalAttributesExtractor.java → ...wsSdkExperimentalAttributesExtractor.java b/...wsSdkExperimentalAttributesExtractor.java → ...wsSdkExperimentalAttributesExtractor.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.awssdk.v2_2;
+package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
 
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.AttributesBuilder;

diff --git a/...ssdk/v2_2/AwsSdkHttpAttributesGetter.java → .../internal/AwsSdkHttpAttributesGetter.java b/...ssdk/v2_2/AwsSdkHttpAttributesGetter.java → .../internal/AwsSdkHttpAttributesGetter.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.awssdk.v2_2;
+package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
 
 import static java.util.Collections.emptyList;
 

diff --git a/...ClientSuppressionAttributesExtractor.java → ...ClientSuppressionAttributesExtractor.java b/...ClientSuppressionAttributesExtractor.java → ...ClientSuppressionAttributesExtractor.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.awssdk.v2_2;
+package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
 
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.context.Context;

diff --git a/...wssdk/v2_2/AwsSdkInstrumenterFactory.java → ...2/internal/AwsSdkInstrumenterFactory.java b/...wssdk/v2_2/AwsSdkInstrumenterFactory.java → ...2/internal/AwsSdkInstrumenterFactory.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.awssdk.v2_2;
+package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
 
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
@@ -31,7 +31,11 @@
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
 import software.amazon.awssdk.core.interceptor.SdkExecutionAttribute;
 
-final class AwsSdkInstrumenterFactory {
+/**
+ * This class is internal and is hence not for public use. Its APIs are unstable and can change at
+ * any time.
+ */
+public final class AwsSdkInstrumenterFactory {
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.aws-sdk-2.2";
 
   private static final AttributesExtractor<ExecutionAttributes, Response> rpcAttributesExtractor =
@@ -74,7 +78,7 @@ final class AwsSdkInstrumenterFactory {
   private final boolean messagingReceiveInstrumentationEnabled;
   private final boolean useXrayPropagator;
 
-  AwsSdkInstrumenterFactory(
+  public AwsSdkInstrumenterFactory(
       OpenTelemetry openTelemetry,
       @Nullable TextMapPropagator messagingPropagator,
       List<String> capturedHeaders,
@@ -89,7 +93,7 @@ final class AwsSdkInstrumenterFactory {
     this.useXrayPropagator = useXrayPropagator;
   }
 
-  Instrumenter<ExecutionAttributes, Response> requestInstrumenter() {
+  public Instrumenter<ExecutionAttributes, Response> requestInstrumenter() {
     return createInstrumenter(
         openTelemetry,
         AwsSdkInstrumenterFactory::spanName,
@@ -118,7 +122,7 @@ private <REQUEST, RESPONSE> AttributesExtractor<REQUEST, RESPONSE> messagingAttr
         .build();
   }
 
-  Instrumenter<SqsReceiveRequest, Response> consumerReceiveInstrumenter() {
+  public Instrumenter<SqsReceiveRequest, Response> consumerReceiveInstrumenter() {
     MessageOperation operation = MessageOperation.RECEIVE;
     SqsReceiveRequestAttributesGetter getter = SqsReceiveRequestAttributesGetter.INSTANCE;
     AttributesExtractor<SqsReceiveRequest, Response> messagingAttributeExtractor =
@@ -133,7 +137,7 @@ Instrumenter<SqsReceiveRequest, Response> consumerReceiveInstrumenter() {
         messagingReceiveInstrumentationEnabled);
   }
 
-  Instrumenter<SqsProcessRequest, Response> consumerProcessInstrumenter() {
+  public Instrumenter<SqsProcessRequest, Response> consumerProcessInstrumenter() {
     MessageOperation operation = MessageOperation.PROCESS;
     SqsProcessRequestAttributesGetter getter = SqsProcessRequestAttributesGetter.INSTANCE;
 
@@ -185,7 +189,7 @@ public void onEnd(
     return result;
   }
 
-  Instrumenter<ExecutionAttributes, Response> producerInstrumenter() {
+  public Instrumenter<ExecutionAttributes, Response> producerInstrumenter() {
     MessageOperation operation = MessageOperation.PUBLISH;
     SqsAttributesGetter getter = SqsAttributesGetter.INSTANCE;
     AttributesExtractor<ExecutionAttributes, Response> messagingAttributeExtractor =

diff --git a/...umentation/awssdk/v2_2/AwsSdkRequest.java → ...n/awssdk/v2_2/internal/AwsSdkRequest.java b/...umentation/awssdk/v2_2/AwsSdkRequest.java → ...n/awssdk/v2_2/internal/AwsSdkRequest.java
@@ -3,15 +3,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.awssdk.v2_2;
+package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
 
-import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsSdkRequestType.DYNAMODB;
-import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsSdkRequestType.KINESIS;
-import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsSdkRequestType.S3;
-import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsSdkRequestType.SNS;
-import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsSdkRequestType.SQS;
-import static io.opentelemetry.instrumentation.awssdk.v2_2.FieldMapping.request;
-import static io.opentelemetry.instrumentation.awssdk.v2_2.FieldMapping.response;
+import static io.opentelemetry.instrumentation.awssdk.v2_2.internal.AwsSdkRequestType.DYNAMODB;
+import static io.opentelemetry.instrumentation.awssdk.v2_2.internal.AwsSdkRequestType.KINESIS;
+import static io.opentelemetry.instrumentation.awssdk.v2_2.internal.AwsSdkRequestType.S3;
+import static io.opentelemetry.instrumentation.awssdk.v2_2.internal.AwsSdkRequestType.SNS;
+import static io.opentelemetry.instrumentation.awssdk.v2_2.internal.AwsSdkRequestType.SQS;
+import static io.opentelemetry.instrumentation.awssdk.v2_2.internal.FieldMapping.request;
+import static io.opentelemetry.instrumentation.awssdk.v2_2.internal.FieldMapping.response;
 
 import java.util.Collections;
 import java.util.List;

diff --git a/...tation/awssdk/v2_2/AwsSdkRequestType.java → ...ssdk/v2_2/internal/AwsSdkRequestType.java b/...tation/awssdk/v2_2/AwsSdkRequestType.java → ...ssdk/v2_2/internal/AwsSdkRequestType.java
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.awssdk.v2_2;
+package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
 
-import static io.opentelemetry.instrumentation.awssdk.v2_2.FieldMapping.request;
+import static io.opentelemetry.instrumentation.awssdk.v2_2.internal.FieldMapping.request;
 
 import io.opentelemetry.api.common.AttributeKey;
 import java.util.Collections;

diff --git a/...wssdk/v2_2/AwsSdkRpcAttributesGetter.java → ...2/internal/AwsSdkRpcAttributesGetter.java b/...wssdk/v2_2/AwsSdkRpcAttributesGetter.java → ...2/internal/AwsSdkRpcAttributesGetter.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.awssdk.v2_2;
+package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
 
 import io.opentelemetry.instrumentation.api.incubator.semconv.rpc.RpcAttributesGetter;
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;

diff --git a/...trumentation/awssdk/v2_2/FieldMapper.java → ...ion/awssdk/v2_2/internal/FieldMapper.java b/...trumentation/awssdk/v2_2/FieldMapper.java → ...ion/awssdk/v2_2/internal/FieldMapper.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.awssdk.v2_2;
+package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
 
 import io.opentelemetry.api.trace.Span;
 import java.util.List;

diff --git a/...rumentation/awssdk/v2_2/FieldMapping.java → ...on/awssdk/v2_2/internal/FieldMapping.java b/...rumentation/awssdk/v2_2/FieldMapping.java → ...on/awssdk/v2_2/internal/FieldMapping.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.awssdk.v2_2;
+package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
 
 import java.util.ArrayList;
 import java.util.Arrays;

diff --git a/...rumentation/awssdk/v2_2/LambdaAccess.java → ...on/awssdk/v2_2/internal/LambdaAccess.java b/...rumentation/awssdk/v2_2/LambdaAccess.java → ...on/awssdk/v2_2/internal/LambdaAccess.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.awssdk.v2_2;
+package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.javaagent.tooling.muzzle.NoMuzzle;

diff --git a/...strumentation/awssdk/v2_2/LambdaImpl.java → ...tion/awssdk/v2_2/internal/LambdaImpl.java b/...strumentation/awssdk/v2_2/LambdaImpl.java → ...tion/awssdk/v2_2/internal/LambdaImpl.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.awssdk.v2_2;
+package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
 
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import java.nio.charset.StandardCharsets;

diff --git a/...tion/awssdk/v2_2/MethodHandleFactory.java → ...dk/v2_2/internal/MethodHandleFactory.java b/...tion/awssdk/v2_2/MethodHandleFactory.java → ...dk/v2_2/internal/MethodHandleFactory.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.awssdk.v2_2;
+package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;

diff --git a/...mentation/awssdk/v2_2/PluginImplUtil.java → .../awssdk/v2_2/internal/PluginImplUtil.java b/...mentation/awssdk/v2_2/PluginImplUtil.java → .../awssdk/v2_2/internal/PluginImplUtil.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.awssdk.v2_2;
+package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;

diff --git a/...tion/awssdk/v2_2/RequestHeaderSetter.java → ...dk/v2_2/internal/RequestHeaderSetter.java b/...tion/awssdk/v2_2/RequestHeaderSetter.java → ...dk/v2_2/internal/RequestHeaderSetter.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.awssdk.v2_2;
+package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
 
 import io.opentelemetry.context.propagation.TextMapSetter;
 import software.amazon.awssdk.http.SdkHttpRequest;

diff --git a/...instrumentation/awssdk/v2_2/Response.java → ...tation/awssdk/v2_2/internal/Response.java b/...instrumentation/awssdk/v2_2/Response.java → ...tation/awssdk/v2_2/internal/Response.java
@@ -3,12 +3,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.awssdk.v2_2;
+package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
 
 import software.amazon.awssdk.core.SdkResponse;
 import software.amazon.awssdk.http.SdkHttpResponse;
 
-final class Response {
+/**
+ * This class is internal and is hence not for public use. Its APIs are unstable and can change at
+ * any time.
+ */
+public final class Response {
   private final SdkHttpResponse sdkHttpResponse;
   private final SdkResponse sdkResponse;
 

diff --git a/...strumentation/awssdk/v2_2/Serializer.java → ...tion/awssdk/v2_2/internal/Serializer.java b/...strumentation/awssdk/v2_2/Serializer.java → ...tion/awssdk/v2_2/internal/Serializer.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.awssdk.v2_2;
+package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
 
 import java.io.IOException;
 import java.io.InputStream;

diff --git a/...nstrumentation/awssdk/v2_2/SnsAccess.java → ...ation/awssdk/v2_2/internal/SnsAccess.java b/...nstrumentation/awssdk/v2_2/SnsAccess.java → ...ation/awssdk/v2_2/internal/SnsAccess.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.awssdk.v2_2;
+package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.propagation.TextMapPropagator;

diff --git a/.../instrumentation/awssdk/v2_2/SnsImpl.java → ...ntation/awssdk/v2_2/internal/SnsImpl.java b/.../instrumentation/awssdk/v2_2/SnsImpl.java → ...ntation/awssdk/v2_2/internal/SnsImpl.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.awssdk.v2_2;
+package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.propagation.TextMapPropagator;

diff --git a/...nstrumentation/awssdk/v2_2/SqsAccess.java → ...ation/awssdk/v2_2/internal/SqsAccess.java b/...nstrumentation/awssdk/v2_2/SqsAccess.java → ...ation/awssdk/v2_2/internal/SqsAccess.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.awssdk.v2_2;
+package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
 
 import io.opentelemetry.context.propagation.TextMapPropagator;
 import io.opentelemetry.instrumentation.api.internal.Timer;

diff --git a/...tion/awssdk/v2_2/SqsAttributesGetter.java → ...dk/v2_2/internal/SqsAttributesGetter.java b/...tion/awssdk/v2_2/SqsAttributesGetter.java → ...dk/v2_2/internal/SqsAttributesGetter.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.awssdk.v2_2;
+package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
 
 import io.opentelemetry.instrumentation.api.incubator.semconv.messaging.MessagingAttributesGetter;
 import java.util.Collections;