Skip to content

Commit eeb1d4d

Browse files
trasktrask
authored
aws-sdk-1.11: remove SqsAdviceBridge living in non-standard javaagent package (#18916)
1 parent bf10af7 commit eeb1d4d

29 files changed

Lines changed: 77 additions & 64 deletions

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

Lines changed: 0 additions & 15 deletions
This file was deleted.

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import static net.bytebuddy.matcher.ElementMatchers.none;
99

1010
import com.google.auto.service.AutoService;
11-
import io.opentelemetry.instrumentation.awssdk.v1_11.SqsAdviceBridge;
11+
import io.opentelemetry.instrumentation.awssdk.v1_11.internal.SqsImpl;
1212
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
1313
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
1414
import net.bytebuddy.asm.Advice;
@@ -29,9 +29,10 @@ public void doTransform(TypeTransformer transformer) {
2929
public static class RegisterAdvice {
3030
@Advice.OnMethodExit(inline = false)
3131
public static void onExit() {
32-
// (indirectly) using SqsImpl class here to make sure it is available from SqsAccess
32+
// using SqsImpl class here to make sure it is available from SqsAccess
3333
// (injected into app classloader) and checked by Muzzle
34-
SqsAdviceBridge.referenceForMuzzleOnly();
34+
throw new UnsupportedOperationException(
35+
SqsImpl.class.getName() + " referencing for muzzle, should never be actually called");
3536
}
3637
}
3738
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
import io.opentelemetry.api.OpenTelemetry;
1212
import io.opentelemetry.context.Context;
1313
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
14+
import io.opentelemetry.instrumentation.awssdk.v1_11.internal.AwsSdkInstrumenterFactory;
15+
import io.opentelemetry.instrumentation.awssdk.v1_11.internal.SqsProcessRequest;
16+
import io.opentelemetry.instrumentation.awssdk.v1_11.internal.SqsReceiveRequest;
17+
import io.opentelemetry.instrumentation.awssdk.v1_11.internal.TracingRequestHandler;
1418
import java.util.List;
1519
import javax.annotation.Nullable;
1620

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

Lines changed: 1 addition & 1 deletion
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.v1_11;
6+
package io.opentelemetry.instrumentation.awssdk.v1_11.internal;
77

88
import com.amazonaws.Request;
99

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

Lines changed: 1 addition & 1 deletion
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.v1_11;
6+
package io.opentelemetry.instrumentation.awssdk.v1_11.internal;
77

88
import static io.opentelemetry.api.common.AttributeKey.stringKey;
99

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

Lines changed: 1 addition & 1 deletion
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.v1_11;
6+
package io.opentelemetry.instrumentation.awssdk.v1_11.internal;
77

88
import static io.opentelemetry.api.common.AttributeKey.stringKey;
99

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

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

8-
import static io.opentelemetry.instrumentation.awssdk.v1_11.AwsExperimentalAttributes.AWS_AGENT;
9-
import static io.opentelemetry.instrumentation.awssdk.v1_11.AwsExperimentalAttributes.AWS_LAMBDA_ARN;
10-
import static io.opentelemetry.instrumentation.awssdk.v1_11.AwsExperimentalAttributes.AWS_LAMBDA_NAME;
11-
import static io.opentelemetry.instrumentation.awssdk.v1_11.AwsExperimentalAttributes.AWS_QUEUE_NAME;
8+
import static io.opentelemetry.instrumentation.awssdk.v1_11.internal.AwsExperimentalAttributes.AWS_AGENT;
9+
import static io.opentelemetry.instrumentation.awssdk.v1_11.internal.AwsExperimentalAttributes.AWS_LAMBDA_ARN;
10+
import static io.opentelemetry.instrumentation.awssdk.v1_11.internal.AwsExperimentalAttributes.AWS_LAMBDA_NAME;
11+
import static io.opentelemetry.instrumentation.awssdk.v1_11.internal.AwsExperimentalAttributes.AWS_QUEUE_NAME;
1212

1313
import com.amazonaws.Request;
1414
import com.amazonaws.Response;

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

Lines changed: 1 addition & 1 deletion
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.v1_11;
6+
package io.opentelemetry.instrumentation.awssdk.v1_11.internal;
77

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

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

Lines changed: 12 additions & 8 deletions
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.v1_11;
6+
package io.opentelemetry.instrumentation.awssdk.v1_11.internal;
77

88
import static java.util.Arrays.asList;
99
import static java.util.Collections.emptyList;
@@ -32,7 +32,11 @@
3232
import java.util.function.Consumer;
3333
import javax.annotation.Nullable;
3434

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

3842
private static final List<AttributesExtractor<Request<?>, Response<?>>>
@@ -45,7 +49,7 @@ final class AwsSdkInstrumenterFactory {
4549
private final boolean captureExperimentalSpanAttributes;
4650
private final boolean messagingReceiveInstrumentationEnabled;
4751

48-
AwsSdkInstrumenterFactory(
52+
public AwsSdkInstrumenterFactory(
4953
OpenTelemetry openTelemetry,
5054
List<String> capturedHeaders,
5155
boolean captureExperimentalSpanAttributes,
@@ -71,7 +75,7 @@ private static List<AttributesExtractor<Request<?>, Response<?>>> createAttribut
7175
return extractors;
7276
}
7377

74-
Instrumenter<Request<?>, Response<?>> requestInstrumenter() {
78+
public Instrumenter<Request<?>, Response<?>> requestInstrumenter() {
7579
return createInstrumenter(
7680
openTelemetry,
7781
new AwsSdkSpanNameExtractor(),
@@ -94,7 +98,7 @@ private <REQUEST, RESPONSE> AttributesExtractor<REQUEST, RESPONSE> messagingAttr
9498
.build();
9599
}
96100

97-
Instrumenter<SqsReceiveRequest, Response<?>> consumerReceiveInstrumenter() {
101+
public Instrumenter<SqsReceiveRequest, Response<?>> consumerReceiveInstrumenter() {
98102
MessageOperation operation = MessageOperation.RECEIVE;
99103
SqsReceiveRequestAttributesGetter getter = new SqsReceiveRequestAttributesGetter();
100104
AttributesExtractor<SqsReceiveRequest, Response<?>> messagingAttributeExtractor =
@@ -109,7 +113,7 @@ Instrumenter<SqsReceiveRequest, Response<?>> consumerReceiveInstrumenter() {
109113
messagingReceiveInstrumentationEnabled);
110114
}
111115

112-
Instrumenter<SqsProcessRequest, Response<?>> consumerProcessInstrumenter() {
116+
public Instrumenter<SqsProcessRequest, Response<?>> consumerProcessInstrumenter() {
113117
MessageOperation operation = MessageOperation.PROCESS;
114118
SqsProcessRequestAttributesGetter getter = new SqsProcessRequestAttributesGetter();
115119
AttributesExtractor<SqsProcessRequest, Response<?>> messagingAttributeExtractor =
@@ -162,7 +166,7 @@ public void onEnd(
162166
return result;
163167
}
164168

165-
Instrumenter<Request<?>, Response<?>> producerInstrumenter() {
169+
public Instrumenter<Request<?>, Response<?>> producerInstrumenter() {
166170
MessageOperation operation = MessageOperation.PUBLISH;
167171
SqsAttributesGetter getter = new SqsAttributesGetter();
168172
AttributesExtractor<Request<?>, Response<?>> messagingAttributeExtractor =
@@ -177,7 +181,7 @@ Instrumenter<Request<?>, Response<?>> producerInstrumenter() {
177181
true);
178182
}
179183

180-
Instrumenter<Request<?>, Response<?>> dynamoDbInstrumenter() {
184+
public Instrumenter<Request<?>, Response<?>> dynamoDbInstrumenter() {
181185
return createInstrumenter(
182186
openTelemetry,
183187
new AwsSdkSpanNameExtractor(),

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

Lines changed: 1 addition & 1 deletion
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.v1_11;
6+
package io.opentelemetry.instrumentation.awssdk.v1_11.internal;
77

88
import com.amazonaws.Request;
99
import com.amazonaws.Response;

0 commit comments

Comments
 (0)