Skip to content

Commit 622372c

Browse files
committed
Fix compilation errors after API changes
1. rxjava-3.0: Fixed import - changed package from v3 to v3_0 TracingAssembly is in io.opentelemetry.instrumentation.rxjava.v3_0 not v3 2. aws-lambda-events: Updated createInstrumenter calls - Removed third parameter (HttpConstants.KNOWN_METHODS) - Method signature changed to only accept (OpenTelemetry, String) - The known methods are now retrieved internally by the factory - Removed unused HttpConstants imports from both v2_2 and v3_11
1 parent a0ec8c9 commit 622372c

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
import com.amazonaws.services.lambda.runtime.Context;
99
import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
10-
import io.opentelemetry.instrumentation.api.internal.HttpConstants;
1110
import io.opentelemetry.instrumentation.awslambdacore.v1_0.TracingRequestHandler;
1211
import io.opentelemetry.instrumentation.awslambdacore.v1_0.internal.MapUtils;
1312
import io.opentelemetry.instrumentation.awslambdacore.v1_0.internal.WrappedLambda;
@@ -49,7 +48,7 @@ protected TracingRequestWrapperBase(BiFunction<I, Class<?>, Object> parameterMap
4948
openTelemetrySdk,
5049
WrapperConfiguration.flushTimeout(),
5150
AwsLambdaEventsInstrumenterFactory.createInstrumenter(
52-
openTelemetrySdk, INSTRUMENTATION_NAME, HttpConstants.KNOWN_METHODS));
51+
openTelemetrySdk, INSTRUMENTATION_NAME));
5352
this.wrappedLambda = wrappedLambda;
5453
this.targetMethod = wrappedLambda.getRequestTargetMethod();
5554
this.parameterMapper = parameterMapper;

instrumentation/aws-lambda/aws-lambda-events-3.11/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v3_11/TracingRequestWrapperBase.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
import com.amazonaws.services.lambda.runtime.Context;
99
import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
10-
import io.opentelemetry.instrumentation.api.internal.HttpConstants;
1110
import io.opentelemetry.instrumentation.awslambdacore.v1_0.TracingRequestHandler;
1211
import io.opentelemetry.instrumentation.awslambdacore.v1_0.internal.MapUtils;
1312
import io.opentelemetry.instrumentation.awslambdacore.v1_0.internal.WrappedLambda;
@@ -49,7 +48,7 @@ protected TracingRequestWrapperBase(BiFunction<I, Class<?>, Object> parameterMap
4948
openTelemetrySdk,
5049
WrapperConfiguration.flushTimeout(),
5150
AwsLambdaEventsInstrumenterFactory.createInstrumenter(
52-
openTelemetrySdk, INSTRUMENTATION_NAME, HttpConstants.KNOWN_METHODS));
51+
openTelemetrySdk, INSTRUMENTATION_NAME));
5352
this.wrappedLambda = wrappedLambda;
5453
this.targetMethod = wrappedLambda.getRequestTargetMethod();
5554
this.parameterMapper = parameterMapper;

instrumentation/rxjava/rxjava-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava/v3_0/TracingAssemblyActivation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import io.opentelemetry.api.GlobalOpenTelemetry;
99
import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil;
10-
import io.opentelemetry.instrumentation.rxjava.v3.TracingAssembly;
10+
import io.opentelemetry.instrumentation.rxjava.v3_0.TracingAssembly;
1111
import java.util.concurrent.atomic.AtomicBoolean;
1212

1313
public final class TracingAssemblyActivation {

0 commit comments

Comments
 (0)