Skip to content

Commit 9a7f712

Browse files
lauritlaurit
authored
Add instrumentation for spring-cloud-aws SqsListener annotation (#12314)
1 parent 6cd0715 commit 9a7f712

File tree

61 files changed

+847
-81
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+847
-81
lines changed

‎dependencyManagement/build.gradle.kts

+2-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,8 @@ val DEPENDENCIES = listOf(
115115
"org.junit-pioneer:junit-pioneer:1.9.1",
116116
"org.objenesis:objenesis:3.4",
117117
"javax.validation:validation-api:2.0.1.Final",
118-
"org.snakeyaml:snakeyaml-engine:2.8"
118+
"org.snakeyaml:snakeyaml-engine:2.8",
119+
"org.elasticmq:elasticmq-rest-sqs_2.13:1.6.8"
119120
)
120121

121122
javaPlatform {

‎docs/supported-libraries.md

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

‎instrumentation/aws-sdk/aws-sdk-1.11/testing/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dependencies {
1616
compileOnly("com.amazonaws:aws-java-sdk-sqs:1.11.106")
1717

1818
// needed for SQS - using emq directly as localstack references emq v0.15.7 ie WITHOUT AWS trace header propagation
19-
implementation("org.elasticmq:elasticmq-rest-sqs_2.12:1.0.0")
19+
implementation("org.elasticmq:elasticmq-rest-sqs_2.13")
2020

2121
implementation("com.google.guava:guava")
2222

‎instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/LambdaAdviceBridge.java ‎instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/LambdaAdviceBridge.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,12 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.awssdk.v2_2;
6+
package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
77

8+
/**
9+
* This class is internal and is hence not for public use. Its APIs are unstable and can change at
10+
* any time.
11+
*/
812
public final class LambdaAdviceBridge {
913
private LambdaAdviceBridge() {}
1014

‎instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/SnsAdviceBridge.java ‎instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/SnsAdviceBridge.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,12 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.awssdk.v2_2;
6+
package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
77

8+
/**
9+
* This class is internal and is hence not for public use. Its APIs are unstable and can change at
10+
* any time.
11+
*/
812
public final class SnsAdviceBridge {
913
private SnsAdviceBridge() {}
1014

‎instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/SqsAdviceBridge.java ‎instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/SqsAdviceBridge.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,12 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.awssdk.v2_2;
6+
package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
77

8+
/**
9+
* This class is internal and is hence not for public use. Its APIs are unstable and can change at
10+
* any time.
11+
*/
812
public final class SqsAdviceBridge {
913
private SqsAdviceBridge() {}
1014

‎instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/LambdaInstrumentationModule.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import static net.bytebuddy.matcher.ElementMatchers.none;
1010

1111
import com.google.auto.service.AutoService;
12-
import io.opentelemetry.instrumentation.awssdk.v2_2.LambdaAdviceBridge;
12+
import io.opentelemetry.instrumentation.awssdk.v2_2.internal.LambdaAdviceBridge;
1313
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
1414
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
1515
import net.bytebuddy.asm.Advice;

‎instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/SnsInstrumentationModule.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import static net.bytebuddy.matcher.ElementMatchers.none;
1010

1111
import com.google.auto.service.AutoService;
12-
import io.opentelemetry.instrumentation.awssdk.v2_2.SnsAdviceBridge;
12+
import io.opentelemetry.instrumentation.awssdk.v2_2.internal.SnsAdviceBridge;
1313
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
1414
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
1515
import net.bytebuddy.asm.Advice;

‎instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/SqsInstrumentationModule.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import static net.bytebuddy.matcher.ElementMatchers.none;
1010

1111
import com.google.auto.service.AutoService;
12-
import io.opentelemetry.instrumentation.awssdk.v2_2.SqsAdviceBridge;
12+
import io.opentelemetry.instrumentation.awssdk.v2_2.internal.SqsAdviceBridge;
1313
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
1414
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
1515
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;

‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkTelemetry.java

+6
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88
import io.opentelemetry.api.OpenTelemetry;
99
import io.opentelemetry.context.propagation.TextMapPropagator;
1010
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
11+
import io.opentelemetry.instrumentation.awssdk.v2_2.internal.AwsSdkInstrumenterFactory;
12+
import io.opentelemetry.instrumentation.awssdk.v2_2.internal.Response;
13+
import io.opentelemetry.instrumentation.awssdk.v2_2.internal.SqsImpl;
14+
import io.opentelemetry.instrumentation.awssdk.v2_2.internal.SqsProcessRequest;
15+
import io.opentelemetry.instrumentation.awssdk.v2_2.internal.SqsReceiveRequest;
16+
import io.opentelemetry.instrumentation.awssdk.v2_2.internal.TracingExecutionInterceptor;
1117
import io.opentelemetry.javaagent.tooling.muzzle.NoMuzzle;
1218
import java.util.List;
1319
import javax.annotation.Nullable;

‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractSqsRequest.java ‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/AbstractSqsRequest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.awssdk.v2_2;
6+
package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
77

88
import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
99

‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsJsonProtocolFactoryAccess.java ‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/AwsJsonProtocolFactoryAccess.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.awssdk.v2_2;
6+
package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
77

88
import java.lang.invoke.MethodHandle;
99
import java.lang.invoke.MethodHandles;

‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkExperimentalAttributesExtractor.java ‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/AwsSdkExperimentalAttributesExtractor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.awssdk.v2_2;
6+
package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
77

88
import io.opentelemetry.api.common.AttributeKey;
99
import io.opentelemetry.api.common.AttributesBuilder;

‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkHttpAttributesGetter.java ‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/AwsSdkHttpAttributesGetter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.awssdk.v2_2;
6+
package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
77

88
import static java.util.Collections.emptyList;
99

‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkHttpClientSuppressionAttributesExtractor.java ‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/AwsSdkHttpClientSuppressionAttributesExtractor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.awssdk.v2_2;
6+
package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
77

88
import io.opentelemetry.api.common.AttributesBuilder;
99
import io.opentelemetry.context.Context;

‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkInstrumenterFactory.java ‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/AwsSdkInstrumenterFactory.java

+11-7
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.awssdk.v2_2;
6+
package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
77

88
import static java.util.Collections.emptyList;
99
import static java.util.Collections.singletonList;
@@ -31,7 +31,11 @@
3131
import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
3232
import software.amazon.awssdk.core.interceptor.SdkExecutionAttribute;
3333

34-
final class AwsSdkInstrumenterFactory {
34+
/**
35+
* This class is internal and is hence not for public use. Its APIs are unstable and can change at
36+
* any time.
37+
*/
38+
public final class AwsSdkInstrumenterFactory {
3539
private static final String INSTRUMENTATION_NAME = "io.opentelemetry.aws-sdk-2.2";
3640

3741
private static final AttributesExtractor<ExecutionAttributes, Response> rpcAttributesExtractor =
@@ -74,7 +78,7 @@ final class AwsSdkInstrumenterFactory {
7478
private final boolean messagingReceiveInstrumentationEnabled;
7579
private final boolean useXrayPropagator;
7680

77-
AwsSdkInstrumenterFactory(
81+
public AwsSdkInstrumenterFactory(
7882
OpenTelemetry openTelemetry,
7983
@Nullable TextMapPropagator messagingPropagator,
8084
List<String> capturedHeaders,
@@ -89,7 +93,7 @@ final class AwsSdkInstrumenterFactory {
8993
this.useXrayPropagator = useXrayPropagator;
9094
}
9195

92-
Instrumenter<ExecutionAttributes, Response> requestInstrumenter() {
96+
public Instrumenter<ExecutionAttributes, Response> requestInstrumenter() {
9397
return createInstrumenter(
9498
openTelemetry,
9599
AwsSdkInstrumenterFactory::spanName,
@@ -118,7 +122,7 @@ private <REQUEST, RESPONSE> AttributesExtractor<REQUEST, RESPONSE> messagingAttr
118122
.build();
119123
}
120124

121-
Instrumenter<SqsReceiveRequest, Response> consumerReceiveInstrumenter() {
125+
public Instrumenter<SqsReceiveRequest, Response> consumerReceiveInstrumenter() {
122126
MessageOperation operation = MessageOperation.RECEIVE;
123127
SqsReceiveRequestAttributesGetter getter = SqsReceiveRequestAttributesGetter.INSTANCE;
124128
AttributesExtractor<SqsReceiveRequest, Response> messagingAttributeExtractor =
@@ -133,7 +137,7 @@ Instrumenter<SqsReceiveRequest, Response> consumerReceiveInstrumenter() {
133137
messagingReceiveInstrumentationEnabled);
134138
}
135139

136-
Instrumenter<SqsProcessRequest, Response> consumerProcessInstrumenter() {
140+
public Instrumenter<SqsProcessRequest, Response> consumerProcessInstrumenter() {
137141
MessageOperation operation = MessageOperation.PROCESS;
138142
SqsProcessRequestAttributesGetter getter = SqsProcessRequestAttributesGetter.INSTANCE;
139143

@@ -185,7 +189,7 @@ public void onEnd(
185189
return result;
186190
}
187191

188-
Instrumenter<ExecutionAttributes, Response> producerInstrumenter() {
192+
public Instrumenter<ExecutionAttributes, Response> producerInstrumenter() {
189193
MessageOperation operation = MessageOperation.PUBLISH;
190194
SqsAttributesGetter getter = SqsAttributesGetter.INSTANCE;
191195
AttributesExtractor<ExecutionAttributes, Response> messagingAttributeExtractor =

‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkRequest.java ‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/AwsSdkRequest.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.awssdk.v2_2;
6+
package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
77

8-
import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsSdkRequestType.DYNAMODB;
9-
import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsSdkRequestType.KINESIS;
10-
import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsSdkRequestType.S3;
11-
import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsSdkRequestType.SNS;
12-
import static io.opentelemetry.instrumentation.awssdk.v2_2.AwsSdkRequestType.SQS;
13-
import static io.opentelemetry.instrumentation.awssdk.v2_2.FieldMapping.request;
14-
import static io.opentelemetry.instrumentation.awssdk.v2_2.FieldMapping.response;
8+
import static io.opentelemetry.instrumentation.awssdk.v2_2.internal.AwsSdkRequestType.DYNAMODB;
9+
import static io.opentelemetry.instrumentation.awssdk.v2_2.internal.AwsSdkRequestType.KINESIS;
10+
import static io.opentelemetry.instrumentation.awssdk.v2_2.internal.AwsSdkRequestType.S3;
11+
import static io.opentelemetry.instrumentation.awssdk.v2_2.internal.AwsSdkRequestType.SNS;
12+
import static io.opentelemetry.instrumentation.awssdk.v2_2.internal.AwsSdkRequestType.SQS;
13+
import static io.opentelemetry.instrumentation.awssdk.v2_2.internal.FieldMapping.request;
14+
import static io.opentelemetry.instrumentation.awssdk.v2_2.internal.FieldMapping.response;
1515

1616
import java.util.Collections;
1717
import java.util.List;

‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkRequestType.java ‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/AwsSdkRequestType.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.awssdk.v2_2;
6+
package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
77

8-
import static io.opentelemetry.instrumentation.awssdk.v2_2.FieldMapping.request;
8+
import static io.opentelemetry.instrumentation.awssdk.v2_2.internal.FieldMapping.request;
99

1010
import io.opentelemetry.api.common.AttributeKey;
1111
import java.util.Collections;

‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkRpcAttributesGetter.java ‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/AwsSdkRpcAttributesGetter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.awssdk.v2_2;
6+
package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
77

88
import io.opentelemetry.instrumentation.api.incubator.semconv.rpc.RpcAttributesGetter;
99
import software.amazon.awssdk.core.interceptor.ExecutionAttributes;

‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/FieldMapper.java ‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/FieldMapper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.awssdk.v2_2;
6+
package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
77

88
import io.opentelemetry.api.trace.Span;
99
import java.util.List;

‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/FieldMapping.java ‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/FieldMapping.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.awssdk.v2_2;
6+
package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
77

88
import java.util.ArrayList;
99
import java.util.Arrays;

‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/LambdaAccess.java ‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/LambdaAccess.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.awssdk.v2_2;
6+
package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
77

88
import io.opentelemetry.context.Context;
99
import io.opentelemetry.javaagent.tooling.muzzle.NoMuzzle;

‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/LambdaImpl.java ‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/LambdaImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.awssdk.v2_2;
6+
package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
77

88
import io.opentelemetry.api.GlobalOpenTelemetry;
99
import java.nio.charset.StandardCharsets;

‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/MethodHandleFactory.java ‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/MethodHandleFactory.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.awssdk.v2_2;
6+
package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
77

88
import java.lang.invoke.MethodHandle;
99
import java.lang.invoke.MethodHandles;

‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/PluginImplUtil.java ‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/PluginImplUtil.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.awssdk.v2_2;
6+
package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
77

88
import java.util.logging.Level;
99
import java.util.logging.Logger;

‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/RequestHeaderSetter.java ‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/RequestHeaderSetter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.awssdk.v2_2;
6+
package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
77

88
import io.opentelemetry.context.propagation.TextMapSetter;
99
import software.amazon.awssdk.http.SdkHttpRequest;

‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/Response.java ‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/Response.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,16 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.awssdk.v2_2;
6+
package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
77

88
import software.amazon.awssdk.core.SdkResponse;
99
import software.amazon.awssdk.http.SdkHttpResponse;
1010

11-
final class Response {
11+
/**
12+
* This class is internal and is hence not for public use. Its APIs are unstable and can change at
13+
* any time.
14+
*/
15+
public final class Response {
1216
private final SdkHttpResponse sdkHttpResponse;
1317
private final SdkResponse sdkResponse;
1418

‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/Serializer.java ‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/Serializer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.awssdk.v2_2;
6+
package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
77

88
import java.io.IOException;
99
import java.io.InputStream;

‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/SnsAccess.java ‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/SnsAccess.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.awssdk.v2_2;
6+
package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
77

88
import io.opentelemetry.context.Context;
99
import io.opentelemetry.context.propagation.TextMapPropagator;

‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/SnsImpl.java ‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/SnsImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.awssdk.v2_2;
6+
package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
77

88
import io.opentelemetry.context.Context;
99
import io.opentelemetry.context.propagation.TextMapPropagator;

‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/SqsAccess.java ‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/SqsAccess.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.awssdk.v2_2;
6+
package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
77

88
import io.opentelemetry.context.propagation.TextMapPropagator;
99
import io.opentelemetry.instrumentation.api.internal.Timer;

‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/SqsAttributesGetter.java ‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/SqsAttributesGetter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.awssdk.v2_2;
6+
package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
77

88
import io.opentelemetry.instrumentation.api.incubator.semconv.messaging.MessagingAttributesGetter;
99
import java.util.Collections;

0 commit comments

Comments
 (0)