Remove transitive dependency on log4j (#71)

Author: agocs

build.gradle

@@ -23,7 +23,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.amazonaws:aws-lambda-java-log4j2:1.4.0'
+    implementation 'com.amazonaws:aws-lambda-java-core:1.2.1'
     implementation 'com.amazonaws:aws-lambda-java-events:3.10.0'
     compileOnly 'com.amazonaws:aws-java-sdk-kinesis:1.12.100'
     implementation 'com.google.code.gson:gson:2.8.9'
@@ -39,6 +39,7 @@ dependencies {
 
     // Use JUnit test framework
     testImplementation 'junit:junit:4.13.2'
+    //log4j imported for running unit tests. Doesn't get bundled with the build artifact.
     testImplementation 'org.apache.logging.log4j:log4j-api:2.17.0'
     testImplementation 'org.apache.logging.log4j:log4j-core:2.17.0'
     testImplementation 'com.github.stefanbirkner:system-rules:1.19.0'
@@ -52,7 +53,7 @@ sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
 group = 'com.datadoghq'
-version= '1.4.2'
+version= '1.4.3'
 archivesBaseName = "datadog-lambda-java"
 description = "datadog-lambda-java"
 

tests/testfunctions/snapshots/logs/helloApiGatewayV2_Java11.log

@@ -16,9 +16,9 @@ START RequestId: XXXX Version: $LATEST
 [dd.trace 1970-01-01 00:00:00 +0000] [main] INFO datadog.trace.agent.common.writer.WriterFactory - Detected serverless environment. Serverless extension has not been detected, using PrintingWriter
 {"level": "ERROR", "message": "datadog: The request passed to DDLambda contained null headers. Are you sure the handler signature matches the event provided?"}
 {"level": "ERROR", "message": "datadog: The request passed to DDLambda contained null headers. Are you sure the handler signature matches the event provided?"}
-{"m": "aws.lambda.enhanced.invocations", "v": 1.0, "t": ["memorysize:1024", "account_id:XXXX", "resource:Java-integration-test-dev-helloApiGatewayV2_Java11", "functionname:Java-integration-test-dev-helloApiGatewayV2_Java11", "region:sa-east-1", "datadog_lambda:1.4.0", "cold_start:false", "runtime:xxxx"], "e": 1234567890}
-{"m": "aws.lambda.enhanced.invocations", "v": 1.0, "t": ["memorysize:1024", "account_id:XXXX", "resource:Java-integration-test-dev-helloApiGatewayV2_Java11", "functionname:Java-integration-test-dev-helloApiGatewayV2_Java11", "region:sa-east-1", "datadog_lambda:1.4.0", "cold_start:false", "runtime:xxxx"], "e": 1234567890}
-{"m": "aws.lambda.enhanced.invocations", "v": 1.0, "t": ["memorysize:1024", "account_id:XXXX", "resource:Java-integration-test-dev-helloApiGatewayV2_Java11", "functionname:Java-integration-test-dev-helloApiGatewayV2_Java11", "region:sa-east-1", "datadog_lambda:1.4.0", "cold_start:true", "runtime:xxxx"], "e": 1234567890}
-{"traces": [[{"service": "aws.lambda", "name": "aws.lambda", "resource": "Java-integration-test-dev-helloApiGatewayV2_Java11", "trace_id": "xxxxx", "span_id": "xxxxx", "parent_id": "0", "start": 1234567890, "duration": 12345, "error": 0, "metrics": {"_dd.agent_psr": 1.0, "_sample_rate": 1, "thread.id": 1}, "meta": {"language": "jvm", "thread.name": "main", "cold_start": "false", "resource_names": "Java-integration-test-dev-helloApiGatewayV2_Java11", "functionname": "java-integration-test-dev-helloapigatewayv2_java11", "function_arn": "arn:aws:lambda:sa-east-1:123456789012:function:java-integration-test-dev-helloapigatewayv2_java11", "runtime-id": "00000000-0000-0000-0000-000000000000", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "1.4.0", "function_version": "$LATEST"}}]]}
-{"traces": [[{"service": "aws.lambda", "name": "aws.lambda", "resource": "Java-integration-test-dev-helloApiGatewayV2_Java11", "trace_id": "xxxxx", "span_id": "xxxxx", "parent_id": "0", "start": 1234567890, "duration": 12345, "error": 0, "metrics": {"_dd.agent_psr": 1.0, "_sample_rate": 1, "thread.id": 1}, "meta": {"language": "jvm", "thread.name": "main", "cold_start": "false", "resource_names": "Java-integration-test-dev-helloApiGatewayV2_Java11", "functionname": "java-integration-test-dev-helloapigatewayv2_java11", "function_arn": "arn:aws:lambda:sa-east-1:123456789012:function:java-integration-test-dev-helloapigatewayv2_java11", "runtime-id": "00000000-0000-0000-0000-000000000000", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "1.4.0", "function_version": "$LATEST"}}]]}
-{"traces": [[{"service": "aws.lambda", "name": "aws.lambda", "resource": "Java-integration-test-dev-helloApiGatewayV2_Java11", "trace_id": "xxxxx", "span_id": "xxxxx", "parent_id": "0", "start": 1234567890, "duration": 12345, "error": 0, "metrics": {"_dd.agent_psr": 1.0, "_sample_rate": 1, "thread.id": 1}, "meta": {"language": "jvm", "thread.name": "main", "cold_start": "true", "resource_names": "Java-integration-test-dev-helloApiGatewayV2_Java11", "functionname": "java-integration-test-dev-helloapigatewayv2_java11", "function_arn": "arn:aws:lambda:sa-east-1:123456789012:function:java-integration-test-dev-helloapigatewayv2_java11", "runtime-id": "00000000-0000-0000-0000-000000000000", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "1.4.0", "function_version": "$LATEST"}}]]}
+{"m": "aws.lambda.enhanced.invocations", "v": 1.0, "t": ["memorysize:1024", "account_id:XXXX", "resource:Java-integration-test-dev-helloApiGatewayV2_Java11", "functionname:Java-integration-test-dev-helloApiGatewayV2_Java11", "region:sa-east-1", "datadog_lambda:1.4.2", "cold_start:false", "runtime:xxxx"], "e": 1234567890}
+{"m": "aws.lambda.enhanced.invocations", "v": 1.0, "t": ["memorysize:1024", "account_id:XXXX", "resource:Java-integration-test-dev-helloApiGatewayV2_Java11", "functionname:Java-integration-test-dev-helloApiGatewayV2_Java11", "region:sa-east-1", "datadog_lambda:1.4.2", "cold_start:false", "runtime:xxxx"], "e": 1234567890}
+{"m": "aws.lambda.enhanced.invocations", "v": 1.0, "t": ["memorysize:1024", "account_id:XXXX", "resource:Java-integration-test-dev-helloApiGatewayV2_Java11", "functionname:Java-integration-test-dev-helloApiGatewayV2_Java11", "region:sa-east-1", "datadog_lambda:1.4.2", "cold_start:true", "runtime:xxxx"], "e": 1234567890}
+{"traces": [[{"service": "aws.lambda", "name": "aws.lambda", "resource": "Java-integration-test-dev-helloApiGatewayV2_Java11", "trace_id": "xxxxx", "span_id": "xxxxx", "parent_id": "0", "start": 1234567890, "duration": 12345, "error": 0, "metrics": {"_dd.agent_psr": 1.0, "_sample_rate": 1, "thread.id": 1}, "meta": {"language": "jvm", "thread.name": "main", "cold_start": "false", "resource_names": "Java-integration-test-dev-helloApiGatewayV2_Java11", "functionname": "java-integration-test-dev-helloapigatewayv2_java11", "function_arn": "arn:aws:lambda:sa-east-1:123456789012:function:java-integration-test-dev-helloapigatewayv2_java11", "runtime-id": "00000000-0000-0000-0000-000000000000", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "1.4.2", "function_version": "$LATEST"}}]]}
+{"traces": [[{"service": "aws.lambda", "name": "aws.lambda", "resource": "Java-integration-test-dev-helloApiGatewayV2_Java11", "trace_id": "xxxxx", "span_id": "xxxxx", "parent_id": "0", "start": 1234567890, "duration": 12345, "error": 0, "metrics": {"_dd.agent_psr": 1.0, "_sample_rate": 1, "thread.id": 1}, "meta": {"language": "jvm", "thread.name": "main", "cold_start": "false", "resource_names": "Java-integration-test-dev-helloApiGatewayV2_Java11", "functionname": "java-integration-test-dev-helloapigatewayv2_java11", "function_arn": "arn:aws:lambda:sa-east-1:123456789012:function:java-integration-test-dev-helloapigatewayv2_java11", "runtime-id": "00000000-0000-0000-0000-000000000000", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "1.4.2", "function_version": "$LATEST"}}]]}
+{"traces": [[{"service": "aws.lambda", "name": "aws.lambda", "resource": "Java-integration-test-dev-helloApiGatewayV2_Java11", "trace_id": "xxxxx", "span_id": "xxxxx", "parent_id": "0", "start": 1234567890, "duration": 12345, "error": 0, "metrics": {"_dd.agent_psr": 1.0, "_sample_rate": 1, "thread.id": 1}, "meta": {"language": "jvm", "thread.name": "main", "cold_start": "true", "resource_names": "Java-integration-test-dev-helloApiGatewayV2_Java11", "functionname": "java-integration-test-dev-helloapigatewayv2_java11", "function_arn": "arn:aws:lambda:sa-east-1:123456789012:function:java-integration-test-dev-helloapigatewayv2_java11", "runtime-id": "00000000-0000-0000-0000-000000000000", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "1.4.2", "function_version": "$LATEST"}}]]}

tests/testfunctions/snapshots/logs/helloApiGatewayV2_Java8.log

@@ -15,9 +15,9 @@ START RequestId: XXXX Version: $LATEST
 [dd.trace 1970-01-01 00:00:00 +0000] [main] INFO datadog.trace.agent.common.writer.WriterFactory - Detected serverless environment. Serverless extension has not been detected, using PrintingWriter
 {"level": "ERROR", "message": "datadog: The request passed to DDLambda contained null headers. Are you sure the handler signature matches the event provided?"}
 {"level": "ERROR", "message": "datadog: The request passed to DDLambda contained null headers. Are you sure the handler signature matches the event provided?"}
-{"m": "aws.lambda.enhanced.invocations", "v": 1.0, "t": ["memorysize:1024", "account_id:XXXX", "resource:Java-integration-test-dev-helloApiGatewayV2_Java8", "functionname:Java-integration-test-dev-helloApiGatewayV2_Java8", "region:sa-east-1", "datadog_lambda:1.4.0", "cold_start:false", "runtime:xxxx"], "e": 1234567890}
-{"m": "aws.lambda.enhanced.invocations", "v": 1.0, "t": ["memorysize:1024", "account_id:XXXX", "resource:Java-integration-test-dev-helloApiGatewayV2_Java8", "functionname:Java-integration-test-dev-helloApiGatewayV2_Java8", "region:sa-east-1", "datadog_lambda:1.4.0", "cold_start:false", "runtime:xxxx"], "e": 1234567890}
-{"m": "aws.lambda.enhanced.invocations", "v": 1.0, "t": ["memorysize:1024", "account_id:XXXX", "resource:Java-integration-test-dev-helloApiGatewayV2_Java8", "functionname:Java-integration-test-dev-helloApiGatewayV2_Java8", "region:sa-east-1", "datadog_lambda:1.4.0", "cold_start:true", "runtime:xxxx"], "e": 1234567890}
-{"traces": [[{"service": "aws.lambda", "name": "aws.lambda", "resource": "Java-integration-test-dev-helloApiGatewayV2_Java8", "trace_id": "xxxxx", "span_id": "xxxxx", "parent_id": "0", "start": 1234567890, "duration": 12345, "error": 0, "metrics": {"_dd.agent_psr": 1.0, "_sample_rate": 1, "thread.id": 1}, "meta": {"language": "jvm", "thread.name": "main", "cold_start": "false", "resource_names": "Java-integration-test-dev-helloApiGatewayV2_Java8", "functionname": "java-integration-test-dev-helloapigatewayv2_java8", "function_arn": "arn:aws:lambda:sa-east-1:123456789012:function:java-integration-test-dev-helloapigatewayv2_java8", "runtime-id": "00000000-0000-0000-0000-000000000000", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "1.4.0", "function_version": "$LATEST"}}]]}
-{"traces": [[{"service": "aws.lambda", "name": "aws.lambda", "resource": "Java-integration-test-dev-helloApiGatewayV2_Java8", "trace_id": "xxxxx", "span_id": "xxxxx", "parent_id": "0", "start": 1234567890, "duration": 12345, "error": 0, "metrics": {"_dd.agent_psr": 1.0, "_sample_rate": 1, "thread.id": 1}, "meta": {"language": "jvm", "thread.name": "main", "cold_start": "false", "resource_names": "Java-integration-test-dev-helloApiGatewayV2_Java8", "functionname": "java-integration-test-dev-helloapigatewayv2_java8", "function_arn": "arn:aws:lambda:sa-east-1:123456789012:function:java-integration-test-dev-helloapigatewayv2_java8", "runtime-id": "00000000-0000-0000-0000-000000000000", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "1.4.0", "function_version": "$LATEST"}}]]}
-{"traces": [[{"service": "aws.lambda", "name": "aws.lambda", "resource": "Java-integration-test-dev-helloApiGatewayV2_Java8", "trace_id": "xxxxx", "span_id": "xxxxx", "parent_id": "0", "start": 1234567890, "duration": 12345, "error": 0, "metrics": {"_dd.agent_psr": 1.0, "_sample_rate": 1, "thread.id": 1}, "meta": {"language": "jvm", "thread.name": "main", "cold_start": "true", "resource_names": "Java-integration-test-dev-helloApiGatewayV2_Java8", "functionname": "java-integration-test-dev-helloapigatewayv2_java8", "function_arn": "arn:aws:lambda:sa-east-1:123456789012:function:java-integration-test-dev-helloapigatewayv2_java8", "runtime-id": "00000000-0000-0000-0000-000000000000", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "1.4.0", "function_version": "$LATEST"}}]]}
+{"m": "aws.lambda.enhanced.invocations", "v": 1.0, "t": ["memorysize:1024", "account_id:XXXX", "resource:Java-integration-test-dev-helloApiGatewayV2_Java8", "functionname:Java-integration-test-dev-helloApiGatewayV2_Java8", "region:sa-east-1", "datadog_lambda:1.4.2", "cold_start:false", "runtime:xxxx"], "e": 1234567890}
+{"m": "aws.lambda.enhanced.invocations", "v": 1.0, "t": ["memorysize:1024", "account_id:XXXX", "resource:Java-integration-test-dev-helloApiGatewayV2_Java8", "functionname:Java-integration-test-dev-helloApiGatewayV2_Java8", "region:sa-east-1", "datadog_lambda:1.4.2", "cold_start:false", "runtime:xxxx"], "e": 1234567890}
+{"m": "aws.lambda.enhanced.invocations", "v": 1.0, "t": ["memorysize:1024", "account_id:XXXX", "resource:Java-integration-test-dev-helloApiGatewayV2_Java8", "functionname:Java-integration-test-dev-helloApiGatewayV2_Java8", "region:sa-east-1", "datadog_lambda:1.4.2", "cold_start:true", "runtime:xxxx"], "e": 1234567890}
+{"traces": [[{"service": "aws.lambda", "name": "aws.lambda", "resource": "Java-integration-test-dev-helloApiGatewayV2_Java8", "trace_id": "xxxxx", "span_id": "xxxxx", "parent_id": "0", "start": 1234567890, "duration": 12345, "error": 0, "metrics": {"_dd.agent_psr": 1.0, "_sample_rate": 1, "thread.id": 1}, "meta": {"language": "jvm", "thread.name": "main", "cold_start": "false", "resource_names": "Java-integration-test-dev-helloApiGatewayV2_Java8", "functionname": "java-integration-test-dev-helloapigatewayv2_java8", "function_arn": "arn:aws:lambda:sa-east-1:123456789012:function:java-integration-test-dev-helloapigatewayv2_java8", "runtime-id": "00000000-0000-0000-0000-000000000000", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "1.4.2", "function_version": "$LATEST"}}]]}
+{"traces": [[{"service": "aws.lambda", "name": "aws.lambda", "resource": "Java-integration-test-dev-helloApiGatewayV2_Java8", "trace_id": "xxxxx", "span_id": "xxxxx", "parent_id": "0", "start": 1234567890, "duration": 12345, "error": 0, "metrics": {"_dd.agent_psr": 1.0, "_sample_rate": 1, "thread.id": 1}, "meta": {"language": "jvm", "thread.name": "main", "cold_start": "false", "resource_names": "Java-integration-test-dev-helloApiGatewayV2_Java8", "functionname": "java-integration-test-dev-helloapigatewayv2_java8", "function_arn": "arn:aws:lambda:sa-east-1:123456789012:function:java-integration-test-dev-helloapigatewayv2_java8", "runtime-id": "00000000-0000-0000-0000-000000000000", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "1.4.2", "function_version": "$LATEST"}}]]}
+{"traces": [[{"service": "aws.lambda", "name": "aws.lambda", "resource": "Java-integration-test-dev-helloApiGatewayV2_Java8", "trace_id": "xxxxx", "span_id": "xxxxx", "parent_id": "0", "start": 1234567890, "duration": 12345, "error": 0, "metrics": {"_dd.agent_psr": 1.0, "_sample_rate": 1, "thread.id": 1}, "meta": {"language": "jvm", "thread.name": "main", "cold_start": "true", "resource_names": "Java-integration-test-dev-helloApiGatewayV2_Java8", "functionname": "java-integration-test-dev-helloapigatewayv2_java8", "function_arn": "arn:aws:lambda:sa-east-1:123456789012:function:java-integration-test-dev-helloapigatewayv2_java8", "runtime-id": "00000000-0000-0000-0000-000000000000", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "1.4.2", "function_version": "$LATEST"}}]]}