Skip to content

aws-sdk-1.11: remove SqsAdviceBridge living in non-standard javaagent package #18916

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
laurit merged 1 commit into from
Jun 8, 2026
Merged

aws-sdk-1.11: remove SqsAdviceBridge living in non-standard javaagent package #18916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions ...avaagent/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/SqsAdviceBridge.java
View file
Open in desktop

This file was deleted.

7 changes: 4 additions & 3 deletions ...ava/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/SqsInstrumentationModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import static net.bytebuddy.matcher.ElementMatchers.none;

import com.google.auto.service.AutoService;
import io.opentelemetry.instrumentation.awssdk.v1_11.SqsAdviceBridge;
import io.opentelemetry.instrumentation.awssdk.v1_11.internal.SqsImpl;
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
import net.bytebuddy.asm.Advice;
Expand All @@ -29,9 +29,10 @@ public void doTransform(TypeTransformer transformer) {
public static class RegisterAdvice {
@Advice.OnMethodExit(inline = false)
public static void onExit() {
// (indirectly) using SqsImpl class here to make sure it is available from SqsAccess
// using SqsImpl class here to make sure it is available from SqsAccess
// (injected into app classloader) and checked by Muzzle
SqsAdviceBridge.referenceForMuzzleOnly();
throw new UnsupportedOperationException(
SqsImpl.class.getName() + " referencing for muzzle, should never be actually called");
}
}
}
4 changes: 4 additions & 0 deletions .../library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkTelemetry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.context.Context;
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import io.opentelemetry.instrumentation.awssdk.v1_11.internal.AwsSdkInstrumenterFactory;
import io.opentelemetry.instrumentation.awssdk.v1_11.internal.SqsProcessRequest;
import io.opentelemetry.instrumentation.awssdk.v1_11.internal.SqsReceiveRequest;
import io.opentelemetry.instrumentation.awssdk.v1_11.internal.TracingRequestHandler;
import java.util.List;
import javax.annotation.Nullable;

Expand Down
2 changes: 1 addition & 1 deletion ...tion/awssdk/v1_11/AbstractSqsRequest.java → ...dk/v1_11/internal/AbstractSqsRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.awssdk.v1_11;
package io.opentelemetry.instrumentation.awssdk.v1_11.internal;

import com.amazonaws.Request;

Expand Down
2 changes: 1 addition & 1 deletion ...ssdk/v1_11/AwsExperimentalAttributes.java → ...1/internal/AwsExperimentalAttributes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.awssdk.v1_11;
package io.opentelemetry.instrumentation.awssdk.v1_11.internal;

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

Expand Down
2 changes: 1 addition & 1 deletion ...ssdk/v1_11/AwsSdkAttributesExtractor.java → ...1/internal/AwsSdkAttributesExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.awssdk.v1_11;
package io.opentelemetry.instrumentation.awssdk.v1_11.internal;

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

Expand Down
10 changes: 5 additions & 5 deletions ...wsSdkExperimentalAttributesExtractor.java → ...wsSdkExperimentalAttributesExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.awssdk.v1_11;
package io.opentelemetry.instrumentation.awssdk.v1_11.internal;

import static io.opentelemetry.instrumentation.awssdk.v1_11.AwsExperimentalAttributes.AWS_AGENT;
import static io.opentelemetry.instrumentation.awssdk.v1_11.AwsExperimentalAttributes.AWS_LAMBDA_ARN;
import static io.opentelemetry.instrumentation.awssdk.v1_11.AwsExperimentalAttributes.AWS_LAMBDA_NAME;
import static io.opentelemetry.instrumentation.awssdk.v1_11.AwsExperimentalAttributes.AWS_QUEUE_NAME;
import static io.opentelemetry.instrumentation.awssdk.v1_11.internal.AwsExperimentalAttributes.AWS_AGENT;
import static io.opentelemetry.instrumentation.awssdk.v1_11.internal.AwsExperimentalAttributes.AWS_LAMBDA_ARN;
import static io.opentelemetry.instrumentation.awssdk.v1_11.internal.AwsExperimentalAttributes.AWS_LAMBDA_NAME;
import static io.opentelemetry.instrumentation.awssdk.v1_11.internal.AwsExperimentalAttributes.AWS_QUEUE_NAME;

import com.amazonaws.Request;
import com.amazonaws.Response;
Expand Down
2 changes: 1 addition & 1 deletion ...sdk/v1_11/AwsSdkHttpAttributesGetter.java → .../internal/AwsSdkHttpAttributesGetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.awssdk.v1_11;
package io.opentelemetry.instrumentation.awssdk.v1_11.internal;

import static java.util.Collections.emptyList;
import static java.util.Collections.singletonList;
Expand Down
20 changes: 12 additions & 8 deletions ...ssdk/v1_11/AwsSdkInstrumenterFactory.java → ...1/internal/AwsSdkInstrumenterFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.awssdk.v1_11;
package io.opentelemetry.instrumentation.awssdk.v1_11.internal;

import static java.util.Arrays.asList;
import static java.util.Collections.emptyList;
Expand Down Expand Up @@ -32,7 +32,11 @@
import java.util.function.Consumer;
import javax.annotation.Nullable;

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-1.11";

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

AwsSdkInstrumenterFactory(
public AwsSdkInstrumenterFactory(
OpenTelemetry openTelemetry,
List<String> capturedHeaders,
boolean captureExperimentalSpanAttributes,
Expand All @@ -71,7 +75,7 @@ private static List<AttributesExtractor<Request<?>, Response<?>>> createAttribut
return extractors;
}

Instrumenter<Request<?>, Response<?>> requestInstrumenter() {
public Instrumenter<Request<?>, Response<?>> requestInstrumenter() {
return createInstrumenter(
openTelemetry,
new AwsSdkSpanNameExtractor(),
Expand All @@ -94,7 +98,7 @@ private <REQUEST, RESPONSE> AttributesExtractor<REQUEST, RESPONSE> messagingAttr
.build();
}

Instrumenter<SqsReceiveRequest, Response<?>> consumerReceiveInstrumenter() {
public Instrumenter<SqsReceiveRequest, Response<?>> consumerReceiveInstrumenter() {
MessageOperation operation = MessageOperation.RECEIVE;
SqsReceiveRequestAttributesGetter getter = new SqsReceiveRequestAttributesGetter();
AttributesExtractor<SqsReceiveRequest, Response<?>> messagingAttributeExtractor =
Expand All @@ -109,7 +113,7 @@ Instrumenter<SqsReceiveRequest, Response<?>> consumerReceiveInstrumenter() {
messagingReceiveInstrumentationEnabled);
}

Instrumenter<SqsProcessRequest, Response<?>> consumerProcessInstrumenter() {
public Instrumenter<SqsProcessRequest, Response<?>> consumerProcessInstrumenter() {
MessageOperation operation = MessageOperation.PROCESS;
SqsProcessRequestAttributesGetter getter = new SqsProcessRequestAttributesGetter();
AttributesExtractor<SqsProcessRequest, Response<?>> messagingAttributeExtractor =
Expand Down Expand Up @@ -162,7 +166,7 @@ public void onEnd(
return result;
}

Instrumenter<Request<?>, Response<?>> producerInstrumenter() {
public Instrumenter<Request<?>, Response<?>> producerInstrumenter() {
MessageOperation operation = MessageOperation.PUBLISH;
SqsAttributesGetter getter = new SqsAttributesGetter();
AttributesExtractor<Request<?>, Response<?>> messagingAttributeExtractor =
Expand All @@ -177,7 +181,7 @@ Instrumenter<Request<?>, Response<?>> producerInstrumenter() {
true);
}

Instrumenter<Request<?>, Response<?>> dynamoDbInstrumenter() {
public Instrumenter<Request<?>, Response<?>> dynamoDbInstrumenter() {
return createInstrumenter(
openTelemetry,
new AwsSdkSpanNameExtractor(),
Expand Down
2 changes: 1 addition & 1 deletion ...ssdk/v1_11/AwsSdkRpcAttributesGetter.java → ...1/internal/AwsSdkRpcAttributesGetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.awssdk.v1_11;
package io.opentelemetry.instrumentation.awssdk.v1_11.internal;

import com.amazonaws.Request;
import com.amazonaws.Response;
Expand Down
2 changes: 1 addition & 1 deletion ...awssdk/v1_11/AwsSdkSpanNameExtractor.java → ..._11/internal/AwsSdkSpanNameExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.awssdk.v1_11;
package io.opentelemetry.instrumentation.awssdk.v1_11.internal;

import com.amazonaws.Request;
import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
Expand Down
2 changes: 1 addition & 1 deletion ...dk/v1_11/DynamoDbAttributesExtractor.java → ...internal/DynamoDbAttributesExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.awssdk.v1_11;
package io.opentelemetry.instrumentation.awssdk.v1_11.internal;

import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitOldDatabaseSemconv;
import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableDatabaseSemconv;
Expand Down
2 changes: 1 addition & 1 deletion ...umentation/awssdk/v1_11/HeaderSetter.java → ...n/awssdk/v1_11/internal/HeaderSetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.awssdk.v1_11;
package io.opentelemetry.instrumentation.awssdk.v1_11.internal;

import com.amazonaws.Request;
import io.opentelemetry.context.propagation.TextMapSetter;
Expand Down
8 changes: 6 additions & 2 deletions ...entation/awssdk/v1_11/PluginImplUtil.java → ...awssdk/v1_11/internal/PluginImplUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,17 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.awssdk.v1_11;
package io.opentelemetry.instrumentation.awssdk.v1_11.internal;

import static java.util.logging.Level.FINE;

import java.util.logging.Logger;

final class PluginImplUtil {
/**
* This class is internal and is hence not for public use. Its APIs are unstable and can change at
* any time.
*/
public final class PluginImplUtil {
private static final Logger logger = Logger.getLogger(PluginImplUtil.class.getName());

/**
Expand Down
2 changes: 1 addition & 1 deletion ...mentation/awssdk/v1_11/RequestAccess.java → .../awssdk/v1_11/internal/RequestAccess.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.awssdk.v1_11;
package io.opentelemetry.instrumentation.awssdk.v1_11.internal;

import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
Expand Down
4 changes: 2 additions & 2 deletions .../awssdk/v1_11/SnsAttributesExtractor.java → ...1_11/internal/SnsAttributesExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.awssdk.v1_11;
package io.opentelemetry.instrumentation.awssdk.v1_11.internal;

import com.amazonaws.AmazonWebServiceRequest;
import com.amazonaws.Request;
Expand All @@ -14,7 +14,7 @@
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
import javax.annotation.Nullable;

public class SnsAttributesExtractor implements AttributesExtractor<Request<?>, Response<?>> {
class SnsAttributesExtractor implements AttributesExtractor<Request<?>, Response<?>> {

// copied from MessagingIncubatingAttributes
private static final AttributeKey<String> MESSAGING_DESTINATION_NAME =
Expand Down
2 changes: 1 addition & 1 deletion ...strumentation/awssdk/v1_11/SqsAccess.java → ...tion/awssdk/v1_11/internal/SqsAccess.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.awssdk.v1_11;
package io.opentelemetry.instrumentation.awssdk.v1_11.internal;

import com.amazonaws.AmazonWebServiceRequest;
import com.amazonaws.Request;
Expand Down
2 changes: 1 addition & 1 deletion ...ion/awssdk/v1_11/SqsAttributesGetter.java → ...k/v1_11/internal/SqsAttributesGetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.awssdk.v1_11;
package io.opentelemetry.instrumentation.awssdk.v1_11.internal;

import static java.util.Collections.emptyList;
import static java.util.Collections.singletonList;
Expand Down
8 changes: 6 additions & 2 deletions ...instrumentation/awssdk/v1_11/SqsImpl.java → ...tation/awssdk/v1_11/internal/SqsImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.awssdk.v1_11;
package io.opentelemetry.instrumentation.awssdk.v1_11.internal;

import com.amazonaws.AmazonWebServiceRequest;
import com.amazonaws.Request;
Expand All @@ -22,7 +22,11 @@
import java.util.Map;
import javax.annotation.Nullable;

final class SqsImpl {
/**
* This class is internal and is hence not for public use. Its APIs are unstable and can change at
* any time.
*/
public final class SqsImpl {
static {
// Force loading of SQS class; this ensures that an exception is thrown at this point when the
// SQS library is not present, which will cause SqsAccess to have enabled=false in library mode.
Expand Down
2 changes: 1 addition & 1 deletion ...trumentation/awssdk/v1_11/SqsMessage.java → ...ion/awssdk/v1_11/internal/SqsMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.awssdk.v1_11;
package io.opentelemetry.instrumentation.awssdk.v1_11.internal;

import java.util.Map;
import javax.annotation.Nullable;
Expand Down
2 changes: 1 addition & 1 deletion ...entation/awssdk/v1_11/SqsMessageImpl.java → ...awssdk/v1_11/internal/SqsMessageImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.awssdk.v1_11;
package io.opentelemetry.instrumentation.awssdk.v1_11.internal;

import com.amazonaws.services.sqs.model.Message;
import com.amazonaws.services.sqs.model.MessageAttributeValue;
Expand Down
2 changes: 1 addition & 1 deletion ...tation/awssdk/v1_11/SqsParentContext.java → ...ssdk/v1_11/internal/SqsParentContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.awssdk.v1_11;
package io.opentelemetry.instrumentation.awssdk.v1_11.internal;

import static java.util.Collections.singletonMap;

Expand Down
8 changes: 6 additions & 2 deletions ...ation/awssdk/v1_11/SqsProcessRequest.java → ...sdk/v1_11/internal/SqsProcessRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,15 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.awssdk.v1_11;
package io.opentelemetry.instrumentation.awssdk.v1_11.internal;

import com.amazonaws.Request;

final class SqsProcessRequest extends AbstractSqsRequest {
/**
* This class is internal and is hence not for public use. Its APIs are unstable and can change at
* any time.
*/
public final class SqsProcessRequest extends AbstractSqsRequest {
private final Request<?> request;
private final SqsMessage message;

Expand Down
2 changes: 1 addition & 1 deletion ...11/SqsProcessRequestAttributesGetter.java → ...al/SqsProcessRequestAttributesGetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.awssdk.v1_11;
package io.opentelemetry.instrumentation.awssdk.v1_11.internal;

import static java.util.Collections.emptyList;
import static java.util.Collections.singletonList;
Expand Down
8 changes: 6 additions & 2 deletions ...ation/awssdk/v1_11/SqsReceiveRequest.java → ...sdk/v1_11/internal/SqsReceiveRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,16 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.awssdk.v1_11;
package io.opentelemetry.instrumentation.awssdk.v1_11.internal;

import com.amazonaws.Request;
import java.util.List;

final class SqsReceiveRequest extends AbstractSqsRequest {
/**
* This class is internal and is hence not for public use. Its APIs are unstable and can change at
* any time.
*/
public final class SqsReceiveRequest extends AbstractSqsRequest {
private final Request<?> request;
private final List<SqsMessage> messages;

Expand Down
2 changes: 1 addition & 1 deletion ...11/SqsReceiveRequestAttributesGetter.java → ...al/SqsReceiveRequestAttributesGetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.awssdk.v1_11;
package io.opentelemetry.instrumentation.awssdk.v1_11.internal;

import static java.util.stream.Collectors.toList;

Expand Down
2 changes: 1 addition & 1 deletion ...ntation/awssdk/v1_11/TracingIterator.java → ...wssdk/v1_11/internal/TracingIterator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.awssdk.v1_11;
package io.opentelemetry.instrumentation.awssdk.v1_11.internal;

import com.amazonaws.Request;
import com.amazonaws.Response;
Expand Down
Loading
Loading