diff --git a/build.gradle b/build.gradle index bda82ab..8405fb2 100644 --- a/build.gradle +++ b/build.gradle @@ -49,7 +49,7 @@ sourceCompatibility = 1.8 targetCompatibility = 1.8 group = 'com.datadoghq' -version= '0.3.1' +version= '0.3.2' archivesBaseName = "datadog-lambda-java" description = "datadog-lambda-java" diff --git a/scripts/cleanup_logs.py b/scripts/cleanup_logs.py index fe607fb..e4c1dd2 100644 --- a/scripts/cleanup_logs.py +++ b/scripts/cleanup_logs.py @@ -52,6 +52,12 @@ def cleanup_json_line(json_line: object): elif "e" in json_line: # probably a metric json_line["e"] = 1234567890 + if json_line["t"]: + for tag in json_line["t"]: + if "runtime:" in tag: + newTag = "runtime:xxxx" + json_line["t"].remove(tag) + json_line["t"].append(newTag) return json_line diff --git a/src/main/java/com/datadoghq/datadog_lambda_java/DDLambda.java b/src/main/java/com/datadoghq/datadog_lambda_java/DDLambda.java index 68ee57f..6f3b021 100644 --- a/src/main/java/com/datadoghq/datadog_lambda_java/DDLambda.java +++ b/src/main/java/com/datadoghq/datadog_lambda_java/DDLambda.java @@ -239,6 +239,7 @@ private SpanBuilder addDDTags(SpanBuilder spanBuilder, Context cxt) { spanBuilder.withTag("cold_start", ColdStart.getColdStart(cxt)); spanBuilder.withTag("datadog_lambda", BuildConfig.datadog_lambda_version); spanBuilder.withTag("resource_names", functionName); + spanBuilder.withTag("functionname", functionName.toLowerCase()); spanBuilder.withTag("function_version", functionVersion); spanBuilder.withTag("resource.name", functionName); } diff --git a/tests/testfunctions/snapshots/logs/helloApiGatewayV2_Java11.log b/tests/testfunctions/snapshots/logs/helloApiGatewayV2_Java11.log index 7747954..abdea89 100644 --- a/tests/testfunctions/snapshots/logs/helloApiGatewayV2_Java11.log +++ b/tests/testfunctions/snapshots/logs/helloApiGatewayV2_Java11.log @@ -12,13 +12,13 @@ REPORT RequestId: XXXX Duration: XXXX ms Billed Duration: XXXX ms Memory Size: 1 START RequestId: XXXX Version: $LATEST START RequestId: XXXX Version: $LATEST START RequestId: XXXX Version: $LATEST -[dd.trace 1970-01-01 00:00:00 +0000] [dd-task-scheduler] INFO datadog.trace.agent.core.StatusLogger - DATADOG TRACER CONFIGURATION {"version":"0.80.0~a7d9f70a4","os_name":"Linux","os_version":"4.14.225-175.364.amzn2.x86_64","architecture":"amd64","lang":"jvm","lang_version":"11.0.9.1","jvm_vendor":"Amazon.com Inc.","jvm_version":"11.0.9.1+12-LTS","java_class_version":"55.0","http_nonProxyHosts":"null","http_proxyHost":"null","enabled":true,"service":"lambdainternal.AWSLambda","agent_url":"http://localhost:8126","agent_error":true,"debug":false,"analytics_enabled":false,"sampling_rules":[{},{}],"priority_sampling_enabled":true,"logs_correlation_enabled":true,"profiling_enabled":false,"dd_version":"0.80.0~a7d9f70a4","health_checks_enabled":true,"configuration_file":"no config file present","runtime_id":"00000000-0000-0000-0000-000000000000","logging_settings":{"levelInBrackets":false,"dateTimeFormat":"'[dd.trace 'yyyy-MM-dd HH:mm:ss:SSS Z']'","logFile":"System.err","configurationFile":"simplelogger.properties","showShortLogName":false,"showDateTime":true,"showLogName":true,"showThreadName":true,"defaultLogLevel":"INFO","warnLevelString":"WARN","embedException":false}} +[dd.trace 1970-01-01 00:00:00 +0000] [dd-task-scheduler] INFO datadog.trace.agent.core.StatusLogger - DATADOG TRACER CONFIGURATION {"version":"0.80.0~a7d9f70a4","os_name":"Linux","os_version":"4.14.231-180.360.amzn2.x86_64","architecture":"amd64","lang":"jvm","lang_version":"11.0.11","jvm_vendor":"Amazon.com Inc.","jvm_version":"11.0.11+9-LTS","java_class_version":"55.0","http_nonProxyHosts":"null","http_proxyHost":"null","enabled":true,"service":"lambdainternal.AWSLambda","agent_url":"http://localhost:8126","agent_error":true,"debug":false,"analytics_enabled":false,"sampling_rules":[{},{}],"priority_sampling_enabled":true,"logs_correlation_enabled":true,"profiling_enabled":false,"dd_version":"0.80.0~a7d9f70a4","health_checks_enabled":true,"configuration_file":"no config file present","runtime_id":"00000000-0000-0000-0000-000000000000","logging_settings":{"levelInBrackets":false,"dateTimeFormat":"'[dd.trace 'yyyy-MM-dd HH:mm:ss:SSS Z']'","logFile":"System.err","configurationFile":"simplelogger.properties","showShortLogName":false,"showDateTime":true,"showLogName":true,"showThreadName":true,"defaultLogLevel":"INFO","warnLevelString":"WARN","embedException":false}} [dd.trace 1970-01-01 00:00:00 +0000] [main] INFO datadog.trace.agent.common.writer.WriterFactory - Detected serverless environment. 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", "runtime:java11.0.9.1", "region:sa-east-1", "datadog_lambda:0.3.1", "cold_start:false"], "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", "runtime:java11.0.9.1", "region:sa-east-1", "datadog_lambda:0.3.1", "cold_start:false"], "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", "runtime:java11.0.9.1", "region:sa-east-1", "datadog_lambda:0.3.1", "cold_start:true"], "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}, "meta": {"function_arn": "arn:aws:lambda:sa-east-1:123456789012:function:java-integration-test-dev-helloapigatewayv2_java11", "runtime-id": "00000000-0000-0000-0000-000000000000", "language": "jvm", "thread.name": "main", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "0.3.1", "thread.id": "1", "cold_start": "false", "resource_names": "Java-integration-test-dev-helloApiGatewayV2_Java11", "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}, "meta": {"function_arn": "arn:aws:lambda:sa-east-1:123456789012:function:java-integration-test-dev-helloapigatewayv2_java11", "runtime-id": "00000000-0000-0000-0000-000000000000", "language": "jvm", "thread.name": "main", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "0.3.1", "thread.id": "1", "cold_start": "false", "resource_names": "Java-integration-test-dev-helloApiGatewayV2_Java11", "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}, "meta": {"function_arn": "arn:aws:lambda:sa-east-1:123456789012:function:java-integration-test-dev-helloapigatewayv2_java11", "runtime-id": "00000000-0000-0000-0000-000000000000", "language": "jvm", "thread.name": "main", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "0.3.1", "thread.id": "1", "cold_start": "true", "resource_names": "Java-integration-test-dev-helloApiGatewayV2_Java11", "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:0.3.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:0.3.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:0.3.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}, "meta": {"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", "language": "jvm", "thread.name": "main", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "0.3.2", "thread.id": "1", "cold_start": "false", "resource_names": "Java-integration-test-dev-helloApiGatewayV2_Java11", "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}, "meta": {"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", "language": "jvm", "thread.name": "main", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "0.3.2", "thread.id": "1", "cold_start": "false", "resource_names": "Java-integration-test-dev-helloApiGatewayV2_Java11", "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}, "meta": {"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", "language": "jvm", "thread.name": "main", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "0.3.2", "thread.id": "1", "cold_start": "true", "resource_names": "Java-integration-test-dev-helloApiGatewayV2_Java11", "function_version": "$LATEST"}}]]} diff --git a/tests/testfunctions/snapshots/logs/helloApiGatewayV2_Java8.log b/tests/testfunctions/snapshots/logs/helloApiGatewayV2_Java8.log index 9ca29b7..b0b6a51 100644 --- a/tests/testfunctions/snapshots/logs/helloApiGatewayV2_Java8.log +++ b/tests/testfunctions/snapshots/logs/helloApiGatewayV2_Java8.log @@ -11,13 +11,13 @@ REPORT RequestId: XXXX Duration: XXXX ms Billed Duration: XXXX ms Memory Size: 1 START RequestId: XXXX Version: $LATEST START RequestId: XXXX Version: $LATEST START RequestId: XXXX Version: $LATEST -[dd.trace 1970-01-01 00:00:00 +0000] [dd-task-scheduler] INFO datadog.trace.agent.core.StatusLogger - DATADOG TRACER CONFIGURATION {"version":"0.80.0~a7d9f70a4","os_name":"Linux","os_version":"4.14.225-175.364.amzn2.x86_64","architecture":"amd64","lang":"jvm","lang_version":"1.8.0_282","jvm_vendor":"Amazon.com Inc.","jvm_version":"25.282-b08","java_class_version":"52.0","http_nonProxyHosts":"null","http_proxyHost":"null","enabled":true,"service":"lambdainternal.AWSLambda","agent_url":"http://localhost:8126","agent_error":true,"debug":false,"analytics_enabled":false,"sampling_rules":[{},{}],"priority_sampling_enabled":true,"logs_correlation_enabled":true,"profiling_enabled":false,"dd_version":"0.80.0~a7d9f70a4","health_checks_enabled":true,"configuration_file":"no config file present","runtime_id":"00000000-0000-0000-0000-000000000000","logging_settings":{"levelInBrackets":false,"dateTimeFormat":"'[dd.trace 'yyyy-MM-dd HH:mm:ss:SSS Z']'","logFile":"System.err","configurationFile":"simplelogger.properties","showShortLogName":false,"showDateTime":true,"showLogName":true,"showThreadName":true,"defaultLogLevel":"INFO","warnLevelString":"WARN","embedException":false}} +[dd.trace 1970-01-01 00:00:00 +0000] [dd-task-scheduler] INFO datadog.trace.agent.core.StatusLogger - DATADOG TRACER CONFIGURATION {"version":"0.80.0~a7d9f70a4","os_name":"Linux","os_version":"4.14.231-180.360.amzn2.x86_64","architecture":"amd64","lang":"jvm","lang_version":"1.8.0_292","jvm_vendor":"Amazon.com Inc.","jvm_version":"25.292-b10","java_class_version":"52.0","http_nonProxyHosts":"null","http_proxyHost":"null","enabled":true,"service":"lambdainternal.AWSLambda","agent_url":"http://localhost:8126","agent_error":true,"debug":false,"analytics_enabled":false,"sampling_rules":[{},{}],"priority_sampling_enabled":true,"logs_correlation_enabled":true,"profiling_enabled":false,"dd_version":"0.80.0~a7d9f70a4","health_checks_enabled":true,"configuration_file":"no config file present","runtime_id":"00000000-0000-0000-0000-000000000000","logging_settings":{"levelInBrackets":false,"dateTimeFormat":"'[dd.trace 'yyyy-MM-dd HH:mm:ss:SSS Z']'","logFile":"System.err","configurationFile":"simplelogger.properties","showShortLogName":false,"showDateTime":true,"showLogName":true,"showThreadName":true,"defaultLogLevel":"INFO","warnLevelString":"WARN","embedException":false}} [dd.trace 1970-01-01 00:00:00 +0000] [main] INFO datadog.trace.agent.common.writer.WriterFactory - Detected serverless environment. 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", "runtime:java1.8.0_282", "region:sa-east-1", "datadog_lambda:0.3.1", "cold_start:false"], "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", "runtime:java1.8.0_282", "region:sa-east-1", "datadog_lambda:0.3.1", "cold_start:false"], "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", "runtime:java1.8.0_282", "region:sa-east-1", "datadog_lambda:0.3.1", "cold_start:true"], "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}, "meta": {"function_arn": "arn:aws:lambda:sa-east-1:123456789012:function:java-integration-test-dev-helloapigatewayv2_java8", "runtime-id": "00000000-0000-0000-0000-000000000000", "language": "jvm", "thread.name": "main", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "0.3.1", "thread.id": "1", "cold_start": "false", "resource_names": "Java-integration-test-dev-helloApiGatewayV2_Java8", "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}, "meta": {"function_arn": "arn:aws:lambda:sa-east-1:123456789012:function:java-integration-test-dev-helloapigatewayv2_java8", "runtime-id": "00000000-0000-0000-0000-000000000000", "language": "jvm", "thread.name": "main", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "0.3.1", "thread.id": "1", "cold_start": "false", "resource_names": "Java-integration-test-dev-helloApiGatewayV2_Java8", "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}, "meta": {"function_arn": "arn:aws:lambda:sa-east-1:123456789012:function:java-integration-test-dev-helloapigatewayv2_java8", "runtime-id": "00000000-0000-0000-0000-000000000000", "language": "jvm", "thread.name": "main", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "0.3.1", "thread.id": "1", "cold_start": "true", "resource_names": "Java-integration-test-dev-helloApiGatewayV2_Java8", "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:0.3.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:0.3.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:0.3.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}, "meta": {"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", "language": "jvm", "thread.name": "main", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "0.3.2", "thread.id": "1", "cold_start": "false", "resource_names": "Java-integration-test-dev-helloApiGatewayV2_Java8", "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}, "meta": {"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", "language": "jvm", "thread.name": "main", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "0.3.2", "thread.id": "1", "cold_start": "false", "resource_names": "Java-integration-test-dev-helloApiGatewayV2_Java8", "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}, "meta": {"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", "language": "jvm", "thread.name": "main", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "0.3.2", "thread.id": "1", "cold_start": "true", "resource_names": "Java-integration-test-dev-helloApiGatewayV2_Java8", "function_version": "$LATEST"}}]]} diff --git a/tests/testfunctions/snapshots/logs/helloApiGateway_Java11.log b/tests/testfunctions/snapshots/logs/helloApiGateway_Java11.log index bcd1dea..1b463e9 100644 --- a/tests/testfunctions/snapshots/logs/helloApiGateway_Java11.log +++ b/tests/testfunctions/snapshots/logs/helloApiGateway_Java11.log @@ -12,13 +12,13 @@ REPORT RequestId: XXXX Duration: XXXX ms Billed Duration: XXXX ms Memory Size: 1 START RequestId: XXXX Version: $LATEST START RequestId: XXXX Version: $LATEST START RequestId: XXXX Version: $LATEST -[dd.trace 1970-01-01 00:00:00 +0000] [dd-task-scheduler] INFO datadog.trace.agent.core.StatusLogger - DATADOG TRACER CONFIGURATION {"version":"0.80.0~a7d9f70a4","os_name":"Linux","os_version":"4.14.225-175.364.amzn2.x86_64","architecture":"amd64","lang":"jvm","lang_version":"11.0.9.1","jvm_vendor":"Amazon.com Inc.","jvm_version":"11.0.9.1+12-LTS","java_class_version":"55.0","http_nonProxyHosts":"null","http_proxyHost":"null","enabled":true,"service":"lambdainternal.AWSLambda","agent_url":"http://localhost:8126","agent_error":true,"debug":false,"analytics_enabled":false,"sampling_rules":[{},{}],"priority_sampling_enabled":true,"logs_correlation_enabled":true,"profiling_enabled":false,"dd_version":"0.80.0~a7d9f70a4","health_checks_enabled":true,"configuration_file":"no config file present","runtime_id":"00000000-0000-0000-0000-000000000000","logging_settings":{"levelInBrackets":false,"dateTimeFormat":"'[dd.trace 'yyyy-MM-dd HH:mm:ss:SSS Z']'","logFile":"System.err","configurationFile":"simplelogger.properties","showShortLogName":false,"showDateTime":true,"showLogName":true,"showThreadName":true,"defaultLogLevel":"INFO","warnLevelString":"WARN","embedException":false}} +[dd.trace 1970-01-01 00:00:00 +0000] [dd-task-scheduler] INFO datadog.trace.agent.core.StatusLogger - DATADOG TRACER CONFIGURATION {"version":"0.80.0~a7d9f70a4","os_name":"Linux","os_version":"4.14.231-180.360.amzn2.x86_64","architecture":"amd64","lang":"jvm","lang_version":"11.0.11","jvm_vendor":"Amazon.com Inc.","jvm_version":"11.0.11+9-LTS","java_class_version":"55.0","http_nonProxyHosts":"null","http_proxyHost":"null","enabled":true,"service":"lambdainternal.AWSLambda","agent_url":"http://localhost:8126","agent_error":true,"debug":false,"analytics_enabled":false,"sampling_rules":[{},{}],"priority_sampling_enabled":true,"logs_correlation_enabled":true,"profiling_enabled":false,"dd_version":"0.80.0~a7d9f70a4","health_checks_enabled":true,"configuration_file":"no config file present","runtime_id":"00000000-0000-0000-0000-000000000000","logging_settings":{"levelInBrackets":false,"dateTimeFormat":"'[dd.trace 'yyyy-MM-dd HH:mm:ss:SSS Z']'","logFile":"System.err","configurationFile":"simplelogger.properties","showShortLogName":false,"showDateTime":true,"showLogName":true,"showThreadName":true,"defaultLogLevel":"INFO","warnLevelString":"WARN","embedException":false}} [dd.trace 1970-01-01 00:00:00 +0000] [main] INFO datadog.trace.agent.common.writer.WriterFactory - Detected serverless environment. 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-helloApiGateway_Java11", "functionname:Java-integration-test-dev-helloApiGateway_Java11", "runtime:java11.0.9.1", "region:sa-east-1", "datadog_lambda:0.3.1", "cold_start:false"], "e": 1234567890} -{"m": "aws.lambda.enhanced.invocations", "v": 1.0, "t": ["memorysize:1024", "account_id:XXXX", "resource:Java-integration-test-dev-helloApiGateway_Java11", "functionname:Java-integration-test-dev-helloApiGateway_Java11", "runtime:java11.0.9.1", "region:sa-east-1", "datadog_lambda:0.3.1", "cold_start:false"], "e": 1234567890} -{"m": "aws.lambda.enhanced.invocations", "v": 1.0, "t": ["memorysize:1024", "account_id:XXXX", "resource:Java-integration-test-dev-helloApiGateway_Java11", "functionname:Java-integration-test-dev-helloApiGateway_Java11", "runtime:java11.0.9.1", "region:sa-east-1", "datadog_lambda:0.3.1", "cold_start:true"], "e": 1234567890} -{"traces": [[{"service": "aws.lambda", "name": "aws.lambda", "resource": "Java-integration-test-dev-helloApiGateway_Java11", "trace_id": "xxxxx", "span_id": "xxxxx", "parent_id": "0", "start": 1234567890, "duration": 12345, "error": 0, "metrics": {"_dd.agent_psr": 1.0}, "meta": {"function_arn": "arn:aws:lambda:sa-east-1:123456789012:function:java-integration-test-dev-helloapigateway_java11", "runtime-id": "00000000-0000-0000-0000-000000000000", "language": "jvm", "thread.name": "main", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "0.3.1", "thread.id": "1", "cold_start": "false", "resource_names": "Java-integration-test-dev-helloApiGateway_Java11", "function_version": "$LATEST"}}]]} -{"traces": [[{"service": "aws.lambda", "name": "aws.lambda", "resource": "Java-integration-test-dev-helloApiGateway_Java11", "trace_id": "xxxxx", "span_id": "xxxxx", "parent_id": "0", "start": 1234567890, "duration": 12345, "error": 0, "metrics": {"_dd.agent_psr": 1.0}, "meta": {"function_arn": "arn:aws:lambda:sa-east-1:123456789012:function:java-integration-test-dev-helloapigateway_java11", "runtime-id": "00000000-0000-0000-0000-000000000000", "language": "jvm", "thread.name": "main", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "0.3.1", "thread.id": "1", "cold_start": "false", "resource_names": "Java-integration-test-dev-helloApiGateway_Java11", "function_version": "$LATEST"}}]]} -{"traces": [[{"service": "aws.lambda", "name": "aws.lambda", "resource": "Java-integration-test-dev-helloApiGateway_Java11", "trace_id": "xxxxx", "span_id": "xxxxx", "parent_id": "0", "start": 1234567890, "duration": 12345, "error": 0, "metrics": {"_dd.agent_psr": 1.0}, "meta": {"function_arn": "arn:aws:lambda:sa-east-1:123456789012:function:java-integration-test-dev-helloapigateway_java11", "runtime-id": "00000000-0000-0000-0000-000000000000", "language": "jvm", "thread.name": "main", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "0.3.1", "thread.id": "1", "cold_start": "true", "resource_names": "Java-integration-test-dev-helloApiGateway_Java11", "function_version": "$LATEST"}}]]} +{"m": "aws.lambda.enhanced.invocations", "v": 1.0, "t": ["memorysize:1024", "account_id:XXXX", "resource:Java-integration-test-dev-helloApiGateway_Java11", "functionname:Java-integration-test-dev-helloApiGateway_Java11", "region:sa-east-1", "datadog_lambda:0.3.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-helloApiGateway_Java11", "functionname:Java-integration-test-dev-helloApiGateway_Java11", "region:sa-east-1", "datadog_lambda:0.3.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-helloApiGateway_Java11", "functionname:Java-integration-test-dev-helloApiGateway_Java11", "region:sa-east-1", "datadog_lambda:0.3.2", "cold_start:true", "runtime:xxxx"], "e": 1234567890} +{"traces": [[{"service": "aws.lambda", "name": "aws.lambda", "resource": "Java-integration-test-dev-helloApiGateway_Java11", "trace_id": "xxxxx", "span_id": "xxxxx", "parent_id": "0", "start": 1234567890, "duration": 12345, "error": 0, "metrics": {"_dd.agent_psr": 1.0}, "meta": {"functionname": "java-integration-test-dev-helloapigateway_java11", "function_arn": "arn:aws:lambda:sa-east-1:123456789012:function:java-integration-test-dev-helloapigateway_java11", "runtime-id": "00000000-0000-0000-0000-000000000000", "language": "jvm", "thread.name": "main", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "0.3.2", "thread.id": "1", "cold_start": "false", "resource_names": "Java-integration-test-dev-helloApiGateway_Java11", "function_version": "$LATEST"}}]]} +{"traces": [[{"service": "aws.lambda", "name": "aws.lambda", "resource": "Java-integration-test-dev-helloApiGateway_Java11", "trace_id": "xxxxx", "span_id": "xxxxx", "parent_id": "0", "start": 1234567890, "duration": 12345, "error": 0, "metrics": {"_dd.agent_psr": 1.0}, "meta": {"functionname": "java-integration-test-dev-helloapigateway_java11", "function_arn": "arn:aws:lambda:sa-east-1:123456789012:function:java-integration-test-dev-helloapigateway_java11", "runtime-id": "00000000-0000-0000-0000-000000000000", "language": "jvm", "thread.name": "main", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "0.3.2", "thread.id": "1", "cold_start": "false", "resource_names": "Java-integration-test-dev-helloApiGateway_Java11", "function_version": "$LATEST"}}]]} +{"traces": [[{"service": "aws.lambda", "name": "aws.lambda", "resource": "Java-integration-test-dev-helloApiGateway_Java11", "trace_id": "xxxxx", "span_id": "xxxxx", "parent_id": "0", "start": 1234567890, "duration": 12345, "error": 0, "metrics": {"_dd.agent_psr": 1.0}, "meta": {"functionname": "java-integration-test-dev-helloapigateway_java11", "function_arn": "arn:aws:lambda:sa-east-1:123456789012:function:java-integration-test-dev-helloapigateway_java11", "runtime-id": "00000000-0000-0000-0000-000000000000", "language": "jvm", "thread.name": "main", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "0.3.2", "thread.id": "1", "cold_start": "true", "resource_names": "Java-integration-test-dev-helloApiGateway_Java11", "function_version": "$LATEST"}}]]} diff --git a/tests/testfunctions/snapshots/logs/helloApiGateway_Java8.log b/tests/testfunctions/snapshots/logs/helloApiGateway_Java8.log index 20a29c6..45b54e7 100644 --- a/tests/testfunctions/snapshots/logs/helloApiGateway_Java8.log +++ b/tests/testfunctions/snapshots/logs/helloApiGateway_Java8.log @@ -11,13 +11,13 @@ REPORT RequestId: XXXX Duration: XXXX ms Billed Duration: XXXX ms Memory Size: 1 START RequestId: XXXX Version: $LATEST START RequestId: XXXX Version: $LATEST START RequestId: XXXX Version: $LATEST -[dd.trace 1970-01-01 00:00:00 +0000] [dd-task-scheduler] INFO datadog.trace.agent.core.StatusLogger - DATADOG TRACER CONFIGURATION {"version":"0.80.0~a7d9f70a4","os_name":"Linux","os_version":"4.14.225-175.364.amzn2.x86_64","architecture":"amd64","lang":"jvm","lang_version":"1.8.0_282","jvm_vendor":"Amazon.com Inc.","jvm_version":"25.282-b08","java_class_version":"52.0","http_nonProxyHosts":"null","http_proxyHost":"null","enabled":true,"service":"lambdainternal.AWSLambda","agent_url":"http://localhost:8126","agent_error":true,"debug":false,"analytics_enabled":false,"sampling_rules":[{},{}],"priority_sampling_enabled":true,"logs_correlation_enabled":true,"profiling_enabled":false,"dd_version":"0.80.0~a7d9f70a4","health_checks_enabled":true,"configuration_file":"no config file present","runtime_id":"00000000-0000-0000-0000-000000000000","logging_settings":{"levelInBrackets":false,"dateTimeFormat":"'[dd.trace 'yyyy-MM-dd HH:mm:ss:SSS Z']'","logFile":"System.err","configurationFile":"simplelogger.properties","showShortLogName":false,"showDateTime":true,"showLogName":true,"showThreadName":true,"defaultLogLevel":"INFO","warnLevelString":"WARN","embedException":false}} +[dd.trace 1970-01-01 00:00:00 +0000] [dd-task-scheduler] INFO datadog.trace.agent.core.StatusLogger - DATADOG TRACER CONFIGURATION {"version":"0.80.0~a7d9f70a4","os_name":"Linux","os_version":"4.14.231-180.360.amzn2.x86_64","architecture":"amd64","lang":"jvm","lang_version":"1.8.0_292","jvm_vendor":"Amazon.com Inc.","jvm_version":"25.292-b10","java_class_version":"52.0","http_nonProxyHosts":"null","http_proxyHost":"null","enabled":true,"service":"lambdainternal.AWSLambda","agent_url":"http://localhost:8126","agent_error":true,"debug":false,"analytics_enabled":false,"sampling_rules":[{},{}],"priority_sampling_enabled":true,"logs_correlation_enabled":true,"profiling_enabled":false,"dd_version":"0.80.0~a7d9f70a4","health_checks_enabled":true,"configuration_file":"no config file present","runtime_id":"00000000-0000-0000-0000-000000000000","logging_settings":{"levelInBrackets":false,"dateTimeFormat":"'[dd.trace 'yyyy-MM-dd HH:mm:ss:SSS Z']'","logFile":"System.err","configurationFile":"simplelogger.properties","showShortLogName":false,"showDateTime":true,"showLogName":true,"showThreadName":true,"defaultLogLevel":"INFO","warnLevelString":"WARN","embedException":false}} [dd.trace 1970-01-01 00:00:00 +0000] [main] INFO datadog.trace.agent.common.writer.WriterFactory - Detected serverless environment. 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-helloApiGateway_Java8", "functionname:Java-integration-test-dev-helloApiGateway_Java8", "runtime:java1.8.0_282", "region:sa-east-1", "datadog_lambda:0.3.1", "cold_start:false"], "e": 1234567890} -{"m": "aws.lambda.enhanced.invocations", "v": 1.0, "t": ["memorysize:1024", "account_id:XXXX", "resource:Java-integration-test-dev-helloApiGateway_Java8", "functionname:Java-integration-test-dev-helloApiGateway_Java8", "runtime:java1.8.0_282", "region:sa-east-1", "datadog_lambda:0.3.1", "cold_start:false"], "e": 1234567890} -{"m": "aws.lambda.enhanced.invocations", "v": 1.0, "t": ["memorysize:1024", "account_id:XXXX", "resource:Java-integration-test-dev-helloApiGateway_Java8", "functionname:Java-integration-test-dev-helloApiGateway_Java8", "runtime:java1.8.0_282", "region:sa-east-1", "datadog_lambda:0.3.1", "cold_start:true"], "e": 1234567890} -{"traces": [[{"service": "aws.lambda", "name": "aws.lambda", "resource": "Java-integration-test-dev-helloApiGateway_Java8", "trace_id": "xxxxx", "span_id": "xxxxx", "parent_id": "0", "start": 1234567890, "duration": 12345, "error": 0, "metrics": {"_dd.agent_psr": 1.0}, "meta": {"function_arn": "arn:aws:lambda:sa-east-1:123456789012:function:java-integration-test-dev-helloapigateway_java8", "runtime-id": "00000000-0000-0000-0000-000000000000", "language": "jvm", "thread.name": "main", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "0.3.1", "thread.id": "1", "cold_start": "false", "resource_names": "Java-integration-test-dev-helloApiGateway_Java8", "function_version": "$LATEST"}}]]} -{"traces": [[{"service": "aws.lambda", "name": "aws.lambda", "resource": "Java-integration-test-dev-helloApiGateway_Java8", "trace_id": "xxxxx", "span_id": "xxxxx", "parent_id": "0", "start": 1234567890, "duration": 12345, "error": 0, "metrics": {"_dd.agent_psr": 1.0}, "meta": {"function_arn": "arn:aws:lambda:sa-east-1:123456789012:function:java-integration-test-dev-helloapigateway_java8", "runtime-id": "00000000-0000-0000-0000-000000000000", "language": "jvm", "thread.name": "main", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "0.3.1", "thread.id": "1", "cold_start": "false", "resource_names": "Java-integration-test-dev-helloApiGateway_Java8", "function_version": "$LATEST"}}]]} -{"traces": [[{"service": "aws.lambda", "name": "aws.lambda", "resource": "Java-integration-test-dev-helloApiGateway_Java8", "trace_id": "xxxxx", "span_id": "xxxxx", "parent_id": "0", "start": 1234567890, "duration": 12345, "error": 0, "metrics": {"_dd.agent_psr": 1.0}, "meta": {"function_arn": "arn:aws:lambda:sa-east-1:123456789012:function:java-integration-test-dev-helloapigateway_java8", "runtime-id": "00000000-0000-0000-0000-000000000000", "language": "jvm", "thread.name": "main", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "0.3.1", "thread.id": "1", "cold_start": "true", "resource_names": "Java-integration-test-dev-helloApiGateway_Java8", "function_version": "$LATEST"}}]]} +{"m": "aws.lambda.enhanced.invocations", "v": 1.0, "t": ["memorysize:1024", "account_id:XXXX", "resource:Java-integration-test-dev-helloApiGateway_Java8", "functionname:Java-integration-test-dev-helloApiGateway_Java8", "region:sa-east-1", "datadog_lambda:0.3.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-helloApiGateway_Java8", "functionname:Java-integration-test-dev-helloApiGateway_Java8", "region:sa-east-1", "datadog_lambda:0.3.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-helloApiGateway_Java8", "functionname:Java-integration-test-dev-helloApiGateway_Java8", "region:sa-east-1", "datadog_lambda:0.3.2", "cold_start:true", "runtime:xxxx"], "e": 1234567890} +{"traces": [[{"service": "aws.lambda", "name": "aws.lambda", "resource": "Java-integration-test-dev-helloApiGateway_Java8", "trace_id": "xxxxx", "span_id": "xxxxx", "parent_id": "0", "start": 1234567890, "duration": 12345, "error": 0, "metrics": {"_dd.agent_psr": 1.0}, "meta": {"functionname": "java-integration-test-dev-helloapigateway_java8", "function_arn": "arn:aws:lambda:sa-east-1:123456789012:function:java-integration-test-dev-helloapigateway_java8", "runtime-id": "00000000-0000-0000-0000-000000000000", "language": "jvm", "thread.name": "main", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "0.3.2", "thread.id": "1", "cold_start": "false", "resource_names": "Java-integration-test-dev-helloApiGateway_Java8", "function_version": "$LATEST"}}]]} +{"traces": [[{"service": "aws.lambda", "name": "aws.lambda", "resource": "Java-integration-test-dev-helloApiGateway_Java8", "trace_id": "xxxxx", "span_id": "xxxxx", "parent_id": "0", "start": 1234567890, "duration": 12345, "error": 0, "metrics": {"_dd.agent_psr": 1.0}, "meta": {"functionname": "java-integration-test-dev-helloapigateway_java8", "function_arn": "arn:aws:lambda:sa-east-1:123456789012:function:java-integration-test-dev-helloapigateway_java8", "runtime-id": "00000000-0000-0000-0000-000000000000", "language": "jvm", "thread.name": "main", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "0.3.2", "thread.id": "1", "cold_start": "false", "resource_names": "Java-integration-test-dev-helloApiGateway_Java8", "function_version": "$LATEST"}}]]} +{"traces": [[{"service": "aws.lambda", "name": "aws.lambda", "resource": "Java-integration-test-dev-helloApiGateway_Java8", "trace_id": "xxxxx", "span_id": "xxxxx", "parent_id": "0", "start": 1234567890, "duration": 12345, "error": 0, "metrics": {"_dd.agent_psr": 1.0}, "meta": {"functionname": "java-integration-test-dev-helloapigateway_java8", "function_arn": "arn:aws:lambda:sa-east-1:123456789012:function:java-integration-test-dev-helloapigateway_java8", "runtime-id": "00000000-0000-0000-0000-000000000000", "language": "jvm", "thread.name": "main", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "0.3.2", "thread.id": "1", "cold_start": "true", "resource_names": "Java-integration-test-dev-helloApiGateway_Java8", "function_version": "$LATEST"}}]]} diff --git a/tests/testfunctions/snapshots/logs/hello_Java11.log b/tests/testfunctions/snapshots/logs/hello_Java11.log index 57a28d2..711a21e 100644 --- a/tests/testfunctions/snapshots/logs/hello_Java11.log +++ b/tests/testfunctions/snapshots/logs/hello_Java11.log @@ -12,11 +12,11 @@ REPORT RequestId: XXXX Duration: XXXX ms Billed Duration: XXXX ms Memory Size: 1 START RequestId: XXXX Version: $LATEST START RequestId: XXXX Version: $LATEST START RequestId: XXXX Version: $LATEST -[dd.trace 1970-01-01 00:00:00 +0000] [dd-task-scheduler] INFO datadog.trace.agent.core.StatusLogger - DATADOG TRACER CONFIGURATION {"version":"0.80.0~a7d9f70a4","os_name":"Linux","os_version":"4.14.225-175.364.amzn2.x86_64","architecture":"amd64","lang":"jvm","lang_version":"11.0.9.1","jvm_vendor":"Amazon.com Inc.","jvm_version":"11.0.9.1+12-LTS","java_class_version":"55.0","http_nonProxyHosts":"null","http_proxyHost":"null","enabled":true,"service":"lambdainternal.AWSLambda","agent_url":"http://localhost:8126","agent_error":true,"debug":false,"analytics_enabled":false,"sampling_rules":[{},{}],"priority_sampling_enabled":true,"logs_correlation_enabled":true,"profiling_enabled":false,"dd_version":"0.80.0~a7d9f70a4","health_checks_enabled":true,"configuration_file":"no config file present","runtime_id":"00000000-0000-0000-0000-000000000000","logging_settings":{"levelInBrackets":false,"dateTimeFormat":"'[dd.trace 'yyyy-MM-dd HH:mm:ss:SSS Z']'","logFile":"System.err","configurationFile":"simplelogger.properties","showShortLogName":false,"showDateTime":true,"showLogName":true,"showThreadName":true,"defaultLogLevel":"INFO","warnLevelString":"WARN","embedException":false}} +[dd.trace 1970-01-01 00:00:00 +0000] [dd-task-scheduler] INFO datadog.trace.agent.core.StatusLogger - DATADOG TRACER CONFIGURATION {"version":"0.80.0~a7d9f70a4","os_name":"Linux","os_version":"4.14.231-180.360.amzn2.x86_64","architecture":"amd64","lang":"jvm","lang_version":"11.0.11","jvm_vendor":"Amazon.com Inc.","jvm_version":"11.0.11+9-LTS","java_class_version":"55.0","http_nonProxyHosts":"null","http_proxyHost":"null","enabled":true,"service":"lambdainternal.AWSLambda","agent_url":"http://localhost:8126","agent_error":true,"debug":false,"analytics_enabled":false,"sampling_rules":[{},{}],"priority_sampling_enabled":true,"logs_correlation_enabled":true,"profiling_enabled":false,"dd_version":"0.80.0~a7d9f70a4","health_checks_enabled":true,"configuration_file":"no config file present","runtime_id":"00000000-0000-0000-0000-000000000000","logging_settings":{"levelInBrackets":false,"dateTimeFormat":"'[dd.trace 'yyyy-MM-dd HH:mm:ss:SSS Z']'","logFile":"System.err","configurationFile":"simplelogger.properties","showShortLogName":false,"showDateTime":true,"showLogName":true,"showThreadName":true,"defaultLogLevel":"INFO","warnLevelString":"WARN","embedException":false}} [dd.trace 1970-01-01 00:00:00 +0000] [main] INFO datadog.trace.agent.common.writer.WriterFactory - Detected serverless environment. Using PrintingWriter -{"m": "aws.lambda.enhanced.invocations", "v": 1.0, "t": ["memorysize:1024", "account_id:XXXX", "resource:Java-integration-test-dev-hello_Java11", "functionname:Java-integration-test-dev-hello_Java11", "runtime:java11.0.9.1", "region:sa-east-1", "datadog_lambda:0.3.1", "cold_start:false"], "e": 1234567890} -{"m": "aws.lambda.enhanced.invocations", "v": 1.0, "t": ["memorysize:1024", "account_id:XXXX", "resource:Java-integration-test-dev-hello_Java11", "functionname:Java-integration-test-dev-hello_Java11", "runtime:java11.0.9.1", "region:sa-east-1", "datadog_lambda:0.3.1", "cold_start:false"], "e": 1234567890} -{"m": "aws.lambda.enhanced.invocations", "v": 1.0, "t": ["memorysize:1024", "account_id:XXXX", "resource:Java-integration-test-dev-hello_Java11", "functionname:Java-integration-test-dev-hello_Java11", "runtime:java11.0.9.1", "region:sa-east-1", "datadog_lambda:0.3.1", "cold_start:true"], "e": 1234567890} -{"traces": [[{"service": "aws.lambda", "name": "aws.lambda", "resource": "Java-integration-test-dev-hello_Java11", "trace_id": "xxxxx", "span_id": "xxxxx", "parent_id": "0", "start": 1234567890, "duration": 12345, "error": 0, "metrics": {"_dd.agent_psr": 1.0}, "meta": {"function_arn": "arn:aws:lambda:sa-east-1:123456789012:function:java-integration-test-dev-hello_java11", "runtime-id": "00000000-0000-0000-0000-000000000000", "language": "jvm", "thread.name": "main", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "0.3.1", "thread.id": "1", "cold_start": "false", "resource_names": "Java-integration-test-dev-hello_Java11", "function_version": "$LATEST"}}]]} -{"traces": [[{"service": "aws.lambda", "name": "aws.lambda", "resource": "Java-integration-test-dev-hello_Java11", "trace_id": "xxxxx", "span_id": "xxxxx", "parent_id": "0", "start": 1234567890, "duration": 12345, "error": 0, "metrics": {"_dd.agent_psr": 1.0}, "meta": {"function_arn": "arn:aws:lambda:sa-east-1:123456789012:function:java-integration-test-dev-hello_java11", "runtime-id": "00000000-0000-0000-0000-000000000000", "language": "jvm", "thread.name": "main", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "0.3.1", "thread.id": "1", "cold_start": "false", "resource_names": "Java-integration-test-dev-hello_Java11", "function_version": "$LATEST"}}]]} -{"traces": [[{"service": "aws.lambda", "name": "aws.lambda", "resource": "Java-integration-test-dev-hello_Java11", "trace_id": "xxxxx", "span_id": "xxxxx", "parent_id": "0", "start": 1234567890, "duration": 12345, "error": 0, "metrics": {"_dd.agent_psr": 1.0}, "meta": {"function_arn": "arn:aws:lambda:sa-east-1:123456789012:function:java-integration-test-dev-hello_java11", "runtime-id": "00000000-0000-0000-0000-000000000000", "language": "jvm", "thread.name": "main", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "0.3.1", "thread.id": "1", "cold_start": "true", "resource_names": "Java-integration-test-dev-hello_Java11", "function_version": "$LATEST"}}]]} +{"m": "aws.lambda.enhanced.invocations", "v": 1.0, "t": ["memorysize:1024", "account_id:XXXX", "resource:Java-integration-test-dev-hello_Java11", "functionname:Java-integration-test-dev-hello_Java11", "region:sa-east-1", "datadog_lambda:0.3.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-hello_Java11", "functionname:Java-integration-test-dev-hello_Java11", "region:sa-east-1", "datadog_lambda:0.3.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-hello_Java11", "functionname:Java-integration-test-dev-hello_Java11", "region:sa-east-1", "datadog_lambda:0.3.2", "cold_start:true", "runtime:xxxx"], "e": 1234567890} +{"traces": [[{"service": "aws.lambda", "name": "aws.lambda", "resource": "Java-integration-test-dev-hello_Java11", "trace_id": "xxxxx", "span_id": "xxxxx", "parent_id": "0", "start": 1234567890, "duration": 12345, "error": 0, "metrics": {"_dd.agent_psr": 1.0}, "meta": {"functionname": "java-integration-test-dev-hello_java11", "function_arn": "arn:aws:lambda:sa-east-1:123456789012:function:java-integration-test-dev-hello_java11", "runtime-id": "00000000-0000-0000-0000-000000000000", "language": "jvm", "thread.name": "main", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "0.3.2", "thread.id": "1", "cold_start": "false", "resource_names": "Java-integration-test-dev-hello_Java11", "function_version": "$LATEST"}}]]} +{"traces": [[{"service": "aws.lambda", "name": "aws.lambda", "resource": "Java-integration-test-dev-hello_Java11", "trace_id": "xxxxx", "span_id": "xxxxx", "parent_id": "0", "start": 1234567890, "duration": 12345, "error": 0, "metrics": {"_dd.agent_psr": 1.0}, "meta": {"functionname": "java-integration-test-dev-hello_java11", "function_arn": "arn:aws:lambda:sa-east-1:123456789012:function:java-integration-test-dev-hello_java11", "runtime-id": "00000000-0000-0000-0000-000000000000", "language": "jvm", "thread.name": "main", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "0.3.2", "thread.id": "1", "cold_start": "false", "resource_names": "Java-integration-test-dev-hello_Java11", "function_version": "$LATEST"}}]]} +{"traces": [[{"service": "aws.lambda", "name": "aws.lambda", "resource": "Java-integration-test-dev-hello_Java11", "trace_id": "xxxxx", "span_id": "xxxxx", "parent_id": "0", "start": 1234567890, "duration": 12345, "error": 0, "metrics": {"_dd.agent_psr": 1.0}, "meta": {"functionname": "java-integration-test-dev-hello_java11", "function_arn": "arn:aws:lambda:sa-east-1:123456789012:function:java-integration-test-dev-hello_java11", "runtime-id": "00000000-0000-0000-0000-000000000000", "language": "jvm", "thread.name": "main", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "0.3.2", "thread.id": "1", "cold_start": "true", "resource_names": "Java-integration-test-dev-hello_Java11", "function_version": "$LATEST"}}]]} diff --git a/tests/testfunctions/snapshots/logs/hello_Java8.log b/tests/testfunctions/snapshots/logs/hello_Java8.log index 389feca..686c4d5 100644 --- a/tests/testfunctions/snapshots/logs/hello_Java8.log +++ b/tests/testfunctions/snapshots/logs/hello_Java8.log @@ -11,11 +11,11 @@ REPORT RequestId: XXXX Duration: XXXX ms Billed Duration: XXXX ms Memory Size: 1 START RequestId: XXXX Version: $LATEST START RequestId: XXXX Version: $LATEST START RequestId: XXXX Version: $LATEST -[dd.trace 1970-01-01 00:00:00 +0000] [dd-task-scheduler] INFO datadog.trace.agent.core.StatusLogger - DATADOG TRACER CONFIGURATION {"version":"0.80.0~a7d9f70a4","os_name":"Linux","os_version":"4.14.225-175.364.amzn2.x86_64","architecture":"amd64","lang":"jvm","lang_version":"1.8.0_282","jvm_vendor":"Amazon.com Inc.","jvm_version":"25.282-b08","java_class_version":"52.0","http_nonProxyHosts":"null","http_proxyHost":"null","enabled":true,"service":"lambdainternal.AWSLambda","agent_url":"http://localhost:8126","agent_error":true,"debug":false,"analytics_enabled":false,"sampling_rules":[{},{}],"priority_sampling_enabled":true,"logs_correlation_enabled":true,"profiling_enabled":false,"dd_version":"0.80.0~a7d9f70a4","health_checks_enabled":true,"configuration_file":"no config file present","runtime_id":"00000000-0000-0000-0000-000000000000","logging_settings":{"levelInBrackets":false,"dateTimeFormat":"'[dd.trace 'yyyy-MM-dd HH:mm:ss:SSS Z']'","logFile":"System.err","configurationFile":"simplelogger.properties","showShortLogName":false,"showDateTime":true,"showLogName":true,"showThreadName":true,"defaultLogLevel":"INFO","warnLevelString":"WARN","embedException":false}} +[dd.trace 1970-01-01 00:00:00 +0000] [dd-task-scheduler] INFO datadog.trace.agent.core.StatusLogger - DATADOG TRACER CONFIGURATION {"version":"0.80.0~a7d9f70a4","os_name":"Linux","os_version":"4.14.231-180.360.amzn2.x86_64","architecture":"amd64","lang":"jvm","lang_version":"1.8.0_292","jvm_vendor":"Amazon.com Inc.","jvm_version":"25.292-b10","java_class_version":"52.0","http_nonProxyHosts":"null","http_proxyHost":"null","enabled":true,"service":"lambdainternal.AWSLambda","agent_url":"http://localhost:8126","agent_error":true,"debug":false,"analytics_enabled":false,"sampling_rules":[{},{}],"priority_sampling_enabled":true,"logs_correlation_enabled":true,"profiling_enabled":false,"dd_version":"0.80.0~a7d9f70a4","health_checks_enabled":true,"configuration_file":"no config file present","runtime_id":"00000000-0000-0000-0000-000000000000","logging_settings":{"levelInBrackets":false,"dateTimeFormat":"'[dd.trace 'yyyy-MM-dd HH:mm:ss:SSS Z']'","logFile":"System.err","configurationFile":"simplelogger.properties","showShortLogName":false,"showDateTime":true,"showLogName":true,"showThreadName":true,"defaultLogLevel":"INFO","warnLevelString":"WARN","embedException":false}} [dd.trace 1970-01-01 00:00:00 +0000] [main] INFO datadog.trace.agent.common.writer.WriterFactory - Detected serverless environment. Using PrintingWriter -{"m": "aws.lambda.enhanced.invocations", "v": 1.0, "t": ["memorysize:1024", "account_id:XXXX", "resource:Java-integration-test-dev-hello_Java8", "functionname:Java-integration-test-dev-hello_Java8", "runtime:java1.8.0_282", "region:sa-east-1", "datadog_lambda:0.3.1", "cold_start:false"], "e": 1234567890} -{"m": "aws.lambda.enhanced.invocations", "v": 1.0, "t": ["memorysize:1024", "account_id:XXXX", "resource:Java-integration-test-dev-hello_Java8", "functionname:Java-integration-test-dev-hello_Java8", "runtime:java1.8.0_282", "region:sa-east-1", "datadog_lambda:0.3.1", "cold_start:false"], "e": 1234567890} -{"m": "aws.lambda.enhanced.invocations", "v": 1.0, "t": ["memorysize:1024", "account_id:XXXX", "resource:Java-integration-test-dev-hello_Java8", "functionname:Java-integration-test-dev-hello_Java8", "runtime:java1.8.0_282", "region:sa-east-1", "datadog_lambda:0.3.1", "cold_start:true"], "e": 1234567890} -{"traces": [[{"service": "aws.lambda", "name": "aws.lambda", "resource": "Java-integration-test-dev-hello_Java8", "trace_id": "xxxxx", "span_id": "xxxxx", "parent_id": "0", "start": 1234567890, "duration": 12345, "error": 0, "metrics": {"_dd.agent_psr": 1.0}, "meta": {"function_arn": "arn:aws:lambda:sa-east-1:123456789012:function:java-integration-test-dev-hello_java8", "runtime-id": "00000000-0000-0000-0000-000000000000", "language": "jvm", "thread.name": "main", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "0.3.1", "thread.id": "1", "cold_start": "false", "resource_names": "Java-integration-test-dev-hello_Java8", "function_version": "$LATEST"}}]]} -{"traces": [[{"service": "aws.lambda", "name": "aws.lambda", "resource": "Java-integration-test-dev-hello_Java8", "trace_id": "xxxxx", "span_id": "xxxxx", "parent_id": "0", "start": 1234567890, "duration": 12345, "error": 0, "metrics": {"_dd.agent_psr": 1.0}, "meta": {"function_arn": "arn:aws:lambda:sa-east-1:123456789012:function:java-integration-test-dev-hello_java8", "runtime-id": "00000000-0000-0000-0000-000000000000", "language": "jvm", "thread.name": "main", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "0.3.1", "thread.id": "1", "cold_start": "false", "resource_names": "Java-integration-test-dev-hello_Java8", "function_version": "$LATEST"}}]]} -{"traces": [[{"service": "aws.lambda", "name": "aws.lambda", "resource": "Java-integration-test-dev-hello_Java8", "trace_id": "xxxxx", "span_id": "xxxxx", "parent_id": "0", "start": 1234567890, "duration": 12345, "error": 0, "metrics": {"_dd.agent_psr": 1.0}, "meta": {"function_arn": "arn:aws:lambda:sa-east-1:123456789012:function:java-integration-test-dev-hello_java8", "runtime-id": "00000000-0000-0000-0000-000000000000", "language": "jvm", "thread.name": "main", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "0.3.1", "thread.id": "1", "cold_start": "true", "resource_names": "Java-integration-test-dev-hello_Java8", "function_version": "$LATEST"}}]]} +{"m": "aws.lambda.enhanced.invocations", "v": 1.0, "t": ["memorysize:1024", "account_id:XXXX", "resource:Java-integration-test-dev-hello_Java8", "functionname:Java-integration-test-dev-hello_Java8", "region:sa-east-1", "datadog_lambda:0.3.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-hello_Java8", "functionname:Java-integration-test-dev-hello_Java8", "region:sa-east-1", "datadog_lambda:0.3.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-hello_Java8", "functionname:Java-integration-test-dev-hello_Java8", "region:sa-east-1", "datadog_lambda:0.3.2", "cold_start:true", "runtime:xxxx"], "e": 1234567890} +{"traces": [[{"service": "aws.lambda", "name": "aws.lambda", "resource": "Java-integration-test-dev-hello_Java8", "trace_id": "xxxxx", "span_id": "xxxxx", "parent_id": "0", "start": 1234567890, "duration": 12345, "error": 0, "metrics": {"_dd.agent_psr": 1.0}, "meta": {"functionname": "java-integration-test-dev-hello_java8", "function_arn": "arn:aws:lambda:sa-east-1:123456789012:function:java-integration-test-dev-hello_java8", "runtime-id": "00000000-0000-0000-0000-000000000000", "language": "jvm", "thread.name": "main", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "0.3.2", "thread.id": "1", "cold_start": "false", "resource_names": "Java-integration-test-dev-hello_Java8", "function_version": "$LATEST"}}]]} +{"traces": [[{"service": "aws.lambda", "name": "aws.lambda", "resource": "Java-integration-test-dev-hello_Java8", "trace_id": "xxxxx", "span_id": "xxxxx", "parent_id": "0", "start": 1234567890, "duration": 12345, "error": 0, "metrics": {"_dd.agent_psr": 1.0}, "meta": {"functionname": "java-integration-test-dev-hello_java8", "function_arn": "arn:aws:lambda:sa-east-1:123456789012:function:java-integration-test-dev-hello_java8", "runtime-id": "00000000-0000-0000-0000-000000000000", "language": "jvm", "thread.name": "main", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "0.3.2", "thread.id": "1", "cold_start": "false", "resource_names": "Java-integration-test-dev-hello_Java8", "function_version": "$LATEST"}}]]} +{"traces": [[{"service": "aws.lambda", "name": "aws.lambda", "resource": "Java-integration-test-dev-hello_Java8", "trace_id": "xxxxx", "span_id": "xxxxx", "parent_id": "0", "start": 1234567890, "duration": 12345, "error": 0, "metrics": {"_dd.agent_psr": 1.0}, "meta": {"functionname": "java-integration-test-dev-hello_java8", "function_arn": "arn:aws:lambda:sa-east-1:123456789012:function:java-integration-test-dev-hello_java8", "runtime-id": "00000000-0000-0000-0000-000000000000", "language": "jvm", "thread.name": "main", "request_id": "00000000-0000-0000-0000-000000000000", "datadog_lambda": "0.3.2", "thread.id": "1", "cold_start": "true", "resource_names": "Java-integration-test-dev-hello_Java8", "function_version": "$LATEST"}}]]}