From 331674189c9aed3af32b78e74d1227d8732151ac Mon Sep 17 00:00:00 2001 From: AJ Stuyvenberg Date: Tue, 21 Nov 2023 13:02:02 -0500 Subject: [PATCH 1/7] feat: Drop py3.7 from build script as we stopped publishing it a while ago --- scripts/build_layers.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/scripts/build_layers.sh b/scripts/build_layers.sh index 976ba5d1..3ccf07da 100755 --- a/scripts/build_layers.sh +++ b/scripts/build_layers.sh @@ -7,14 +7,14 @@ # Builds datadog-lambda-python layers for Lambda functions -# Usage: PYTHON_VERSION=3.7 ./build_layers.sh +# Usage: PYTHON_VERSION=3.11 ./build_layers.sh # If PYTHON_VERSION is not specified, all versions will be built. set -e LAYER_DIR=".layers" LAYER_FILES_PREFIX="datadog_lambda_py" -AVAILABLE_PYTHON_VERSIONS=("3.7" "3.8" "3.9" "3.10" "3.11") +AVAILABLE_PYTHON_VERSIONS=("3.8" "3.9" "3.10" "3.11") # Determine which Python versions to build layers for if [ -z "$PYTHON_VERSION" ]; then @@ -68,10 +68,8 @@ mkdir $LAYER_DIR for python_version in "${PYTHON_VERSIONS[@]}" do - if [ "$python_version" != "3.7" ]; then - echo "Building layer for Python ${python_version} arch=arm64" - docker_build_zip ${python_version} $LAYER_DIR/${LAYER_FILES_PREFIX}-arm64-${python_version}.zip arm64 - fi + echo "Building layer for Python ${python_version} arch=arm64" + docker_build_zip ${python_version} $LAYER_DIR/${LAYER_FILES_PREFIX}-arm64-${python_version}.zip arm64 echo "Building layer for Python ${python_version} arch=amd64" docker_build_zip ${python_version} $LAYER_DIR/${LAYER_FILES_PREFIX}-amd64-${python_version}.zip amd64 done From 3a11383c0d0afc64345c6915580dd1bc34f2dc99 Mon Sep 17 00:00:00 2001 From: AJ Stuyvenberg Date: Tue, 21 Nov 2023 13:16:19 -0500 Subject: [PATCH 2/7] feat: more drops --- scripts/run_integration_tests.sh | 5 ++--- scripts/sign_layers.sh | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/run_integration_tests.sh b/scripts/run_integration_tests.sh index ebda6fde..44e78caf 100755 --- a/scripts/run_integration_tests.sh +++ b/scripts/run_integration_tests.sh @@ -11,7 +11,7 @@ set -e # These values need to be in sync with serverless.yml, where there needs to be a function # defined for every handler_runtime combination LAMBDA_HANDLERS=("async-metrics" "sync-metrics") -RUNTIMES=("python37" "python38" "python39" "python310" "python311") +RUNTIMES=("python38" "python39" "python310" "python311") LOGS_WAIT_SECONDS=20 @@ -28,13 +28,12 @@ mismatch_found=false # [0]: serverless runtime name # [1]: python version # [2]: random 8-character ID to avoid collisions with other runs -python37=("python3.7" "3.7" $(xxd -l 4 -c 4 -p < /dev/random)) python38=("python3.8" "3.8" $(xxd -l 4 -c 4 -p < /dev/random)) python39=("python3.9" "3.9" $(xxd -l 4 -c 4 -p < /dev/random)) python310=("python3.10" "3.10" $(xxd -l 4 -c 4 -p < /dev/random)) python311=("python3.11" "3.11" $(xxd -l 4 -c 4 -p < /dev/random)) -PARAMETERS_SETS=("python37" "python38" "python39" "python310" "python311") +PARAMETERS_SETS=("python38" "python39" "python310" "python311") if [ -z "$RUNTIME_PARAM" ]; then echo "Python version not specified, running for all python versions." diff --git a/scripts/sign_layers.sh b/scripts/sign_layers.sh index 3c9aa662..c875f6ad 100755 --- a/scripts/sign_layers.sh +++ b/scripts/sign_layers.sh @@ -9,7 +9,6 @@ set -e LAYER_DIR=".layers" LAYER_FILES=( - "datadog_lambda_py-amd64-3.7.zip" "datadog_lambda_py-amd64-3.8.zip" "datadog_lambda_py-arm64-3.8.zip" "datadog_lambda_py-amd64-3.9.zip" From 4513e573e4c7bd351ea19bc4e0f957b0d4289b16 Mon Sep 17 00:00:00 2001 From: AJ Stuyvenberg Date: Tue, 12 Dec 2023 09:25:52 -0500 Subject: [PATCH 3/7] feat: Remove python 3.7 --- scripts/add_new_region.sh | 2 - scripts/list_layers.sh | 1 - scripts/publish_layers.sh | 3 - .../snapshots/logs/async-metrics_python37.log | 1498 --------------- .../snapshots/logs/sync-metrics_python37.log | 1669 ----------------- tests/test_tags.py | 4 +- 6 files changed, 2 insertions(+), 3175 deletions(-) delete mode 100644 tests/integration/snapshots/logs/async-metrics_python37.log delete mode 100644 tests/integration/snapshots/logs/sync-metrics_python37.log diff --git a/scripts/add_new_region.sh b/scripts/add_new_region.sh index 7d113446..434632d9 100755 --- a/scripts/add_new_region.sh +++ b/scripts/add_new_region.sh @@ -13,7 +13,6 @@ set -e OLD_REGION='us-east-1' LAYER_NAMES=( - "Datadog-Python37" "Datadog-Python38" "Datadog-Python38-ARM" "Datadog-Python39" @@ -26,7 +25,6 @@ LAYER_NAMES=( "Datadog-Python312-ARM" ) PYTHON_VERSIONS_FOR_AWS_CLI=( - "python3.7" "python3.8" "python3.8" "python3.9" diff --git a/scripts/list_layers.sh b/scripts/list_layers.sh index 25058c5b..8a49cde4 100755 --- a/scripts/list_layers.sh +++ b/scripts/list_layers.sh @@ -11,7 +11,6 @@ set -e LAYER_NAMES=( - "Datadog-Python37" "Datadog-Python38" "Datadog-Python38-ARM" "Datadog-Python39" diff --git a/scripts/publish_layers.sh b/scripts/publish_layers.sh index 7541d47d..3deec0b4 100755 --- a/scripts/publish_layers.sh +++ b/scripts/publish_layers.sh @@ -14,7 +14,6 @@ set -e trap "pkill -P $$; exit 1;" INT PYTHON_VERSIONS_FOR_AWS_CLI=( - "python3.7" "python3.8" "python3.8" "python3.9" @@ -27,7 +26,6 @@ PYTHON_VERSIONS_FOR_AWS_CLI=( "python3.12" ) LAYER_PATHS=( - ".layers/datadog_lambda_py-amd64-3.7.zip" ".layers/datadog_lambda_py-amd64-3.8.zip" ".layers/datadog_lambda_py-arm64-3.8.zip" ".layers/datadog_lambda_py-amd64-3.9.zip" @@ -40,7 +38,6 @@ LAYER_PATHS=( ".layers/datadog_lambda_py-arm64-3.12.zip" ) AVAILABLE_LAYERS=( - "Datadog-Python37" "Datadog-Python38" "Datadog-Python38-ARM" "Datadog-Python39" diff --git a/tests/integration/snapshots/logs/async-metrics_python37.log b/tests/integration/snapshots/logs/async-metrics_python37.log deleted file mode 100644 index bdde3f9e..00000000 --- a/tests/integration/snapshots/logs/async-metrics_python37.log +++ /dev/null @@ -1,1498 +0,0 @@ -INIT_START Runtime Version: python:3.7.vX Runtime Version ARN: arn:aws:lambda:eu-west-1:XXXX:eu-west-1 -START -{ - "m": "aws.lambda.enhanced.invocations", - "v": 1, - "e": XXXX, - "t": [ - "region:eu-west-1", - "account_id:XXXX", - "functionname:integration-tests-python-XXXX-async-metrics_python37", - "resource:integration-tests-python-XXXX-async-metrics_python37", - "cold_start:true", - "memorysize:1024", - "runtime:python3.7", - "datadog_lambda:vXX", - "dd_lambda_layer:datadog-python37_X.X.X" - ] -} -{ - "m": "hello.dog", - "v": 1, - "e": XXXX, - "t": [ - "team:serverless", - "role:hello", - "dd_lambda_layer:datadog-python37_X.X.X" - ] -} -{ - "m": "tests.integration.count", - "v": 21, - "e": XXXX, - "t": [ - "test:integration", - "role:hello", - "dd_lambda_layer:datadog-python37_X.X.X" - ] -} -HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX -HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX -{ - "traces": [ - [ - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "XXXX.execute-api.us-east-2.amazonaws.com", - "resource": "GET /", - "name": "aws.apigateway", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "runtime-id": "XXXX", - "_dd.origin": "lambda", - "operation_name": "aws.apigateway.rest", - "http.url": "XXXX.execute-api.us-east-2.amazonaws.com/", - "endpoint": "/", - "http.method": "GET", - "resource_names": "GET /", - "apiid": "XXXX", - "apiname": "XXXX", - "stage": "Prod", - "request_id": "XXXX", - "_inferred_span.synchronicity": "sync", - "_inferred_span.tag_source": "self", - "http.status_code": "200", - "peer.service": "integration-tests-python", - "_dd.p.dm": "-0", - "_dd.p.tid": "XXXX", - "language": "python", - "_dd.peer.service.source": "peer.service", - "_dd.base_service": "integration-tests-python" - }, - "metrics": { - "process_id": XXXX, - "_dd.top_level": 1, - "_sampling_priority_v1": 1 - }, - "type": "http" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "aws.lambda", - "resource": "integration-tests-python-XXXX-async-metrics_python37", - "name": "aws.lambda", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.origin": "lambda", - "cold_start": "true", - "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python37", - "function_version": "$LATEST", - "request_id": "XXXX", - "resource_names": "integration-tests-python-XXXX-async-metrics_python37", - "functionname": "integration-tests-python-XXXX-async-metrics_python37", - "datadog_lambda": "X.X.X", - "dd_trace": "X.X.X", - "span.name": "aws.lambda", - "function_trigger.event_source": "api-gateway", - "function_trigger.event_source_arn": "XXXX", - "http.url": "XXXX.execute-api.us-east-2.amazonaws.com", - "http.url_details.path": "/Prod/", - "http.method": "GET", - "http.status_code": "200", - "_dd.base_service": "integration-tests-python" - }, - "metrics": { - "_dd.top_level": 1 - }, - "type": "serverless" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "GET", - "http.url": "https://datadoghq.com/", - "out.host": "datadoghq.com", - "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" - }, - "metrics": { - "_dd.measured": 1, - "_dd.top_level": 1 - }, - "type": "http" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.p.tid": "XXXX", - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "GET", - "http.url": "https://www.datadoghq.com/", - "out.host": "www.datadoghq.com", - "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" - }, - "metrics": { - "_dd.measured": 1 - }, - "type": "http" - } - ] - ] -} -END Duration: XXXX ms (init: XXXX ms) Memory Used: XXXX MB -START -{ - "m": "aws.lambda.enhanced.invocations", - "v": 1, - "e": XXXX, - "t": [ - "region:eu-west-1", - "account_id:XXXX", - "functionname:integration-tests-python-XXXX-async-metrics_python37", - "resource:integration-tests-python-XXXX-async-metrics_python37", - "cold_start:false", - "memorysize:1024", - "runtime:python3.7", - "datadog_lambda:vXX", - "dd_lambda_layer:datadog-python37_X.X.X" - ] -} -{ - "m": "hello.dog", - "v": 1, - "e": XXXX, - "t": [ - "team:serverless", - "role:hello", - "dd_lambda_layer:datadog-python37_X.X.X" - ] -} -{ - "m": "tests.integration.count", - "v": 21, - "e": XXXX, - "t": [ - "test:integration", - "role:hello", - "dd_lambda_layer:datadog-python37_X.X.X" - ] -} -HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX -HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX -{ - "traces": [ - [ - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "dynamodb", - "resource": "ExampleTableWithStream", - "name": "aws.dynamodb", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "runtime-id": "XXXX", - "_dd.origin": "lambda", - "operation_name": "aws.dynamodb", - "resource_names": "ExampleTableWithStream", - "tablename": "ExampleTableWithStream", - "event_source_arn": "arn:aws:dynamodb:us-east-1:XXXX:us-east-1/ExampleTableWithStream/stream/2015-06-27T00:48:05.899", - "event_id": "XXXX", - "event_name": "INSERT", - "event_version": "1.1", - "stream_view_type": "NEW_AND_OLD_IMAGES", - "size_bytes": "26", - "_inferred_span.synchronicity": "async", - "_inferred_span.tag_source": "self", - "peer.service": "integration-tests-python", - "_dd.p.dm": "-0", - "_dd.p.tid": "XXXX", - "language": "python", - "_dd.peer.service.source": "peer.service", - "_dd.base_service": "integration-tests-python" - }, - "metrics": { - "process_id": XXXX, - "_dd.top_level": 1, - "_sampling_priority_v1": 1 - }, - "type": "web" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "aws.lambda", - "resource": "integration-tests-python-XXXX-async-metrics_python37", - "name": "aws.lambda", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.origin": "lambda", - "cold_start": "false", - "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python37", - "function_version": "$LATEST", - "request_id": "XXXX", - "resource_names": "integration-tests-python-XXXX-async-metrics_python37", - "functionname": "integration-tests-python-XXXX-async-metrics_python37", - "datadog_lambda": "X.X.X", - "dd_trace": "X.X.X", - "span.name": "aws.lambda", - "function_trigger.event_source": "dynamodb", - "function_trigger.event_source_arn": "XXXX", - "_dd.base_service": "integration-tests-python" - }, - "metrics": { - "_dd.top_level": 1 - }, - "type": "serverless" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "GET", - "http.url": "https://datadoghq.com/", - "out.host": "datadoghq.com", - "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" - }, - "metrics": { - "_dd.measured": 1, - "_dd.top_level": 1 - }, - "type": "http" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.p.tid": "XXXX", - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "GET", - "http.url": "https://www.datadoghq.com/", - "out.host": "www.datadoghq.com", - "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" - }, - "metrics": { - "_dd.measured": 1 - }, - "type": "http" - } - ] - ] -} -END Duration: XXXX ms Memory Used: XXXX MB -START -{ - "m": "aws.lambda.enhanced.invocations", - "v": 1, - "e": XXXX, - "t": [ - "region:eu-west-1", - "account_id:XXXX", - "functionname:integration-tests-python-XXXX-async-metrics_python37", - "resource:integration-tests-python-XXXX-async-metrics_python37", - "cold_start:false", - "memorysize:1024", - "runtime:python3.7", - "datadog_lambda:vXX", - "dd_lambda_layer:datadog-python37_X.X.X" - ] -} -{ - "m": "hello.dog", - "v": 1, - "e": XXXX, - "t": [ - "team:serverless", - "role:hello", - "dd_lambda_layer:datadog-python37_X.X.X" - ] -} -{ - "m": "tests.integration.count", - "v": 21, - "e": XXXX, - "t": [ - "test:integration", - "role:hello", - "dd_lambda_layer:datadog-python37_X.X.X" - ] -} -HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX -HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX -{ - "traces": [ - [ - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "eventbridge", - "resource": "eventbridge.custom.event.sender", - "name": "aws.eventbridge", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "runtime-id": "XXXX", - "_dd.origin": "lambda", - "operation_name": "aws.eventbridge", - "resource_names": "eventbridge.custom.event.sender", - "detail_type": "testdetail", - "_inferred_span.synchronicity": "async", - "_inferred_span.tag_source": "self", - "peer.service": "integration-tests-python", - "_dd.p.dm": "-0", - "_dd.p.tid": "XXXX", - "language": "python", - "_dd.peer.service.source": "peer.service", - "_dd.base_service": "integration-tests-python" - }, - "metrics": { - "process_id": XXXX, - "_dd.top_level": 1, - "_sampling_priority_v1": 1 - }, - "type": "web" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "aws.lambda", - "resource": "integration-tests-python-XXXX-async-metrics_python37", - "name": "aws.lambda", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.origin": "lambda", - "cold_start": "false", - "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python37", - "function_version": "$LATEST", - "request_id": "XXXX", - "resource_names": "integration-tests-python-XXXX-async-metrics_python37", - "functionname": "integration-tests-python-XXXX-async-metrics_python37", - "datadog_lambda": "X.X.X", - "dd_trace": "X.X.X", - "span.name": "aws.lambda", - "function_trigger.event_source": "eventbridge", - "_dd.base_service": "integration-tests-python" - }, - "metrics": { - "_dd.top_level": 1 - }, - "type": "serverless" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "GET", - "http.url": "https://datadoghq.com/", - "out.host": "datadoghq.com", - "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" - }, - "metrics": { - "_dd.measured": 1, - "_dd.top_level": 1 - }, - "type": "http" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.p.tid": "XXXX", - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "GET", - "http.url": "https://www.datadoghq.com/", - "out.host": "www.datadoghq.com", - "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" - }, - "metrics": { - "_dd.measured": 1 - }, - "type": "http" - } - ] - ] -} -END Duration: XXXX ms Memory Used: XXXX MB -START -{ - "m": "aws.lambda.enhanced.invocations", - "v": 1, - "e": XXXX, - "t": [ - "region:eu-west-1", - "account_id:XXXX", - "functionname:integration-tests-python-XXXX-async-metrics_python37", - "resource:integration-tests-python-XXXX-async-metrics_python37", - "cold_start:false", - "memorysize:1024", - "runtime:python3.7", - "datadog_lambda:vXX", - "dd_lambda_layer:datadog-python37_X.X.X" - ] -} -{ - "m": "hello.dog", - "v": 1, - "e": XXXX, - "t": [ - "team:serverless", - "role:hello", - "dd_lambda_layer:datadog-python37_X.X.X" - ] -} -{ - "m": "tests.integration.count", - "v": 21, - "e": XXXX, - "t": [ - "test:integration", - "role:hello", - "dd_lambda_layer:datadog-python37_X.X.X" - ] -} -HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX -HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX -{ - "traces": [ - [ - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "XXXX.execute-api.eu-west-1.amazonaws.com", - "resource": "GET /httpapi/get", - "name": "aws.httpapi", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "runtime-id": "XXXX", - "_dd.origin": "lambda", - "operation_name": "aws.httpapi", - "endpoint": "/httpapi/get", - "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com/httpapi/get", - "http.method": "GET", - "http.protocol": "HTTP/1.1", - "http.source_ip": "XXXX", - "http.user_agent": "XXXX/7.64.1", - "resource_names": "GET /httpapi/get", - "request_id": "XXXX", - "apiid": "XXXX", - "apiname": "XXXX", - "stage": "$default", - "_inferred_span.synchronicity": "sync", - "_inferred_span.tag_source": "self", - "http.status_code": "200", - "peer.service": "integration-tests-python", - "_dd.p.dm": "-0", - "_dd.p.tid": "XXXX", - "language": "python", - "_dd.peer.service.source": "peer.service", - "_dd.base_service": "integration-tests-python" - }, - "metrics": { - "process_id": XXXX, - "_dd.top_level": 1, - "_sampling_priority_v1": 1 - }, - "type": "http" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "aws.lambda", - "resource": "integration-tests-python-XXXX-async-metrics_python37", - "name": "aws.lambda", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.origin": "lambda", - "cold_start": "false", - "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python37", - "function_version": "$LATEST", - "request_id": "XXXX", - "resource_names": "integration-tests-python-XXXX-async-metrics_python37", - "functionname": "integration-tests-python-XXXX-async-metrics_python37", - "datadog_lambda": "X.X.X", - "dd_trace": "X.X.X", - "span.name": "aws.lambda", - "function_trigger.event_source": "api-gateway", - "function_trigger.event_source_arn": "XXXX$default", - "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com", - "http.url_details.path": "/httpapi/get", - "http.method": "GET", - "http.status_code": "200", - "_dd.base_service": "integration-tests-python" - }, - "metrics": { - "_dd.top_level": 1 - }, - "type": "serverless" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "GET", - "http.url": "https://datadoghq.com/", - "out.host": "datadoghq.com", - "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" - }, - "metrics": { - "_dd.measured": 1, - "_dd.top_level": 1 - }, - "type": "http" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.p.tid": "XXXX", - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "GET", - "http.url": "https://www.datadoghq.com/", - "out.host": "www.datadoghq.com", - "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" - }, - "metrics": { - "_dd.measured": 1 - }, - "type": "http" - } - ] - ] -} -END Duration: XXXX ms Memory Used: XXXX MB -START -{ - "m": "aws.lambda.enhanced.invocations", - "v": 1, - "e": XXXX, - "t": [ - "region:eu-west-1", - "account_id:XXXX", - "functionname:integration-tests-python-XXXX-async-metrics_python37", - "resource:integration-tests-python-XXXX-async-metrics_python37", - "cold_start:false", - "memorysize:1024", - "runtime:python3.7", - "datadog_lambda:vXX", - "dd_lambda_layer:datadog-python37_X.X.X" - ] -} -{ - "m": "hello.dog", - "v": 1, - "e": XXXX, - "t": [ - "team:serverless", - "role:hello", - "dd_lambda_layer:datadog-python37_X.X.X" - ] -} -{ - "m": "tests.integration.count", - "v": 21, - "e": XXXX, - "t": [ - "test:integration", - "role:hello", - "dd_lambda_layer:datadog-python37_X.X.X" - ] -} -HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX -HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX -{ - "traces": [ - [ - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "kinesis", - "resource": "EXAMPLE", - "name": "aws.kinesis", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "runtime-id": "XXXX", - "_dd.origin": "lambda", - "operation_name": "aws.kinesis", - "resource_names": "EXAMPLE", - "streamname": "EXAMPLE", - "shardid": "shardId-XXXX", - "event_source_arn": "arn:aws:kinesis:EXAMPLE", - "event_id": "XXXX", - "event_name": "aws:kinesis:record", - "event_version": "1.0", - "partition_key": "XXXX", - "_inferred_span.synchronicity": "async", - "_inferred_span.tag_source": "self", - "peer.service": "integration-tests-python", - "_dd.p.dm": "-0", - "_dd.p.tid": "XXXX", - "language": "python", - "_dd.peer.service.source": "peer.service", - "_dd.base_service": "integration-tests-python" - }, - "metrics": { - "process_id": XXXX, - "_dd.top_level": 1, - "_sampling_priority_v1": 1 - }, - "type": "web" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "aws.lambda", - "resource": "integration-tests-python-XXXX-async-metrics_python37", - "name": "aws.lambda", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.origin": "lambda", - "cold_start": "false", - "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python37", - "function_version": "$LATEST", - "request_id": "XXXX", - "resource_names": "integration-tests-python-XXXX-async-metrics_python37", - "functionname": "integration-tests-python-XXXX-async-metrics_python37", - "datadog_lambda": "X.X.X", - "dd_trace": "X.X.X", - "span.name": "aws.lambda", - "function_trigger.event_source": "kinesis", - "function_trigger.event_source_arn": "XXXX", - "_dd.base_service": "integration-tests-python" - }, - "metrics": { - "_dd.top_level": 1 - }, - "type": "serverless" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "GET", - "http.url": "https://datadoghq.com/", - "out.host": "datadoghq.com", - "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" - }, - "metrics": { - "_dd.measured": 1, - "_dd.top_level": 1 - }, - "type": "http" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.p.tid": "XXXX", - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "GET", - "http.url": "https://www.datadoghq.com/", - "out.host": "www.datadoghq.com", - "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" - }, - "metrics": { - "_dd.measured": 1 - }, - "type": "http" - } - ] - ] -} -END Duration: XXXX ms Memory Used: XXXX MB -START -{ - "m": "aws.lambda.enhanced.invocations", - "v": 1, - "e": XXXX, - "t": [ - "region:eu-west-1", - "account_id:XXXX", - "functionname:integration-tests-python-XXXX-async-metrics_python37", - "resource:integration-tests-python-XXXX-async-metrics_python37", - "cold_start:false", - "memorysize:1024", - "runtime:python3.7", - "datadog_lambda:vXX", - "dd_lambda_layer:datadog-python37_X.X.X" - ] -} -{ - "m": "hello.dog", - "v": 1, - "e": XXXX, - "t": [ - "team:serverless", - "role:hello", - "dd_lambda_layer:datadog-python37_X.X.X" - ] -} -{ - "m": "tests.integration.count", - "v": 21, - "e": XXXX, - "t": [ - "test:integration", - "role:hello", - "dd_lambda_layer:datadog-python37_X.X.X" - ] -} -HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX -HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX -{ - "traces": [ - [ - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "s3", - "resource": "example-bucket", - "name": "aws.s3", - "error": 0, - "meta": { - "runtime-id": "XXXX", - "_dd.origin": "lambda", - "operation_name": "aws.s3", - "resource_names": "example-bucket", - "event_name": "ObjectCreated:Put", - "bucketname": "example-bucket", - "bucket_arn": "arn:aws:s3:::example-bucket", - "object_key": "test/key", - "object_size": "1024", - "object_etag": "XXXX", - "_inferred_span.synchronicity": "async", - "_inferred_span.tag_source": "self", - "peer.service": "integration-tests-python", - "_dd.p.dm": "-0", - "_dd.p.tid": "XXXX", - "language": "python", - "_dd.peer.service.source": "peer.service", - "_dd.base_service": "integration-tests-python" - }, - "metrics": { - "process_id": XXXX, - "_dd.top_level": 1, - "_sampling_priority_v1": 1 - }, - "type": "web" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "aws.lambda", - "resource": "integration-tests-python-XXXX-async-metrics_python37", - "name": "aws.lambda", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.origin": "lambda", - "cold_start": "false", - "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python37", - "function_version": "$LATEST", - "request_id": "XXXX", - "resource_names": "integration-tests-python-XXXX-async-metrics_python37", - "functionname": "integration-tests-python-XXXX-async-metrics_python37", - "datadog_lambda": "X.X.X", - "dd_trace": "X.X.X", - "span.name": "aws.lambda", - "function_trigger.event_source": "s3", - "function_trigger.event_source_arn": "XXXX", - "_dd.base_service": "integration-tests-python" - }, - "metrics": { - "_dd.top_level": 1 - }, - "type": "serverless" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "GET", - "http.url": "https://datadoghq.com/", - "out.host": "datadoghq.com", - "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" - }, - "metrics": { - "_dd.measured": 1, - "_dd.top_level": 1 - }, - "type": "http" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.p.tid": "XXXX", - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "GET", - "http.url": "https://www.datadoghq.com/", - "out.host": "www.datadoghq.com", - "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" - }, - "metrics": { - "_dd.measured": 1 - }, - "type": "http" - } - ] - ] -} -END Duration: XXXX ms Memory Used: XXXX MB -START -{ - "m": "aws.lambda.enhanced.invocations", - "v": 1, - "e": XXXX, - "t": [ - "region:eu-west-1", - "account_id:XXXX", - "functionname:integration-tests-python-XXXX-async-metrics_python37", - "resource:integration-tests-python-XXXX-async-metrics_python37", - "cold_start:false", - "memorysize:1024", - "runtime:python3.7", - "datadog_lambda:vXX", - "dd_lambda_layer:datadog-python37_X.X.X" - ] -} -{ - "m": "hello.dog", - "v": 1, - "e": XXXX, - "t": [ - "team:serverless", - "role:hello", - "dd_lambda_layer:datadog-python37_X.X.X" - ] -} -{ - "m": "tests.integration.count", - "v": 21, - "e": XXXX, - "t": [ - "test:integration", - "role:hello", - "dd_lambda_layer:datadog-python37_X.X.X" - ] -} -HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX -HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX -{ - "traces": [ - [ - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "sns", - "resource": "sns-lambda", - "name": "aws.sns", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "runtime-id": "XXXX", - "_dd.origin": "lambda", - "operation_name": "aws.sns", - "resource_names": "sns-lambda", - "topicname": "sns-lambda", - "topic_arn": "arn:aws:sns:us-east-2:XXXX:us-east-2-lambda", - "message_id": "XXXX", - "type": "Notification", - "subject": "TestInvoke", - "_inferred_span.synchronicity": "async", - "_inferred_span.tag_source": "self", - "peer.service": "integration-tests-python", - "_dd.p.dm": "-0", - "_dd.p.tid": "XXXX", - "language": "python", - "_dd.peer.service.source": "peer.service", - "_dd.base_service": "integration-tests-python" - }, - "metrics": { - "process_id": XXXX, - "_dd.top_level": 1, - "_sampling_priority_v1": 1 - }, - "type": "web" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "aws.lambda", - "resource": "integration-tests-python-XXXX-async-metrics_python37", - "name": "aws.lambda", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.origin": "lambda", - "cold_start": "false", - "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python37", - "function_version": "$LATEST", - "request_id": "XXXX", - "resource_names": "integration-tests-python-XXXX-async-metrics_python37", - "functionname": "integration-tests-python-XXXX-async-metrics_python37", - "datadog_lambda": "X.X.X", - "dd_trace": "X.X.X", - "span.name": "aws.lambda", - "function_trigger.event_source": "sns", - "function_trigger.event_source_arn": "XXXX", - "_dd.base_service": "integration-tests-python" - }, - "metrics": { - "_dd.top_level": 1 - }, - "type": "serverless" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "GET", - "http.url": "https://datadoghq.com/", - "out.host": "datadoghq.com", - "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" - }, - "metrics": { - "_dd.measured": 1, - "_dd.top_level": 1 - }, - "type": "http" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.p.tid": "XXXX", - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "GET", - "http.url": "https://www.datadoghq.com/", - "out.host": "www.datadoghq.com", - "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" - }, - "metrics": { - "_dd.measured": 1 - }, - "type": "http" - } - ] - ] -} -END Duration: XXXX ms Memory Used: XXXX MB -START -{ - "m": "aws.lambda.enhanced.invocations", - "v": 1, - "e": XXXX, - "t": [ - "region:eu-west-1", - "account_id:XXXX", - "functionname:integration-tests-python-XXXX-async-metrics_python37", - "resource:integration-tests-python-XXXX-async-metrics_python37", - "cold_start:false", - "memorysize:1024", - "runtime:python3.7", - "datadog_lambda:vXX", - "dd_lambda_layer:datadog-python37_X.X.X" - ] -} -{ - "m": "hello.dog", - "v": 1, - "e": XXXX, - "t": [ - "team:serverless", - "role:hello", - "dd_lambda_layer:datadog-python37_X.X.X" - ] -} -{ - "m": "tests.integration.count", - "v": 21, - "e": XXXX, - "t": [ - "test:integration", - "role:hello", - "dd_lambda_layer:datadog-python37_X.X.X" - ] -} -HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX -HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX -{ - "traces": [ - [ - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "sqs", - "resource": "my-queue", - "name": "aws.sqs", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "runtime-id": "XXXX", - "_dd.origin": "lambda", - "operation_name": "aws.sqs", - "resource_names": "my-queue", - "queuename": "my-queue", - "event_source_arn": "arn:aws:sqs:us-east-2:XXXX:us-east-2-queue", - "receipt_handle": "AQEBwJnKyrHigUMZj6rYigCgxlaS3SLy0a...", - "sender_id": "AIDAIENQZJOLO23YVJ4VO", - "_inferred_span.synchronicity": "async", - "_inferred_span.tag_source": "self", - "peer.service": "integration-tests-python", - "_dd.p.dm": "-0", - "_dd.p.tid": "XXXX", - "language": "python", - "_dd.peer.service.source": "peer.service", - "_dd.base_service": "integration-tests-python" - }, - "metrics": { - "process_id": XXXX, - "_dd.top_level": 1, - "_sampling_priority_v1": 1 - }, - "type": "web" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "aws.lambda", - "resource": "integration-tests-python-XXXX-async-metrics_python37", - "name": "aws.lambda", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.origin": "lambda", - "cold_start": "false", - "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python37", - "function_version": "$LATEST", - "request_id": "XXXX", - "resource_names": "integration-tests-python-XXXX-async-metrics_python37", - "functionname": "integration-tests-python-XXXX-async-metrics_python37", - "datadog_lambda": "X.X.X", - "dd_trace": "X.X.X", - "span.name": "aws.lambda", - "function_trigger.event_source": "sqs", - "function_trigger.event_source_arn": "XXXX", - "_dd.base_service": "integration-tests-python" - }, - "metrics": { - "_dd.top_level": 1 - }, - "type": "serverless" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "GET", - "http.url": "https://datadoghq.com/", - "out.host": "datadoghq.com", - "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" - }, - "metrics": { - "_dd.measured": 1, - "_dd.top_level": 1 - }, - "type": "http" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.p.tid": "XXXX", - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "GET", - "http.url": "https://www.datadoghq.com/", - "out.host": "www.datadoghq.com", - "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" - }, - "metrics": { - "_dd.measured": 1 - }, - "type": "http" - } - ] - ] -} -END Duration: XXXX ms Memory Used: XXXX MB -START -{ - "m": "aws.lambda.enhanced.invocations", - "v": 1, - "e": XXXX, - "t": [ - "region:eu-west-1", - "account_id:XXXX", - "functionname:integration-tests-python-XXXX-async-metrics_python37", - "resource:integration-tests-python-XXXX-async-metrics_python37", - "cold_start:false", - "memorysize:1024", - "runtime:python3.7", - "datadog_lambda:vXX", - "dd_lambda_layer:datadog-python37_X.X.X" - ] -} -{ - "m": "hello.dog", - "v": 1, - "e": XXXX, - "t": [ - "team:serverless", - "role:hello", - "dd_lambda_layer:datadog-python37_X.X.X" - ] -} -{ - "m": "tests.integration.count", - "v": 21, - "e": XXXX, - "t": [ - "test:integration", - "role:hello", - "dd_lambda_layer:datadog-python37_X.X.X" - ] -} -HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX -HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX -{ - "traces": [ - [ - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "XXXX.execute-api.eu-west-1.amazonaws.com", - "resource": "$default", - "name": "aws.apigateway.websocket", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "runtime-id": "XXXX", - "_dd.origin": "lambda", - "operation_name": "aws.apigateway.websocket", - "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com$default", - "endpoint": "$default", - "resource_names": "$default", - "apiid": "XXXX", - "apiname": "XXXX", - "stage": "dev", - "request_id": "XXXX", - "connection_id": "XXXX=", - "event_type": "MESSAGE", - "message_direction": "IN", - "_inferred_span.synchronicity": "sync", - "_inferred_span.tag_source": "self", - "http.status_code": "200", - "peer.service": "integration-tests-python", - "_dd.p.dm": "-0", - "_dd.p.tid": "XXXX", - "language": "python", - "_dd.peer.service.source": "peer.service", - "_dd.base_service": "integration-tests-python" - }, - "metrics": { - "process_id": XXXX, - "_dd.top_level": 1, - "_sampling_priority_v1": 1 - }, - "type": "web" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "aws.lambda", - "resource": "integration-tests-python-XXXX-async-metrics_python37", - "name": "aws.lambda", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.origin": "lambda", - "cold_start": "false", - "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python37", - "function_version": "$LATEST", - "request_id": "XXXX", - "resource_names": "integration-tests-python-XXXX-async-metrics_python37", - "functionname": "integration-tests-python-XXXX-async-metrics_python37", - "datadog_lambda": "X.X.X", - "dd_trace": "X.X.X", - "span.name": "aws.lambda", - "function_trigger.event_source": "api-gateway", - "function_trigger.event_source_arn": "XXXX", - "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com", - "http.status_code": "200", - "_dd.base_service": "integration-tests-python" - }, - "metrics": { - "_dd.top_level": 1 - }, - "type": "serverless" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "GET", - "http.url": "https://datadoghq.com/", - "out.host": "datadoghq.com", - "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" - }, - "metrics": { - "_dd.measured": 1, - "_dd.top_level": 1 - }, - "type": "http" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.p.tid": "XXXX", - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "GET", - "http.url": "https://www.datadoghq.com/", - "out.host": "www.datadoghq.com", - "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" - }, - "metrics": { - "_dd.measured": 1 - }, - "type": "http" - } - ] - ] -} -END Duration: XXXX ms Memory Used: XXXX MB diff --git a/tests/integration/snapshots/logs/sync-metrics_python37.log b/tests/integration/snapshots/logs/sync-metrics_python37.log deleted file mode 100644 index fb7b879b..00000000 --- a/tests/integration/snapshots/logs/sync-metrics_python37.log +++ /dev/null @@ -1,1669 +0,0 @@ -INIT_START Runtime Version: python:3.7.vX Runtime Version ARN: arn:aws:lambda:eu-west-1:XXXX:eu-west-1 -START -{ - "m": "aws.lambda.enhanced.invocations", - "v": 1, - "e": XXXX, - "t": [ - "region:eu-west-1", - "account_id:XXXX", - "functionname:integration-tests-python-XXXX-sync-metrics_python37", - "resource:integration-tests-python-XXXX-sync-metrics_python37", - "cold_start:true", - "memorysize:1024", - "runtime:python3.7", - "datadog_lambda:vXX", - "dd_lambda_layer:datadog-python37_X.X.X" - ] -} -HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX -HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX -{ - "traces": [ - [ - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "XXXX.execute-api.us-east-2.amazonaws.com", - "resource": "GET /", - "name": "aws.apigateway", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "runtime-id": "XXXX", - "_dd.origin": "lambda", - "operation_name": "aws.apigateway.rest", - "http.url": "XXXX.execute-api.us-east-2.amazonaws.com/", - "endpoint": "/", - "http.method": "GET", - "resource_names": "GET /", - "apiid": "XXXX", - "apiname": "XXXX", - "stage": "Prod", - "request_id": "XXXX", - "_inferred_span.synchronicity": "sync", - "_inferred_span.tag_source": "self", - "http.status_code": "200", - "peer.service": "integration-tests-python", - "_dd.p.dm": "-0", - "_dd.p.tid": "XXXX", - "language": "python", - "_dd.peer.service.source": "peer.service", - "_dd.base_service": "integration-tests-python" - }, - "metrics": { - "process_id": XXXX, - "_dd.top_level": 1, - "_sampling_priority_v1": 1 - }, - "type": "http" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "aws.lambda", - "resource": "integration-tests-python-XXXX-sync-metrics_python37", - "name": "aws.lambda", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.origin": "lambda", - "cold_start": "true", - "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python37", - "function_version": "$LATEST", - "request_id": "XXXX", - "resource_names": "integration-tests-python-XXXX-sync-metrics_python37", - "functionname": "integration-tests-python-XXXX-sync-metrics_python37", - "datadog_lambda": "X.X.X", - "dd_trace": "X.X.X", - "span.name": "aws.lambda", - "function_trigger.event_source": "api-gateway", - "function_trigger.event_source_arn": "XXXX", - "http.url": "XXXX.execute-api.us-east-2.amazonaws.com", - "http.url_details.path": "/Prod/", - "http.method": "GET", - "http.status_code": "200", - "_dd.base_service": "integration-tests-python" - }, - "metrics": { - "_dd.top_level": 1 - }, - "type": "serverless" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "GET", - "http.url": "https://datadoghq.com/", - "out.host": "datadoghq.com", - "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" - }, - "metrics": { - "_dd.measured": 1, - "_dd.top_level": 1 - }, - "type": "http" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.p.tid": "XXXX", - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "GET", - "http.url": "https://www.datadoghq.com/", - "out.host": "www.datadoghq.com", - "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" - }, - "metrics": { - "_dd.measured": 1 - }, - "type": "http" - } - ] - ] -} -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:XXX -{ - "traces": [ - [ - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "runtime-id": "XXXX", - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "POST", - "http.url": "https://api.datadoghq.com/api/v1/distribution_points", - "out.host": "api.datadoghq.com", - "http.status_code": "202", - "http.useragent": "datadogpy/XX (python XX; os linux; arch x86_64)", - "_dd.p.dm": "-0", - "_dd.p.tid": "XXXX", - "language": "python" - }, - "metrics": { - "process_id": XXXX, - "_dd.measured": 1, - "_dd.top_level": 1, - "_sampling_priority_v1": 1 - }, - "type": "http" - } - ] - ] -} -END Duration: XXXX ms (init: XXXX ms) Memory Used: XXXX MB -START -{ - "m": "aws.lambda.enhanced.invocations", - "v": 1, - "e": XXXX, - "t": [ - "region:eu-west-1", - "account_id:XXXX", - "functionname:integration-tests-python-XXXX-sync-metrics_python37", - "resource:integration-tests-python-XXXX-sync-metrics_python37", - "cold_start:false", - "memorysize:1024", - "runtime:python3.7", - "datadog_lambda:vXX", - "dd_lambda_layer:datadog-python37_X.X.X" - ] -} -HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX -HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX -{ - "traces": [ - [ - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "dynamodb", - "resource": "ExampleTableWithStream", - "name": "aws.dynamodb", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "runtime-id": "XXXX", - "_dd.origin": "lambda", - "operation_name": "aws.dynamodb", - "resource_names": "ExampleTableWithStream", - "tablename": "ExampleTableWithStream", - "event_source_arn": "arn:aws:dynamodb:us-east-1:XXXX:us-east-1/ExampleTableWithStream/stream/2015-06-27T00:48:05.899", - "event_id": "XXXX", - "event_name": "INSERT", - "event_version": "1.1", - "stream_view_type": "NEW_AND_OLD_IMAGES", - "size_bytes": "26", - "_inferred_span.synchronicity": "async", - "_inferred_span.tag_source": "self", - "peer.service": "integration-tests-python", - "_dd.p.dm": "-0", - "_dd.p.tid": "XXXX", - "language": "python", - "_dd.peer.service.source": "peer.service", - "_dd.base_service": "integration-tests-python" - }, - "metrics": { - "process_id": XXXX, - "_dd.top_level": 1, - "_sampling_priority_v1": 1 - }, - "type": "web" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "aws.lambda", - "resource": "integration-tests-python-XXXX-sync-metrics_python37", - "name": "aws.lambda", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.origin": "lambda", - "cold_start": "false", - "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python37", - "function_version": "$LATEST", - "request_id": "XXXX", - "resource_names": "integration-tests-python-XXXX-sync-metrics_python37", - "functionname": "integration-tests-python-XXXX-sync-metrics_python37", - "datadog_lambda": "X.X.X", - "dd_trace": "X.X.X", - "span.name": "aws.lambda", - "function_trigger.event_source": "dynamodb", - "function_trigger.event_source_arn": "XXXX", - "_dd.base_service": "integration-tests-python" - }, - "metrics": { - "_dd.top_level": 1 - }, - "type": "serverless" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "GET", - "http.url": "https://datadoghq.com/", - "out.host": "datadoghq.com", - "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" - }, - "metrics": { - "_dd.measured": 1, - "_dd.top_level": 1 - }, - "type": "http" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.p.tid": "XXXX", - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "GET", - "http.url": "https://www.datadoghq.com/", - "out.host": "www.datadoghq.com", - "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" - }, - "metrics": { - "_dd.measured": 1 - }, - "type": "http" - } - ] - ] -} -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:XXX -{ - "traces": [ - [ - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "runtime-id": "XXXX", - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "POST", - "http.url": "https://api.datadoghq.com/api/v1/distribution_points", - "out.host": "api.datadoghq.com", - "http.status_code": "202", - "http.useragent": "datadogpy/XX (python XX; os linux; arch x86_64)", - "_dd.p.dm": "-0", - "_dd.p.tid": "XXXX", - "language": "python" - }, - "metrics": { - "process_id": XXXX, - "_dd.measured": 1, - "_dd.top_level": 1, - "_sampling_priority_v1": 1 - }, - "type": "http" - } - ] - ] -} -END Duration: XXXX ms Memory Used: XXXX MB -START -{ - "m": "aws.lambda.enhanced.invocations", - "v": 1, - "e": XXXX, - "t": [ - "region:eu-west-1", - "account_id:XXXX", - "functionname:integration-tests-python-XXXX-sync-metrics_python37", - "resource:integration-tests-python-XXXX-sync-metrics_python37", - "cold_start:false", - "memorysize:1024", - "runtime:python3.7", - "datadog_lambda:vXX", - "dd_lambda_layer:datadog-python37_X.X.X" - ] -} -HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX -HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX -{ - "traces": [ - [ - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "eventbridge", - "resource": "eventbridge.custom.event.sender", - "name": "aws.eventbridge", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "runtime-id": "XXXX", - "_dd.origin": "lambda", - "operation_name": "aws.eventbridge", - "resource_names": "eventbridge.custom.event.sender", - "detail_type": "testdetail", - "_inferred_span.synchronicity": "async", - "_inferred_span.tag_source": "self", - "peer.service": "integration-tests-python", - "_dd.p.dm": "-0", - "_dd.p.tid": "XXXX", - "language": "python", - "_dd.peer.service.source": "peer.service", - "_dd.base_service": "integration-tests-python" - }, - "metrics": { - "process_id": XXXX, - "_dd.top_level": 1, - "_sampling_priority_v1": 1 - }, - "type": "web" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "aws.lambda", - "resource": "integration-tests-python-XXXX-sync-metrics_python37", - "name": "aws.lambda", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.origin": "lambda", - "cold_start": "false", - "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python37", - "function_version": "$LATEST", - "request_id": "XXXX", - "resource_names": "integration-tests-python-XXXX-sync-metrics_python37", - "functionname": "integration-tests-python-XXXX-sync-metrics_python37", - "datadog_lambda": "X.X.X", - "dd_trace": "X.X.X", - "span.name": "aws.lambda", - "function_trigger.event_source": "eventbridge", - "_dd.base_service": "integration-tests-python" - }, - "metrics": { - "_dd.top_level": 1 - }, - "type": "serverless" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "GET", - "http.url": "https://datadoghq.com/", - "out.host": "datadoghq.com", - "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" - }, - "metrics": { - "_dd.measured": 1, - "_dd.top_level": 1 - }, - "type": "http" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.p.tid": "XXXX", - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "GET", - "http.url": "https://www.datadoghq.com/", - "out.host": "www.datadoghq.com", - "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" - }, - "metrics": { - "_dd.measured": 1 - }, - "type": "http" - } - ] - ] -} -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:XXX -{ - "traces": [ - [ - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "runtime-id": "XXXX", - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "POST", - "http.url": "https://api.datadoghq.com/api/v1/distribution_points", - "out.host": "api.datadoghq.com", - "http.status_code": "202", - "http.useragent": "datadogpy/XX (python XX; os linux; arch x86_64)", - "_dd.p.dm": "-0", - "_dd.p.tid": "XXXX", - "language": "python" - }, - "metrics": { - "process_id": XXXX, - "_dd.measured": 1, - "_dd.top_level": 1, - "_sampling_priority_v1": 1 - }, - "type": "http" - } - ] - ] -} -END Duration: XXXX ms Memory Used: XXXX MB -START -{ - "m": "aws.lambda.enhanced.invocations", - "v": 1, - "e": XXXX, - "t": [ - "region:eu-west-1", - "account_id:XXXX", - "functionname:integration-tests-python-XXXX-sync-metrics_python37", - "resource:integration-tests-python-XXXX-sync-metrics_python37", - "cold_start:false", - "memorysize:1024", - "runtime:python3.7", - "datadog_lambda:vXX", - "dd_lambda_layer:datadog-python37_X.X.X" - ] -} -HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX -HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX -{ - "traces": [ - [ - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "XXXX.execute-api.eu-west-1.amazonaws.com", - "resource": "GET /httpapi/get", - "name": "aws.httpapi", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "runtime-id": "XXXX", - "_dd.origin": "lambda", - "operation_name": "aws.httpapi", - "endpoint": "/httpapi/get", - "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com/httpapi/get", - "http.method": "GET", - "http.protocol": "HTTP/1.1", - "http.source_ip": "XXXX", - "http.user_agent": "XXXX/7.64.1", - "resource_names": "GET /httpapi/get", - "request_id": "XXXX", - "apiid": "XXXX", - "apiname": "XXXX", - "stage": "$default", - "_inferred_span.synchronicity": "sync", - "_inferred_span.tag_source": "self", - "http.status_code": "200", - "peer.service": "integration-tests-python", - "_dd.p.dm": "-0", - "_dd.p.tid": "XXXX", - "language": "python", - "_dd.peer.service.source": "peer.service", - "_dd.base_service": "integration-tests-python" - }, - "metrics": { - "process_id": XXXX, - "_dd.top_level": 1, - "_sampling_priority_v1": 1 - }, - "type": "http" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "aws.lambda", - "resource": "integration-tests-python-XXXX-sync-metrics_python37", - "name": "aws.lambda", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.origin": "lambda", - "cold_start": "false", - "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python37", - "function_version": "$LATEST", - "request_id": "XXXX", - "resource_names": "integration-tests-python-XXXX-sync-metrics_python37", - "functionname": "integration-tests-python-XXXX-sync-metrics_python37", - "datadog_lambda": "X.X.X", - "dd_trace": "X.X.X", - "span.name": "aws.lambda", - "function_trigger.event_source": "api-gateway", - "function_trigger.event_source_arn": "XXXX$default", - "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com", - "http.url_details.path": "/httpapi/get", - "http.method": "GET", - "http.status_code": "200", - "_dd.base_service": "integration-tests-python" - }, - "metrics": { - "_dd.top_level": 1 - }, - "type": "serverless" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "GET", - "http.url": "https://datadoghq.com/", - "out.host": "datadoghq.com", - "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" - }, - "metrics": { - "_dd.measured": 1, - "_dd.top_level": 1 - }, - "type": "http" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.p.tid": "XXXX", - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "GET", - "http.url": "https://www.datadoghq.com/", - "out.host": "www.datadoghq.com", - "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" - }, - "metrics": { - "_dd.measured": 1 - }, - "type": "http" - } - ] - ] -} -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:XXX -END Duration: XXXX ms Memory Used: XXXX MB -{ - "traces": [ - [ - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "runtime-id": "XXXX", - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "POST", - "http.url": "https://api.datadoghq.com/api/v1/distribution_points", - "out.host": "api.datadoghq.com", - "http.status_code": "202", - "http.useragent": "datadogpy/XX (python XX; os linux; arch x86_64)", - "_dd.p.dm": "-0", - "_dd.p.tid": "XXXX", - "language": "python" - }, - "metrics": { - "process_id": XXXX, - "_dd.measured": 1, - "_dd.top_level": 1, - "_sampling_priority_v1": 1 - }, - "type": "http" - } - ] - ] -} -START -{ - "m": "aws.lambda.enhanced.invocations", - "v": 1, - "e": XXXX, - "t": [ - "region:eu-west-1", - "account_id:XXXX", - "functionname:integration-tests-python-XXXX-sync-metrics_python37", - "resource:integration-tests-python-XXXX-sync-metrics_python37", - "cold_start:false", - "memorysize:1024", - "runtime:python3.7", - "datadog_lambda:vXX", - "dd_lambda_layer:datadog-python37_X.X.X" - ] -} -HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX -HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX -{ - "traces": [ - [ - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "kinesis", - "resource": "EXAMPLE", - "name": "aws.kinesis", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "runtime-id": "XXXX", - "_dd.origin": "lambda", - "operation_name": "aws.kinesis", - "resource_names": "EXAMPLE", - "streamname": "EXAMPLE", - "shardid": "shardId-XXXX", - "event_source_arn": "arn:aws:kinesis:EXAMPLE", - "event_id": "XXXX", - "event_name": "aws:kinesis:record", - "event_version": "1.0", - "partition_key": "XXXX", - "_inferred_span.synchronicity": "async", - "_inferred_span.tag_source": "self", - "peer.service": "integration-tests-python", - "_dd.p.dm": "-0", - "_dd.p.tid": "XXXX", - "language": "python", - "_dd.peer.service.source": "peer.service", - "_dd.base_service": "integration-tests-python" - }, - "metrics": { - "process_id": XXXX, - "_dd.top_level": 1, - "_sampling_priority_v1": 1 - }, - "type": "web" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "aws.lambda", - "resource": "integration-tests-python-XXXX-sync-metrics_python37", - "name": "aws.lambda", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.origin": "lambda", - "cold_start": "false", - "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python37", - "function_version": "$LATEST", - "request_id": "XXXX", - "resource_names": "integration-tests-python-XXXX-sync-metrics_python37", - "functionname": "integration-tests-python-XXXX-sync-metrics_python37", - "datadog_lambda": "X.X.X", - "dd_trace": "X.X.X", - "span.name": "aws.lambda", - "function_trigger.event_source": "kinesis", - "function_trigger.event_source_arn": "XXXX", - "_dd.base_service": "integration-tests-python" - }, - "metrics": { - "_dd.top_level": 1 - }, - "type": "serverless" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "GET", - "http.url": "https://datadoghq.com/", - "out.host": "datadoghq.com", - "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" - }, - "metrics": { - "_dd.measured": 1, - "_dd.top_level": 1 - }, - "type": "http" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.p.tid": "XXXX", - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "GET", - "http.url": "https://www.datadoghq.com/", - "out.host": "www.datadoghq.com", - "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" - }, - "metrics": { - "_dd.measured": 1 - }, - "type": "http" - } - ] - ] -} -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:XXX -{ - "traces": [ - [ - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "runtime-id": "XXXX", - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "POST", - "http.url": "https://api.datadoghq.com/api/v1/distribution_points", - "out.host": "api.datadoghq.com", - "http.status_code": "202", - "http.useragent": "datadogpy/XX (python XX; os linux; arch x86_64)", - "_dd.p.dm": "-0", - "_dd.p.tid": "XXXX", - "language": "python" - }, - "metrics": { - "process_id": XXXX, - "_dd.measured": 1, - "_dd.top_level": 1, - "_sampling_priority_v1": 1 - }, - "type": "http" - } - ] - ] -} -END Duration: XXXX ms Memory Used: XXXX MB -START -{ - "m": "aws.lambda.enhanced.invocations", - "v": 1, - "e": XXXX, - "t": [ - "region:eu-west-1", - "account_id:XXXX", - "functionname:integration-tests-python-XXXX-sync-metrics_python37", - "resource:integration-tests-python-XXXX-sync-metrics_python37", - "cold_start:false", - "memorysize:1024", - "runtime:python3.7", - "datadog_lambda:vXX", - "dd_lambda_layer:datadog-python37_X.X.X" - ] -} -HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX -HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX -{ - "traces": [ - [ - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "s3", - "resource": "example-bucket", - "name": "aws.s3", - "error": 0, - "meta": { - "runtime-id": "XXXX", - "_dd.origin": "lambda", - "operation_name": "aws.s3", - "resource_names": "example-bucket", - "event_name": "ObjectCreated:Put", - "bucketname": "example-bucket", - "bucket_arn": "arn:aws:s3:::example-bucket", - "object_key": "test/key", - "object_size": "1024", - "object_etag": "XXXX", - "_inferred_span.synchronicity": "async", - "_inferred_span.tag_source": "self", - "peer.service": "integration-tests-python", - "_dd.p.dm": "-0", - "_dd.p.tid": "XXXX", - "language": "python", - "_dd.peer.service.source": "peer.service", - "_dd.base_service": "integration-tests-python" - }, - "metrics": { - "process_id": XXXX, - "_dd.top_level": 1, - "_sampling_priority_v1": 1 - }, - "type": "web" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "aws.lambda", - "resource": "integration-tests-python-XXXX-sync-metrics_python37", - "name": "aws.lambda", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.origin": "lambda", - "cold_start": "false", - "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python37", - "function_version": "$LATEST", - "request_id": "XXXX", - "resource_names": "integration-tests-python-XXXX-sync-metrics_python37", - "functionname": "integration-tests-python-XXXX-sync-metrics_python37", - "datadog_lambda": "X.X.X", - "dd_trace": "X.X.X", - "span.name": "aws.lambda", - "function_trigger.event_source": "s3", - "function_trigger.event_source_arn": "XXXX", - "_dd.base_service": "integration-tests-python" - }, - "metrics": { - "_dd.top_level": 1 - }, - "type": "serverless" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "GET", - "http.url": "https://datadoghq.com/", - "out.host": "datadoghq.com", - "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" - }, - "metrics": { - "_dd.measured": 1, - "_dd.top_level": 1 - }, - "type": "http" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.p.tid": "XXXX", - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "GET", - "http.url": "https://www.datadoghq.com/", - "out.host": "www.datadoghq.com", - "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" - }, - "metrics": { - "_dd.measured": 1 - }, - "type": "http" - } - ] - ] -} -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:XXX -{ - "traces": [ - [ - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "runtime-id": "XXXX", - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "POST", - "http.url": "https://api.datadoghq.com/api/v1/distribution_points", - "out.host": "api.datadoghq.com", - "http.status_code": "202", - "http.useragent": "datadogpy/XX (python XX; os linux; arch x86_64)", - "_dd.p.dm": "-0", - "_dd.p.tid": "XXXX", - "language": "python" - }, - "metrics": { - "process_id": XXXX, - "_dd.measured": 1, - "_dd.top_level": 1, - "_sampling_priority_v1": 1 - }, - "type": "http" - } - ] - ] -} -END Duration: XXXX ms Memory Used: XXXX MB -START -{ - "m": "aws.lambda.enhanced.invocations", - "v": 1, - "e": XXXX, - "t": [ - "region:eu-west-1", - "account_id:XXXX", - "functionname:integration-tests-python-XXXX-sync-metrics_python37", - "resource:integration-tests-python-XXXX-sync-metrics_python37", - "cold_start:false", - "memorysize:1024", - "runtime:python3.7", - "datadog_lambda:vXX", - "dd_lambda_layer:datadog-python37_X.X.X" - ] -} -HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX -HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX -{ - "traces": [ - [ - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "sns", - "resource": "sns-lambda", - "name": "aws.sns", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "runtime-id": "XXXX", - "_dd.origin": "lambda", - "operation_name": "aws.sns", - "resource_names": "sns-lambda", - "topicname": "sns-lambda", - "topic_arn": "arn:aws:sns:us-east-2:XXXX:us-east-2-lambda", - "message_id": "XXXX", - "type": "Notification", - "subject": "TestInvoke", - "_inferred_span.synchronicity": "async", - "_inferred_span.tag_source": "self", - "peer.service": "integration-tests-python", - "_dd.p.dm": "-0", - "_dd.p.tid": "XXXX", - "language": "python", - "_dd.peer.service.source": "peer.service", - "_dd.base_service": "integration-tests-python" - }, - "metrics": { - "process_id": XXXX, - "_dd.top_level": 1, - "_sampling_priority_v1": 1 - }, - "type": "web" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "aws.lambda", - "resource": "integration-tests-python-XXXX-sync-metrics_python37", - "name": "aws.lambda", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.origin": "lambda", - "cold_start": "false", - "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python37", - "function_version": "$LATEST", - "request_id": "XXXX", - "resource_names": "integration-tests-python-XXXX-sync-metrics_python37", - "functionname": "integration-tests-python-XXXX-sync-metrics_python37", - "datadog_lambda": "X.X.X", - "dd_trace": "X.X.X", - "span.name": "aws.lambda", - "function_trigger.event_source": "sns", - "function_trigger.event_source_arn": "XXXX", - "_dd.base_service": "integration-tests-python" - }, - "metrics": { - "_dd.top_level": 1 - }, - "type": "serverless" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "GET", - "http.url": "https://datadoghq.com/", - "out.host": "datadoghq.com", - "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" - }, - "metrics": { - "_dd.measured": 1, - "_dd.top_level": 1 - }, - "type": "http" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.p.tid": "XXXX", - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "GET", - "http.url": "https://www.datadoghq.com/", - "out.host": "www.datadoghq.com", - "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" - }, - "metrics": { - "_dd.measured": 1 - }, - "type": "http" - } - ] - ] -} -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:XXX -{ - "traces": [ - [ - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "runtime-id": "XXXX", - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "POST", - "http.url": "https://api.datadoghq.com/api/v1/distribution_points", - "out.host": "api.datadoghq.com", - "http.status_code": "202", - "http.useragent": "datadogpy/XX (python XX; os linux; arch x86_64)", - "_dd.p.dm": "-0", - "_dd.p.tid": "XXXX", - "language": "python" - }, - "metrics": { - "process_id": XXXX, - "_dd.measured": 1, - "_dd.top_level": 1, - "_sampling_priority_v1": 1 - }, - "type": "http" - } - ] - ] -} -END Duration: XXXX ms Memory Used: XXXX MB -START -{ - "m": "aws.lambda.enhanced.invocations", - "v": 1, - "e": XXXX, - "t": [ - "region:eu-west-1", - "account_id:XXXX", - "functionname:integration-tests-python-XXXX-sync-metrics_python37", - "resource:integration-tests-python-XXXX-sync-metrics_python37", - "cold_start:false", - "memorysize:1024", - "runtime:python3.7", - "datadog_lambda:vXX", - "dd_lambda_layer:datadog-python37_X.X.X" - ] -} -HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX -HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX -{ - "traces": [ - [ - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "sqs", - "resource": "my-queue", - "name": "aws.sqs", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "runtime-id": "XXXX", - "_dd.origin": "lambda", - "operation_name": "aws.sqs", - "resource_names": "my-queue", - "queuename": "my-queue", - "event_source_arn": "arn:aws:sqs:us-east-2:XXXX:us-east-2-queue", - "receipt_handle": "AQEBwJnKyrHigUMZj6rYigCgxlaS3SLy0a...", - "sender_id": "AIDAIENQZJOLO23YVJ4VO", - "_inferred_span.synchronicity": "async", - "_inferred_span.tag_source": "self", - "peer.service": "integration-tests-python", - "_dd.p.dm": "-0", - "_dd.p.tid": "XXXX", - "language": "python", - "_dd.peer.service.source": "peer.service", - "_dd.base_service": "integration-tests-python" - }, - "metrics": { - "process_id": XXXX, - "_dd.top_level": 1, - "_sampling_priority_v1": 1 - }, - "type": "web" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "aws.lambda", - "resource": "integration-tests-python-XXXX-sync-metrics_python37", - "name": "aws.lambda", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.origin": "lambda", - "cold_start": "false", - "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python37", - "function_version": "$LATEST", - "request_id": "XXXX", - "resource_names": "integration-tests-python-XXXX-sync-metrics_python37", - "functionname": "integration-tests-python-XXXX-sync-metrics_python37", - "datadog_lambda": "X.X.X", - "dd_trace": "X.X.X", - "span.name": "aws.lambda", - "function_trigger.event_source": "sqs", - "function_trigger.event_source_arn": "XXXX", - "_dd.base_service": "integration-tests-python" - }, - "metrics": { - "_dd.top_level": 1 - }, - "type": "serverless" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "GET", - "http.url": "https://datadoghq.com/", - "out.host": "datadoghq.com", - "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" - }, - "metrics": { - "_dd.measured": 1, - "_dd.top_level": 1 - }, - "type": "http" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.p.tid": "XXXX", - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "GET", - "http.url": "https://www.datadoghq.com/", - "out.host": "www.datadoghq.com", - "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" - }, - "metrics": { - "_dd.measured": 1 - }, - "type": "http" - } - ] - ] -} -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:XXX -{ - "traces": [ - [ - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "runtime-id": "XXXX", - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "POST", - "http.url": "https://api.datadoghq.com/api/v1/distribution_points", - "out.host": "api.datadoghq.com", - "http.status_code": "202", - "http.useragent": "datadogpy/XX (python XX; os linux; arch x86_64)", - "_dd.p.dm": "-0", - "_dd.p.tid": "XXXX", - "language": "python" - }, - "metrics": { - "process_id": XXXX, - "_dd.measured": 1, - "_dd.top_level": 1, - "_sampling_priority_v1": 1 - }, - "type": "http" - } - ] - ] -} -END Duration: XXXX ms Memory Used: XXXX MB -START -{ - "m": "aws.lambda.enhanced.invocations", - "v": 1, - "e": XXXX, - "t": [ - "region:eu-west-1", - "account_id:XXXX", - "functionname:integration-tests-python-XXXX-sync-metrics_python37", - "resource:integration-tests-python-XXXX-sync-metrics_python37", - "cold_start:false", - "memorysize:1024", - "runtime:python3.7", - "datadog_lambda:vXX", - "dd_lambda_layer:datadog-python37_X.X.X" - ] -} -HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX -HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX -{ - "traces": [ - [ - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "XXXX.execute-api.eu-west-1.amazonaws.com", - "resource": "$default", - "name": "aws.apigateway.websocket", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "runtime-id": "XXXX", - "_dd.origin": "lambda", - "operation_name": "aws.apigateway.websocket", - "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com$default", - "endpoint": "$default", - "resource_names": "$default", - "apiid": "XXXX", - "apiname": "XXXX", - "stage": "dev", - "request_id": "XXXX", - "connection_id": "XXXX=", - "event_type": "MESSAGE", - "message_direction": "IN", - "_inferred_span.synchronicity": "sync", - "_inferred_span.tag_source": "self", - "http.status_code": "200", - "peer.service": "integration-tests-python", - "_dd.p.dm": "-0", - "_dd.p.tid": "XXXX", - "language": "python", - "_dd.peer.service.source": "peer.service", - "_dd.base_service": "integration-tests-python" - }, - "metrics": { - "process_id": XXXX, - "_dd.top_level": 1, - "_sampling_priority_v1": 1 - }, - "type": "web" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "aws.lambda", - "resource": "integration-tests-python-XXXX-sync-metrics_python37", - "name": "aws.lambda", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.origin": "lambda", - "cold_start": "false", - "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python37", - "function_version": "$LATEST", - "request_id": "XXXX", - "resource_names": "integration-tests-python-XXXX-sync-metrics_python37", - "functionname": "integration-tests-python-XXXX-sync-metrics_python37", - "datadog_lambda": "X.X.X", - "dd_trace": "X.X.X", - "span.name": "aws.lambda", - "function_trigger.event_source": "api-gateway", - "function_trigger.event_source_arn": "XXXX", - "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com", - "http.status_code": "200", - "_dd.base_service": "integration-tests-python" - }, - "metrics": { - "_dd.top_level": 1 - }, - "type": "serverless" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "GET", - "http.url": "https://datadoghq.com/", - "out.host": "datadoghq.com", - "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" - }, - "metrics": { - "_dd.measured": 1, - "_dd.top_level": 1 - }, - "type": "http" - }, - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "_dd.p.tid": "XXXX", - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "GET", - "http.url": "https://www.datadoghq.com/", - "out.host": "www.datadoghq.com", - "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" - }, - "metrics": { - "_dd.measured": 1 - }, - "type": "http" - } - ] - ] -} -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:XXX -{ - "traces": [ - [ - { - "trace_id": "XXXX", - "parent_id": "XXXX", - "span_id": "XXXX", - "service": "integration-tests-python", - "resource": "requests.request", - "name": "requests.request", - "error": 0, - "start": "XXXX", - "duration": "XXXX", - "meta": { - "runtime-id": "XXXX", - "_dd.origin": "lambda", - "component": "requests", - "span.kind": "client", - "http.method": "POST", - "http.url": "https://api.datadoghq.com/api/v1/distribution_points", - "out.host": "api.datadoghq.com", - "http.status_code": "202", - "http.useragent": "datadogpy/XX (python XX; os linux; arch x86_64)", - "_dd.p.dm": "-0", - "_dd.p.tid": "XXXX", - "language": "python" - }, - "metrics": { - "process_id": XXXX, - "_dd.measured": 1, - "_dd.top_level": 1, - "_sampling_priority_v1": 1 - }, - "type": "http" - } - ] - ] -} -END Duration: XXXX ms Memory Used: XXXX MB diff --git a/tests/test_tags.py b/tests/test_tags.py index 80b5f86d..66c0c39f 100644 --- a/tests/test_tags.py +++ b/tests/test_tags.py @@ -65,5 +65,5 @@ def test_parse_lambda_tags_from_arn_alias(self): ) def test_get_runtime_tag(self): - self.mock_python_version_tuple.return_value = ("3", "7", "2") - self.assertEqual(get_runtime_tag(), "runtime:python3.7") + self.mock_python_version_tuple.return_value = ("3", "12", "0") + self.assertEqual(get_runtime_tag(), "runtime:python3.12") From 880d308ab49d8c2f7174d47a70373a2acdb317ee Mon Sep 17 00:00:00 2001 From: AJ Stuyvenberg Date: Tue, 12 Dec 2023 09:37:44 -0500 Subject: [PATCH 4/7] feat: Remove more 3.7 refs --- .github/workflows/check-size.yml | 2 +- README.md | 2 +- pyproject.toml | 3 +-- scripts/check_layer_size.sh | 2 +- scripts/run_tests.sh | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/check-size.yml b/.github/workflows/check-size.yml index c056d09b..9a60bfe9 100644 --- a/.github/workflows/check-size.yml +++ b/.github/workflows/check-size.yml @@ -12,7 +12,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: 3.7 + python-version: 3.12 - name: Install Crossbuild Deps run: | diff --git a/README.md b/README.md index 107020a0..2a283d56 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [![Slack](https://chat.datadoghq.com/badge.svg?bg=632CA6)](https://chat.datadoghq.com/) [![License](https://img.shields.io/badge/license-Apache--2.0-blue)](https://github.com/DataDog/datadog-lambda-python/blob/main/LICENSE) -Datadog Lambda Library for Python (3.7, 3.8, 3.9, 3.10, 3.11, and 3.12) enables [enhanced Lambda metrics](https://docs.datadoghq.com/serverless/enhanced_lambda_metrics), [distributed tracing](https://docs.datadoghq.com/serverless/distributed_tracing), and [custom metric submission](https://docs.datadoghq.com/serverless/custom_metrics) from AWS Lambda functions. +Datadog Lambda Library for Python (3.8, 3.9, 3.10, 3.11, and 3.12) enables [enhanced Lambda metrics](https://docs.datadoghq.com/serverless/enhanced_lambda_metrics), [distributed tracing](https://docs.datadoghq.com/serverless/distributed_tracing), and [custom metric submission](https://docs.datadoghq.com/serverless/custom_metrics) from AWS Lambda functions. ## Installation diff --git a/pyproject.toml b/pyproject.toml index 056309c1..25bfb337 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,7 +16,6 @@ packages = [ { include = "datadog_lambda" } ] classifiers = [ - "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", @@ -25,7 +24,7 @@ classifiers = [ ] [tool.poetry.dependencies] -python = ">=3.7.0,<4" +python = ">=3.8.0,<4" datadog = ">=0.41.0,<1.0.0" wrapt = "^1.11.2" ddtrace = ">=2.3.1" diff --git a/scripts/check_layer_size.sh b/scripts/check_layer_size.sh index 4ef2c10b..395f79a4 100755 --- a/scripts/check_layer_size.sh +++ b/scripts/check_layer_size.sh @@ -14,7 +14,7 @@ MAX_LAYER_UNCOMPRESSED_SIZE_KB=$(expr 24 \* 1024) LAYER_FILES_PREFIX="datadog_lambda_py" LAYER_DIR=".layers" -VERSIONS=("3.7" "3.8" "3.9" "3.10" "3.11" "3.12") +VERSIONS=("3.8" "3.9" "3.10" "3.11" "3.12") for version in "${VERSIONS[@]}" do diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh index 86127f5a..e06e9912 100755 --- a/scripts/run_tests.sh +++ b/scripts/run_tests.sh @@ -8,7 +8,7 @@ # Run unit tests in Docker set -e -PYTHON_VERSIONS=("3.7" "3.8" "3.9" "3.10" "3.11" "3.12") +PYTHON_VERSIONS=("3.8" "3.9" "3.10" "3.11" "3.12") for python_version in "${PYTHON_VERSIONS[@]}" do From 8e74ac2e0d7f4071eacf6caa7b981d3adf1e226c Mon Sep 17 00:00:00 2001 From: AJ Stuyvenberg Date: Tue, 12 Dec 2023 09:43:11 -0500 Subject: [PATCH 5/7] feat: More 3.7 refs dropped --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 13e2c322..7092388b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,7 +41,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12'] + python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] steps: - name: Checkout @@ -68,7 +68,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - runtime-param: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12'] + runtime-param: ['3.8', '3.9', '3.10', '3.11', '3.12'] steps: - name: Checkout uses: actions/checkout@v3 From 567d51a9a8172d9558084d66931174f7f59a3252 Mon Sep 17 00:00:00 2001 From: AJ Stuyvenberg Date: Tue, 12 Dec 2023 10:12:24 -0500 Subject: [PATCH 6/7] Feat: Mention deprecation in readme. Remove 3.7 from contributing.md --- CONTRIBUTING.md | 2 +- README.md | 3 +++ datadog_lambda/cold_start.py | 11 +++++------ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index befae3ca..3b57858c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -24,7 +24,7 @@ We love pull requests. For new features, consider opening an issue to discuss th ./scripts/build_layers.sh # Publish the a testing layer to your own AWS account, and the ARN will be returned - # Example: VERSION=1 REGIONS=us-east-1 LAYERS=Datadog-Python37 ./scripts/publish_layers.sh + # Example: VERSION=1 REGIONS=us-east-1 LAYERS=Datadog-Python312 ./scripts/publish_layers.sh VERSION= REGIONS= LAYERS= ./scripts/publish_layers.sh ``` diff --git a/README.md b/README.md index 2a283d56..39bc4ce0 100644 --- a/README.md +++ b/README.md @@ -47,6 +47,9 @@ The Continuous Profiler works by spawning a thread which periodically wakes up a ## Major Version Notes +### 5.x / Layer version 86+ +- Python3.7 support has been [deprecated](https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html) by AWS, and support removed from this library. + ### 4.x / Layer version 61+ - Python3.6 support has been [deprecated](https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html) by AWS, and support removed from this library. diff --git a/datadog_lambda/cold_start.py b/datadog_lambda/cold_start.py index 0a3ba34d..a7045bd6 100644 --- a/datadog_lambda/cold_start.py +++ b/datadog_lambda/cold_start.py @@ -146,12 +146,11 @@ def initialize_cold_start_tracing(): ): from sys import version_info, meta_path - if version_info >= (3, 7): # current implementation only support version > 3.7 - for importer in meta_path: - try: - importer.find_spec = wrap_find_spec(importer.find_spec) - except Exception: - pass + for importer in meta_path: + try: + importer.find_spec = wrap_find_spec(importer.find_spec) + except Exception: + pass class ColdStartTracer(object): From c31de96fe7c41794228e663929410d178caf36d7 Mon Sep 17 00:00:00 2001 From: AJ Stuyvenberg Date: Tue, 12 Dec 2023 10:15:17 -0500 Subject: [PATCH 7/7] feat: Remove version_info --- datadog_lambda/cold_start.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datadog_lambda/cold_start.py b/datadog_lambda/cold_start.py index a7045bd6..9da02e78 100644 --- a/datadog_lambda/cold_start.py +++ b/datadog_lambda/cold_start.py @@ -144,7 +144,7 @@ def initialize_cold_start_tracing(): and os.environ.get("DD_TRACE_ENABLED", "true").lower() == "true" and os.environ.get("DD_COLD_START_TRACING", "true").lower() == "true" ): - from sys import version_info, meta_path + from sys import meta_path for importer in meta_path: try: