Changes for supporting all input types

Author: katiewest820

extension/publish-layer.sh

@@ -52,7 +52,7 @@ function publish-layer {
             --content "S3Bucket=${bucket_name},S3Key=${layer_s3key}" \
             --description "New Relic Lambda Extension Layer" \
             --license-info "Apache-2.0" \
-            --compatible-runtimes "dotnetcore3.1" "java8.al2" "java11" "provided" "provided.al2" \
+            --compatible-runtimes "dotnetcore3.1" "provided" "provided.al2" \
             --region $region \
             --output text \
             --query Version)

java/build.gradle

@@ -7,11 +7,12 @@ repositories {
 }
 
 dependencies {
-    implementation("com.newrelic.opentracing:newrelic-java-lambda:2.1.2")
-    implementation("com.newrelic.opentracing:java-aws-lambda:2.1.0")
-    implementation("com.amazonaws:aws-lambda-java-events:3.1.0")
     implementation("io.opentracing:opentracing-util:0.33.0")
-    implementation("com.amazonaws:aws-lambda-java-core:1.1.0")
+    implementation("com.newrelic.opentracing:newrelic-java-lambda:2.2.0")
+    implementation("com.newrelic.opentracing:java-aws-lambda:2.1.0")
+    implementation("com.amazonaws:aws-lambda-java-events:3.8.0")
+    implementation("com.amazonaws:aws-lambda-java-core:1.2.0")
+    implementation("com.amazonaws:aws-lambda-java-serialization:1.0.0")
     implementation("com.fasterxml.jackson.core:jackson-databind:2.12.2")
     implementation("com.fasterxml.jackson.datatype:jackson-datatype-joda:2.12.2")
     testImplementation("junit:junit:4.13")

java/publish-layers.sh

@@ -14,21 +14,21 @@ EXTENSION_DIST_ZIP=extension.zip
 EXTENSION_DIST_PREVIEW_FILE=preview-extensions-ggqizro707
 
 REGIONS=(
-    ap-northeast-1
-    ap-northeast-2
-    ap-south-1
-    ap-southeast-1
-    ap-southeast-2
-    ca-central-1
-    eu-central-1
-    eu-west-1
-    eu-west-2
-    eu-west-3
-    sa-east-1
-    us-east-1
-    us-east-2
-    us-west-1
-    us-west-2
+  ap-northeast-1
+  ap-northeast-2
+  ap-south-1
+  ap-southeast-1
+  ap-southeast-2
+  ca-central-1
+  eu-central-1
+  eu-west-1
+  eu-west-2
+  eu-west-3
+  sa-east-1
+  us-east-1
+  us-east-2
+  us-west-1
+  us-west-2
 )
 
 function usage {

java/src/main/java/com/newrelic/java/JavaClassLoader.java

@@ -2,6 +2,9 @@
 
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestStreamHandler;
+import com.amazonaws.services.lambda.runtime.serialization.PojoSerializer;
+import com.amazonaws.services.lambda.runtime.serialization.events.LambdaEventSerializers;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -22,7 +25,6 @@ public class JavaClassLoader {
             .enable(DeserializationFeature.READ_DATE_TIMESTAMPS_AS_NANOSECONDS)
             .registerModule(new JodaModule());
 
-
     private static Class inputType;
     private static MethodHandle methodHandle;
     private static RequestStreamHandler classInstance;
@@ -53,24 +55,20 @@ private JavaClassLoader(Class inputType, MethodHandle methodHandle) {
     static JavaClassLoader initializeClassLoader(String className, String methodName) throws ReflectiveOperationException {
         Class loadedClass = classLoader.loadClass(className);
         Class methodInputType = null;
-
         for (Method method : loadedClass.getMethods()) {
             if (isUserHandlerMethod(method, className, methodName) == true) {
                 methodInputType = method.getParameterTypes()[0];
                 break;
             }
         }
-
         Object classInstance = loadedClass.getDeclaredConstructor().newInstance();
         MethodHandle methodHandle = publicLookup.findVirtual(loadedClass, methodName, methodType).bindTo(classInstance);
-
         return new JavaClassLoader(methodInputType, methodHandle);
     }
 
     public Object invokeClassMethod(Object inputParam, Context contextParam) {
-
+        Object handlerType = mappingInputToHandlerType(inputParam, inputType);
         try {
-            Object handlerType = mappingInputToHandlerType(inputParam, inputType);
             return methodHandle.invokeWithArguments(handlerType, contextParam);
         } catch (Throwable e) {
             throw new RuntimeException("Error occurred while invoking handler method: " + e);
@@ -89,10 +87,16 @@ private static boolean isUserHandlerMethod(Method method, String className, Stri
     }
 
     private Object mappingInputToHandlerType(Object inputParam, Class inputType) {
-        if (inputType.isAssignableFrom(Integer.class)) {
-            return inputParam;
-        } else if (inputType.isAssignableFrom(String.class)) {
+        if (inputType.isAssignableFrom(Number.class) || inputType.isAssignableFrom(String.class)) {
             return inputParam;
+        } else if (LambdaEventSerializers.isLambdaSupportedEvent(inputType.getName())) {
+            try {
+                PojoSerializer serializer = LambdaEventSerializers.serializerFor(inputType, classLoader);
+                String inputParamString = mapper.writeValueAsString(inputParam);
+                return serializer.fromJson(inputParamString);
+            } catch (JsonProcessingException e) {
+                throw new RuntimeException("Error occurred while serializing lambda input type: " + e);
+            }
         }
         return mapper.convertValue(inputParam, inputType);
     }

java/src/main/java/com/newrelic/java/RequestHandlerWrapper.java

@@ -36,7 +36,4 @@ public Object handleRequest(Object input, Context context) {
                 (event, ctx) -> javaClassLoader.invokeClassMethod(input, context)
         );
     }
-
-
-
 }