Skip to content

Commit d3dc314

Browse files
lauritlaurit
committed
deprecate 2.2 instrumentation library
1 parent 69eb7eb commit d3dc314

File tree

40 files changed

+1292
-26
lines changed

40 files changed

+1292
-26
lines changed

‎docs/supported-libraries.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ These are the supported libraries and frameworks:
4747
| [Armeria gRPC](https://armeria.dev) | 1.14+ | | [RPC Client Spans], [RPC Client Metrics], [RPC Server Spans], [RPC Server Metrics] |
4848
| [AsyncHttpClient](https://github.com/AsyncHttpClient/async-http-client) | 1.9+ | N/A | [HTTP Client Spans], [HTTP Client Metrics] |
4949
| [Avaje Jex](https://avaje.io/jex/) | 3.0+ | N/A | Provides `http.route` [2] |
50-
| [AWS Lambda](https://docs.aws.amazon.com/lambda/latest/dg/java-handler.html) | 1.0+ | [opentelemetry-aws-lambda-core-1.0](../instrumentation/aws-lambda/aws-lambda-core-1.0/library),<br>[opentelemetry-aws-lambda-events-2.2](../instrumentation/aws-lambda/aws-lambda-events-2.2/library) | [FaaS Server Spans] |
50+
| [AWS Lambda](https://docs.aws.amazon.com/lambda/latest/dg/java-handler.html) | 1.0+ | [opentelemetry-aws-lambda-core-1.0](../instrumentation/aws-lambda/aws-lambda-core-1.0/library),<br>[opentelemetry-aws-lambda-events-3.11](../instrumentation/aws-lambda/aws-lambda-events-3.11/library) | [FaaS Server Spans] |
5151
| [AWS SDK](https://aws.amazon.com/sdk-for-java/) | 1.11 - 1.12.583,<br>2.2+ | [opentelemetry-aws-sdk-1.11](../instrumentation/aws-sdk/aws-sdk-1.11/library),<br>[opentelemetry-aws-sdk-1.11-autoconfigure](../instrumentation/aws-sdk/aws-sdk-1.11/library-autoconfigure),<br>[opentelemetry-aws-sdk-2.2](../instrumentation/aws-sdk/aws-sdk-2.2/library),<br>[opentelemetry-aws-sdk-2.2-autoconfigure](../instrumentation/aws-sdk/aws-sdk-2.2/library-autoconfigure) | [Messaging Spans], [Database Client Spans], [Database Client Metrics]&nbsp;[6], [HTTP Client Spans], [GenAI Client Spans], [GenAI Client Metrics] |
5252
| [Azure Core](https://docs.microsoft.com/en-us/java/api/overview/azure/core-readme) | 1.14+ | N/A | Context propagation |
5353
| [Cassandra Driver](https://github.com/datastax/java-driver) | 3.0+ | [opentelemetry-cassandra-4.4](../instrumentation/cassandra/cassandra-4.4/library) | [Database Client Spans], [Database Client Metrics]&nbsp;[6] |

‎instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencies {
1717

1818
implementation(project(":instrumentation:aws-lambda:aws-lambda-core-1.0:library"))
1919

20-
implementation(project(":instrumentation:aws-lambda:aws-lambda-events-2.2:library")) {
20+
implementation(project(":instrumentation:aws-lambda:aws-lambda-events-common:library")) {
2121
// Only needed by wrappers, not the javaagent. Muzzle will catch if we accidentally change this.
2222
exclude("com.fasterxml.jackson.core", "jackson-databind")
2323
}

‎instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaSingletons.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,14 @@
1717
import java.time.Duration;
1818

1919
public final class AwsLambdaSingletons {
20-
20+
private static final String INSTRUMENTATION_NAME = "io.opentelemetry.aws-lambda-events-2.2";
2121
private static final AwsLambdaFunctionInstrumenter FUNCTION_INSTRUMENTER =
2222
AwsLambdaEventsInstrumenterFactory.createInstrumenter(
23-
GlobalOpenTelemetry.get(), AgentCommonConfig.get().getKnownHttpRequestMethods());
23+
GlobalOpenTelemetry.get(),
24+
INSTRUMENTATION_NAME,
25+
AgentCommonConfig.get().getKnownHttpRequestMethods());
2426
private static final Instrumenter<SQSEvent, Void> MESSAGE_TRACER =
25-
AwsLambdaSqsInstrumenterFactory.forEvent(GlobalOpenTelemetry.get());
27+
AwsLambdaSqsInstrumenterFactory.forEvent(GlobalOpenTelemetry.get(), INSTRUMENTATION_NAME);
2628
private static final Duration FLUSH_TIMEOUT =
2729
Duration.ofMillis(
2830
AgentInstrumentationConfig.get()

‎instrumentation/aws-lambda/aws-lambda-events-2.2/library/build.gradle.kts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ plugins {
44

55
dependencies {
66
api(project(":instrumentation:aws-lambda:aws-lambda-core-1.0:library"))
7+
implementation(project(":instrumentation:aws-lambda:aws-lambda-events-common:library"))
8+
compileOnly(project(":instrumentation:aws-lambda:aws-lambda-events-3.11:library"))
79

810
compileOnly("io.opentelemetry:opentelemetry-sdk")
911
compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")

‎instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/TracingRequestApiGatewayWrapper.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,12 @@
1717
* Wrapper for {@link io.opentelemetry.instrumentation.awslambdacore.v1_0.TracingRequestHandler}.
1818
* Allows for wrapping a lambda proxied through API Gateway, enabling single span tracing and HTTP
1919
* context propagation.
20+
*
21+
* @deprecated use {@link
22+
* io.opentelemetry.instrumentation.awslambdaevents.v3_11.TracingRequestApiGatewayWrapper}
23+
* instead.
2024
*/
25+
@Deprecated
2126
public class TracingRequestApiGatewayWrapper
2227
extends TracingRequestWrapperBase<APIGatewayProxyRequestEvent, Object> {
2328

‎instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/TracingRequestWrapper.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,11 @@
2727

2828
/**
2929
* Wrapper for {@link com.amazonaws.services.lambda.runtime.RequestHandler} based Lambda handlers.
30+
*
31+
* @deprecated use {@link
32+
* io.opentelemetry.instrumentation.awslambdaevents.v3_11.TracingRequestWrapper} instead.
3033
*/
34+
@Deprecated
3135
public class TracingRequestWrapper extends TracingRequestStreamWrapper {
3236
public TracingRequestWrapper() {
3337
super();

‎instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/TracingRequestWrapperBase.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
* env property OTEL_INSTRUMENTATION_AWS_LAMBDA_HANDLER in package.ClassName::methodName format
2828
*/
2929
abstract class TracingRequestWrapperBase<I, O> extends TracingRequestHandler<I, O> {
30+
private static final String INSTRUMENTATION_NAME = "io.opentelemetry.aws-lambda-events-2.2";
3031

3132
private final WrappedLambda wrappedLambda;
3233
private final Method targetMethod;
@@ -48,7 +49,7 @@ protected TracingRequestWrapperBase(BiFunction<I, Class<?>, Object> parameterMap
4849
openTelemetrySdk,
4950
WrapperConfiguration.flushTimeout(),
5051
AwsLambdaEventsInstrumenterFactory.createInstrumenter(
51-
openTelemetrySdk, HttpConstants.KNOWN_METHODS));
52+
openTelemetrySdk, INSTRUMENTATION_NAME, HttpConstants.KNOWN_METHODS));
5253
this.wrappedLambda = wrappedLambda;
5354
this.targetMethod = wrappedLambda.getRequestTargetMethod();
5455
this.parameterMapper = parameterMapper;

‎instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/TracingSqsEventHandler.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,13 @@
1414
import io.opentelemetry.sdk.OpenTelemetrySdk;
1515
import java.time.Duration;
1616

17+
/**
18+
* @deprecated use {@link
19+
* io.opentelemetry.instrumentation.awslambdaevents.v3_11.TracingSqsEventHandler} instead.
20+
*/
21+
@Deprecated
1722
public abstract class TracingSqsEventHandler extends TracingRequestHandler<SQSEvent, Void> {
23+
static final String INSTRUMENTATION_NAME = "io.opentelemetry.aws-lambda-events-2.2";
1824

1925
private final Instrumenter<SQSEvent, Void> instrumenter;
2026

@@ -33,7 +39,9 @@ protected TracingSqsEventHandler(OpenTelemetrySdk openTelemetrySdk) {
3339
*/
3440
protected TracingSqsEventHandler(OpenTelemetrySdk openTelemetrySdk, Duration flushTimeout) {
3541
this(
36-
openTelemetrySdk, flushTimeout, AwsLambdaSqsInstrumenterFactory.forEvent(openTelemetrySdk));
42+
openTelemetrySdk,
43+
flushTimeout,
44+
AwsLambdaSqsInstrumenterFactory.forEvent(openTelemetrySdk, INSTRUMENTATION_NAME));
3745
}
3846

3947
/**

‎instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/TracingSqsEventWrapper.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@
1515
import java.lang.reflect.InvocationTargetException;
1616
import java.lang.reflect.Method;
1717

18+
/**
19+
* @deprecated use {@link
20+
* io.opentelemetry.instrumentation.awslambdaevents.v3_11.TracingSqsEventWrapper} instead.
21+
*/
22+
@Deprecated
1823
public class TracingSqsEventWrapper extends TracingSqsEventHandler {
1924

2025
private final WrappedLambda wrappedLambda;

‎instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/TracingSqsMessageHandler.java‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@
1414
import io.opentelemetry.sdk.OpenTelemetrySdk;
1515
import java.time.Duration;
1616

17+
/**
18+
* @deprecated use {@link
19+
* io.opentelemetry.instrumentation.awslambdaevents.v3_11.TracingSqsMessageHandler} instead.
20+
*/
21+
@Deprecated
1722
public abstract class TracingSqsMessageHandler extends TracingSqsEventHandler {
1823

1924
private final Instrumenter<SQSMessage, Void> messageInstrumenter;
@@ -33,7 +38,9 @@ protected TracingSqsMessageHandler(OpenTelemetrySdk openTelemetrySdk) {
3338
*/
3439
protected TracingSqsMessageHandler(OpenTelemetrySdk openTelemetrySdk, Duration flushTimeout) {
3540
this(
36-
openTelemetrySdk, flushTimeout, AwsLambdaSqsInstrumenterFactory.forEvent(openTelemetrySdk));
41+
openTelemetrySdk,
42+
flushTimeout,
43+
AwsLambdaSqsInstrumenterFactory.forEvent(openTelemetrySdk, INSTRUMENTATION_NAME));
3744
}
3845

3946
/**
@@ -50,7 +57,7 @@ protected TracingSqsMessageHandler(
5057
openTelemetrySdk,
5158
flushTimeout,
5259
eventInstrumenter,
53-
AwsLambdaSqsInstrumenterFactory.forMessage(openTelemetrySdk));
60+
AwsLambdaSqsInstrumenterFactory.forMessage(openTelemetrySdk, INSTRUMENTATION_NAME));
5461
}
5562

5663
/**

0 commit comments

Comments
 (0)