Addresses GitHub Issue #24 - Implements support for APIGatewayV2 Events.

Signed-off-by: Andrew Garbutt <agarbutt@users.noreply.github.com>

Author: agarbutt

build.gradle

@@ -37,8 +37,8 @@ targetCompatibility = JavaVersion.VERSION_1_8
 
 dependencies {
     implementation 'com.amazonaws:aws-lambda-java-core:1.1.0'
-    // 2.2.2 is earliest version that has all needed event sources
-    implementation 'com.amazonaws:aws-lambda-java-events:2.2.2'
+    // 2.2.7 is earliest version that has all needed event sources
+    implementation 'com.amazonaws:aws-lambda-java-events:2.2.7'
     implementation 'com.amazonaws:aws-java-sdk-s3:1.11.163'
     implementation 'com.amazonaws:aws-java-sdk-kinesis:1.11.163'
     implementation 'com.amazonaws:aws-java-sdk-dynamodb:1.11.163'

src/main/java/com/newrelic/opentracing/aws/EventSourceParser.java

@@ -6,6 +6,7 @@
 package com.newrelic.opentracing.aws;
 
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
+import com.amazonaws.services.lambda.runtime.events.APIGatewayV2ProxyRequestEvent;
 import com.amazonaws.services.lambda.runtime.events.CodeCommitEvent;
 import com.amazonaws.services.lambda.runtime.events.DynamodbEvent;
 import com.amazonaws.services.lambda.runtime.events.KinesisEvent;
@@ -49,6 +50,8 @@ static String parseEventSourceArn(Object object) {
       return parseCodeCommitEventSourceArn(object);
     } else if (object instanceof APIGatewayProxyRequestEvent) {
       return parseAPIGatewayProxyRequestEventUserArn(object);
+    } else if (object instanceof APIGatewayV2ProxyRequestEvent) {
+      return parseAPIGatewayV2ProxyRequestEventUserArn(object);
     }
     return null;
   }
@@ -221,4 +224,22 @@ private static String parseAPIGatewayProxyRequestEventUserArn(Object object) {
 
     return identity.getUserArn();
   }
+
+  private static String parseAPIGatewayV2ProxyRequestEventUserArn(Object object) {
+    APIGatewayV2ProxyRequestEvent apiGatewayV2ProxyRequestEvent =
+        (APIGatewayV2ProxyRequestEvent) object;
+
+    APIGatewayV2ProxyRequestEvent.RequestContext requestContext =
+        apiGatewayV2ProxyRequestEvent.getRequestContext();
+    if (requestContext == null) {
+      return null;
+    }
+
+    APIGatewayV2ProxyRequestEvent.RequestIdentity identity = requestContext.getIdentity();
+    if (identity == null) {
+      return null;
+    }
+
+    return identity.getUserArn();
+  }
 }

src/test/java/com/newrelic/opentracing/aws/TracingRequestHandlerTest.java

@@ -10,6 +10,7 @@
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.LambdaLogger;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
+import com.amazonaws.services.lambda.runtime.events.APIGatewayV2ProxyRequestEvent;
 import com.amazonaws.services.lambda.runtime.events.CloudFrontEvent;
 import com.amazonaws.services.lambda.runtime.events.CloudWatchLogsEvent;
 import com.amazonaws.services.lambda.runtime.events.CodeCommitEvent;
@@ -253,6 +254,27 @@ public void testAPIGatewayProxyRequestEvent() {
         "APIGatewayProxyRequestEventUserARN", span.tags().get("aws.lambda.eventSource.arn"));
   }
 
+  @Test
+  public void testAPIGatewayV2ProxyRequestEvent() {
+    final MyApiGatewayV2ProxyRequestHandler myApiGatewayV2ProxyRequestHandler =
+        new MyApiGatewayV2ProxyRequestHandler();
+
+    final APIGatewayV2ProxyRequestEvent apiGatewayV2ProxyRequestEvent =
+        new APIGatewayV2ProxyRequestEvent();
+    final APIGatewayV2ProxyRequestEvent.RequestIdentity requestIdentity =
+        new APIGatewayV2ProxyRequestEvent.RequestIdentity();
+    requestIdentity.setUserArn("APIGatewayV2ProxyRequestEventUserARN");
+    final APIGatewayV2ProxyRequestEvent.RequestContext proxyRequestContext =
+        new APIGatewayV2ProxyRequestEvent.RequestContext();
+    proxyRequestContext.setIdentity(requestIdentity);
+    apiGatewayV2ProxyRequestEvent.setRequestContext(proxyRequestContext);
+
+    myApiGatewayV2ProxyRequestHandler.handleRequest(apiGatewayV2ProxyRequestEvent, createContext());
+    final MockSpan span = mockTracer.finishedSpans().get(0);
+    Assert.assertEquals(
+        "APIGatewayV2ProxyRequestEventUserARN", span.tags().get("aws.lambda.eventSource.arn"));
+  }
+
   @Test
   @Ignore("We would like this but there doesn't seem to be an available arn currently")
   public void testCloudWatchLogsEvent() {
@@ -373,6 +395,16 @@ public Object doHandleRequest(
     }
   }
 
+  static class MyApiGatewayV2ProxyRequestHandler
+      implements TracingRequestHandler<APIGatewayV2ProxyRequestEvent, Object> {
+
+    @Override
+    public Object doHandleRequest(
+        APIGatewayV2ProxyRequestEvent apiGatewayV2ProxyRequestEvent, Context context) {
+      return "null";
+    }
+  }
+
   // Cloud Front
   static class MyCloudFrontRequestHandler
       implements TracingRequestHandler<CloudFrontEvent, Object> {