AWS Lambda Runtime legacy internal handlers need to be ignored from b…

…eing instrumented and so traced … (#10942)

Co-authored-by: Trask Stalnaker <[email protected]>

instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaRequestHandlerInstrumentation.java

@@ -38,7 +38,12 @@ public ElementMatcher<ClassLoader> classLoaderOptimization() {
   @Override
   public ElementMatcher<TypeDescription> typeMatcher() {
     return implementsInterface(named("com.amazonaws.services.lambda.runtime.RequestHandler"))
-        .and(not(nameStartsWith("com.amazonaws.services.lambda.runtime.api.client")));
+        .and(not(nameStartsWith("com.amazonaws.services.lambda.runtime.api.client")))
+        // In Java 8 and Java 11 runtimes,
+        // AWS Lambda runtime is packaged under `lambdainternal` package.
+        // But it is `com.amazonaws.services.lambda.runtime.api.client`
+        // for new runtime likes Java 17 and Java 21.
+        .and(not(nameStartsWith("lambdainternal")));
   }
 
   @Override

instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaTest.java

@@ -16,6 +16,7 @@
 import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import io.opentelemetry.semconv.SemanticAttributes;
+import lambdainternal.AwsLambdaLegacyInternalRequestHandler;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -57,6 +58,23 @@ void awsLambdaInternalHandlerIgnoredAndUserHandlerTraced() {
                                 equalTo(SemanticAttributes.FAAS_INVOCATION_ID, "1-22-333"))));
   }
 
+  @Test
+  void awsLambdaLegacyInternalHandlerIgnoredAndUserHandlerTraced() {
+    RequestHandler<String, String> handler = new AwsLambdaLegacyInternalRequestHandler(handler());
+    String result = handler.handleRequest("hello", context());
+    assertThat(result).isEqualTo("world");
+
+    testing()
+        .waitAndAssertTraces(
+            trace ->
+                trace.hasSpansSatisfyingExactly(
+                    span ->
+                        span.hasName("my_function")
+                            .hasKind(SpanKind.SERVER)
+                            .hasAttributesSatisfyingExactly(
+                                equalTo(SemanticAttributes.FAAS_INVOCATION_ID, "1-22-333"))));
+  }
+
   private static final class TestRequestHandler implements RequestHandler<String, String> {
 
     @Override

instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/test/java/lambdainternal/AwsLambdaLegacyInternalRequestHandler.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package lambdainternal;
+
+import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.RequestHandler;
+
+public class AwsLambdaLegacyInternalRequestHandler implements RequestHandler<String, String> {
+
+  private final RequestHandler<String, String> requestHandler;
+
+  public AwsLambdaLegacyInternalRequestHandler(RequestHandler<String, String> requestHandler) {
+    this.requestHandler = requestHandler;
+  }
+
+  @Override
+  public String handleRequest(String input, Context context) {
+    return requestHandler.handleRequest(input, context);
+  }
+}