From 6dfc18b01c2f77b5f8bfe096e3a9ad548029e493 Mon Sep 17 00:00:00 2001 From: Jay DeLuca Date: Mon, 4 Aug 2025 14:21:39 -0400 Subject: [PATCH] Cleanup lambda core and events --- ...wsLambdaRequestHandlerInstrumentation.java | 4 ++-- ...daRequestStreamHandlerInstrumentation.java | 4 ++-- ...onHelper.java => AwsLambdaSingletons.java} | 4 ++-- .../v1_0/AwsLambdaStreamHandlerTest.java | 4 ++-- .../awslambdacore/v1_0/AwsLambdaTest.java | 4 ++-- ...ambdaStreamWrapperHttpPropagationTest.java | 4 ++-- .../v1_0/AwsLambdaStreamWrapperTest.java | 4 ++-- .../awslambdacore/v1_0/AwsLambdaTest.java | 4 ++-- .../internal/ApiGatewayProxyRequestTest.java | 8 ++++---- .../v1_0/internal/HeadersFactoryTest.java | 4 ++-- .../internal/InstrumenterExtractionTest.java | 2 +- ...wsLambdaRequestHandlerInstrumentation.java | 20 ++++++++----------- ...daRequestStreamHandlerInstrumentation.java | 13 +++++------- ...onHelper.java => AwsLambdaSingletons.java} | 4 ++-- .../v2_2/AwsLambdaApiGatewayHandlerTest.java | 4 ++-- .../v2_2/AwsLambdaSqsEventHandlerTest.java | 4 ++-- .../v2_2/AwsLambdaStreamHandlerTest.java | 4 ++-- .../v2_2/AwsLambdaApiGatewayWrapperTest.java | 4 ++-- .../v2_2/AwsLambdaSqsEventHandlerTest.java | 4 ++-- .../v2_2/AwsLambdaSqsEventWrapperTest.java | 4 ++-- .../v2_2/AwsLambdaSqsMessageHandlerTest.java | 4 ++-- .../v2_2/AwsLambdaWrapperTest.java | 4 ++-- 22 files changed, 54 insertions(+), 61 deletions(-) rename instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/{AwsLambdaInstrumentationHelper.java => AwsLambdaSingletons.java} (92%) rename instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/{AwsLambdaInstrumentationHelper.java => AwsLambdaSingletons.java} (95%) diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaRequestHandlerInstrumentation.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaRequestHandlerInstrumentation.java index 93071e04d25e..fb7fd13148d9 100644 --- a/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaRequestHandlerInstrumentation.java +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaRequestHandlerInstrumentation.java @@ -7,8 +7,8 @@ import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed; import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface; -import static io.opentelemetry.javaagent.instrumentation.awslambdacore.v1_0.AwsLambdaInstrumentationHelper.flushTimeout; -import static io.opentelemetry.javaagent.instrumentation.awslambdacore.v1_0.AwsLambdaInstrumentationHelper.functionInstrumenter; +import static io.opentelemetry.javaagent.instrumentation.awslambdacore.v1_0.AwsLambdaSingletons.flushTimeout; +import static io.opentelemetry.javaagent.instrumentation.awslambdacore.v1_0.AwsLambdaSingletons.functionInstrumenter; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isPublic; import static net.bytebuddy.matcher.ElementMatchers.nameStartsWith; diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaRequestStreamHandlerInstrumentation.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaRequestStreamHandlerInstrumentation.java index a6b89d253d89..62057af0eaaa 100644 --- a/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaRequestStreamHandlerInstrumentation.java +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaRequestStreamHandlerInstrumentation.java @@ -7,8 +7,8 @@ import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed; import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface; -import static io.opentelemetry.javaagent.instrumentation.awslambdacore.v1_0.AwsLambdaInstrumentationHelper.flushTimeout; -import static io.opentelemetry.javaagent.instrumentation.awslambdacore.v1_0.AwsLambdaInstrumentationHelper.functionInstrumenter; +import static io.opentelemetry.javaagent.instrumentation.awslambdacore.v1_0.AwsLambdaSingletons.flushTimeout; +import static io.opentelemetry.javaagent.instrumentation.awslambdacore.v1_0.AwsLambdaSingletons.functionInstrumenter; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isPublic; import static net.bytebuddy.matcher.ElementMatchers.nameStartsWith; diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaInstrumentationHelper.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaSingletons.java similarity index 92% rename from instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaInstrumentationHelper.java rename to instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaSingletons.java index bc37e29f6bc8..5cef0f369635 100644 --- a/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaInstrumentationHelper.java +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaSingletons.java @@ -12,7 +12,7 @@ import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig; import java.time.Duration; -public final class AwsLambdaInstrumentationHelper { +public final class AwsLambdaSingletons { private static final AwsLambdaFunctionInstrumenter FUNCTION_INSTRUMENTER = AwsLambdaFunctionInstrumenterFactory.createInstrumenter(GlobalOpenTelemetry.get()); @@ -31,5 +31,5 @@ public static Duration flushTimeout() { return FLUSH_TIMEOUT; } - private AwsLambdaInstrumentationHelper() {} + private AwsLambdaSingletons() {} } diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaStreamHandlerTest.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaStreamHandlerTest.java index 500abd684344..400ddd506270 100644 --- a/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaStreamHandlerTest.java +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaStreamHandlerTest.java @@ -36,10 +36,10 @@ import org.mockito.junit.jupiter.MockitoExtension; @ExtendWith(MockitoExtension.class) -public class AwsLambdaStreamHandlerTest { +class AwsLambdaStreamHandlerTest { @RegisterExtension - public static final InstrumentationExtension testing = AgentInstrumentationExtension.create(); + static final InstrumentationExtension testing = AgentInstrumentationExtension.create(); @Mock private Context context; diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaTest.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaTest.java index 575a553fbfb0..eb88b5637b27 100644 --- a/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaTest.java +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaTest.java @@ -21,10 +21,10 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -public class AwsLambdaTest extends AbstractAwsLambdaTest { +class AwsLambdaTest extends AbstractAwsLambdaTest { @RegisterExtension - public static final InstrumentationExtension testing = AgentInstrumentationExtension.create(); + static final InstrumentationExtension testing = AgentInstrumentationExtension.create(); @Override protected RequestHandler handler() { diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperHttpPropagationTest.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperHttpPropagationTest.java index 45818d860558..f307c62b28b3 100644 --- a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperHttpPropagationTest.java +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperHttpPropagationTest.java @@ -44,10 +44,10 @@ key = WrappedLambda.OTEL_LAMBDA_HANDLER_ENV_KEY, value = "io.opentelemetry.instrumentation.awslambdacore.v1_0.AwsLambdaStreamWrapperHttpPropagationTest$TestRequestHandler::handleRequest") -public class AwsLambdaStreamWrapperHttpPropagationTest { +class AwsLambdaStreamWrapperHttpPropagationTest { @RegisterExtension - public static final InstrumentationExtension testing = LibraryInstrumentationExtension.create(); + static final InstrumentationExtension testing = LibraryInstrumentationExtension.create(); @Mock private Context context; diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperTest.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperTest.java index 71ac8db1ed8c..d760cacae96c 100644 --- a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperTest.java +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperTest.java @@ -43,10 +43,10 @@ key = WrappedLambda.OTEL_LAMBDA_HANDLER_ENV_KEY, value = "io.opentelemetry.instrumentation.awslambdacore.v1_0.AwsLambdaStreamWrapperTest$TestRequestHandler::handleRequest") -public class AwsLambdaStreamWrapperTest { +class AwsLambdaStreamWrapperTest { @RegisterExtension - public static final InstrumentationExtension testing = LibraryInstrumentationExtension.create(); + static final InstrumentationExtension testing = LibraryInstrumentationExtension.create(); @Mock private Context context; diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaTest.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaTest.java index 1c64cb02bccb..20817112ea4d 100644 --- a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaTest.java +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaTest.java @@ -12,10 +12,10 @@ import io.opentelemetry.sdk.OpenTelemetrySdk; import org.junit.jupiter.api.extension.RegisterExtension; -public class AwsLambdaTest extends AbstractAwsLambdaTest { +class AwsLambdaTest extends AbstractAwsLambdaTest { @RegisterExtension - public static final InstrumentationExtension testing = LibraryInstrumentationExtension.create(); + static final InstrumentationExtension testing = LibraryInstrumentationExtension.create(); @Override protected RequestHandler handler() { diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/ApiGatewayProxyRequestTest.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/ApiGatewayProxyRequestTest.java index 6d8d3e153dfc..4536ef084266 100644 --- a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/ApiGatewayProxyRequestTest.java +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/ApiGatewayProxyRequestTest.java @@ -30,7 +30,7 @@ void resetOpenTelemetry() { } @Test - public void shouldCreateNoopRequestIfNoPropagatorsSet() throws IOException { + void shouldCreateNoopRequestIfNoPropagatorsSet() throws IOException { // given InputStream mock = mock(InputStream.class); GlobalOpenTelemetry.set(OpenTelemetry.noop()); @@ -42,7 +42,7 @@ public void shouldCreateNoopRequestIfNoPropagatorsSet() throws IOException { } @Test - public void shouldCreateNoopRequestIfXrayPropagatorsSet() throws IOException { + void shouldCreateNoopRequestIfXrayPropagatorsSet() throws IOException { // given InputStream mock = mock(InputStream.class); GlobalOpenTelemetry.set( @@ -55,7 +55,7 @@ public void shouldCreateNoopRequestIfXrayPropagatorsSet() throws IOException { } @Test - public void shouldUseStreamMarkingIfHttpPropagatorsSet() throws IOException { + void shouldUseStreamMarkingIfHttpPropagatorsSet() throws IOException { // given InputStream mock = mock(InputStream.class); when(mock.markSupported()).thenReturn(true); @@ -70,7 +70,7 @@ public void shouldUseStreamMarkingIfHttpPropagatorsSet() throws IOException { } @Test - public void shouldUseNoopIfMarkingNotAvailableAndHttpPropagatorsSet() throws IOException { + void shouldUseNoopIfMarkingNotAvailableAndHttpPropagatorsSet() throws IOException { // given InputStream mock = mock(InputStream.class); when(mock.markSupported()).thenReturn(false); diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/HeadersFactoryTest.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/HeadersFactoryTest.java index b2998fc7b29f..6116a0b1fbac 100644 --- a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/HeadersFactoryTest.java +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/HeadersFactoryTest.java @@ -17,7 +17,7 @@ class HeadersFactoryTest { @Test - public void shouldReadHeadersFromStream() { + void shouldReadHeadersFromStream() { // given String json = "{" @@ -40,7 +40,7 @@ public void shouldReadHeadersFromStream() { } @Test - public void shouldReturnNullIfNoHeadersInStream() { + void shouldReturnNullIfNoHeadersInStream() { // given String json = "{\"something\" : \"else\"}"; InputStream inputStream = new ByteArrayInputStream(json.getBytes(Charset.defaultCharset())); diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/InstrumenterExtractionTest.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/InstrumenterExtractionTest.java index cb19d1e56879..de9aa4006c02 100644 --- a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/InstrumenterExtractionTest.java +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/InstrumenterExtractionTest.java @@ -22,7 +22,7 @@ class InstrumenterExtractionTest { @Test - public void useCustomContext() { + void useCustomContext() { AwsLambdaFunctionInstrumenter instr = AwsLambdaFunctionInstrumenterFactory.createInstrumenter( OpenTelemetry.propagating( diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaRequestHandlerInstrumentation.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaRequestHandlerInstrumentation.java index e05925080782..8be416cb29f6 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaRequestHandlerInstrumentation.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaRequestHandlerInstrumentation.java @@ -7,7 +7,7 @@ import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed; import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface; -import static io.opentelemetry.javaagent.instrumentation.awslambdaevents.v2_2.AwsLambdaInstrumentationHelper.flushTimeout; +import static io.opentelemetry.javaagent.instrumentation.awslambdaevents.v2_2.AwsLambdaSingletons.flushTimeout; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isPublic; import static net.bytebuddy.matcher.ElementMatchers.named; @@ -70,23 +70,20 @@ public static void onEnter( } input = AwsLambdaRequest.create(context, arg, headers); io.opentelemetry.context.Context parentContext = - AwsLambdaInstrumentationHelper.functionInstrumenter().extract(input); + AwsLambdaSingletons.functionInstrumenter().extract(input); - if (!AwsLambdaInstrumentationHelper.functionInstrumenter() - .shouldStart(parentContext, input)) { + if (!AwsLambdaSingletons.functionInstrumenter().shouldStart(parentContext, input)) { return; } - functionContext = - AwsLambdaInstrumentationHelper.functionInstrumenter().start(parentContext, input); + functionContext = AwsLambdaSingletons.functionInstrumenter().start(parentContext, input); functionScope = functionContext.makeCurrent(); if (arg instanceof SQSEvent) { - if (AwsLambdaInstrumentationHelper.messageInstrumenter() + if (AwsLambdaSingletons.messageInstrumenter() .shouldStart(functionContext, (SQSEvent) arg)) { messageContext = - AwsLambdaInstrumentationHelper.messageInstrumenter() - .start(functionContext, (SQSEvent) arg); + AwsLambdaSingletons.messageInstrumenter().start(functionContext, (SQSEvent) arg); messageScope = messageContext.makeCurrent(); } } @@ -105,14 +102,13 @@ public static void stopSpan( if (messageScope != null) { messageScope.close(); - AwsLambdaInstrumentationHelper.messageInstrumenter() + AwsLambdaSingletons.messageInstrumenter() .end(messageContext, (SQSEvent) arg, null, throwable); } if (functionScope != null) { functionScope.close(); - AwsLambdaInstrumentationHelper.functionInstrumenter() - .end(functionContext, input, result, throwable); + AwsLambdaSingletons.functionInstrumenter().end(functionContext, input, result, throwable); } OpenTelemetrySdkAccess.forceFlush(flushTimeout().toNanos(), TimeUnit.NANOSECONDS); diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaRequestStreamHandlerInstrumentation.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaRequestStreamHandlerInstrumentation.java index fb5971016a5d..6219a2818b74 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaRequestStreamHandlerInstrumentation.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaRequestStreamHandlerInstrumentation.java @@ -7,7 +7,7 @@ import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed; import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface; -import static io.opentelemetry.javaagent.instrumentation.awslambdaevents.v2_2.AwsLambdaInstrumentationHelper.flushTimeout; +import static io.opentelemetry.javaagent.instrumentation.awslambdaevents.v2_2.AwsLambdaSingletons.flushTimeout; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isPublic; import static net.bytebuddy.matcher.ElementMatchers.named; @@ -62,15 +62,13 @@ public static void onEnter( Map headers = Collections.emptyMap(); otelInput = AwsLambdaRequest.create(context, input, headers); io.opentelemetry.context.Context parentContext = - AwsLambdaInstrumentationHelper.functionInstrumenter().extract(otelInput); + AwsLambdaSingletons.functionInstrumenter().extract(otelInput); - if (!AwsLambdaInstrumentationHelper.functionInstrumenter() - .shouldStart(parentContext, otelInput)) { + if (!AwsLambdaSingletons.functionInstrumenter().shouldStart(parentContext, otelInput)) { return; } - otelContext = - AwsLambdaInstrumentationHelper.functionInstrumenter().start(parentContext, otelInput); + otelContext = AwsLambdaSingletons.functionInstrumenter().start(parentContext, otelInput); otelScope = otelContext.makeCurrent(); } @@ -82,8 +80,7 @@ public static void stopSpan( @Advice.Local("otelScope") Scope functionScope) { if (functionScope != null) { functionScope.close(); - AwsLambdaInstrumentationHelper.functionInstrumenter() - .end(functionContext, input, null, throwable); + AwsLambdaSingletons.functionInstrumenter().end(functionContext, input, null, throwable); } OpenTelemetrySdkAccess.forceFlush(flushTimeout().toNanos(), TimeUnit.NANOSECONDS); diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaInstrumentationHelper.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaSingletons.java similarity index 95% rename from instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaInstrumentationHelper.java rename to instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaSingletons.java index bf10ab374ed6..1ecafdeb19f1 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaInstrumentationHelper.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaSingletons.java @@ -16,7 +16,7 @@ import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig; import java.time.Duration; -public final class AwsLambdaInstrumentationHelper { +public final class AwsLambdaSingletons { private static final AwsLambdaFunctionInstrumenter FUNCTION_INSTRUMENTER = AwsLambdaEventsInstrumenterFactory.createInstrumenter( @@ -42,5 +42,5 @@ public static Duration flushTimeout() { return FLUSH_TIMEOUT; } - private AwsLambdaInstrumentationHelper() {} + private AwsLambdaSingletons() {} } diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaApiGatewayHandlerTest.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaApiGatewayHandlerTest.java index e97ea6d19edb..e1ae21bfabc3 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaApiGatewayHandlerTest.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaApiGatewayHandlerTest.java @@ -35,10 +35,10 @@ @ExtendWith(MockitoExtension.class) @MockitoSettings(strictness = Strictness.LENIENT) -public class AwsLambdaApiGatewayHandlerTest { +class AwsLambdaApiGatewayHandlerTest { @RegisterExtension - public static final InstrumentationExtension testing = AgentInstrumentationExtension.create(); + static final InstrumentationExtension testing = AgentInstrumentationExtension.create(); @Mock private Context context; diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsEventHandlerTest.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsEventHandlerTest.java index dd643f023f66..0a8ebdbe4b1b 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsEventHandlerTest.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsEventHandlerTest.java @@ -13,10 +13,10 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import org.junit.jupiter.api.extension.RegisterExtension; -public class AwsLambdaSqsEventHandlerTest extends AbstractAwsLambdaSqsEventHandlerTest { +class AwsLambdaSqsEventHandlerTest extends AbstractAwsLambdaSqsEventHandlerTest { @RegisterExtension - public static final InstrumentationExtension testing = AgentInstrumentationExtension.create(); + static final InstrumentationExtension testing = AgentInstrumentationExtension.create(); @Override protected RequestHandler handler() { diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaStreamHandlerTest.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaStreamHandlerTest.java index f6dbd04086ec..d1d99382637f 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaStreamHandlerTest.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaStreamHandlerTest.java @@ -36,10 +36,10 @@ import org.mockito.junit.jupiter.MockitoExtension; @ExtendWith(MockitoExtension.class) -public class AwsLambdaStreamHandlerTest { +class AwsLambdaStreamHandlerTest { @RegisterExtension - public static final InstrumentationExtension testing = AgentInstrumentationExtension.create(); + static final InstrumentationExtension testing = AgentInstrumentationExtension.create(); @Mock private Context context; diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaApiGatewayWrapperTest.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaApiGatewayWrapperTest.java index 5e36aba991e3..4c37d92a5b83 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaApiGatewayWrapperTest.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaApiGatewayWrapperTest.java @@ -38,10 +38,10 @@ @ExtendWith(MockitoExtension.class) @MockitoSettings(strictness = Strictness.LENIENT) -public class AwsLambdaApiGatewayWrapperTest { +class AwsLambdaApiGatewayWrapperTest { @RegisterExtension - public static final InstrumentationExtension testing = LibraryInstrumentationExtension.create(); + static final InstrumentationExtension testing = LibraryInstrumentationExtension.create(); @Mock private Context context; diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsEventHandlerTest.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsEventHandlerTest.java index 8a6ccfa5842b..f46fa01eb42b 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsEventHandlerTest.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsEventHandlerTest.java @@ -13,10 +13,10 @@ import io.opentelemetry.sdk.OpenTelemetrySdk; import org.junit.jupiter.api.extension.RegisterExtension; -public class AwsLambdaSqsEventHandlerTest extends AbstractAwsLambdaSqsEventHandlerTest { +class AwsLambdaSqsEventHandlerTest extends AbstractAwsLambdaSqsEventHandlerTest { @RegisterExtension - public static final InstrumentationExtension testing = LibraryInstrumentationExtension.create(); + static final InstrumentationExtension testing = LibraryInstrumentationExtension.create(); @Override protected RequestHandler handler() { diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsEventWrapperTest.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsEventWrapperTest.java index 27c208714e7e..18344969fd02 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsEventWrapperTest.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsEventWrapperTest.java @@ -37,10 +37,10 @@ key = WrappedLambda.OTEL_LAMBDA_HANDLER_ENV_KEY, value = "io.opentelemetry.instrumentation.awslambdaevents.v2_2.AwsLambdaSqsEventWrapperTest$TestRequestHandler::handleRequest") -public class AwsLambdaSqsEventWrapperTest { +class AwsLambdaSqsEventWrapperTest { @RegisterExtension - public static final InstrumentationExtension testing = LibraryInstrumentationExtension.create(); + static final InstrumentationExtension testing = LibraryInstrumentationExtension.create(); @Mock private Context context; diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsMessageHandlerTest.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsMessageHandlerTest.java index 8cf52012601e..04c6538bbe97 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsMessageHandlerTest.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsMessageHandlerTest.java @@ -37,7 +37,7 @@ import org.mockito.junit.jupiter.MockitoExtension; @ExtendWith(MockitoExtension.class) -public class AwsLambdaSqsMessageHandlerTest { +class AwsLambdaSqsMessageHandlerTest { private static final String AWS_TRACE_HEADER1 = "Root=1-5759e988-bd862e3fe1be46a994272793;Parent=53995c3f42cd8ad8;Sampled=1"; @@ -45,7 +45,7 @@ public class AwsLambdaSqsMessageHandlerTest { "Root=1-5759e988-bd862e3fe1be46a994272793;Parent=53995c3f42cd8ad9;Sampled=1"; @RegisterExtension - public static final InstrumentationExtension testing = LibraryInstrumentationExtension.create(); + static final InstrumentationExtension testing = LibraryInstrumentationExtension.create(); @Mock private Context context; diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaWrapperTest.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaWrapperTest.java index 2c00f5fa2028..f72fe08f5d6f 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaWrapperTest.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaWrapperTest.java @@ -30,10 +30,10 @@ import org.mockito.junit.jupiter.MockitoExtension; @ExtendWith(MockitoExtension.class) -public class AwsLambdaWrapperTest { +class AwsLambdaWrapperTest { @RegisterExtension - public static final InstrumentationExtension testing = LibraryInstrumentationExtension.create(); + static final InstrumentationExtension testing = LibraryInstrumentationExtension.create(); @Mock private Context context;