(#12422)

- extract `APIGatewayProxyRequestEvent` headers for context propagation

Author: cleverchuk

instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/build.gradle.kts

@@ -7,6 +7,7 @@ muzzle {
     group.set("com.amazonaws")
     module.set("aws-lambda-java-core")
     versions.set("[1.0.0,)")
+    extraDependency("com.amazonaws:aws-lambda-java-events:2.2.1")
     extraDependency("com.amazonaws.serverless:aws-serverless-java-container-core:1.5.2")
   }
 }
@@ -17,6 +18,11 @@ dependencies {
   implementation(project(":instrumentation:aws-lambda:aws-lambda-core-1.0:library"))
 
   library("com.amazonaws:aws-lambda-java-core:1.0.0")
+  // First version to includes support for SQSEvent, currently the most popular message queue used
+  // with lambda.
+  // NB: 2.2.0 includes a class called SQSEvent but isn't usable due to it returning private classes
+  // in public API.
+  library("com.amazonaws:aws-lambda-java-events:2.2.1")
 
   testImplementation(project(":instrumentation:aws-lambda:aws-lambda-core-1.0:testing"))
 }

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

@@ -16,12 +16,15 @@
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 
 import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 import io.opentelemetry.context.Scope;
 import io.opentelemetry.instrumentation.awslambdacore.v1_0.AwsLambdaRequest;
+import io.opentelemetry.instrumentation.awslambdacore.v1_0.internal.MapUtils;
 import io.opentelemetry.javaagent.bootstrap.OpenTelemetrySdkAccess;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import java.util.Collections;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
@@ -66,7 +69,12 @@ public static void onEnter(
         @Advice.Local("otelInput") AwsLambdaRequest input,
         @Advice.Local("otelContext") io.opentelemetry.context.Context otelContext,
         @Advice.Local("otelScope") Scope otelScope) {
-      input = AwsLambdaRequest.create(context, arg, Collections.emptyMap());
+      Map<String, String> headers = Collections.emptyMap();
+      if (arg instanceof APIGatewayProxyRequestEvent) {
+        headers = MapUtils.lowercaseMap(((APIGatewayProxyRequestEvent) arg).getHeaders());
+      }
+
+      input = AwsLambdaRequest.create(context, arg, headers);
       io.opentelemetry.context.Context parentContext = functionInstrumenter().extract(input);
 
       if (!functionInstrumenter().shouldStart(parentContext, input)) {

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

@@ -13,13 +13,16 @@
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 
 import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 import com.amazonaws.services.lambda.runtime.events.SQSEvent;
 import io.opentelemetry.context.Scope;
 import io.opentelemetry.instrumentation.awslambdacore.v1_0.AwsLambdaRequest;
+import io.opentelemetry.instrumentation.awslambdacore.v1_0.internal.MapUtils;
 import io.opentelemetry.javaagent.bootstrap.OpenTelemetrySdkAccess;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import java.util.Collections;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
@@ -60,7 +63,11 @@ public static void onEnter(
         @Advice.Local("otelFunctionScope") Scope functionScope,
         @Advice.Local("otelMessageContext") io.opentelemetry.context.Context messageContext,
         @Advice.Local("otelMessageScope") Scope messageScope) {
-      input = AwsLambdaRequest.create(context, arg, Collections.emptyMap());
+      Map<String, String> headers = Collections.emptyMap();
+      if (arg instanceof APIGatewayProxyRequestEvent) {
+        headers = MapUtils.lowercaseMap(((APIGatewayProxyRequestEvent) arg).getHeaders());
+      }
+      input = AwsLambdaRequest.create(context, arg, headers);
       io.opentelemetry.context.Context parentContext =
           AwsLambdaInstrumentationHelper.functionInstrumenter().extract(input);