diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 26b4b78e4..a7f48dfeb 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,6 +1 @@
-* @DataDog/serverless-aws
-datadog_lambda/tracing.py @DataDog/apm-serverless
-datadog_lambda/patch.py @DataDog/apm-serverless
-datadog_lambda/span_points.py @DataDog/apm-serverless
-datadog_lambda/cold_start.py @DataDog/apm-serverless
-datadog_lambda/wrapper.py @DataDog/apm-serverless
+* @DataDog/serverless-aws @DataDog/apm-serverless
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d218bdefd..050624478 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -5,6 +5,8 @@ on:
branches:
- "main"
pull_request:
+ schedule:
+ - cron: '0 0,12 * * *' # Runs every day at midnight and noon utc
jobs:
lint:
diff --git a/.github/workflows/build_layer.yml b/.github/workflows/build_layer.yml
new file mode 100644
index 000000000..789868ed0
--- /dev/null
+++ b/.github/workflows/build_layer.yml
@@ -0,0 +1,35 @@
+name: Build Layers for system-Tests
+
+on:
+ push:
+ branches:
+ - "main"
+
+jobs:
+ build:
+ runs-on: ${{ matrix.arch == 'arm64' && 'ubuntu-24.04-arm' || 'ubuntu-latest' }}
+
+ strategy:
+ matrix:
+ arch: [arm64, amd64]
+ python_version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
+
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v4
+
+ - name: Patch pyproject.toml
+ run: |
+ echo "Patching pyproject.toml to use main branch of dd-trace-py"
+ sed -i 's|^ddtrace =.*$|ddtrace = { git = "https://github.com/DataDog/dd-trace-py.git" }|' pyproject.toml
+
+ - name: Build layer for Python ${{ matrix.python_version }} on ${{ matrix.arch }}
+ run: |
+ echo "Building layer for Python ${{ matrix.python_version }} on ${{ matrix.arch }}"
+ ARCH=${{ matrix.arch }} PYTHON_VERSION=${{ matrix.python_version }} ./scripts/build_layers.sh
+
+ - name: Upload layer artifact
+ uses: actions/upload-artifact@v4
+ with:
+ path: .layers/datadog_lambda_py-${{ matrix.arch }}-${{ matrix.python_version }}.zip
+ name: datadog-lambda-python-${{ matrix.python_version }}-${{ matrix.arch }}
diff --git a/.github/workflows/system_tests.yml b/.github/workflows/system_tests.yml
new file mode 100644
index 000000000..b61725b1a
--- /dev/null
+++ b/.github/workflows/system_tests.yml
@@ -0,0 +1,38 @@
+name: System Tests
+
+on:
+ push:
+ branches:
+ - main
+ pull_request:
+ branches:
+ - "**"
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v4
+
+ - name: Build layer
+ run: |
+ ARCH=amd64 PYTHON_VERSION=3.13 ./scripts/build_layers.sh
+
+ - uses: actions/upload-artifact@v4
+ with:
+ path: .layers/datadog_lambda_py-amd64-3.13.zip
+ name: binaries
+
+ system-tests:
+ needs:
+ - build
+ uses: DataDog/system-tests/.github/workflows/system-tests.yml@main
+ secrets: inherit
+ permissions:
+ contents: read
+ packages: write
+ with:
+ library: python_lambda
+ binaries_artifact: binaries
+ scenarios_groups: appsec
+ skip_empty_scenarios: true
diff --git a/.github/workflows/update_deps.yml b/.github/workflows/update_deps.yml
index 31025402f..15a3ac665 100644
--- a/.github/workflows/update_deps.yml
+++ b/.github/workflows/update_deps.yml
@@ -3,30 +3,39 @@ name: update-deps
on:
schedule:
- cron: "0 10 * * *" # Run at 10 am every day
+ workflow_dispatch:
jobs:
check:
runs-on: ubuntu-latest
+ environment:
+ name: protected-main-env
steps:
+ - name: Generate token
+ id: generate_token
+ uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
+ with:
+ app-id: ${{ secrets.GH_APP_ID }}
+ private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
+
- uses: actions/checkout@v3
with:
- ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}
+ token: ${{ steps.generate_token.outputs.token }}
- name: Set up Python
uses: actions/setup-python@v4
with:
- python-version: 3.7
+ python-version: 3.13
- name: Update Dependencies
run: |
- curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python -
- source $HOME/.poetry/env
- poetry build
+ pip install poetry
poetry update
- name: Create Pull Request
uses: peter-evans/create-pull-request@v3
with:
+ token: ${{ steps.generate_token.outputs.token }}
commit-message: update dependencies
title: Update Dependencies
body: |
diff --git a/CODEOWNERS b/CODEOWNERS
deleted file mode 100644
index e340f1ed6..000000000
--- a/CODEOWNERS
+++ /dev/null
@@ -1 +0,0 @@
-* @DataDog/serverless
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 0e79d884a..cc9e9d70f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,6 +7,16 @@ ARG runtime
RUN mkdir -p /build/python/lib/$runtime/site-packages
WORKDIR /build
+# Install newer version of GCC on AL2
+RUN set -eux; \
+ if command -v yum >/dev/null 2>&1; then \
+ yum -y install git gcc10 gcc10-c++; \
+ cd /usr/bin; \
+ rm gcc && ln -s gcc10-gcc gcc; \
+ rm g++ && ln -s gcc10-g++ g++; \
+ rm cc && ln -s gcc10-cc cc; \
+ fi
+
# Add Rust compiler which is needed to build dd-trace-py from source
RUN curl https://sh.rustup.rs -sSf | \
sh -s -- --default-toolchain stable -y
@@ -21,15 +31,16 @@ RUN pip install --no-cache-dir . -t ./python/lib/$runtime/site-packages
RUN rm -rf ./python/lib/$runtime/site-packages/botocore*
RUN rm -rf ./python/lib/$runtime/site-packages/setuptools
RUN rm -rf ./python/lib/$runtime/site-packages/jsonschema/tests
-RUN find . -name 'libddwaf.so' -delete
+RUN rm -f ./python/lib/$runtime/site-packages/ddtrace/appsec/_iast/_ast/iastpatch*.so
RUN rm -f ./python/lib/$runtime/site-packages/ddtrace/appsec/_iast/_taint_tracking/*.so
RUN rm -f ./python/lib/$runtime/site-packages/ddtrace/appsec/_iast/_stacktrace*.so
-RUN rm -f ./python/lib/$runtime/site-packages/ddtrace/internal/datadog/profiling/libdd_wrapper*.so
-RUN rm -f ./python/lib/$runtime/site-packages/ddtrace/internal/datadog/profiling/ddup/_ddup.*.so
# _stack_v2 may not exist for some versions of ddtrace (e.g. under python 3.13)
RUN rm -f ./python/lib/$runtime/site-packages/ddtrace/internal/datadog/profiling/stack_v2/_stack_v2.*.so
-# remove *.dist-info directories except any entry_points.txt files
-RUN find ./python/lib/$runtime/site-packages/*.dist-info -not -name "entry_points.txt" -type f -delete
+# remove *.dist-info directories except any entry_points.txt files and METADATA files required for Appsec Software Composition Analysis
+RUN find ./python/lib/$runtime/site-packages/*.dist-info \
+ -type f \
+ ! \( -name 'entry_points.txt' -o -name 'METADATA' \) \
+ -delete
RUN find ./python/lib/$runtime/site-packages -type d -empty -delete
# Remove requests and dependencies
@@ -62,5 +73,12 @@ RUN find ./python/lib/$runtime/site-packages/ddtrace -name \*.h -delete
RUN find ./python/lib/$runtime/site-packages/ddtrace -name \*.hpp -delete
RUN find ./python/lib/$runtime/site-packages/ddtrace -name \*.pyx -delete
+# Strip debug symbols and symbols that are not needed for relocation
+# processing using strip --strip-unneeded for all .so files. This is to
+# reduce the size when ddtrace is built from sources. The release wheels are
+# already stripped of debug symbols. We should revisit this when serverless
+# benchmark uses pre-built wheels instead of building from sources.
+RUN find ./python/lib/$runtime/site-packages -name "*.so" -exec strip --strip-unneeded {} \;
+
FROM scratch
COPY --from=builder /build/python /
diff --git a/README.md b/README.md
index 03cd846a6..658babc28 100644
--- a/README.md
+++ b/README.md
@@ -29,6 +29,7 @@ Besides the environment variables supported by dd-trace-py, the datadog-lambda-p
| DD_COLD_START_TRACE_SKIP_LIB | optionally skip creating Cold Start Spans for a comma-separated list of libraries. Useful to limit depth or skip known libraries. | `ddtrace.internal.compat,ddtrace.filters` |
| DD_CAPTURE_LAMBDA_PAYLOAD | [Captures incoming and outgoing AWS Lambda payloads][1] in the Datadog APM spans for Lambda invocations. | `false` |
| DD_CAPTURE_LAMBDA_PAYLOAD_MAX_DEPTH | Determines the level of detail captured from AWS Lambda payloads, which are then assigned as tags for the `aws.lambda` span. It specifies the nesting depth of the JSON payload structure to process. Once the specified maximum depth is reached, the tag's value is set to the stringified value of any nested elements beyond this level.
For example, given the input payload: {
"lv1" : {
"lv2": {
"lv3": "val"
}
}
} If the depth is set to `2`, the resulting tag's key is set to `function.request.lv1.lv2` and the value is `{\"lv3\": \"val\"}`.
If the depth is set to `0`, the resulting tag's key is set to `function.request` and value is `{\"lv1\":{\"lv2\":{\"lv3\": \"val\"}}}` | `10` |
+| DD_EXCEPTION_REPLAY_ENABLED | When set to `true`, the Lambda will run with Error Tracking Exception Replay enabled, capturing local variables. | `false` |
## Opening Issues
diff --git a/ci/datasources/regions.yaml b/ci/datasources/regions.yaml
index 93816ce9c..d41bade3a 100644
--- a/ci/datasources/regions.yaml
+++ b/ci/datasources/regions.yaml
@@ -12,6 +12,7 @@ regions:
- code: "ap-southeast-3"
- code: "ap-southeast-4"
- code: "ap-southeast-5"
+ - code: "ap-southeast-7"
- code: "ap-northeast-1"
- code: "ap-northeast-2"
- code: "ap-northeast-3"
@@ -28,4 +29,5 @@ regions:
- code: "il-central-1"
- code: "me-south-1"
- code: "me-central-1"
+ - code: "mx-central-1"
- code: "sa-east-1"
diff --git a/ci/input_files/build.yaml.tpl b/ci/input_files/build.yaml.tpl
index 769f87f5c..599160fbf 100644
--- a/ci/input_files/build.yaml.tpl
+++ b/ci/input_files/build.yaml.tpl
@@ -1,8 +1,11 @@
+{{- $e2e_region := "us-west-2" -}}
+
stages:
- build
- test
- sign
- publish
+ - e2e
.python-before-script: &python-before-script
- pip install virtualenv
@@ -24,8 +27,8 @@ default:
- apt-get install -y ca-certificates curl gnupg xxd
- mkdir -p /etc/apt/keyrings
- curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
- # We are explicitly setting the node_18.x version for the installation
- - echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
+ # We are explicitly setting the node_20.x version for the installation
+ - echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
- apt-get update
- apt-get install nodejs -y
- npm install --global yarn
@@ -56,11 +59,11 @@ check-layer-size ({{ $runtime.name }}-{{ $runtime.arch }}):
stage: test
tags: ["arch:amd64"]
image: registry.ddbuild.io/images/docker:20.10
- needs:
+ needs:
- build-layer ({{ $runtime.name }}-{{ $runtime.arch }})
dependencies:
- build-layer ({{ $runtime.name }}-{{ $runtime.arch }})
- script:
+ script:
- PYTHON_VERSION={{ $runtime.python_version }} ARCH={{ $runtime.arch }} ./scripts/check_layer_size.sh
lint python:
@@ -69,7 +72,7 @@ lint python:
image: registry.ddbuild.io/images/mirror/python:{{ $runtime.image }}
cache: &{{ $runtime.name }}-{{ $runtime.arch }}-cache
before_script: *python-before-script
- script:
+ script:
- source venv/bin/activate
- ./scripts/check_format.sh
@@ -79,7 +82,7 @@ unit-test ({{ $runtime.name }}-{{ $runtime.arch }}):
image: registry.ddbuild.io/images/mirror/python:{{ $runtime.image }}
cache: &{{ $runtime.name }}-{{ $runtime.arch }}-cache
before_script: *python-before-script
- script:
+ script:
- source venv/bin/activate
- pytest -vv
@@ -87,7 +90,7 @@ integration-test ({{ $runtime.name }}-{{ $runtime.arch }}):
stage: test
tags: ["arch:amd64"]
image: registry.ddbuild.io/images/docker:20.10-py3
- needs:
+ needs:
- build-layer ({{ $runtime.name }}-{{ $runtime.arch }})
dependencies:
- build-layer ({{ $runtime.name }}-{{ $runtime.arch }})
@@ -132,16 +135,22 @@ sign-layer ({{ $runtime.name }}-{{ $runtime.arch }}):
- LAYER_FILE=datadog_lambda_py-{{ $runtime.arch}}-{{ $runtime.python_version }}.zip ./scripts/sign_layers.sh prod
{{ range $environment_name, $environment := (ds "environments").environments }}
+{{ $dotenv := print $runtime.name "_" $runtime.arch "_" $environment_name ".env" }}
publish-layer-{{ $environment_name }} ({{ $runtime.name }}-{{ $runtime.arch }}):
stage: publish
tags: ["arch:amd64"]
image: registry.ddbuild.io/images/docker:20.10-py3
rules:
+ - if: '"{{ $environment_name }}" == "sandbox" && $REGION == "{{ $e2e_region }}" && "{{ $runtime.arch }}" == "amd64"'
+ when: on_success
- if: '"{{ $environment_name }}" == "sandbox"'
when: manual
allow_failure: true
- if: '$CI_COMMIT_TAG =~ /^v.*/'
+ artifacts:
+ reports:
+ dotenv: {{ $dotenv }}
needs:
{{ if or (eq $environment_name "prod") }}
- sign-layer ({{ $runtime.name }}-{{ $runtime.arch}})
@@ -166,7 +175,7 @@ publish-layer-{{ $environment_name }} ({{ $runtime.name }}-{{ $runtime.arch }}):
before_script:
- EXTERNAL_ID_NAME={{ $environment.external_id }} ROLE_TO_ASSUME={{ $environment.role_to_assume }} AWS_ACCOUNT={{ $environment.account }} source ./ci/get_secrets.sh
script:
- - STAGE={{ $environment_name }} PYTHON_VERSION={{ $runtime.python_version }} ARCH={{ $runtime.arch }} ./ci/publish_layers.sh
+ - STAGE={{ $environment_name }} PYTHON_VERSION={{ $runtime.python_version }} ARCH={{ $runtime.arch }} DOTENV={{ $dotenv }} ./ci/publish_layers.sh
{{- end }}
@@ -232,3 +241,56 @@ signed layer bundle:
- rm -rf datadog_lambda_py-signed-bundle-${CI_JOB_ID}
- mkdir -p datadog_lambda_py-signed-bundle-${CI_JOB_ID}
- cp .layers/datadog_lambda_py-*.zip datadog_lambda_py-signed-bundle-${CI_JOB_ID}
+
+e2e-test:
+ stage: e2e
+ trigger:
+ project: DataDog/serverless-e2e-tests
+ strategy: depend
+ variables:
+ LANGUAGES_SUBSET: python
+ # These env vars are inherited from the dotenv reports of the publish-layer jobs
+ {{- range (ds "runtimes").runtimes }}
+ {{- if eq .arch "amd64" }}
+ {{- $version := print (.name | strings.Trim "python") }}
+ PYTHON_{{ $version }}_VERSION: $PYTHON_{{ $version }}_VERSION
+ {{- end }}
+ {{- end }}
+ needs: {{ range (ds "runtimes").runtimes }}
+ {{- if eq .arch "amd64" }}
+ - "publish-layer-sandbox ({{ .name }}-{{ .arch }}): [{{ $e2e_region }}]"
+ {{- end }}
+ {{- end }}
+
+e2e-test-status:
+ stage: e2e
+ image: registry.ddbuild.io/images/docker:20.10-py3
+ tags: ["arch:amd64"]
+ timeout: 3h
+ script: |
+ GITLAB_API_TOKEN=$(aws ssm get-parameter --region us-east-1 --name "ci.${CI_PROJECT_NAME}.serverless-e2e-gitlab-token" --with-decryption --query "Parameter.Value" --out text)
+ URL="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/pipelines/${CI_PIPELINE_ID}/bridges"
+ echo "Fetching E2E job status from: $URL"
+ while true; do
+ RESPONSE=$(curl -s --header "PRIVATE-TOKEN: ${GITLAB_API_TOKEN}" "$URL")
+ E2E_JOB_STATUS=$(echo "$RESPONSE" | jq -r '.[] | select(.name=="e2e-test") | .downstream_pipeline.status')
+ echo -n "E2E job status: $E2E_JOB_STATUS, "
+ if [ "$E2E_JOB_STATUS" == "success" ]; then
+ echo "✅ E2E tests completed successfully"
+ exit 0
+ elif [ "$E2E_JOB_STATUS" == "failed" ]; then
+ echo "❌ E2E tests failed"
+ exit 1
+ elif [ "$E2E_JOB_STATUS" == "running" ]; then
+ echo "⏳ E2E tests are still running, retrying in 1 minute..."
+ elif [ "$E2E_JOB_STATUS" == "canceled" ]; then
+ echo "🚫 E2E tests were canceled"
+ exit 1
+ elif [ "$E2E_JOB_STATUS" == "skipped" ]; then
+ echo "⏭️ E2E tests were skipped"
+ exit 0
+ else
+ echo "❓ Unknown E2E test status: $E2E_JOB_STATUS, retrying in 1 minute..."
+ fi
+ sleep 60
+ done
diff --git a/ci/publish_layers.sh b/ci/publish_layers.sh
index 58257bf11..9654582a2 100755
--- a/ci/publish_layers.sh
+++ b/ci/publish_layers.sh
@@ -199,6 +199,8 @@ fi
while [ $latest_version -lt $VERSION ]; do
latest_version=$(publish_layer $REGION $layer $aws_cli_python_version_key $layer_path)
printf "[$REGION] Published version $latest_version for layer $layer in region $REGION\n"
+ latest_arn=$(aws lambda get-layer-version --layer-name $layer --version-number $latest_version --region $REGION --query 'LayerVersionArn' --output text)
+ printf "[$REGION] Published arn $latest_arn\n"
# This shouldn't happen unless someone manually deleted the latest version, say 28, and
# then tries to republish 28 again. The published version would actually be 29, because
@@ -209,4 +211,10 @@ while [ $latest_version -lt $VERSION ]; do
fi
done
+if [ -n "$DOTENV" ]; then
+ printf "[$REGION] Exporting layer version to $DOTENV file...\n"
+ echo "PYTHON_${PYTHON_VERSION/./}_VERSION=$latest_arn" >> "$DOTENV"
+ cat "$DOTENV"
+fi
+
printf "[$REGION] Finished publishing layers...\n\n"
diff --git a/datadog_lambda/__init__.py b/datadog_lambda/__init__.py
index 378fd15c8..059cead9e 100644
--- a/datadog_lambda/__init__.py
+++ b/datadog_lambda/__init__.py
@@ -1,13 +1,7 @@
+import datadog_lambda.config # noqa: F401 needs to be imported before `ddtrace`
from datadog_lambda.cold_start import initialize_cold_start_tracing
-import os
-if os.environ.get("DD_INSTRUMENTATION_TELEMETRY_ENABLED") is None:
- os.environ["DD_INSTRUMENTATION_TELEMETRY_ENABLED"] = "false"
-
-if os.environ.get("DD_API_SECURITY_ENABLED") is None:
- os.environ["DD_API_SECURITY_ENABLED"] = "False"
-
initialize_cold_start_tracing()
# The minor version corresponds to the Lambda layer version.
@@ -17,3 +11,10 @@
initialize_logging(__name__)
+
+
+from datadog_lambda.patch import patch_all # noqa: E402
+
+# Patch third-party libraries for tracing, must be done before importing any
+# handler code.
+patch_all()
diff --git a/datadog_lambda/api.py b/datadog_lambda/api.py
index fd3e2c177..4921dae90 100644
--- a/datadog_lambda/api.py
+++ b/datadog_lambda/api.py
@@ -1,5 +1,7 @@
-import os
import logging
+import os
+
+from datadog_lambda.config import config
logger = logging.getLogger(__name__)
KMS_ENCRYPTION_CONTEXT_KEY = "LambdaFunctionName"
@@ -7,9 +9,10 @@
def decrypt_kms_api_key(kms_client, ciphertext):
- from botocore.exceptions import ClientError
import base64
+ from botocore.exceptions import ClientError
+
"""
Decodes and deciphers the base64-encoded ciphertext given as a parameter using KMS.
For this to work properly, the Lambda function must have the appropriate IAM permissions.
@@ -26,7 +29,6 @@ def decrypt_kms_api_key(kms_client, ciphertext):
is added. We need to try decrypting the API key both with and without the encryption context.
"""
# Try without encryption context, in case API key was encrypted using the AWS CLI
- function_name = os.environ.get("AWS_LAMBDA_FUNCTION_NAME")
try:
plaintext = kms_client.decrypt(CiphertextBlob=decoded_bytes)[
"Plaintext"
@@ -40,7 +42,7 @@ def decrypt_kms_api_key(kms_client, ciphertext):
plaintext = kms_client.decrypt(
CiphertextBlob=decoded_bytes,
EncryptionContext={
- KMS_ENCRYPTION_CONTEXT_KEY: function_name,
+ KMS_ENCRYPTION_CONTEXT_KEY: config.function_name,
},
)["Plaintext"].decode("utf-8")
@@ -63,10 +65,9 @@ def get_api_key() -> str:
DD_API_KEY = os.environ.get("DD_API_KEY", os.environ.get("DATADOG_API_KEY", ""))
LAMBDA_REGION = os.environ.get("AWS_REGION", "")
- is_gov_region = LAMBDA_REGION.startswith("us-gov-")
- if is_gov_region:
+ if config.fips_mode_enabled:
logger.debug(
- "Govcloud region detected. Using FIPs endpoints for secrets management."
+ "FIPS mode is enabled, using FIPS endpoints for secrets management."
)
if DD_API_KEY_SECRET_ARN:
@@ -80,7 +81,7 @@ def get_api_key() -> str:
return ""
endpoint_url = (
f"https://secretsmanager-fips.{secrets_region}.amazonaws.com/"
- if is_gov_region
+ if config.fips_mode_enabled
else None
)
secrets_manager_client = _boto3_client(
@@ -92,7 +93,9 @@ def get_api_key() -> str:
elif DD_API_KEY_SSM_NAME:
# SSM endpoints: https://docs.aws.amazon.com/general/latest/gr/ssm.html
fips_endpoint = (
- f"https://ssm-fips.{lambda_region}.amazonaws.com/" if is_gov_region else None
+ f"https://ssm-fips.{lambda_region}.amazonaws.com/"
+ if config.fips_mode_enabled
+ else None
)
ssm_client = _boto3_client("ssm", endpoint_url=fips_endpoint)
api_key = ssm_client.get_parameter(
@@ -101,7 +104,9 @@ def get_api_key() -> str:
elif DD_KMS_API_KEY:
# KMS endpoints: https://docs.aws.amazon.com/general/latest/gr/kms.html
fips_endpoint = (
- f"https://kms-fips.{lambda_region}.amazonaws.com/" if is_gov_region else None
+ f"https://kms-fips.{lambda_region}.amazonaws.com/"
+ if config.fips_mode_enabled
+ else None
)
kms_client = _boto3_client("kms", endpoint_url=fips_endpoint)
api_key = decrypt_kms_api_key(kms_client, DD_KMS_API_KEY)
@@ -112,7 +117,7 @@ def get_api_key() -> str:
def init_api():
- if not os.environ.get("DD_FLUSH_TO_LOG", "").lower() == "true":
+ if not config.flush_to_log:
# Make sure that this package would always be lazy-loaded/outside from the critical path
# since underlying packages are quite heavy to load
# and useless with the extension unless sending metrics with timestamps
diff --git a/datadog_lambda/asm.py b/datadog_lambda/asm.py
new file mode 100644
index 000000000..6c65a9465
--- /dev/null
+++ b/datadog_lambda/asm.py
@@ -0,0 +1,251 @@
+import logging
+import urllib.parse
+from copy import deepcopy
+from typing import Any, Dict, List, Optional, Union
+
+from ddtrace.contrib.internal.trace_utils import _get_request_header_client_ip
+from ddtrace.internal import core
+from ddtrace.internal.utils import get_blocked
+from ddtrace.internal.utils import http as http_utils
+from ddtrace.trace import Span
+
+from datadog_lambda.trigger import (
+ EventSubtypes,
+ EventTypes,
+ _EventSource,
+ _http_event_types,
+)
+
+logger = logging.getLogger(__name__)
+
+
+def _to_single_value_headers(headers: Dict[str, List[str]]) -> Dict[str, str]:
+ """
+ Convert multi-value headers to single-value headers.
+ If a header has multiple values, join them with commas.
+ """
+ single_value_headers = {}
+ for key, values in headers.items():
+ single_value_headers[key] = ", ".join(values)
+ return single_value_headers
+
+
+def _merge_single_and_multi_value_headers(
+ single_value_headers: Dict[str, str],
+ multi_value_headers: Dict[str, List[str]],
+):
+ """
+ Merge single-value headers with multi-value headers.
+ If a header exists in both, we merge them removing duplicates
+ """
+ merged_headers = deepcopy(multi_value_headers)
+ for key, value in single_value_headers.items():
+ if key not in merged_headers:
+ merged_headers[key] = [value]
+ elif value not in merged_headers[key]:
+ merged_headers[key].append(value)
+ return _to_single_value_headers(merged_headers)
+
+
+def asm_set_context(event_source: _EventSource):
+ """Add asm specific items to the ExecutionContext.
+
+ This allows the AppSecSpanProcessor to know information about the event
+ at the moment the span is created and skip it when not relevant.
+ """
+
+ if event_source.event_type not in _http_event_types:
+ core.set_item("appsec_skip_next_lambda_event", True)
+
+
+def asm_start_request(
+ span: Span,
+ event: Dict[str, Any],
+ event_source: _EventSource,
+ trigger_tags: Dict[str, str],
+):
+ if event_source.event_type not in _http_event_types:
+ return
+
+ request_headers: Dict[str, str] = {}
+ peer_ip: Optional[str] = None
+ request_path_parameters: Optional[Dict[str, Any]] = None
+ route: Optional[str] = None
+
+ if event_source.event_type == EventTypes.ALB:
+ raw_uri = event.get("path")
+
+ if event_source.subtype == EventSubtypes.ALB:
+ request_headers = event.get("headers", {})
+ parsed_query = event.get("queryStringParameters")
+ if event_source.subtype == EventSubtypes.ALB_MULTI_VALUE_HEADERS:
+ request_headers = _to_single_value_headers(
+ event.get("multiValueHeaders", {})
+ )
+ parsed_query = event.get("multiValueQueryStringParameters")
+
+ elif event_source.event_type == EventTypes.LAMBDA_FUNCTION_URL:
+ request_headers = event.get("headers", {})
+ peer_ip = event.get("requestContext", {}).get("http", {}).get("sourceIp")
+ raw_uri = event.get("rawPath")
+ parsed_query = event.get("queryStringParameters")
+
+ elif event_source.event_type == EventTypes.API_GATEWAY:
+ request_context = event.get("requestContext", {})
+ request_path_parameters = event.get("pathParameters")
+ route = trigger_tags.get("http.route")
+
+ if event_source.subtype == EventSubtypes.API_GATEWAY:
+ request_headers = event.get("headers", {})
+ peer_ip = request_context.get("identity", {}).get("sourceIp")
+ raw_uri = event.get("path")
+ parsed_query = event.get("multiValueQueryStringParameters")
+
+ elif event_source.subtype == EventSubtypes.HTTP_API:
+ request_headers = event.get("headers", {})
+ peer_ip = request_context.get("http", {}).get("sourceIp")
+ raw_uri = event.get("rawPath")
+ parsed_query = event.get("queryStringParameters")
+
+ elif event_source.subtype == EventSubtypes.WEBSOCKET:
+ request_headers = _to_single_value_headers(
+ event.get("multiValueHeaders", {})
+ )
+ peer_ip = request_context.get("identity", {}).get("sourceIp")
+ raw_uri = event.get("path")
+ parsed_query = event.get("multiValueQueryStringParameters")
+
+ else:
+ return
+
+ else:
+ return
+
+ body = event.get("body")
+ is_base64_encoded = event.get("isBase64Encoded", False)
+
+ request_ip = _get_request_header_client_ip(request_headers, peer_ip, True)
+ if request_ip is not None:
+ span.set_tag("http.client_ip", request_ip)
+ span.set_tag("network.client.ip", request_ip)
+
+ # Encode the parsed query and append it to reconstruct the original raw URI expected by AppSec.
+ if parsed_query:
+ try:
+ encoded_query = urllib.parse.urlencode(parsed_query, doseq=True)
+ raw_uri += "?" + encoded_query # type: ignore
+ except Exception:
+ pass
+
+ core.dispatch(
+ # The matching listener is registered in ddtrace.appsec._handlers
+ "aws_lambda.start_request",
+ (
+ span,
+ request_headers,
+ request_ip,
+ body,
+ is_base64_encoded,
+ raw_uri,
+ route,
+ trigger_tags.get("http.method"),
+ parsed_query,
+ request_path_parameters,
+ ),
+ )
+
+
+def asm_start_response(
+ span: Span,
+ status_code: str,
+ event_source: _EventSource,
+ response: Union[Dict[str, Any], str, None],
+):
+ if event_source.event_type not in _http_event_types:
+ return
+
+ if isinstance(response, dict) and (
+ "headers" in response or "multiValueHeaders" in response
+ ):
+ headers = response.get("headers", {})
+ multi_value_request_headers = response.get("multiValueHeaders")
+ if isinstance(multi_value_request_headers, dict) and isinstance(headers, dict):
+ response_headers = _merge_single_and_multi_value_headers(
+ headers, multi_value_request_headers
+ )
+ elif isinstance(headers, dict):
+ response_headers = headers
+ else:
+ response_headers = {
+ "content-type": "application/json",
+ }
+ else:
+ response_headers = {
+ "content-type": "application/json",
+ }
+
+ core.dispatch(
+ # The matching listener is registered in ddtrace.appsec._handlers
+ "aws_lambda.start_response",
+ (
+ span,
+ status_code,
+ response_headers,
+ ),
+ )
+
+ if isinstance(response, dict) and "statusCode" in response:
+ body = response.get("body")
+ else:
+ body = response
+
+ core.dispatch(
+ # The matching listener is registered in ddtrace.appsec._handlers
+ "aws_lambda.parse_body",
+ (body,),
+ )
+
+
+def get_asm_blocked_response(
+ event_source: _EventSource,
+) -> Optional[Dict[str, Any]]:
+ """Get the blocked response for the given event source."""
+ if event_source.event_type not in _http_event_types:
+ return None
+
+ blocked = get_blocked()
+ if not blocked:
+ return None
+
+ desired_type = blocked.get("type", "auto")
+ if desired_type == "none":
+ content_type = "text/plain; charset=utf-8"
+ content = ""
+ else:
+ content_type = blocked.get("content-type", "application/json")
+ content = http_utils._get_blocked_template(content_type)
+
+ response = {
+ "statusCode": blocked.get("status_code", 403),
+ "body": content,
+ "isBase64Encoded": False,
+ }
+
+ needs_multi_value_headers = event_source.equals(
+ EventTypes.ALB, EventSubtypes.ALB_MULTI_VALUE_HEADERS
+ )
+
+ if needs_multi_value_headers:
+ response["multiValueHeaders"] = {
+ "content-type": [content_type],
+ }
+ if "location" in blocked:
+ response["multiValueHeaders"]["location"] = [blocked["location"]]
+ else:
+ response["headers"] = {
+ "content-type": content_type,
+ }
+ if "location" in blocked:
+ response["headers"]["location"] = blocked["location"]
+
+ return response
diff --git a/datadog_lambda/cold_start.py b/datadog_lambda/cold_start.py
index ea10ea206..a40e2fcb3 100644
--- a/datadog_lambda/cold_start.py
+++ b/datadog_lambda/cold_start.py
@@ -1,8 +1,9 @@
import time
-import os
from typing import List, Hashable
import logging
+from datadog_lambda.config import config
+
logger = logging.getLogger(__name__)
_cold_start = True
@@ -86,14 +87,12 @@ def reset_node_stacks():
def push_node(module_name, file_path):
node = ImportNode(module_name, file_path, time.time_ns())
- global import_stack
if import_stack:
import_stack[-1].children.append(node)
import_stack.append(node)
def pop_node(module_name):
- global import_stack
if not import_stack:
return
node = import_stack.pop()
@@ -102,7 +101,6 @@ def pop_node(module_name):
end_time_ns = time.time_ns()
node.end_time_ns = end_time_ns
if not import_stack: # import_stack empty, a root node has been found
- global root_nodes
root_nodes.append(node)
@@ -147,11 +145,7 @@ def wrapped_find_spec(*args, **kwargs):
def initialize_cold_start_tracing():
- if (
- is_new_sandbox()
- and os.environ.get("DD_TRACE_ENABLED", "true").lower() == "true"
- and os.environ.get("DD_COLD_START_TRACING", "true").lower() == "true"
- ):
+ if is_new_sandbox() and config.cold_start_tracing:
from sys import meta_path
for importer in meta_path:
diff --git a/datadog_lambda/config.py b/datadog_lambda/config.py
new file mode 100644
index 000000000..eda6b5828
--- /dev/null
+++ b/datadog_lambda/config.py
@@ -0,0 +1,149 @@
+# Unless explicitly stated otherwise all files in this repository are licensed
+# under the Apache License Version 2.0.
+# This product includes software developed at Datadog (https://www.datadoghq.com/).
+# Copyright 2019 Datadog, Inc.
+
+import logging
+import os
+
+logger = logging.getLogger(__name__)
+
+
+def _get_env(key, default=None, cast=None, depends_on_tracing=False):
+ @property
+ def _getter(self):
+ if not hasattr(self, prop_key):
+ val = self._resolve_env(key, default, cast, depends_on_tracing)
+ setattr(self, prop_key, val)
+ return getattr(self, prop_key)
+
+ prop_key = f"_config_{key}"
+ return _getter
+
+
+def as_bool(val):
+ return val.lower() == "true" or val == "1"
+
+
+def as_list(val):
+ return [val.strip() for val in val.split(",") if val.strip()]
+
+
+class Config:
+ def _resolve_env(self, key, default=None, cast=None, depends_on_tracing=False):
+ if depends_on_tracing and not self.trace_enabled:
+ return False
+ val = os.environ.get(key, default)
+ if cast is not None:
+ try:
+ val = cast(val)
+ except (ValueError, TypeError):
+ msg = (
+ "Failed to cast environment variable '%s' with "
+ "value '%s' to type %s. Using default value '%s'."
+ )
+ logger.warning(msg, key, val, cast.__name__, default)
+ val = default
+ return val
+
+ service = _get_env("DD_SERVICE")
+ env = _get_env("DD_ENV")
+
+ cold_start_tracing = _get_env(
+ "DD_COLD_START_TRACING", "true", as_bool, depends_on_tracing=True
+ )
+ min_cold_start_trace_duration = _get_env("DD_MIN_COLD_START_DURATION", 3, int)
+ cold_start_trace_skip_lib = _get_env(
+ "DD_COLD_START_TRACE_SKIP_LIB",
+ "ddtrace.internal.compat,ddtrace.filters",
+ as_list,
+ )
+
+ capture_payload_max_depth = _get_env("DD_CAPTURE_LAMBDA_PAYLOAD_MAX_DEPTH", 10, int)
+ capture_payload_enabled = _get_env("DD_CAPTURE_LAMBDA_PAYLOAD", "false", as_bool)
+
+ trace_enabled = _get_env("DD_TRACE_ENABLED", "true", as_bool)
+ make_inferred_span = _get_env(
+ "DD_TRACE_MANAGED_SERVICES", "true", as_bool, depends_on_tracing=True
+ )
+ encode_authorizer_context = _get_env(
+ "DD_ENCODE_AUTHORIZER_CONTEXT", "true", as_bool, depends_on_tracing=True
+ )
+ decode_authorizer_context = _get_env(
+ "DD_DECODE_AUTHORIZER_CONTEXT", "true", as_bool, depends_on_tracing=True
+ )
+ add_span_pointers = _get_env("DD_BOTOCORE_ADD_SPAN_POINTERS", "true", as_bool)
+ trace_extractor = _get_env("DD_TRACE_EXTRACTOR")
+
+ enhanced_metrics_enabled = _get_env("DD_ENHANCED_METRICS", "true", as_bool)
+
+ flush_in_thread = _get_env("DD_FLUSH_IN_THREAD", "false", as_bool)
+ flush_to_log = _get_env("DD_FLUSH_TO_LOG", "false", as_bool)
+ logs_injection = _get_env("DD_LOGS_INJECTION", "true", as_bool)
+ merge_xray_traces = _get_env("DD_MERGE_XRAY_TRACES", "false", as_bool)
+
+ otel_enabled = _get_env("DD_TRACE_OTEL_ENABLED", "false", as_bool)
+ profiling_enabled = _get_env("DD_PROFILING_ENABLED", "false", as_bool)
+ llmobs_enabled = _get_env("DD_LLMOBS_ENABLED", "false", as_bool)
+ exception_replay_enabled = _get_env("DD_EXCEPTION_REPLAY_ENABLED", "false", as_bool)
+ data_streams_enabled = _get_env(
+ "DD_DATA_STREAMS_ENABLED", "false", as_bool, depends_on_tracing=True
+ )
+ appsec_enabled = _get_env("DD_APPSEC_ENABLED", "false", as_bool)
+ sca_enabled = _get_env("DD_APPSEC_SCA_ENABLED", "false", as_bool)
+
+ is_gov_region = _get_env("AWS_REGION", "", lambda x: x.startswith("us-gov-"))
+
+ local_test = _get_env("DD_LOCAL_TEST", "false", as_bool)
+ integration_test = _get_env("DD_INTEGRATION_TEST", "false", as_bool)
+
+ aws_lambda_function_name = _get_env("AWS_LAMBDA_FUNCTION_NAME")
+
+ @property
+ def function_name(self):
+ if not hasattr(self, "_config_function_name"):
+ if self.aws_lambda_function_name is None:
+ self._config_function_name = "function"
+ else:
+ self._config_function_name = self.aws_lambda_function_name
+ return self._config_function_name
+
+ @property
+ def is_lambda_context(self):
+ if not hasattr(self, "_config_is_lambda_context"):
+ self._config_is_lambda_context = bool(self.aws_lambda_function_name)
+ return self._config_is_lambda_context
+
+ @property
+ def fips_mode_enabled(self):
+ if not hasattr(self, "_config_fips_mode_enabled"):
+ self._config_fips_mode_enabled = (
+ os.environ.get(
+ "DD_LAMBDA_FIPS_MODE",
+ "true" if self.is_gov_region else "false",
+ ).lower()
+ == "true"
+ )
+ return self._config_fips_mode_enabled
+
+ def _reset(self):
+ for attr in dir(self):
+ if attr.startswith("_config_"):
+ delattr(self, attr)
+
+
+config = Config()
+
+if config.is_gov_region or config.fips_mode_enabled:
+ logger.debug(
+ "Python Lambda Layer FIPS mode is %s.",
+ "enabled" if config.fips_mode_enabled else "not enabled",
+ )
+
+
+if (
+ "DD_INSTRUMENTATION_TELEMETRY_ENABLED" not in os.environ
+ and not config.sca_enabled
+ and not config.appsec_enabled
+):
+ os.environ["DD_INSTRUMENTATION_TELEMETRY_ENABLED"] = "false"
diff --git a/datadog_lambda/dogstatsd.py b/datadog_lambda/dogstatsd.py
index a627492dc..a08e25926 100644
--- a/datadog_lambda/dogstatsd.py
+++ b/datadog_lambda/dogstatsd.py
@@ -1,11 +1,10 @@
+import errno
import logging
import os
-import socket
-import errno
import re
+import socket
from threading import Lock
-
MIN_SEND_BUFFER_SIZE = 32 * 1024
log = logging.getLogger("datadog_lambda.dogstatsd")
@@ -55,14 +54,21 @@ def _get_udp_socket(cls, host, port):
return sock
- def distribution(self, metric, value, tags=None):
+ def distribution(self, metric, value, tags=None, timestamp=None):
"""
- Send a global distribution value, optionally setting tags.
+ Send a global distribution value, optionally setting tags. The optional
+ timestamp should be an integer representing seconds since the epoch
+ (January 1, 1970, 00:00:00 UTC).
>>> statsd.distribution("uploaded.file.size", 1445)
>>> statsd.distribution("album.photo.count", 26, tags=["gender:female"])
+ >>> statsd.distribution(
+ >>> "historic.file.count",
+ >>> 5,
+ >>> timestamp=int(datetime(2020, 2, 14, 12, 0, 0).timestamp()),
+ >>> )
"""
- self._report(metric, "d", value, tags)
+ self._report(metric, "d", value, tags, timestamp)
def close_socket(self):
"""
@@ -84,20 +90,21 @@ def normalize_tags(self, tag_list):
for tag in tag_list
]
- def _serialize_metric(self, metric, metric_type, value, tags):
+ def _serialize_metric(self, metric, metric_type, value, tags, timestamp):
# Create/format the metric packet
- return "%s:%s|%s%s" % (
+ return "%s:%s|%s%s%s" % (
metric,
value,
metric_type,
("|#" + ",".join(self.normalize_tags(tags))) if tags else "",
+ ("|T" + str(int(timestamp))) if timestamp is not None else "",
)
- def _report(self, metric, metric_type, value, tags):
+ def _report(self, metric, metric_type, value, tags, timestamp):
if value is None:
return
- payload = self._serialize_metric(metric, metric_type, value, tags)
+ payload = self._serialize_metric(metric, metric_type, value, tags, timestamp)
# Send it
self._send_to_server(payload)
diff --git a/datadog_lambda/metric.py b/datadog_lambda/metric.py
index f9c67a26e..5df0812f1 100644
--- a/datadog_lambda/metric.py
+++ b/datadog_lambda/metric.py
@@ -3,40 +3,62 @@
# This product includes software developed at Datadog (https://www.datadoghq.com/).
# Copyright 2019 Datadog, Inc.
-import os
-import time
+import enum
import logging
-import ujson as json
+import time
from datetime import datetime, timedelta
+import ujson as json
+
+from datadog_lambda.config import config
from datadog_lambda.extension import should_use_extension
-from datadog_lambda.tags import get_enhanced_metrics_tags, dd_lambda_layer_tag
+from datadog_lambda.tags import dd_lambda_layer_tag, get_enhanced_metrics_tags
logger = logging.getLogger(__name__)
-lambda_stats = None
-extension_thread_stats = None
-flush_in_thread = os.environ.get("DD_FLUSH_IN_THREAD", "").lower() == "true"
+class MetricsHandler(enum.Enum):
+ EXTENSION = "extension"
+ FORWARDER = "forwarder"
+ DATADOG_API = "datadog_api"
+ NO_METRICS = "no_metrics"
+
+
+def _select_metrics_handler():
+ if should_use_extension:
+ return MetricsHandler.EXTENSION
+ if config.flush_to_log:
+ return MetricsHandler.FORWARDER
+
+ if config.fips_mode_enabled:
+ logger.debug(
+ "With FIPS mode enabled, the Datadog API metrics handler is unavailable."
+ )
+ return MetricsHandler.NO_METRICS
+
+ return MetricsHandler.DATADOG_API
+
-if should_use_extension:
+metrics_handler = _select_metrics_handler()
+logger.debug("identified primary metrics handler as %s", metrics_handler)
+
+
+lambda_stats = None
+if metrics_handler == MetricsHandler.EXTENSION:
from datadog_lambda.statsd_writer import StatsDWriter
lambda_stats = StatsDWriter()
-else:
+
+elif metrics_handler == MetricsHandler.DATADOG_API:
# Periodical flushing in a background thread is NOT guaranteed to succeed
# and leads to data loss. When disabled, metrics are only flushed at the
# end of invocation. To make metrics submitted from a long-running Lambda
# function available sooner, consider using the Datadog Lambda extension.
- from datadog_lambda.thread_stats_writer import ThreadStatsWriter
from datadog_lambda.api import init_api
+ from datadog_lambda.thread_stats_writer import ThreadStatsWriter
init_api()
- lambda_stats = ThreadStatsWriter(flush_in_thread)
-
-enhanced_metrics_enabled = (
- os.environ.get("DD_ENHANCED_METRICS", "true").lower() == "true"
-)
+ lambda_stats = ThreadStatsWriter(config.flush_in_thread)
def lambda_metric(metric_name, value, timestamp=None, tags=None, force_async=False):
@@ -44,16 +66,19 @@ def lambda_metric(metric_name, value, timestamp=None, tags=None, force_async=Fal
Submit a data point to Datadog distribution metrics.
https://docs.datadoghq.com/graphing/metrics/distributions/
- When DD_FLUSH_TO_LOG is True, write metric to log, and
- wait for the Datadog Log Forwarder Lambda function to submit
- the metrics asynchronously.
+ If the Datadog Lambda Extension is present, metrics are submitted to its
+ dogstatsd endpoint.
+
+ When DD_FLUSH_TO_LOG is True or force_async is True, write metric to log,
+ and wait for the Datadog Log Forwarder Lambda function to submit the
+ metrics asynchronously.
Otherwise, the metrics will be submitted to the Datadog API
periodically and at the end of the function execution in a
background thread.
- Note that if the extension is present, it will override the DD_FLUSH_TO_LOG value
- and always use the layer to send metrics to the extension
+ Note that if the extension is present, it will override the DD_FLUSH_TO_LOG
+ value and always use the layer to send metrics to the extension
"""
if not metric_name or not isinstance(metric_name, str):
logger.warning(
@@ -71,56 +96,66 @@ def lambda_metric(metric_name, value, timestamp=None, tags=None, force_async=Fal
)
return
- flush_to_logs = os.environ.get("DD_FLUSH_TO_LOG", "").lower() == "true"
tags = [] if tags is None else list(tags)
tags.append(dd_lambda_layer_tag)
- if should_use_extension and timestamp is not None:
- # The extension does not support timestamps for distributions so we create a
- # a thread stats writer to submit metrics with timestamps to the API
- timestamp_ceiling = int(
- (datetime.now() - timedelta(hours=4)).timestamp()
- ) # 4 hours ago
- if isinstance(timestamp, datetime):
- timestamp = int(timestamp.timestamp())
- if timestamp_ceiling > timestamp:
- logger.warning(
- "Timestamp %s is older than 4 hours, not submitting metric %s",
- timestamp,
- metric_name,
- )
- return
- global extension_thread_stats
- if extension_thread_stats is None:
- from datadog_lambda.thread_stats_writer import ThreadStatsWriter
- from datadog_lambda.api import init_api
-
- init_api()
- extension_thread_stats = ThreadStatsWriter(flush_in_thread)
-
- extension_thread_stats.distribution(
- metric_name, value, tags=tags, timestamp=timestamp
- )
- return
+ if metrics_handler == MetricsHandler.EXTENSION:
+ if timestamp is not None:
+ if isinstance(timestamp, datetime):
+ timestamp = int(timestamp.timestamp())
+
+ else:
+ try:
+ timestamp = int(timestamp)
+ except Exception:
+ logger.debug(
+ "Ignoring metric submission for metric '%s' because the timestamp cannot "
+ "be turned into an integer: %r",
+ metric_name,
+ timestamp,
+ )
+ return
+
+ timestamp_floor = int((datetime.now() - timedelta(hours=4)).timestamp())
+ if timestamp < timestamp_floor:
+ logger.warning(
+ "Timestamp %s is older than 4 hours, not submitting metric %s",
+ timestamp,
+ metric_name,
+ )
+ return
- if should_use_extension:
logger.debug(
"Sending metric %s value %s to Datadog via extension", metric_name, value
)
lambda_stats.distribution(metric_name, value, tags=tags, timestamp=timestamp)
+
+ elif force_async or (metrics_handler == MetricsHandler.FORWARDER):
+ write_metric_point_to_stdout(metric_name, value, timestamp=timestamp, tags=tags)
+
+ elif metrics_handler == MetricsHandler.DATADOG_API:
+ lambda_stats.distribution(metric_name, value, tags=tags, timestamp=timestamp)
+
+ elif metrics_handler == MetricsHandler.NO_METRICS:
+ logger.debug(
+ "Metric %s cannot be submitted because the metrics handler is disabled",
+ metric_name,
+ ),
+
else:
- if flush_to_logs or force_async:
- write_metric_point_to_stdout(
- metric_name, value, timestamp=timestamp, tags=tags
- )
- else:
- lambda_stats.distribution(
- metric_name, value, tags=tags, timestamp=timestamp
- )
+ # This should be qutie impossible, but let's at least log a message if
+ # it somehow happens.
+ logger.debug(
+ "Metric %s cannot be submitted because the metrics handler is not configured: %s",
+ metric_name,
+ metrics_handler,
+ )
-def write_metric_point_to_stdout(metric_name, value, timestamp=None, tags=[]):
+def write_metric_point_to_stdout(metric_name, value, timestamp=None, tags=None):
"""Writes the specified metric point to standard output"""
+ tags = tags or []
+
logger.debug(
"Sending metric %s value %s to Datadog via log forwarder", metric_name, value
)
@@ -138,19 +173,8 @@ def write_metric_point_to_stdout(metric_name, value, timestamp=None, tags=[]):
def flush_stats(lambda_context=None):
- lambda_stats.flush()
-
- if extension_thread_stats is not None:
- tags = None
- if lambda_context is not None:
- tags = get_enhanced_metrics_tags(lambda_context)
- split_arn = lambda_context.invoked_function_arn.split(":")
- if len(split_arn) > 7:
- # Get rid of the alias
- split_arn.pop()
- arn = ":".join(split_arn)
- tags.append("function_arn:" + arn)
- extension_thread_stats.flush(tags)
+ if lambda_stats is not None:
+ lambda_stats.flush()
def submit_enhanced_metric(metric_name, lambda_context):
@@ -160,7 +184,7 @@ def submit_enhanced_metric(metric_name, lambda_context):
metric_name (str): metric name w/o enhanced prefix i.e. "invocations" or "errors"
lambda_context (object): Lambda context dict passed to the function by AWS
"""
- if not enhanced_metrics_enabled:
+ if not config.enhanced_metrics_enabled:
logger.debug(
"Not submitting enhanced metric %s because enhanced metrics are disabled",
metric_name,
@@ -190,6 +214,33 @@ def submit_errors_metric(lambda_context):
submit_enhanced_metric("errors", lambda_context)
+def submit_batch_item_failures_metric(response, lambda_context):
+ """Submit aws.lambda.enhanced.batch_item_failures metric with the count of batch item failures
+
+ Args:
+ response (dict): Lambda function response object
+ lambda_context (object): Lambda context dict passed to the function by AWS
+ """
+ if not config.enhanced_metrics_enabled:
+ logger.debug(
+ "Not submitting batch_item_failures metric because enhanced metrics are disabled"
+ )
+ return
+
+ if not isinstance(response, dict):
+ return
+
+ batch_item_failures = response.get("batchItemFailures")
+ if batch_item_failures is not None and isinstance(batch_item_failures, list):
+ lambda_metric(
+ "aws.lambda.enhanced.batch_item_failures",
+ len(batch_item_failures),
+ timestamp=None,
+ tags=get_enhanced_metrics_tags(lambda_context),
+ force_async=True,
+ )
+
+
def submit_dynamodb_stream_type_metric(event):
stream_view_type = (
event.get("Records", [{}])[0].get("dynamodb", {}).get("StreamViewType")
diff --git a/datadog_lambda/patch.py b/datadog_lambda/patch.py
index 5b8a92c53..6d2af0dcf 100644
--- a/datadog_lambda/patch.py
+++ b/datadog_lambda/patch.py
@@ -3,7 +3,6 @@
# This product includes software developed at Datadog (https://www.datadoghq.com/).
# Copyright 2019 Datadog, Inc.
-import os
import sys
import logging
import zlib
@@ -13,10 +12,8 @@
from wrapt.importer import when_imported
from ddtrace import patch_all as patch_all_dd
-from datadog_lambda.tracing import (
- get_dd_trace_context,
- dd_tracing_enabled,
-)
+from datadog_lambda.config import config
+from datadog_lambda.tracing import get_dd_trace_context
from collections.abc import MutableMapping
logger = logging.getLogger(__name__)
@@ -32,7 +29,7 @@ def patch_all():
"""
_patch_for_integration_tests()
- if dd_tracing_enabled:
+ if config.trace_enabled:
patch_all_dd()
else:
_patch_http()
@@ -44,8 +41,7 @@ def _patch_for_integration_tests():
Patch `requests` to log the outgoing requests for integration tests.
"""
global _integration_tests_patched
- is_in_tests = os.environ.get("DD_INTEGRATION_TEST", "false").lower() == "true"
- if not _integration_tests_patched and is_in_tests:
+ if not _integration_tests_patched and config.integration_test:
wrap("requests", "Session.send", _log_request)
_integration_tests_patched = True
diff --git a/datadog_lambda/span_pointers.py b/datadog_lambda/span_pointers.py
index 40d959e61..45925d929 100644
--- a/datadog_lambda/span_pointers.py
+++ b/datadog_lambda/span_pointers.py
@@ -1,12 +1,12 @@
from itertools import chain
import logging
-import os
from typing import List
from typing import Optional
from ddtrace._trace._span_pointer import _SpanPointerDirection
from ddtrace._trace._span_pointer import _SpanPointerDescription
+from datadog_lambda.config import config
from datadog_lambda.metric import submit_dynamodb_stream_type_metric
from datadog_lambda.trigger import EventTypes
@@ -14,15 +14,10 @@
logger = logging.getLogger(__name__)
-dd_botocore_add_span_pointers = os.environ.get(
- "DD_BOTOCORE_ADD_SPAN_POINTERS", "true"
-).lower() in ("true", "1")
-
-
def calculate_span_pointers(
event_source,
event,
- botocore_add_span_pointers=dd_botocore_add_span_pointers,
+ botocore_add_span_pointers=config.add_span_pointers,
) -> List[_SpanPointerDescription]:
try:
if botocore_add_span_pointers:
diff --git a/datadog_lambda/stats_writer.py b/datadog_lambda/stats_writer.py
index d3919c30f..563b1ae98 100644
--- a/datadog_lambda/stats_writer.py
+++ b/datadog_lambda/stats_writer.py
@@ -1,5 +1,5 @@
class StatsWriter:
- def distribution(self, metric_name, value, tags=[], timestamp=None):
+ def distribution(self, metric_name, value, tags=None, timestamp=None):
raise NotImplementedError()
def flush(self):
diff --git a/datadog_lambda/statsd_writer.py b/datadog_lambda/statsd_writer.py
index 33843dc6a..4aaab8d53 100644
--- a/datadog_lambda/statsd_writer.py
+++ b/datadog_lambda/statsd_writer.py
@@ -1,5 +1,5 @@
-from datadog_lambda.stats_writer import StatsWriter
from datadog_lambda.dogstatsd import statsd
+from datadog_lambda.stats_writer import StatsWriter
class StatsDWriter(StatsWriter):
@@ -7,8 +7,8 @@ class StatsDWriter(StatsWriter):
Writes distribution metrics using StatsD protocol
"""
- def distribution(self, metric_name, value, tags=[], timestamp=None):
- statsd.distribution(metric_name, value, tags=tags)
+ def distribution(self, metric_name, value, tags=None, timestamp=None):
+ statsd.distribution(metric_name, value, tags=tags, timestamp=timestamp)
def flush(self):
pass
diff --git a/datadog_lambda/tag_object.py b/datadog_lambda/tag_object.py
index 6d82f83b5..744e48933 100644
--- a/datadog_lambda/tag_object.py
+++ b/datadog_lambda/tag_object.py
@@ -4,18 +4,17 @@
# Copyright 2021 Datadog, Inc.
from decimal import Decimal
-import logging
import ujson as json
+from datadog_lambda.config import config
+
redactable_keys = ["authorization", "x-authorization", "password", "token"]
-max_depth = 10
-logger = logging.getLogger(__name__)
def tag_object(span, key, obj, depth=0):
if obj is None:
return span.set_tag(key, obj)
- if depth >= max_depth:
+ if depth >= config.capture_payload_max_depth:
return span.set_tag(key, _redact_val(key, str(obj)[0:5000]))
depth += 1
if _should_try_string(obj):
diff --git a/datadog_lambda/thread_stats_writer.py b/datadog_lambda/thread_stats_writer.py
index 422a9a0a4..f21ee31f9 100644
--- a/datadog_lambda/thread_stats_writer.py
+++ b/datadog_lambda/thread_stats_writer.py
@@ -3,6 +3,7 @@
# Make sure that this package would always be lazy-loaded/outside from the critical path
# since underlying packages are quite heavy to load and useless when the extension is present
from datadog.threadstats import ThreadStats
+
from datadog_lambda.stats_writer import StatsWriter
logger = logging.getLogger(__name__)
@@ -17,7 +18,7 @@ def __init__(self, flush_in_thread):
self.thread_stats = ThreadStats(compress_payload=True)
self.thread_stats.start(flush_in_thread=flush_in_thread)
- def distribution(self, metric_name, value, tags=[], timestamp=None):
+ def distribution(self, metric_name, value, tags=None, timestamp=None):
self.thread_stats.distribution(
metric_name, value, tags=tags, timestamp=timestamp
)
diff --git a/datadog_lambda/tracing.py b/datadog_lambda/tracing.py
index 9a27673c6..225f5dd82 100644
--- a/datadog_lambda/tracing.py
+++ b/datadog_lambda/tracing.py
@@ -4,6 +4,7 @@
# Copyright 2019 Datadog, Inc.
import logging
import os
+import re
import traceback
import ujson as json
from datetime import datetime, timezone
@@ -32,6 +33,8 @@
from ddtrace import __version__ as ddtrace_version
from ddtrace.propagation.http import HTTPPropagator
from ddtrace.trace import Context, Span, tracer
+
+from datadog_lambda.config import config
from datadog_lambda import __version__ as datadog_lambda_version
from datadog_lambda.trigger import (
_EventSource,
@@ -42,10 +45,7 @@
EventSubtypes,
)
-dd_trace_otel_enabled = (
- os.environ.get("DD_TRACE_OTEL_ENABLED", "false").lower() == "true"
-)
-if dd_trace_otel_enabled:
+if config.otel_enabled:
from opentelemetry.trace import set_tracer_provider
from ddtrace.opentelemetry import TracerProvider
@@ -55,18 +55,6 @@
logger = logging.getLogger(__name__)
dd_trace_context = None
-dd_tracing_enabled = os.environ.get("DD_TRACE_ENABLED", "false").lower() == "true"
-if dd_tracing_enabled:
- # Enable the telemetry client if the user has opted in
- if (
- os.environ.get("DD_INSTRUMENTATION_TELEMETRY_ENABLED", "false").lower()
- == "true"
- ):
- from ddtrace.internal.telemetry import telemetry_writer
-
- telemetry_writer.enable()
-
-is_lambda_context = os.environ.get(XrayDaemon.FUNCTION_NAME_HEADER_NAME) != ""
propagator = HTTPPropagator()
@@ -75,6 +63,24 @@
LOWER_64_BITS = "LOWER_64_BITS"
+def _dsm_set_checkpoint(context_json, event_type, arn):
+ if not config.data_streams_enabled:
+ return
+
+ if not arn:
+ return
+
+ try:
+ from ddtrace.data_streams import set_consume_checkpoint
+
+ carrier_get = lambda k: context_json and context_json.get(k) # noqa: E731
+ set_consume_checkpoint(event_type, arn, carrier_get, manual_checkpoint=False)
+ except Exception as e:
+ logger.debug(
+ f"DSM:Failed to set consume checkpoint for {event_type} {arn}: {e}"
+ )
+
+
def _convert_xray_trace_id(xray_trace_id):
"""
Convert X-Ray trace id (hex)'s last 63 bits to a Datadog trace id (int).
@@ -97,7 +103,7 @@ def _convert_xray_sampling(xray_sampled):
def _get_xray_trace_context():
- if not is_lambda_context:
+ if not config.is_lambda_context:
return None
xray_trace_entity = parse_xray_header(
@@ -198,6 +204,20 @@ def extract_context_from_http_event_or_context(
return context
+def extract_context_from_request_header_or_context(event, lambda_context, event_source):
+ request = event.get("request")
+ if isinstance(request, (set, dict)) and "headers" in request:
+ context = extract_context_from_http_event_or_context(
+ request,
+ lambda_context,
+ event_source,
+ decode_authorizer_context=False,
+ )
+ else:
+ context = extract_context_from_lambda_context(lambda_context)
+ return context
+
+
def create_sns_event(message):
return {
"Records": [
@@ -210,7 +230,9 @@ def create_sns_event(message):
}
-def extract_context_from_sqs_or_sns_event_or_context(event, lambda_context):
+def extract_context_from_sqs_or_sns_event_or_context(
+ event, lambda_context, event_source
+):
"""
Extract Datadog trace context from an SQS event.
@@ -222,7 +244,10 @@ def extract_context_from_sqs_or_sns_event_or_context(event, lambda_context):
Lambda Context.
Falls back to lambda context if no trace data is found in the SQS message attributes.
+ Set a DSM checkpoint if DSM is enabled and the method for context propagation is supported.
"""
+ source_arn = ""
+ event_type = "sqs" if event_source.equals(EventTypes.SQS) else "sns"
# EventBridge => SQS
try:
@@ -234,6 +259,7 @@ def extract_context_from_sqs_or_sns_event_or_context(event, lambda_context):
try:
first_record = event.get("Records")[0]
+ source_arn = first_record.get("eventSourceARN", "")
# logic to deal with SNS => SQS event
if "body" in first_record:
@@ -249,6 +275,9 @@ def extract_context_from_sqs_or_sns_event_or_context(event, lambda_context):
msg_attributes = first_record.get("messageAttributes")
if msg_attributes is None:
sns_record = first_record.get("Sns") or {}
+ # SNS->SQS event would extract SNS arn without this check
+ if event_source.equals(EventTypes.SNS):
+ source_arn = sns_record.get("TopicArn", "")
msg_attributes = sns_record.get("MessageAttributes") or {}
dd_payload = msg_attributes.get("_datadog")
if dd_payload:
@@ -280,8 +309,9 @@ def extract_context_from_sqs_or_sns_event_or_context(event, lambda_context):
logger.debug(
"Failed to extract Step Functions context from SQS/SNS event."
)
-
- return propagator.extract(dd_data)
+ context = propagator.extract(dd_data)
+ _dsm_set_checkpoint(dd_data, event_type, source_arn)
+ return context
else:
# Handle case where trace context is injected into attributes.AWSTraceHeader
# example: Root=1-654321ab-000000001234567890abcdef;Parent=0123456789abcdef;Sampled=1
@@ -304,9 +334,13 @@ def extract_context_from_sqs_or_sns_event_or_context(event, lambda_context):
span_id=int(x_ray_context["parent_id"], 16),
sampling_priority=float(x_ray_context["sampled"]),
)
+ # Still want to set a DSM checkpoint even if DSM context not propagated
+ _dsm_set_checkpoint(None, event_type, source_arn)
return extract_context_from_lambda_context(lambda_context)
except Exception as e:
logger.debug("The trace extractor returned with error %s", e)
+ # Still want to set a DSM checkpoint even if DSM context not propagated
+ _dsm_set_checkpoint(None, event_type, source_arn)
return extract_context_from_lambda_context(lambda_context)
@@ -365,9 +399,12 @@ def extract_context_from_eventbridge_event(event, lambda_context):
def extract_context_from_kinesis_event(event, lambda_context):
"""
Extract datadog trace context from a Kinesis Stream's base64 encoded data string
+ Set a DSM checkpoint if DSM is enabled and the method for context propagation is supported.
"""
+ source_arn = ""
try:
record = get_first_record(event)
+ source_arn = record.get("eventSourceARN", "")
kinesis = record.get("kinesis")
if not kinesis:
return extract_context_from_lambda_context(lambda_context)
@@ -381,10 +418,13 @@ def extract_context_from_kinesis_event(event, lambda_context):
data_obj = json.loads(data_str)
dd_ctx = data_obj.get("_datadog")
if dd_ctx:
- return propagator.extract(dd_ctx)
+ context = propagator.extract(dd_ctx)
+ _dsm_set_checkpoint(dd_ctx, "kinesis", source_arn)
+ return context
except Exception as e:
logger.debug("The trace extractor returned with error %s", e)
-
+ # Still want to set a DSM checkpoint even if DSM context not propagated
+ _dsm_set_checkpoint(None, "kinesis", source_arn)
return extract_context_from_lambda_context(lambda_context)
@@ -596,13 +636,17 @@ def extract_dd_trace_context(
if extractor is not None:
context = extract_context_custom_extractor(extractor, event, lambda_context)
+ elif isinstance(event, (set, dict)) and "request" in event:
+ context = extract_context_from_request_header_or_context(
+ event, lambda_context, event_source
+ )
elif isinstance(event, (set, dict)) and "headers" in event:
context = extract_context_from_http_event_or_context(
event, lambda_context, event_source, decode_authorizer_context
)
elif event_source.equals(EventTypes.SNS) or event_source.equals(EventTypes.SQS):
context = extract_context_from_sqs_or_sns_event_or_context(
- event, lambda_context
+ event, lambda_context, event_source
)
elif event_source.equals(EventTypes.EVENTBRIDGE):
context = extract_context_from_eventbridge_event(event, lambda_context)
@@ -639,13 +683,11 @@ def get_dd_trace_context_obj():
automatically, but this function can be used to manually inject the trace
context to an outgoing request.
"""
- if dd_tracing_enabled:
+ if config.trace_enabled:
dd_trace_py_context = _get_dd_trace_py_context()
if _is_context_complete(dd_trace_py_context):
return dd_trace_py_context
- global dd_trace_context
-
try:
xray_context = _get_xray_trace_context() # xray (sub)segment
except Exception as e:
@@ -690,10 +732,10 @@ def set_correlation_ids():
TODO: Remove me when Datadog tracer is natively supported in Lambda.
"""
- if not is_lambda_context:
+ if not config.is_lambda_context:
logger.debug("set_correlation_ids is only supported in LambdaContext")
return
- if dd_tracing_enabled:
+ if config.trace_enabled:
logger.debug("using ddtrace implementation for spans")
return
@@ -828,15 +870,31 @@ def create_service_mapping(val):
return new_service_mapping
-def determine_service_name(service_mapping, specific_key, generic_key, default_value):
- service_name = service_mapping.get(specific_key)
- if service_name is None:
- service_name = service_mapping.get(generic_key, default_value)
- return service_name
+def determine_service_name(
+ service_mapping, specific_key, generic_key, extracted_key, fallback=None
+):
+ # Check for mapped service (specific key first, then generic key)
+ mapped_service = service_mapping.get(specific_key) or service_mapping.get(
+ generic_key
+ )
+ if mapped_service:
+ return mapped_service
+
+ # Check if AWS service representation is disabled
+ aws_service_representation = os.environ.get(
+ "DD_TRACE_AWS_SERVICE_REPRESENTATION_ENABLED", ""
+ ).lower()
+ if aws_service_representation in ("false", "0"):
+ return fallback
+
+ # Use extracted_key if it exists and is not empty, otherwise use fallback
+ return (
+ extracted_key.strip() if extracted_key and extracted_key.strip() else fallback
+ )
# Initialization code
-service_mapping_str = os.getenv("DD_SERVICE_MAPPING", "")
+service_mapping_str = os.environ.get("DD_SERVICE_MAPPING", "")
service_mapping = create_service_mapping(service_mapping_str)
_dd_origin = {"_dd.origin": "lambda"}
@@ -850,13 +908,14 @@ def create_inferred_span_from_lambda_function_url_event(event, context):
http = request_context.get("http")
method = http.get("method") if http else None
path = http.get("path") if http else None
+ http_url = f"https://{domain}{path}/"
resource = f"{method} {path}"
tags = {
"operation_name": "aws.lambda.url",
- "http.url": domain + path,
+ "http.url": http_url,
"endpoint": path,
"http.method": method,
- "resource_names": domain + path,
+ "resource_names": resource,
"request_id": context.aws_request_id,
}
request_time_epoch = request_context.get("timeEpoch")
@@ -868,7 +927,7 @@ def create_inferred_span_from_lambda_function_url_event(event, context):
InferredSpanInfo.set_tags(tags, tag_source="self", synchronicity="sync")
if span:
span.set_tags(tags)
- span.start_ns = int(request_time_epoch) * 1e6
+ span.start_ns = int(request_time_epoch * 1e6)
return span
@@ -948,6 +1007,7 @@ def create_inferred_span_from_api_gateway_websocket_event(
request_context = event.get("requestContext")
domain = request_context.get("domainName")
endpoint = request_context.get("routeKey")
+ http_url = f"https://{domain}{endpoint}/"
api_id = request_context.get("apiId")
service_name = determine_service_name(
@@ -955,9 +1015,10 @@ def create_inferred_span_from_api_gateway_websocket_event(
)
tags = {
"operation_name": "aws.apigateway.websocket",
- "http.url": domain + endpoint,
+ "http.url": http_url,
"endpoint": endpoint,
"resource_names": endpoint,
+ "span.kind": "server",
"apiid": api_id,
"apiname": api_id,
"stage": request_context.get("stage"),
@@ -1007,14 +1068,16 @@ def create_inferred_span_from_api_gateway_event(
)
method = event.get("httpMethod")
path = event.get("path")
+ http_url = f"https://{domain}{path}/"
resource_path = _get_resource_path(event, request_context)
resource = f"{method} {resource_path}"
tags = {
"operation_name": "aws.apigateway.rest",
- "http.url": domain + path,
+ "http.url": http_url,
"endpoint": path,
"http.method": method,
"resource_names": resource,
+ "span.kind": "server",
"apiid": api_id,
"apiname": api_id,
"stage": request_context.get("stage"),
@@ -1073,12 +1136,13 @@ def create_inferred_span_from_http_api_event(
http = request_context.get("http") or {}
method = http.get("method")
path = event.get("rawPath")
+ http_url = f"https://{domain}{path}/"
resource_path = _get_resource_path(event, request_context)
resource = f"{method} {resource_path}"
tags = {
"operation_name": "aws.httpapi",
"endpoint": path,
- "http.url": domain + path,
+ "http.url": http_url,
"http.method": http.get("method"),
"http.protocol": http.get("protocol"),
"http.source_ip": http.get("sourceIp"),
@@ -1118,12 +1182,13 @@ def create_inferred_span_from_sqs_event(event, context):
event_source_arn = event_record.get("eventSourceARN")
queue_name = event_source_arn.split(":")[-1]
service_name = determine_service_name(
- service_mapping, queue_name, "lambda_sqs", "sqs"
+ service_mapping, queue_name, "lambda_sqs", queue_name, "sqs"
)
attrs = event_record.get("attributes") or {}
tags = {
"operation_name": "aws.sqs",
"resource_names": queue_name,
+ "span.kind": "server",
"queuename": queue_name,
"event_source_arn": event_source_arn,
"receipt_handle": event_record.get("receiptHandle"),
@@ -1185,11 +1250,12 @@ def create_inferred_span_from_sns_event(event, context):
topic_arn = sns_message.get("TopicArn")
topic_name = topic_arn.split(":")[-1]
service_name = determine_service_name(
- service_mapping, topic_name, "lambda_sns", "sns"
+ service_mapping, topic_name, "lambda_sns", topic_name, "sns"
)
tags = {
"operation_name": "aws.sns",
"resource_names": topic_name,
+ "span.kind": "server",
"topicname": topic_name,
"topic_arn": topic_arn,
"message_id": sns_message.get("MessageId"),
@@ -1220,15 +1286,16 @@ def create_inferred_span_from_kinesis_event(event, context):
event_record = get_first_record(event)
event_source_arn = event_record.get("eventSourceARN")
event_id = event_record.get("eventID")
- stream_name = event_source_arn.split(":")[-1]
+ stream_name = re.sub(r"^stream/", "", (event_source_arn or "").split(":")[-1])
shard_id = event_id.split(":")[0]
service_name = determine_service_name(
- service_mapping, stream_name, "lambda_kinesis", "kinesis"
+ service_mapping, stream_name, "lambda_kinesis", stream_name, "kinesis"
)
kinesis = event_record.get("kinesis") or {}
tags = {
"operation_name": "aws.kinesis",
"resource_names": stream_name,
+ "span.kind": "server",
"streamname": stream_name,
"shardid": shard_id,
"event_source_arn": event_source_arn,
@@ -1255,12 +1322,13 @@ def create_inferred_span_from_dynamodb_event(event, context):
event_source_arn = event_record.get("eventSourceARN")
table_name = event_source_arn.split("/")[1]
service_name = determine_service_name(
- service_mapping, table_name, "lambda_dynamodb", "dynamodb"
+ service_mapping, table_name, "lambda_dynamodb", table_name, "dynamodb"
)
dynamodb_message = event_record.get("dynamodb") or {}
tags = {
"operation_name": "aws.dynamodb",
"resource_names": table_name,
+ "span.kind": "server",
"tablename": table_name,
"event_source_arn": event_source_arn,
"event_id": event_record.get("eventID"),
@@ -1289,11 +1357,12 @@ def create_inferred_span_from_s3_event(event, context):
obj = s3.get("object") or {}
bucket_name = bucket.get("name")
service_name = determine_service_name(
- service_mapping, bucket_name, "lambda_s3", "s3"
+ service_mapping, bucket_name, "lambda_s3", bucket_name, "s3"
)
tags = {
"operation_name": "aws.s3",
"resource_names": bucket_name,
+ "span.kind": "server",
"event_name": event_record.get("eventName"),
"bucketname": bucket_name,
"bucket_arn": bucket.get("arn"),
@@ -1319,11 +1388,12 @@ def create_inferred_span_from_s3_event(event, context):
def create_inferred_span_from_eventbridge_event(event, context):
source = event.get("source")
service_name = determine_service_name(
- service_mapping, source, "lambda_eventbridge", "eventbridge"
+ service_mapping, source, "lambda_eventbridge", source, "eventbridge"
)
tags = {
"operation_name": "aws.eventbridge",
"resource_names": source,
+ "span.kind": "server",
"detail_type": event.get("detail-type"),
}
InferredSpanInfo.set_tags(
@@ -1397,9 +1467,21 @@ def create_function_execution_span(
tags["_dd.parent_source"] = trace_context_source
tags.update(trigger_tags)
tracer.set_tags(_dd_origin)
+ # Determine service name based on config and env var
+ if config.service:
+ service_name = config.service
+ else:
+ aws_service_representation = os.environ.get(
+ "DD_TRACE_AWS_SERVICE_REPRESENTATION_ENABLED", ""
+ ).lower()
+ if aws_service_representation in ("false", "0"):
+ service_name = "aws.lambda"
+ else:
+ service_name = function_name if function_name else "aws.lambda"
+
span = tracer.trace(
"aws.lambda",
- service="aws.lambda",
+ service=service_name,
resource=function_name,
span_type="serverless",
)
@@ -1476,7 +1558,7 @@ def emit_telemetry_on_exception_outside_of_handler(
Emit an enhanced error metric and create a span for exceptions occurring outside the handler
"""
submit_errors_metric(None)
- if dd_tracing_enabled:
+ if config.trace_enabled:
span = tracer.trace(
"aws.lambda",
service="aws.lambda",
diff --git a/datadog_lambda/trigger.py b/datadog_lambda/trigger.py
index 8090e36e6..e60de8f0c 100644
--- a/datadog_lambda/trigger.py
+++ b/datadog_lambda/trigger.py
@@ -54,6 +54,10 @@ class EventSubtypes(_stringTypedEnum):
WEBSOCKET = "websocket"
HTTP_API = "http-api"
+ ALB = "alb" # regular alb
+ # ALB with the multi-value headers option checked on the target group
+ ALB_MULTI_VALUE_HEADERS = "alb-multi-value-headers"
+
class _EventSource:
"""
@@ -114,10 +118,14 @@ def parse_event_source(event: dict) -> _EventSource:
event_source = None
+ # Get requestContext safely and ensure it's a dictionary
request_context = event.get("requestContext")
+ if not isinstance(request_context, dict):
+ request_context = None
+
if request_context and request_context.get("stage"):
if "domainName" in request_context and detect_lambda_function_url_domain(
- request_context.get("domainName")
+ request_context.get("domainName", "")
):
return _EventSource(EventTypes.LAMBDA_FUNCTION_URL)
event_source = _EventSource(EventTypes.API_GATEWAY)
@@ -129,7 +137,12 @@ def parse_event_source(event: dict) -> _EventSource:
event_source.subtype = EventSubtypes.WEBSOCKET
if request_context and request_context.get("elb"):
- event_source = _EventSource(EventTypes.ALB)
+ if "multiValueHeaders" in event:
+ event_source = _EventSource(
+ EventTypes.ALB, EventSubtypes.ALB_MULTI_VALUE_HEADERS
+ )
+ else:
+ event_source = _EventSource(EventTypes.ALB, EventSubtypes.ALB)
if event.get("awslogs"):
event_source = _EventSource(EventTypes.CLOUDWATCH_LOGS)
@@ -149,7 +162,7 @@ def parse_event_source(event: dict) -> _EventSource:
event_source = _EventSource(EventTypes.STEPFUNCTIONS)
event_record = get_first_record(event)
- if event_record:
+ if event_record and isinstance(event_record, dict):
aws_event_source = event_record.get("eventSource") or event_record.get(
"EventSource"
)
@@ -171,6 +184,8 @@ def parse_event_source(event: dict) -> _EventSource:
def detect_lambda_function_url_domain(domain: str) -> bool:
# e.g. "etsn5fibjr.lambda-url.eu-south-1.amazonaws.com"
+ if not isinstance(domain, str):
+ return False
domain_parts = domain.split(".")
if len(domain_parts) < 2:
return False
@@ -282,36 +297,56 @@ def extract_http_tags(event):
"""
Extracts HTTP facet tags from the triggering event
"""
- http_tags = {}
+ http_tags = {"span.kind": "server"}
+
+ # Safely get request_context and ensure it's a dictionary
request_context = event.get("requestContext")
+ if not isinstance(request_context, dict):
+ request_context = None
+
path = event.get("path")
method = event.get("httpMethod")
+
if request_context and request_context.get("stage"):
- if request_context.get("domainName"):
- http_tags["http.url"] = request_context.get("domainName")
+ domain_name = request_context.get("domainName")
+ if domain_name:
+ http_tags["http.url"] = f"https://{domain_name}/"
path = request_context.get("path")
method = request_context.get("httpMethod")
+
# Version 2.0 HTTP API Gateway
- apigateway_v2_http = request_context.get("http")
+ apigateway_v2_http = request_context.get("http", {})
+ if not isinstance(apigateway_v2_http, dict):
+ apigateway_v2_http = {}
+
if event.get("version") == "2.0" and apigateway_v2_http:
path = apigateway_v2_http.get("path")
method = apigateway_v2_http.get("method")
if path:
- http_tags["http.url_details.path"] = path
+ if http_tags.get("http.url"):
+ http_tags["http.url"] += path
if method:
http_tags["http.method"] = method
- headers = event.get("headers")
+ # Safely get headers
+ headers = event.get("headers", {})
+ if not isinstance(headers, dict):
+ headers = {}
+
if headers and headers.get("Referer"):
http_tags["http.referer"] = headers.get("Referer")
# Try to get `routeKey` from API GW v2; otherwise try to get `resource` from API GW v1
route = event.get("routeKey") or event.get("resource")
- if route:
- # "GET /my/endpoint" = > "/my/endpoint"
- http_tags["http.route"] = route.split(" ")[-1]
+ if route and isinstance(route, str):
+ try:
+ # "GET /my/endpoint" = > "/my/endpoint"
+ http_tags["http.route"] = route.split(" ")[-1]
+ except Exception:
+ # If splitting fails, use the route as is
+ http_tags["http.route"] = route
return http_tags
diff --git a/datadog_lambda/version.py b/datadog_lambda/version.py
index 702691d81..373eef7d0 100644
--- a/datadog_lambda/version.py
+++ b/datadog_lambda/version.py
@@ -1 +1 @@
-__version__ = "6.107.0"
+__version__ = "8.117.0.dev0"
diff --git a/datadog_lambda/wrapper.py b/datadog_lambda/wrapper.py
index 8c1914e32..8dbd7e359 100644
--- a/datadog_lambda/wrapper.py
+++ b/datadog_lambda/wrapper.py
@@ -9,6 +9,7 @@
from importlib import import_module
from time import time_ns
+from ddtrace.internal._exceptions import BlockingException
from datadog_lambda.extension import should_use_extension, flush_extension
from datadog_lambda.cold_start import (
set_cold_start,
@@ -17,19 +18,19 @@
is_new_sandbox,
ColdStartTracer,
)
+from datadog_lambda.config import config
from datadog_lambda.constants import (
TraceContextSource,
XraySubsegment,
Headers,
)
from datadog_lambda.module_name import modify_module_name
-from datadog_lambda.patch import patch_all
from datadog_lambda.span_pointers import calculate_span_pointers
+from datadog_lambda.tag_object import tag_object
from datadog_lambda.tracing import (
extract_dd_trace_context,
create_dd_dummy_metadata_subsegment,
inject_correlation_ids,
- dd_tracing_enabled,
mark_trace_as_error_for_5xx_responses,
set_correlation_ids,
set_dd_trace_py_root,
@@ -45,61 +46,39 @@
extract_http_status_code_tag,
)
-profiling_env_var = os.environ.get("DD_PROFILING_ENABLED", "false").lower() == "true"
-if profiling_env_var:
- from ddtrace.profiling import profiler
+# ddtrace imports are also tested in
+# dd-trace-py/tests/internal/test_serverless.py please update those tests when
+# making changes to any ddtrace import.
-llmobs_api_key = None
-llmobs_env_var = os.environ.get("DD_LLMOBS_ENABLED", "false").lower() in ("true", "1")
-if llmobs_env_var:
- from datadog_lambda.api import get_api_key
- from ddtrace.llmobs import LLMObs
+if config.appsec_enabled:
+ from datadog_lambda.asm import (
+ asm_set_context,
+ asm_start_response,
+ asm_start_request,
+ get_asm_blocked_response,
+ )
+ from ddtrace.internal.appsec.product import start
- llmobs_api_key = get_api_key()
+ start()
-logger = logging.getLogger(__name__)
+if config.profiling_enabled:
+ from ddtrace.profiling import profiler
-DD_FLUSH_TO_LOG = "DD_FLUSH_TO_LOG"
-DD_LOGS_INJECTION = "DD_LOGS_INJECTION"
-DD_MERGE_XRAY_TRACES = "DD_MERGE_XRAY_TRACES"
-AWS_LAMBDA_FUNCTION_NAME = "AWS_LAMBDA_FUNCTION_NAME"
-DD_LOCAL_TEST = "DD_LOCAL_TEST"
-DD_TRACE_EXTRACTOR = "DD_TRACE_EXTRACTOR"
-DD_TRACE_MANAGED_SERVICES = "DD_TRACE_MANAGED_SERVICES"
-DD_ENCODE_AUTHORIZER_CONTEXT = "DD_ENCODE_AUTHORIZER_CONTEXT"
-DD_DECODE_AUTHORIZER_CONTEXT = "DD_DECODE_AUTHORIZER_CONTEXT"
-DD_COLD_START_TRACING = "DD_COLD_START_TRACING"
-DD_MIN_COLD_START_DURATION = "DD_MIN_COLD_START_DURATION"
-DD_COLD_START_TRACE_SKIP_LIB = "DD_COLD_START_TRACE_SKIP_LIB"
-DD_CAPTURE_LAMBDA_PAYLOAD = "DD_CAPTURE_LAMBDA_PAYLOAD"
-DD_CAPTURE_LAMBDA_PAYLOAD_MAX_DEPTH = "DD_CAPTURE_LAMBDA_PAYLOAD_MAX_DEPTH"
-DD_REQUESTS_SERVICE_NAME = "DD_REQUESTS_SERVICE_NAME"
-DD_SERVICE = "DD_SERVICE"
-DD_ENV = "DD_ENV"
+if config.llmobs_enabled:
+ from ddtrace.llmobs import LLMObs
+if config.exception_replay_enabled:
+ from ddtrace.debugging._exception.replay import SpanExceptionHandler
-def get_env_as_int(env_key, default_value: int) -> int:
try:
- return int(os.environ.get(env_key, default_value))
- except Exception as e:
- logger.warn(
- f"Failed to parse {env_key} as int. Using default value: {default_value}. Error: {e}"
- )
- return default_value
+ from ddtrace.debugging._uploader import SignalUploader
+ except ImportError:
+ from ddtrace.debugging._uploader import LogsIntakeUploaderV1 as SignalUploader
+logger = logging.getLogger(__name__)
-dd_capture_lambda_payload_enabled = (
- os.environ.get(DD_CAPTURE_LAMBDA_PAYLOAD, "false").lower() == "true"
-)
-
-if dd_capture_lambda_payload_enabled:
- import datadog_lambda.tag_object as tag_object
-
- tag_object.max_depth = get_env_as_int(
- DD_CAPTURE_LAMBDA_PAYLOAD_MAX_DEPTH, tag_object.max_depth
- )
-
-env_env_var = os.environ.get(DD_ENV, None)
+DD_REQUESTS_SERVICE_NAME = "DD_REQUESTS_SERVICE_NAME"
+DD_SERVICE = "DD_SERVICE"
init_timestamp_ns = time_ns()
@@ -156,56 +135,17 @@ def __init__(self, func):
"""Executes when the wrapped function gets wrapped"""
try:
self.func = func
- self.flush_to_log = os.environ.get(DD_FLUSH_TO_LOG, "").lower() == "true"
- self.logs_injection = (
- os.environ.get(DD_LOGS_INJECTION, "true").lower() == "true"
- )
- self.merge_xray_traces = (
- os.environ.get(DD_MERGE_XRAY_TRACES, "false").lower() == "true"
- )
- self.function_name = os.environ.get(AWS_LAMBDA_FUNCTION_NAME, "function")
- self.service = os.environ.get(DD_SERVICE, None)
- self.extractor_env = os.environ.get(DD_TRACE_EXTRACTOR, None)
self.trace_extractor = None
self.span = None
self.inferred_span = None
- depends_on_dd_tracing_enabled = (
- lambda original_boolean: dd_tracing_enabled and original_boolean
- )
- self.make_inferred_span = depends_on_dd_tracing_enabled(
- os.environ.get(DD_TRACE_MANAGED_SERVICES, "true").lower() == "true"
- )
- self.encode_authorizer_context = depends_on_dd_tracing_enabled(
- os.environ.get(DD_ENCODE_AUTHORIZER_CONTEXT, "true").lower() == "true"
- )
- self.decode_authorizer_context = depends_on_dd_tracing_enabled(
- os.environ.get(DD_DECODE_AUTHORIZER_CONTEXT, "true").lower() == "true"
- )
- self.cold_start_tracing = depends_on_dd_tracing_enabled(
- os.environ.get(DD_COLD_START_TRACING, "true").lower() == "true"
- )
- self.min_cold_start_trace_duration = get_env_as_int(
- DD_MIN_COLD_START_DURATION, 3
- )
- self.local_testing_mode = os.environ.get(
- DD_LOCAL_TEST, "false"
- ).lower() in ("true", "1")
- self.cold_start_trace_skip_lib = [
- "ddtrace.internal.compat",
- "ddtrace.filters",
- ]
- if DD_COLD_START_TRACE_SKIP_LIB in os.environ:
- try:
- self.cold_start_trace_skip_lib = os.environ[
- DD_COLD_START_TRACE_SKIP_LIB
- ].split(",")
- except Exception:
- logger.debug(f"Malformatted for env {DD_COLD_START_TRACE_SKIP_LIB}")
self.response = None
- if profiling_env_var:
- self.prof = profiler.Profiler(env=env_env_var, service=self.service)
- if self.extractor_env:
- extractor_parts = self.extractor_env.rsplit(".", 1)
+ self.blocking_response = None
+
+ if config.profiling_enabled:
+ self.prof = profiler.Profiler(env=config.env, service=config.service)
+
+ if config.trace_extractor:
+ extractor_parts = config.trace_extractor.rsplit(".", 1)
if len(extractor_parts) == 2:
(mod_name, extractor_name) = extractor_parts
modified_extractor_name = modify_module_name(mod_name)
@@ -213,7 +153,7 @@ def __init__(self, func):
self.trace_extractor = getattr(extractor_module, extractor_name)
# Inject trace correlation ids to logs
- if self.logs_injection:
+ if config.logs_injection:
inject_correlation_ids()
# This prevents a breaking change in ddtrace v0.49 regarding the service name
@@ -221,15 +161,15 @@ def __init__(self, func):
os.environ[DD_REQUESTS_SERVICE_NAME] = os.environ.get(
DD_SERVICE, "aws.lambda"
)
- # Patch third-party libraries for tracing
- patch_all()
# Enable LLM Observability
- if llmobs_env_var:
- LLMObs.enable(
- agentless_enabled=True,
- api_key=llmobs_api_key,
- )
+ if config.llmobs_enabled:
+ LLMObs.enable()
+
+ # Enable Exception Replay
+ if config.exception_replay_enabled:
+ logger.debug("Enabling exception replay")
+ SpanExceptionHandler.enable()
logger.debug("datadog_lambda_wrapper initialized")
except Exception as e:
@@ -239,19 +179,24 @@ def __call__(self, event, context, **kwargs):
"""Executes when the wrapped function gets called"""
self._before(event, context)
try:
+ if self.blocking_response:
+ return self.blocking_response
self.response = self.func(event, context, **kwargs)
return self.response
+ except BlockingException:
+ self.blocking_response = get_asm_blocked_response(self.event_source)
except Exception:
- if not should_use_extension:
- from datadog_lambda.metric import submit_errors_metric
+ from datadog_lambda.metric import submit_errors_metric
- submit_errors_metric(context)
+ submit_errors_metric(context)
if self.span:
self.span.set_traceback()
raise
finally:
self._after(event, context)
+ if self.blocking_response:
+ return self.blocking_response
def _inject_authorizer_span_headers(self, request_id):
reference_span = self.inferred_span if self.inferred_span else self.span
@@ -284,6 +229,7 @@ def _inject_authorizer_span_headers(self, request_id):
def _before(self, event, context):
try:
self.response = None
+ self.blocking_response = None
set_cold_start(init_timestamp_ns)
if not should_use_extension:
@@ -297,7 +243,7 @@ def _before(self, event, context):
event,
context,
extractor=self.trace_extractor,
- decode_authorizer_context=self.decode_authorizer_context,
+ decode_authorizer_context=config.decode_authorizer_context,
)
self.event_source = event_source
# Create a Datadog X-Ray subsegment with the trace context
@@ -311,26 +257,33 @@ def _before(self, event, context):
XraySubsegment.TRACE_KEY,
)
- if dd_tracing_enabled:
- set_dd_trace_py_root(trace_context_source, self.merge_xray_traces)
- if self.make_inferred_span:
+ if config.trace_enabled:
+ set_dd_trace_py_root(trace_context_source, config.merge_xray_traces)
+ if config.make_inferred_span:
self.inferred_span = create_inferred_span(
- event, context, event_source, self.decode_authorizer_context
+ event, context, event_source, config.decode_authorizer_context
)
+
+ if config.appsec_enabled:
+ asm_set_context(event_source)
+
self.span = create_function_execution_span(
context=context,
- function_name=self.function_name,
+ function_name=config.function_name,
is_cold_start=is_cold_start(),
is_proactive_init=is_proactive_init(),
trace_context_source=trace_context_source,
- merge_xray_traces=self.merge_xray_traces,
+ merge_xray_traces=config.merge_xray_traces,
trigger_tags=self.trigger_tags,
parent_span=self.inferred_span,
span_pointers=calculate_span_pointers(event_source, event),
)
+ if config.appsec_enabled:
+ asm_start_request(self.span, event, event_source, self.trigger_tags)
+ self.blocking_response = get_asm_blocked_response(self.event_source)
else:
set_correlation_ids()
- if profiling_env_var and is_new_sandbox():
+ if config.profiling_enabled and is_new_sandbox():
self.prof.start(stop_on_exit=False, profile_children=True)
logger.debug("datadog_lambda_wrapper _before() done")
except Exception as e:
@@ -338,7 +291,39 @@ def _before(self, event, context):
def _after(self, event, context):
try:
+ from datadog_lambda.metric import submit_batch_item_failures_metric
+
+ submit_batch_item_failures_metric(self.response, context)
+
status_code = extract_http_status_code_tag(self.trigger_tags, self.response)
+
+ if self.span:
+ if config.appsec_enabled and not self.blocking_response:
+ asm_start_response(
+ self.span,
+ status_code,
+ self.event_source,
+ response=self.response,
+ )
+ self.blocking_response = get_asm_blocked_response(self.event_source)
+
+ if self.blocking_response:
+ status_code = str(self.blocking_response.get("statusCode"))
+ if config.capture_payload_enabled and self.response:
+ tag_object(
+ self.span, "function.blocked_response", self.response
+ )
+ self.response = self.blocking_response
+
+ if config.capture_payload_enabled:
+ tag_object(self.span, "function.request", event)
+ tag_object(self.span, "function.response", self.response)
+
+ if status_code:
+ self.span.set_tag("http.status_code", status_code)
+
+ self.span.finish()
+
if status_code:
self.trigger_tags["http.status_code"] = status_code
mark_trace_as_error_for_5xx_responses(context, status_code, self.span)
@@ -349,25 +334,19 @@ def _after(self, event, context):
create_dd_dummy_metadata_subsegment(
self.trigger_tags, XraySubsegment.LAMBDA_FUNCTION_TAGS_KEY
)
- should_trace_cold_start = self.cold_start_tracing and is_new_sandbox()
+ should_trace_cold_start = config.cold_start_tracing and is_new_sandbox()
if should_trace_cold_start:
trace_ctx = tracer.current_trace_context()
- if self.span:
- if dd_capture_lambda_payload_enabled:
- tag_object.tag_object(self.span, "function.request", event)
- tag_object.tag_object(self.span, "function.response", self.response)
-
- if status_code:
- self.span.set_tag("http.status_code", status_code)
- self.span.finish()
-
if self.inferred_span:
if status_code:
self.inferred_span.set_tag("http.status_code", status_code)
- if self.service:
- self.inferred_span.set_tag("peer.service", self.service)
+ if self.trigger_tags and (route := self.trigger_tags.get("http.route")):
+ self.inferred_span.set_tag("http.route", route)
+
+ if config.service:
+ self.inferred_span.set_tag("peer.service", config.service)
if InferredSpanInfo.is_async(self.inferred_span) and self.span:
self.inferred_span.finish(finish_time=self.span.start)
@@ -379,29 +358,35 @@ def _after(self, event, context):
following_span = self.span or self.inferred_span
ColdStartTracer(
tracer,
- self.function_name,
+ config.function_name,
following_span.start_ns,
trace_ctx,
- self.min_cold_start_trace_duration,
- self.cold_start_trace_skip_lib,
+ config.min_cold_start_trace_duration,
+ config.cold_start_trace_skip_lib,
).trace()
except Exception as e:
logger.debug("Failed to create cold start spans. %s", e)
- if not self.flush_to_log or should_use_extension:
+ if not config.flush_to_log or should_use_extension:
from datadog_lambda.metric import flush_stats
flush_stats(context)
- if should_use_extension and self.local_testing_mode:
+ if should_use_extension and config.local_test:
# when testing locally, the extension does not know when an
# invocation completes because it does not have access to the
# logs api
flush_extension()
- if llmobs_env_var:
+ if config.llmobs_enabled:
LLMObs.flush()
- if self.encode_authorizer_context and is_authorizer_response(self.response):
+ # Flush exception replay
+ if config.exception_replay_enabled:
+ SignalUploader._instance.periodic()
+
+ if config.encode_authorizer_context and is_authorizer_response(
+ self.response
+ ):
self._inject_authorizer_span_headers(
event.get("requestContext", {}).get("requestId")
)
diff --git a/poetry.lock b/poetry.lock
index 3953f9539..4c37bf871 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1,23 +1,4 @@
-# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand.
-
-[[package]]
-name = "boto3"
-version = "1.36.8"
-description = "The AWS SDK for Python"
-optional = true
-python-versions = ">=3.8"
-files = [
- {file = "boto3-1.36.8-py3-none-any.whl", hash = "sha256:7f61c9d0ea64f484a17c1e3115fdf90fd7b17ab6771e07cb4549f42b9fd28fb9"},
- {file = "boto3-1.36.8.tar.gz", hash = "sha256:ac47215d320b0c2534340db58d6d5284cb1860b7bff172b4dd6eee2dee1d5779"},
-]
-
-[package.dependencies]
-botocore = ">=1.36.8,<1.37.0"
-jmespath = ">=0.7.1,<2.0.0"
-s3transfer = ">=0.11.0,<0.12.0"
-
-[package.extras]
-crt = ["botocore[crt] (>=1.21.0,<2.0a0)"]
+# This file is automatically @generated by Poetry 2.1.1 and should not be changed by hand.
[[package]]
name = "botocore"
@@ -25,6 +6,8 @@ version = "1.36.8"
description = "Low-level, data-driven core of boto 3."
optional = true
python-versions = ">=3.8"
+groups = ["main"]
+markers = "extra == \"dev\""
files = [
{file = "botocore-1.36.8-py3-none-any.whl", hash = "sha256:59d3fdfbae6d916b046e973bebcbeb70a102f9e570ca86d5ba512f1854b78fc2"},
{file = "botocore-1.36.8.tar.gz", hash = "sha256:81c88e5566cf018e1411a68304dc1fb9e4156ca2b50a3a0f0befc274299e67fa"},
@@ -34,8 +17,8 @@ files = [
jmespath = ">=0.7.1,<2.0.0"
python-dateutil = ">=2.1,<3.0.0"
urllib3 = [
- {version = ">=1.25.4,<2.2.0 || >2.2.0,<3", markers = "python_version >= \"3.10\""},
{version = ">=1.25.4,<1.27", markers = "python_version < \"3.10\""},
+ {version = ">=1.25.4,<2.2.0 || >2.2.0,<3", markers = "python_version >= \"3.10\""},
]
[package.extras]
@@ -47,6 +30,7 @@ version = "0.16.1"
description = "Python module to generate and modify bytecode"
optional = false
python-versions = ">=3.8"
+groups = ["main"]
files = [
{file = "bytecode-0.16.1-py3-none-any.whl", hash = "sha256:1d4b61ed6bade4bff44127c8283bef8131a664ce4dbe09d64a88caf329939f35"},
{file = "bytecode-0.16.1.tar.gz", hash = "sha256:8fbbb637c880f339e564858bc6c7984ede67ae97bc71343379a535a9a4baf398"},
@@ -61,6 +45,7 @@ version = "2024.12.14"
description = "Python package for providing Mozilla's CA Bundle."
optional = false
python-versions = ">=3.6"
+groups = ["main"]
files = [
{file = "certifi-2024.12.14-py3-none-any.whl", hash = "sha256:1275f7a45be9464efc1173084eaa30f866fe2e47d389406136d332ed4967ec56"},
{file = "certifi-2024.12.14.tar.gz", hash = "sha256:b650d30f370c2b724812bee08008be0c4163b163ddaec3f2546c1caf65f191db"},
@@ -72,6 +57,7 @@ version = "3.4.1"
description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet."
optional = false
python-versions = ">=3.7"
+groups = ["main"]
files = [
{file = "charset_normalizer-3.4.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:91b36a978b5ae0ee86c394f5a54d6ef44db1de0815eb43de826d41d21e4af3de"},
{file = "charset_normalizer-3.4.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7461baadb4dc00fd9e0acbe254e3d7d2112e7f92ced2adc96e54ef6501c5f176"},
@@ -173,6 +159,8 @@ version = "0.4.6"
description = "Cross-platform colored terminal text."
optional = true
python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7"
+groups = ["main"]
+markers = "extra == \"dev\" and sys_platform == \"win32\""
files = [
{file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"},
{file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"},
@@ -184,6 +172,7 @@ version = "0.51.0"
description = "The Datadog Python library"
optional = false
python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7"
+groups = ["main"]
files = [
{file = "datadog-0.51.0-py2.py3-none-any.whl", hash = "sha256:a9764f091c96af4e0996d4400b168fc5fba380f911d6d672c9dcd4773e29ea3f"},
{file = "datadog-0.51.0.tar.gz", hash = "sha256:3279534f831ae0b4ae2d8ce42ef038b4ab38e667d7ed6ff7437982d7a0cf5250"},
@@ -198,6 +187,7 @@ version = "2.20.0"
description = "Datadog APM client library"
optional = false
python-versions = ">=3.7"
+groups = ["main"]
files = [
{file = "ddtrace-2.20.0-cp310-cp310-macosx_12_0_universal2.whl", hash = "sha256:e1dee099099b95acf7d0e552179925cfec58a52315cc914d153506367b195bc4"},
{file = "ddtrace-2.20.0-cp310-cp310-macosx_12_0_x86_64.whl", hash = "sha256:9d209bef14caafcd53be8c14e04741d86c08f76496c1bf755e2eaa38605ce3e0"},
@@ -271,10 +261,10 @@ files = [
[package.dependencies]
bytecode = [
+ {version = ">=0.13.0", markers = "python_version < \"3.11\""},
{version = ">=0.16.0", markers = "python_version >= \"3.13.0\""},
{version = ">=0.15.0", markers = "python_version ~= \"3.12.0\""},
{version = ">=0.14.0", markers = "python_version ~= \"3.11.0\""},
- {version = ">=0.13.0", markers = "python_version < \"3.11.0\""},
]
envier = ">=0.5,<1.0"
legacy-cgi = {version = ">=2.0.0", markers = "python_version >= \"3.13.0\""}
@@ -294,6 +284,7 @@ version = "1.2.18"
description = "Python @deprecated decorator to deprecate old python classes, functions or methods."
optional = false
python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7"
+groups = ["main"]
files = [
{file = "Deprecated-1.2.18-py2.py3-none-any.whl", hash = "sha256:bd5011788200372a32418f888e326a09ff80d0214bd961147cfed01b5c018eec"},
{file = "deprecated-1.2.18.tar.gz", hash = "sha256:422b6f6d859da6f2ef57857761bfb392480502a64c3028ca9bbe86085d72115d"},
@@ -303,7 +294,7 @@ files = [
wrapt = ">=1.10,<2"
[package.extras]
-dev = ["PyTest", "PyTest-Cov", "bump2version (<1)", "setuptools", "tox"]
+dev = ["PyTest", "PyTest-Cov", "bump2version (<1)", "setuptools ; python_version >= \"3.12\"", "tox"]
[[package]]
name = "envier"
@@ -311,6 +302,7 @@ version = "0.6.1"
description = "Python application configuration via the environment"
optional = false
python-versions = ">=3.7"
+groups = ["main"]
files = [
{file = "envier-0.6.1-py3-none-any.whl", hash = "sha256:73609040a76be48bbcb97074d9969666484aa0de706183a6e9ef773156a8a6a9"},
{file = "envier-0.6.1.tar.gz", hash = "sha256:3309a01bb3d8850c9e7a31a5166d5a836846db2faecb79b9cb32654dd50ca9f9"},
@@ -325,6 +317,8 @@ version = "1.2.2"
description = "Backport of PEP 654 (exception groups)"
optional = true
python-versions = ">=3.7"
+groups = ["main"]
+markers = "extra == \"dev\" and python_version <= \"3.10\""
files = [
{file = "exceptiongroup-1.2.2-py3-none-any.whl", hash = "sha256:3111b9d131c238bec2f8f516e123e14ba243563fb135d3fe885990585aa7795b"},
{file = "exceptiongroup-1.2.2.tar.gz", hash = "sha256:47c2edf7c6738fafb49fd34290706d1a1a2f4d1c6df275526b62cbb4aa5393cc"},
@@ -339,6 +333,8 @@ version = "5.0.4"
description = "the modular source code checker: pep8 pyflakes and co"
optional = true
python-versions = ">=3.6.1"
+groups = ["main"]
+markers = "extra == \"dev\""
files = [
{file = "flake8-5.0.4-py2.py3-none-any.whl", hash = "sha256:7a1cf6b73744f5806ab95e526f6f0d8c01c66d7bbe349562d22dfca20610b248"},
{file = "flake8-5.0.4.tar.gz", hash = "sha256:6fbe320aad8d6b95cec8b8e47bc933004678dc63095be98528b7bdd2a9f510db"},
@@ -355,6 +351,7 @@ version = "3.10"
description = "Internationalized Domain Names in Applications (IDNA)"
optional = false
python-versions = ">=3.6"
+groups = ["main"]
files = [
{file = "idna-3.10-py3-none-any.whl", hash = "sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3"},
{file = "idna-3.10.tar.gz", hash = "sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9"},
@@ -369,6 +366,7 @@ version = "8.5.0"
description = "Read metadata from Python packages"
optional = false
python-versions = ">=3.8"
+groups = ["main"]
files = [
{file = "importlib_metadata-8.5.0-py3-none-any.whl", hash = "sha256:45e54197d28b7a7f1559e60b95e7c567032b602131fbd588f1497f47880aa68b"},
{file = "importlib_metadata-8.5.0.tar.gz", hash = "sha256:71522656f0abace1d072b9e5481a48f07c138e00f079c38c8f883823f9c26bd7"},
@@ -378,12 +376,12 @@ files = [
zipp = ">=3.20"
[package.extras]
-check = ["pytest-checkdocs (>=2.4)", "pytest-ruff (>=0.2.1)"]
+check = ["pytest-checkdocs (>=2.4)", "pytest-ruff (>=0.2.1) ; sys_platform != \"cygwin\""]
cover = ["pytest-cov"]
doc = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"]
enabler = ["pytest-enabler (>=2.2)"]
perf = ["ipython"]
-test = ["flufl.flake8", "importlib-resources (>=1.3)", "jaraco.test (>=5.4)", "packaging", "pyfakefs", "pytest (>=6,!=8.1.*)", "pytest-perf (>=0.9.2)"]
+test = ["flufl.flake8", "importlib-resources (>=1.3) ; python_version < \"3.9\"", "jaraco.test (>=5.4)", "packaging", "pyfakefs", "pytest (>=6,!=8.1.*)", "pytest-perf (>=0.9.2)"]
type = ["pytest-mypy"]
[[package]]
@@ -392,6 +390,8 @@ version = "2.0.0"
description = "brain-dead simple config-ini parsing"
optional = true
python-versions = ">=3.7"
+groups = ["main"]
+markers = "extra == \"dev\""
files = [
{file = "iniconfig-2.0.0-py3-none-any.whl", hash = "sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374"},
{file = "iniconfig-2.0.0.tar.gz", hash = "sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3"},
@@ -403,6 +403,8 @@ version = "1.0.1"
description = "JSON Matching Expressions"
optional = true
python-versions = ">=3.7"
+groups = ["main"]
+markers = "extra == \"dev\""
files = [
{file = "jmespath-1.0.1-py3-none-any.whl", hash = "sha256:02e2e4cc71b5bcab88332eebf907519190dd9e6e82107fa7f83b1003a6252980"},
{file = "jmespath-1.0.1.tar.gz", hash = "sha256:90261b206d6defd58fdd5e85f478bf633a2901798906be2ad389150c5c60edbe"},
@@ -414,6 +416,8 @@ version = "2.6.2"
description = "Fork of the standard library cgi and cgitb modules, being deprecated in PEP-594"
optional = false
python-versions = ">=3.10"
+groups = ["main"]
+markers = "python_version >= \"3.13.0\""
files = [
{file = "legacy_cgi-2.6.2-py3-none-any.whl", hash = "sha256:a7b83afb1baf6ebeb56522537c5943ef9813cf933f6715e88a803f7edbce0bff"},
{file = "legacy_cgi-2.6.2.tar.gz", hash = "sha256:9952471ceb304043b104c22d00b4f333cac27a6abe446d8a528fc437cf13c85f"},
@@ -425,6 +429,8 @@ version = "0.7.0"
description = "McCabe checker, plugin for flake8"
optional = true
python-versions = ">=3.6"
+groups = ["main"]
+markers = "extra == \"dev\""
files = [
{file = "mccabe-0.7.0-py2.py3-none-any.whl", hash = "sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e"},
{file = "mccabe-0.7.0.tar.gz", hash = "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325"},
@@ -436,6 +442,7 @@ version = "1.29.0"
description = "OpenTelemetry Python API"
optional = false
python-versions = ">=3.8"
+groups = ["main"]
files = [
{file = "opentelemetry_api-1.29.0-py3-none-any.whl", hash = "sha256:5fcd94c4141cc49c736271f3e1efb777bebe9cc535759c54c936cca4f1b312b8"},
{file = "opentelemetry_api-1.29.0.tar.gz", hash = "sha256:d04a6cf78aad09614f52964ecb38021e248f5714dc32c2e0d8fd99517b4d69cf"},
@@ -451,6 +458,8 @@ version = "24.2"
description = "Core utilities for Python packages"
optional = true
python-versions = ">=3.8"
+groups = ["main"]
+markers = "extra == \"dev\""
files = [
{file = "packaging-24.2-py3-none-any.whl", hash = "sha256:09abb1bccd265c01f4a3aa3f7a7db064b36514d2cba19a2f694fe6150451a759"},
{file = "packaging-24.2.tar.gz", hash = "sha256:c228a6dc5e932d346bc5739379109d49e8853dd8223571c7c5b55260edc0b97f"},
@@ -462,6 +471,8 @@ version = "1.5.0"
description = "plugin and hook calling mechanisms for python"
optional = true
python-versions = ">=3.8"
+groups = ["main"]
+markers = "extra == \"dev\""
files = [
{file = "pluggy-1.5.0-py3-none-any.whl", hash = "sha256:44e1ad92c8ca002de6377e165f3e0f1be63266ab4d554740532335b9d75ea669"},
{file = "pluggy-1.5.0.tar.gz", hash = "sha256:2cffa88e94fdc978c4c574f15f9e59b7f4201d439195c3715ca9e2486f1d0cf1"},
@@ -473,22 +484,23 @@ testing = ["pytest", "pytest-benchmark"]
[[package]]
name = "protobuf"
-version = "5.29.3"
+version = "5.29.5"
description = ""
optional = false
python-versions = ">=3.8"
+groups = ["main"]
files = [
- {file = "protobuf-5.29.3-cp310-abi3-win32.whl", hash = "sha256:3ea51771449e1035f26069c4c7fd51fba990d07bc55ba80701c78f886bf9c888"},
- {file = "protobuf-5.29.3-cp310-abi3-win_amd64.whl", hash = "sha256:a4fa6f80816a9a0678429e84973f2f98cbc218cca434abe8db2ad0bffc98503a"},
- {file = "protobuf-5.29.3-cp38-abi3-macosx_10_9_universal2.whl", hash = "sha256:a8434404bbf139aa9e1300dbf989667a83d42ddda9153d8ab76e0d5dcaca484e"},
- {file = "protobuf-5.29.3-cp38-abi3-manylinux2014_aarch64.whl", hash = "sha256:daaf63f70f25e8689c072cfad4334ca0ac1d1e05a92fc15c54eb9cf23c3efd84"},
- {file = "protobuf-5.29.3-cp38-abi3-manylinux2014_x86_64.whl", hash = "sha256:c027e08a08be10b67c06bf2370b99c811c466398c357e615ca88c91c07f0910f"},
- {file = "protobuf-5.29.3-cp38-cp38-win32.whl", hash = "sha256:84a57163a0ccef3f96e4b6a20516cedcf5bb3a95a657131c5c3ac62200d23252"},
- {file = "protobuf-5.29.3-cp38-cp38-win_amd64.whl", hash = "sha256:b89c115d877892a512f79a8114564fb435943b59067615894c3b13cd3e1fa107"},
- {file = "protobuf-5.29.3-cp39-cp39-win32.whl", hash = "sha256:0eb32bfa5219fc8d4111803e9a690658aa2e6366384fd0851064b963b6d1f2a7"},
- {file = "protobuf-5.29.3-cp39-cp39-win_amd64.whl", hash = "sha256:6ce8cc3389a20693bfde6c6562e03474c40851b44975c9b2bf6df7d8c4f864da"},
- {file = "protobuf-5.29.3-py3-none-any.whl", hash = "sha256:0a18ed4a24198528f2333802eb075e59dea9d679ab7a6c5efb017a59004d849f"},
- {file = "protobuf-5.29.3.tar.gz", hash = "sha256:5da0f41edaf117bde316404bad1a486cb4ededf8e4a54891296f648e8e076620"},
+ {file = "protobuf-5.29.5-cp310-abi3-win32.whl", hash = "sha256:3f1c6468a2cfd102ff4703976138844f78ebd1fb45f49011afc5139e9e283079"},
+ {file = "protobuf-5.29.5-cp310-abi3-win_amd64.whl", hash = "sha256:3f76e3a3675b4a4d867b52e4a5f5b78a2ef9565549d4037e06cf7b0942b1d3fc"},
+ {file = "protobuf-5.29.5-cp38-abi3-macosx_10_9_universal2.whl", hash = "sha256:e38c5add5a311f2a6eb0340716ef9b039c1dfa428b28f25a7838ac329204a671"},
+ {file = "protobuf-5.29.5-cp38-abi3-manylinux2014_aarch64.whl", hash = "sha256:fa18533a299d7ab6c55a238bf8629311439995f2e7eca5caaff08663606e9015"},
+ {file = "protobuf-5.29.5-cp38-abi3-manylinux2014_x86_64.whl", hash = "sha256:63848923da3325e1bf7e9003d680ce6e14b07e55d0473253a690c3a8b8fd6e61"},
+ {file = "protobuf-5.29.5-cp38-cp38-win32.whl", hash = "sha256:ef91363ad4faba7b25d844ef1ada59ff1604184c0bcd8b39b8a6bef15e1af238"},
+ {file = "protobuf-5.29.5-cp38-cp38-win_amd64.whl", hash = "sha256:7318608d56b6402d2ea7704ff1e1e4597bee46d760e7e4dd42a3d45e24b87f2e"},
+ {file = "protobuf-5.29.5-cp39-cp39-win32.whl", hash = "sha256:6f642dc9a61782fa72b90878af134c5afe1917c89a568cd3476d758d3c3a0736"},
+ {file = "protobuf-5.29.5-cp39-cp39-win_amd64.whl", hash = "sha256:470f3af547ef17847a28e1f47200a1cbf0ba3ff57b7de50d22776607cd2ea353"},
+ {file = "protobuf-5.29.5-py3-none-any.whl", hash = "sha256:6cf42630262c59b2d8de33954443d94b746c952b01434fc58a417fdbd2e84bd5"},
+ {file = "protobuf-5.29.5.tar.gz", hash = "sha256:bc1463bafd4b0929216c35f437a8e28731a2b7fe3d98bb77a600efced5a15c84"},
]
[[package]]
@@ -497,6 +509,8 @@ version = "9.0.0"
description = "Get CPU info with pure Python"
optional = true
python-versions = "*"
+groups = ["main"]
+markers = "extra == \"dev\""
files = [
{file = "py-cpuinfo-9.0.0.tar.gz", hash = "sha256:3cdbbf3fac90dc6f118bfd64384f309edeadd902d7c8fb17f02ffa1fc3f49690"},
{file = "py_cpuinfo-9.0.0-py3-none-any.whl", hash = "sha256:859625bc251f64e21f077d099d4162689c762b5d6a4c3c97553d56241c9674d5"},
@@ -508,6 +522,8 @@ version = "2.9.1"
description = "Python style guide checker"
optional = true
python-versions = ">=3.6"
+groups = ["main"]
+markers = "extra == \"dev\""
files = [
{file = "pycodestyle-2.9.1-py2.py3-none-any.whl", hash = "sha256:d1735fc58b418fd7c5f658d28d943854f8a849b01a5d0a1e6f3f3fdd0166804b"},
{file = "pycodestyle-2.9.1.tar.gz", hash = "sha256:2c9607871d58c76354b697b42f5d57e1ada7d261c261efac224b664affdc5785"},
@@ -519,6 +535,8 @@ version = "2.5.0"
description = "passive checker of Python programs"
optional = true
python-versions = ">=3.6"
+groups = ["main"]
+markers = "extra == \"dev\""
files = [
{file = "pyflakes-2.5.0-py2.py3-none-any.whl", hash = "sha256:4579f67d887f804e67edb544428f264b7b24f435b263c4614f384135cea553d2"},
{file = "pyflakes-2.5.0.tar.gz", hash = "sha256:491feb020dca48ccc562a8c0cbe8df07ee13078df59813b83959cbdada312ea3"},
@@ -530,6 +548,8 @@ version = "8.3.4"
description = "pytest: simple powerful testing with Python"
optional = true
python-versions = ">=3.8"
+groups = ["main"]
+markers = "extra == \"dev\""
files = [
{file = "pytest-8.3.4-py3-none-any.whl", hash = "sha256:50e16d954148559c9a74109af1eaf0c945ba2d8f30f0a3d3335edde19788b6f6"},
{file = "pytest-8.3.4.tar.gz", hash = "sha256:965370d062bce11e73868e0335abac31b4d3de0e82f4007408d242b4f8610761"},
@@ -552,6 +572,8 @@ version = "4.0.0"
description = "A ``pytest`` fixture for benchmarking code. It will group the tests into rounds that are calibrated to the chosen timer."
optional = true
python-versions = ">=3.7"
+groups = ["main"]
+markers = "extra == \"dev\""
files = [
{file = "pytest-benchmark-4.0.0.tar.gz", hash = "sha256:fb0785b83efe599a6a956361c0691ae1dbb5318018561af10f3e915caa0048d1"},
{file = "pytest_benchmark-4.0.0-py3-none-any.whl", hash = "sha256:fdb7db64e31c8b277dff9850d2a2556d8b60bcb0ea6524e36e28ffd7c87f71d6"},
@@ -572,6 +594,8 @@ version = "2.9.0.post0"
description = "Extensions to the standard Python datetime module"
optional = true
python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7"
+groups = ["main"]
+markers = "extra == \"dev\""
files = [
{file = "python-dateutil-2.9.0.post0.tar.gz", hash = "sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3"},
{file = "python_dateutil-2.9.0.post0-py2.py3-none-any.whl", hash = "sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427"},
@@ -582,18 +606,19 @@ six = ">=1.5"
[[package]]
name = "requests"
-version = "2.32.3"
+version = "2.32.4"
description = "Python HTTP for Humans."
optional = false
python-versions = ">=3.8"
+groups = ["main"]
files = [
- {file = "requests-2.32.3-py3-none-any.whl", hash = "sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6"},
- {file = "requests-2.32.3.tar.gz", hash = "sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760"},
+ {file = "requests-2.32.4-py3-none-any.whl", hash = "sha256:27babd3cda2a6d50b30443204ee89830707d396671944c998b5975b031ac2b2c"},
+ {file = "requests-2.32.4.tar.gz", hash = "sha256:27d0316682c8a29834d3264820024b62a36942083d52caf2f14c0591336d3422"},
]
[package.dependencies]
certifi = ">=2017.4.17"
-charset-normalizer = ">=2,<4"
+charset_normalizer = ">=2,<4"
idna = ">=2.5,<4"
urllib3 = ">=1.21.1,<3"
@@ -601,29 +626,14 @@ urllib3 = ">=1.21.1,<3"
socks = ["PySocks (>=1.5.6,!=1.5.7)"]
use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"]
-[[package]]
-name = "s3transfer"
-version = "0.11.2"
-description = "An Amazon S3 Transfer Manager"
-optional = true
-python-versions = ">=3.8"
-files = [
- {file = "s3transfer-0.11.2-py3-none-any.whl", hash = "sha256:be6ecb39fadd986ef1701097771f87e4d2f821f27f6071c872143884d2950fbc"},
- {file = "s3transfer-0.11.2.tar.gz", hash = "sha256:3b39185cb72f5acc77db1a58b6e25b977f28d20496b6e58d6813d75f464d632f"},
-]
-
-[package.dependencies]
-botocore = ">=1.36.0,<2.0a.0"
-
-[package.extras]
-crt = ["botocore[crt] (>=1.36.0,<2.0a.0)"]
-
[[package]]
name = "six"
version = "1.17.0"
description = "Python 2 and 3 compatibility utilities"
optional = true
python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7"
+groups = ["main"]
+markers = "extra == \"dev\""
files = [
{file = "six-1.17.0-py2.py3-none-any.whl", hash = "sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274"},
{file = "six-1.17.0.tar.gz", hash = "sha256:ff70335d468e7eb6ec65b95b99d3a2836546063f63acc5171de367e834932a81"},
@@ -635,6 +645,8 @@ version = "2.2.1"
description = "A lil' TOML parser"
optional = true
python-versions = ">=3.8"
+groups = ["main"]
+markers = "extra == \"dev\" and python_version <= \"3.10\""
files = [
{file = "tomli-2.2.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:678e4fa69e4575eb77d103de3df8a895e1591b48e740211bd1067378c69e8249"},
{file = "tomli-2.2.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:023aa114dd824ade0100497eb2318602af309e5a55595f76b626d6d9f3b7b0a6"},
@@ -676,6 +688,7 @@ version = "4.12.2"
description = "Backported and Experimental Type Hints for Python 3.8+"
optional = false
python-versions = ">=3.8"
+groups = ["main"]
files = [
{file = "typing_extensions-4.12.2-py3-none-any.whl", hash = "sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d"},
{file = "typing_extensions-4.12.2.tar.gz", hash = "sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8"},
@@ -687,6 +700,7 @@ version = "5.10.0"
description = "Ultra fast JSON encoder and decoder for Python"
optional = false
python-versions = ">=3.8"
+groups = ["main"]
files = [
{file = "ujson-5.10.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:2601aa9ecdbee1118a1c2065323bda35e2c5a2cf0797ef4522d485f9d3ef65bd"},
{file = "ujson-5.10.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:348898dd702fc1c4f1051bc3aacbf894caa0927fe2c53e68679c073375f732cf"},
@@ -774,14 +788,16 @@ version = "1.26.20"
description = "HTTP library with thread-safe connection pooling, file post, and more."
optional = false
python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,>=2.7"
+groups = ["main"]
+markers = "python_version < \"3.10\""
files = [
{file = "urllib3-1.26.20-py2.py3-none-any.whl", hash = "sha256:0ed14ccfbf1c30a9072c7ca157e4319b70d65f623e91e7b32fadb2853431016e"},
{file = "urllib3-1.26.20.tar.gz", hash = "sha256:40c2dc0c681e47eb8f90e7e27bf6ff7df2e677421fd46756da1161c39ca70d32"},
]
[package.extras]
-brotli = ["brotli (==1.0.9)", "brotli (>=1.0.9)", "brotlicffi (>=0.8.0)", "brotlipy (>=0.6.0)"]
-secure = ["certifi", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "ipaddress", "pyOpenSSL (>=0.14)", "urllib3-secure-extra"]
+brotli = ["brotli (==1.0.9) ; os_name != \"nt\" and python_version < \"3\" and platform_python_implementation == \"CPython\"", "brotli (>=1.0.9) ; python_version >= \"3\" and platform_python_implementation == \"CPython\"", "brotlicffi (>=0.8.0) ; (os_name != \"nt\" or python_version >= \"3\") and platform_python_implementation != \"CPython\"", "brotlipy (>=0.6.0) ; os_name == \"nt\" and python_version < \"3\""]
+secure = ["certifi", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "ipaddress ; python_version == \"2.7\"", "pyOpenSSL (>=0.14)", "urllib3-secure-extra"]
socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
[[package]]
@@ -790,13 +806,15 @@ version = "2.3.0"
description = "HTTP library with thread-safe connection pooling, file post, and more."
optional = false
python-versions = ">=3.9"
+groups = ["main"]
+markers = "python_version >= \"3.10\""
files = [
{file = "urllib3-2.3.0-py3-none-any.whl", hash = "sha256:1cee9ad369867bfdbbb48b7dd50374c0967a0bb7710050facf0dd6911440e3df"},
{file = "urllib3-2.3.0.tar.gz", hash = "sha256:f8c5449b3cf0861679ce7e0503c7b44b5ec981bec0d1d3795a07f1ba96f0204d"},
]
[package.extras]
-brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)"]
+brotli = ["brotli (>=1.0.9) ; platform_python_implementation == \"CPython\"", "brotlicffi (>=0.8.0) ; platform_python_implementation != \"CPython\""]
h2 = ["h2 (>=4,<5)"]
socks = ["pysocks (>=1.5.6,!=1.5.7,<2.0)"]
zstd = ["zstandard (>=0.18.0)"]
@@ -807,6 +825,7 @@ version = "1.17.2"
description = "Module for decorators, wrappers and monkey patching."
optional = false
python-versions = ">=3.8"
+groups = ["main"]
files = [
{file = "wrapt-1.17.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:3d57c572081fed831ad2d26fd430d565b76aa277ed1d30ff4d40670b1c0dd984"},
{file = "wrapt-1.17.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:b5e251054542ae57ac7f3fba5d10bfff615b6c2fb09abeb37d2f1463f841ae22"},
@@ -895,6 +914,7 @@ version = "0.14.2"
description = "Makes working with XML feel like you are working with JSON"
optional = false
python-versions = ">=3.6"
+groups = ["main"]
files = [
{file = "xmltodict-0.14.2-py2.py3-none-any.whl", hash = "sha256:20cc7d723ed729276e808f26fb6b3599f786cbc37e06c65e192ba77c40f20aac"},
{file = "xmltodict-0.14.2.tar.gz", hash = "sha256:201e7c28bb210e374999d1dde6382923ab0ed1a8a5faeece48ab525b7810a553"},
@@ -906,23 +926,24 @@ version = "3.20.2"
description = "Backport of pathlib-compatible object wrapper for zip files"
optional = false
python-versions = ">=3.8"
+groups = ["main"]
files = [
{file = "zipp-3.20.2-py3-none-any.whl", hash = "sha256:a817ac80d6cf4b23bf7f2828b7cabf326f15a001bea8b1f9b49631780ba28350"},
{file = "zipp-3.20.2.tar.gz", hash = "sha256:bc9eb26f4506fda01b81bcde0ca78103b6e62f991b381fec825435c836edbc29"},
]
[package.extras]
-check = ["pytest-checkdocs (>=2.4)", "pytest-ruff (>=0.2.1)"]
+check = ["pytest-checkdocs (>=2.4)", "pytest-ruff (>=0.2.1) ; sys_platform != \"cygwin\""]
cover = ["pytest-cov"]
doc = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"]
enabler = ["pytest-enabler (>=2.2)"]
-test = ["big-O", "importlib-resources", "jaraco.functools", "jaraco.itertools", "jaraco.test", "more-itertools", "pytest (>=6,!=8.1.*)", "pytest-ignore-flaky"]
+test = ["big-O", "importlib-resources ; python_version < \"3.9\"", "jaraco.functools", "jaraco.itertools", "jaraco.test", "more-itertools", "pytest (>=6,!=8.1.*)", "pytest-ignore-flaky"]
type = ["pytest-mypy"]
[extras]
-dev = ["boto3", "flake8", "pytest", "pytest-benchmark", "requests"]
+dev = ["botocore", "flake8", "pytest", "pytest-benchmark", "requests"]
[metadata]
-lock-version = "2.0"
+lock-version = "2.1"
python-versions = ">=3.8.0,<4"
-content-hash = "9128af5437fd535ec458c64280d8390574c632e704cace5ea783de3c5d453c8c"
+content-hash = "f6a2f7355200da107aa5b027d6fe4fb6bdb5a898ce8298a56e6ac39fe8d8e34d"
diff --git a/pyproject.toml b/pyproject.toml
index 165a8cbe4..d135e085b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
[tool.poetry]
name = "datadog_lambda"
-version = "6.107.0"
+version = "8.117.0.dev0"
description = "The Datadog AWS Lambda Library"
authors = ["Datadog, Inc. "]
license = "Apache-2.0"
@@ -28,7 +28,7 @@ classifiers = [
python = ">=3.8.0,<4"
datadog = ">=0.51.0,<1.0.0"
wrapt = "^1.11.2"
-ddtrace = ">=2.20.0,<4"
+ddtrace = ">=3.16.2,<4"
ujson = ">=5.9.0"
botocore = { version = "^1.34.0", optional = true }
requests = { version ="^2.22.0", optional = true }
diff --git a/scripts/build_layers.sh b/scripts/build_layers.sh
index a0d6ee39d..23941b7a0 100755
--- a/scripts/build_layers.sh
+++ b/scripts/build_layers.sh
@@ -61,7 +61,7 @@ function docker_build_zip {
# between different python runtimes.
temp_dir=$(mktemp -d)
docker buildx build -t datadog-lambda-python-${arch}:$1 . --no-cache \
- --build-arg image=public.ecr.aws/docker/library/python:$1 \
+ --build-arg image=public.ecr.aws/sam/build-python$1:1 \
--build-arg runtime=python$1 \
--platform linux/${arch} \
--progress=plain \
diff --git a/scripts/check_layer_size.sh b/scripts/check_layer_size.sh
index 90d5861b0..ce67d92d9 100755
--- a/scripts/check_layer_size.sh
+++ b/scripts/check_layer_size.sh
@@ -8,8 +8,8 @@
# Compares layer size to threshold, and fails if below that threshold
set -e
-MAX_LAYER_COMPRESSED_SIZE_KB=$(expr 5 \* 1024)
-MAX_LAYER_UNCOMPRESSED_SIZE_KB=$(expr 13 \* 1024)
+MAX_LAYER_COMPRESSED_SIZE_KB=$(expr 9 \* 1024) # 9216 KB
+MAX_LAYER_UNCOMPRESSED_SIZE_KB=$(expr 25 \* 1024) # 25600 KB
LAYER_FILES_PREFIX="datadog_lambda_py"
diff --git a/scripts/run_integration_tests.sh b/scripts/run_integration_tests.sh
index 9ea2f0130..f6e4f537c 100755
--- a/scripts/run_integration_tests.sh
+++ b/scripts/run_integration_tests.sh
@@ -212,6 +212,8 @@ for handler_name in "${LAMBDA_HANDLERS[@]}"; do
sed -E "s/(datadog_lambda:v)([0-9]+\.[0-9]+\.[0-9]+)/\1XX/g" |
sed -E "s/(datadogpy\/)([0-9]+\.[0-9]+\.[0-9]+)/\1XX/g" |
sed -E "s/(python )([0-9]\.[0-9]+\.[0-9]+)/\1XX/g" |
+ # Remove .devN versioning from logs
+ sed -E "s/\.dev[0-9]+//g" |
# Strip out run ID (from function name, resource, etc.)
sed -E "s/${!run_id}/XXXX/g" |
# Normalize python-requests version
diff --git a/tests/conftest.py b/tests/conftest.py
new file mode 100644
index 000000000..338698025
--- /dev/null
+++ b/tests/conftest.py
@@ -0,0 +1,8 @@
+import pytest
+
+from datadog_lambda.config import config
+
+
+@pytest.fixture(autouse=True)
+def reset_config():
+ config._reset()
diff --git a/tests/event_samples/application-load-balancer-multivalue-headers.json b/tests/event_samples/application-load-balancer-multivalue-headers.json
new file mode 100644
index 000000000..a35ca5023
--- /dev/null
+++ b/tests/event_samples/application-load-balancer-multivalue-headers.json
@@ -0,0 +1,31 @@
+{
+ "requestContext": {
+ "elb": {
+ "targetGroupArn": "arn:aws:elasticloadbalancing:us-east-2:123456789012:targetgroup/lambda-xyz/123abc"
+ }
+ },
+ "httpMethod": "GET",
+ "path": "/lambda",
+ "multiValueQueryStringParameters": {
+ "query": "1234ABCD"
+ },
+ "multiValueHeaders": {
+ "accept": ["text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8"],
+ "accept-encoding": ["gzip"],
+ "accept-language": ["en-US,en;q=0.9"],
+ "connection": ["keep-alive"],
+ "host": ["lambda-alb-123578498.us-east-2.elb.amazonaws.com"],
+ "upgrade-insecure-requests": ["1"],
+ "user-agent": ["Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.98 Safari/537.36"],
+ "x-amzn-trace-id": ["Root=1-5c536348-3d683b8b04734faae651f476"],
+ "x-forwarded-for": ["72.12.164.125"],
+ "x-forwarded-port": ["80"],
+ "x-forwarded-proto": ["http"],
+ "x-imforwards": ["20"],
+ "x-datadog-trace-id": ["12345"],
+ "x-datadog-parent-id": ["67890"],
+ "x-datadog-sampling-priority": ["2"]
+ },
+ "body": "",
+ "isBase64Encoded": false
+}
diff --git a/tests/event_samples/kinesisStream.json b/tests/event_samples/kinesisStream.json
new file mode 100644
index 000000000..a320fc44f
--- /dev/null
+++ b/tests/event_samples/kinesisStream.json
@@ -0,0 +1,20 @@
+{
+ "Records": [
+ {
+ "kinesis": {
+ "kinesisSchemaVersion": "1.0",
+ "partitionKey": "partitionkey",
+ "sequenceNumber": "49624230154685806402418173680709770494154422022871973922",
+ "data": "eyJmb28iOiAiYmFyIiwgIl9kYXRhZG9nIjogeyJ4LWRhdGFkb2ctdHJhY2UtaWQiOiAiNDk0ODM3NzMxNjM1NzI5MTQyMSIsICJ4LWRhdGFkb2ctcGFyZW50LWlkIjogIjI4NzYyNTMzODAwMTg2ODEwMjYiLCAieC1kYXRhZG9nLXNhbXBsaW5nLXByaW9yaXR5IjogIjEifX0=",
+ "approximateArrivalTimestamp": 1643638425.163
+ },
+ "eventSource": "aws:kinesis",
+ "eventVersion": "1.0",
+ "eventID": "shardId-000000000002:49624230154685806402418173680709770494154422022871973922",
+ "eventName": "aws:kinesis:record",
+ "invokeIdentityArn": "arn:aws:iam::601427279990:role/inferred-spans-python-dev-eu-west-1-lambdaRole",
+ "awsRegion": "eu-west-1",
+ "eventSourceARN": "arn:aws:kinesis:eu-west-1:601427279990:stream/kinesisStream"
+ }
+ ]
+}
diff --git a/tests/event_samples/rum-appsync-no-headers.json b/tests/event_samples/rum-appsync-no-headers.json
new file mode 100644
index 000000000..ce42c9722
--- /dev/null
+++ b/tests/event_samples/rum-appsync-no-headers.json
@@ -0,0 +1,14 @@
+{
+ "identity": "None",
+ "info": {
+ "fieldName": "getItems",
+ "parentTypeName": "Query",
+ "selectionSetGraphQL": "{\n id\n}",
+ "selectionSetList":["id"]
+ },
+ "prev": "None",
+ "request": {
+ "domainName": "None"
+ },
+ "source": "None"
+}
\ No newline at end of file
diff --git a/tests/event_samples/rum-appsync-request-not-dict.json b/tests/event_samples/rum-appsync-request-not-dict.json
new file mode 100644
index 000000000..1ab6dba82
--- /dev/null
+++ b/tests/event_samples/rum-appsync-request-not-dict.json
@@ -0,0 +1,12 @@
+{
+ "identity": "None",
+ "info": {
+ "fieldName": "getItems",
+ "parentTypeName": "Query",
+ "selectionSetGraphQL": "{\n id\n}",
+ "selectionSetList":["id"]
+ },
+ "prev": "None",
+ "request": "hello",
+ "source": "None"
+}
\ No newline at end of file
diff --git a/tests/event_samples/rum-appsync.json b/tests/event_samples/rum-appsync.json
new file mode 100644
index 000000000..ae085359f
--- /dev/null
+++ b/tests/event_samples/rum-appsync.json
@@ -0,0 +1,53 @@
+{
+ "identity": "None",
+ "info": {
+ "fieldName": "getItems",
+ "parentTypeName": "Query",
+ "selectionSetGraphQL": "{\n id\n}",
+ "selectionSetList":["id"]
+ },
+ "prev": "None",
+ "request": {
+ "domainName": "None",
+ "headers": {
+ "accept": "*/*",
+ "accept-encoding": "gzip, deflate, br, zstd",
+ "accept-language": "en-US,en;q=0.9",
+ "cloudfront-forwarded-proto": "https",
+ "cloudfront-is-desktop-viewer": "True",
+ "cloudfront-is-mobile-viewer": "False",
+ "cloudfront-is-smarttv-viewer":"False",
+ "cloudfront-is-tablet-viewer":" False",
+ "cloudfront-viewer-asn": "6461",
+ "cloudfront-viewer-country": "US",
+ "content-length": "47",
+ "content-type": "application/graphql",
+ "host": "4aowrg2uhvbw5mn7osu6searqi.appsync-api.us-east-1.amazonaws.com",
+ "origin": "http://localhost:5173/",
+ "priority": "u=1, i",
+ "referer": "http://localhost:5173/",
+ "sec-ch-ua": "\"Chromium\";v=\"140\", \"Not=A?Brand\";v=\"24\", \"Google Chrome\";v=\"140\"",
+ "sec-ch-ua-mobile": "?0",
+ "sec-ch-ua-platform": "macOS",
+ "sec-fetch-dest": "empty",
+ "sec-fetch-mode": "cors",
+ "sec-fetch-site": "cross-site",
+ "traceparent": "00-0000000000000000d9f454c80b9a529a-73ac6ca3427073a3-01",
+ "tracestate": "dd=s:1;o:rum",
+ "user-agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.0.0 Safari/537.36","via":"2.0 62f9f3967e93a923f21c8acb20cf10b6.cloudfront.net (CloudFront)",
+ "x-amz-cf-id": "Femhicb_Vbva-J8qWjdI4hKMmqusCeQSp207UGyY3u8VOUrdE8BBvg==",
+ "x-amzn-appsync-is-vpce-request": "False",
+ "x-amzn-remote-ip": "64.124.12.19",
+ "x-amzn-requestid": "1ee1669a-eda3-4d4f-911c-35f74ebef31d",
+ "x-amzn-trace-id": "Root=1-68cdb7e9-438bf88259d7ce3535723bdd",
+ "x-datadog-origin": "rum",
+ "x-datadog-parent-id": "67890",
+ "x-datadog-sampling-priority": "1",
+ "x-datadog-trace-id": "12345",
+ "x-forwarded-for": "64.124.12.19,15.158.225.229",
+ "x-forwarded-port": "443",
+ "x-forwarded-proto": "https"
+ }
+ },
+ "source": "None"
+}
\ No newline at end of file
diff --git a/tests/integration/input_events/appsync.json b/tests/integration/input_events/appsync.json
new file mode 100644
index 000000000..dacf24e7e
--- /dev/null
+++ b/tests/integration/input_events/appsync.json
@@ -0,0 +1,49 @@
+{
+ "identity": "None",
+ "info": {
+ "fieldName": "getItems",
+ "parentTypeName": "Query",
+ "selectionSetGraphQL": "{\n id\n}",
+ "selectionSetList":["id"]
+ },
+ "prev": "None",
+ "request": {
+ "domainName": "None",
+ "headers": {
+ "accept": "*/*",
+ "accept-encoding": "gzip, deflate, br, zstd",
+ "accept-language": "en-US,en;q=0.9",
+ "cloudfront-forwarded-proto": "https",
+ "cloudfront-is-desktop-viewer": "True",
+ "cloudfront-is-mobile-viewer": "False",
+ "cloudfront-is-smarttv-viewer":"False",
+ "cloudfront-is-tablet-viewer":" False",
+ "cloudfront-viewer-asn": "6461",
+ "cloudfront-viewer-country": "US",
+ "content-length": "47",
+ "content-type": "application/graphql",
+ "host": "4aowrg2uhvbw5mn7osu6searqi.appsync-api.us-east-1.amazonaws.com",
+ "origin": "http://localhost:5173/",
+ "priority": "u=1, i",
+ "referer": "http://localhost:5173/",
+ "sec-ch-ua": "\"Chromium\";v=\"140\", \"Not=A?Brand\";v=\"24\", \"Google Chrome\";v=\"140\"",
+ "sec-ch-ua-mobile": "?0",
+ "sec-ch-ua-platform": "macOS",
+ "sec-fetch-dest": "empty",
+ "sec-fetch-mode": "cors",
+ "sec-fetch-site": "cross-site",
+ "traceparent": "00-0000000000000000d9f454c80b9a529a-73ac6ca3427073a3-01",
+ "tracestate": "dd=s:1;o:rum",
+ "user-agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.0.0 Safari/537.36","via":"2.0 62f9f3967e93a923f21c8acb20cf10b6.cloudfront.net (CloudFront)",
+ "x-amz-cf-id": "Femhicb_Vbva-J8qWjdI4hKMmqusCeQSp207UGyY3u8VOUrdE8BBvg==",
+ "x-amzn-appsync-is-vpce-request": "False",
+ "x-amzn-remote-ip": "64.124.12.19",
+ "x-amzn-requestid": "1ee1669a-eda3-4d4f-911c-35f74ebef31d",
+ "x-amzn-trace-id": "Root=1-68cdb7e9-438bf88259d7ce3535723bdd",
+ "x-forwarded-for": "64.124.12.19,15.158.225.229",
+ "x-forwarded-port": "443",
+ "x-forwarded-proto": "https"
+ }
+ },
+ "source": "None"
+}
\ No newline at end of file
diff --git a/tests/integration/package-lock.json b/tests/integration/package-lock.json
new file mode 100644
index 000000000..5990cc8db
--- /dev/null
+++ b/tests/integration/package-lock.json
@@ -0,0 +1,1119 @@
+{
+ "name": "integration",
+ "lockfileVersion": 3,
+ "requires": true,
+ "packages": {
+ "": {
+ "devDependencies": {
+ "serverless-plugin-datadog": "^2.18.0",
+ "serverless-python-requirements": "^6.1.2"
+ }
+ },
+ "node_modules/@iarna/toml": {
+ "version": "2.2.5",
+ "resolved": "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.5.tgz",
+ "integrity": "sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==",
+ "dev": true,
+ "license": "ISC"
+ },
+ "node_modules/2-thenable": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/2-thenable/-/2-thenable-1.0.0.tgz",
+ "integrity": "sha512-HqiDzaLDFCXkcCO/SwoyhRwqYtINFHF7t9BDRq4x90TOKNAJpiqUt9X5lQ08bwxYzc067HUywDjGySpebHcUpw==",
+ "dev": true,
+ "license": "ISC",
+ "dependencies": {
+ "d": "1",
+ "es5-ext": "^0.10.47"
+ }
+ },
+ "node_modules/ansi-regex": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+ "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/ansi-styles": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "color-convert": "^2.0.1"
+ },
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+ }
+ },
+ "node_modules/appdirectory": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/appdirectory/-/appdirectory-0.1.0.tgz",
+ "integrity": "sha512-DJ5DV8vZXBbusyiyPlH28xppwS8eAMRuuyMo88xeEcf4bV64lbLtbxRxqixZuJBXsZzLtXFmA13GwVjJc7vdQw==",
+ "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
+ "dev": true,
+ "license": "MIT"
+ },
+ "node_modules/balanced-match": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+ "dev": true,
+ "license": "MIT"
+ },
+ "node_modules/bluebird": {
+ "version": "3.7.2",
+ "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+ "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+ "dev": true,
+ "license": "MIT"
+ },
+ "node_modules/brace-expansion": {
+ "version": "1.1.12",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+ "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "balanced-match": "^1.0.0",
+ "concat-map": "0.0.1"
+ }
+ },
+ "node_modules/camelcase": {
+ "version": "5.3.1",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+ "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/child-process-ext": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/child-process-ext/-/child-process-ext-2.1.1.tgz",
+ "integrity": "sha512-0UQ55f51JBkOFa+fvR76ywRzxiPwQS3Xe8oe5bZRphpv+dIMeerW5Zn5e4cUy4COJwVtJyU0R79RMnw+aCqmGA==",
+ "dev": true,
+ "license": "ISC",
+ "dependencies": {
+ "cross-spawn": "^6.0.5",
+ "es5-ext": "^0.10.53",
+ "log": "^6.0.0",
+ "split2": "^3.1.1",
+ "stream-promise": "^3.2.0"
+ }
+ },
+ "node_modules/cliui": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+ "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+ "dev": true,
+ "license": "ISC",
+ "dependencies": {
+ "string-width": "^4.2.0",
+ "strip-ansi": "^6.0.0",
+ "wrap-ansi": "^6.2.0"
+ }
+ },
+ "node_modules/color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "color-name": "~1.1.4"
+ },
+ "engines": {
+ "node": ">=7.0.0"
+ }
+ },
+ "node_modules/color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true,
+ "license": "MIT"
+ },
+ "node_modules/concat-map": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+ "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+ "dev": true,
+ "license": "MIT"
+ },
+ "node_modules/core-util-is": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+ "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+ "dev": true,
+ "license": "MIT"
+ },
+ "node_modules/cross-spawn": {
+ "version": "6.0.6",
+ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.6.tgz",
+ "integrity": "sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "nice-try": "^1.0.4",
+ "path-key": "^2.0.1",
+ "semver": "^5.5.0",
+ "shebang-command": "^1.2.0",
+ "which": "^1.2.9"
+ },
+ "engines": {
+ "node": ">=4.8"
+ }
+ },
+ "node_modules/cross-spawn/node_modules/semver": {
+ "version": "5.7.2",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+ "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+ "dev": true,
+ "license": "ISC",
+ "bin": {
+ "semver": "bin/semver"
+ }
+ },
+ "node_modules/d": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/d/-/d-1.0.2.tgz",
+ "integrity": "sha512-MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw==",
+ "dev": true,
+ "license": "ISC",
+ "dependencies": {
+ "es5-ext": "^0.10.64",
+ "type": "^2.7.2"
+ },
+ "engines": {
+ "node": ">=0.12"
+ }
+ },
+ "node_modules/decamelize": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+ "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/duration": {
+ "version": "0.2.2",
+ "resolved": "https://registry.npmjs.org/duration/-/duration-0.2.2.tgz",
+ "integrity": "sha512-06kgtea+bGreF5eKYgI/36A6pLXggY7oR4p1pq4SmdFBn1ReOL5D8RhG64VrqfTTKNucqqtBAwEj8aB88mcqrg==",
+ "dev": true,
+ "license": "ISC",
+ "dependencies": {
+ "d": "1",
+ "es5-ext": "~0.10.46"
+ }
+ },
+ "node_modules/emoji-regex": {
+ "version": "8.0.0",
+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+ "dev": true,
+ "license": "MIT"
+ },
+ "node_modules/es5-ext": {
+ "version": "0.10.64",
+ "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.64.tgz",
+ "integrity": "sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==",
+ "dev": true,
+ "hasInstallScript": true,
+ "license": "ISC",
+ "dependencies": {
+ "es6-iterator": "^2.0.3",
+ "es6-symbol": "^3.1.3",
+ "esniff": "^2.0.1",
+ "next-tick": "^1.1.0"
+ },
+ "engines": {
+ "node": ">=0.10"
+ }
+ },
+ "node_modules/es6-iterator": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
+ "integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "d": "1",
+ "es5-ext": "^0.10.35",
+ "es6-symbol": "^3.1.1"
+ }
+ },
+ "node_modules/es6-symbol": {
+ "version": "3.1.4",
+ "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.4.tgz",
+ "integrity": "sha512-U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg==",
+ "dev": true,
+ "license": "ISC",
+ "dependencies": {
+ "d": "^1.0.2",
+ "ext": "^1.7.0"
+ },
+ "engines": {
+ "node": ">=0.12"
+ }
+ },
+ "node_modules/esniff": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/esniff/-/esniff-2.0.1.tgz",
+ "integrity": "sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==",
+ "dev": true,
+ "license": "ISC",
+ "dependencies": {
+ "d": "^1.0.1",
+ "es5-ext": "^0.10.62",
+ "event-emitter": "^0.3.5",
+ "type": "^2.7.2"
+ },
+ "engines": {
+ "node": ">=0.10"
+ }
+ },
+ "node_modules/event-emitter": {
+ "version": "0.3.5",
+ "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
+ "integrity": "sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "d": "1",
+ "es5-ext": "~0.10.14"
+ }
+ },
+ "node_modules/ext": {
+ "version": "1.7.0",
+ "resolved": "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz",
+ "integrity": "sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==",
+ "dev": true,
+ "license": "ISC",
+ "dependencies": {
+ "type": "^2.7.2"
+ }
+ },
+ "node_modules/find-up": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "locate-path": "^5.0.0",
+ "path-exists": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/fs-extra": {
+ "version": "10.1.0",
+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+ "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "graceful-fs": "^4.2.0",
+ "jsonfile": "^6.0.1",
+ "universalify": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/fs.realpath": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+ "dev": true,
+ "license": "ISC"
+ },
+ "node_modules/get-caller-file": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+ "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+ "dev": true,
+ "license": "ISC",
+ "engines": {
+ "node": "6.* || 8.* || >= 10.*"
+ }
+ },
+ "node_modules/glob": {
+ "version": "7.2.3",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+ "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+ "deprecated": "Glob versions prior to v9 are no longer supported",
+ "dev": true,
+ "license": "ISC",
+ "dependencies": {
+ "fs.realpath": "^1.0.0",
+ "inflight": "^1.0.4",
+ "inherits": "2",
+ "minimatch": "^3.1.1",
+ "once": "^1.3.0",
+ "path-is-absolute": "^1.0.0"
+ },
+ "engines": {
+ "node": "*"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ }
+ },
+ "node_modules/glob-all": {
+ "version": "3.3.1",
+ "resolved": "https://registry.npmjs.org/glob-all/-/glob-all-3.3.1.tgz",
+ "integrity": "sha512-Y+ESjdI7ZgMwfzanHZYQ87C59jOO0i+Hd+QYtVt9PhLi6d8wlOpzQnfBxWUlaTuAoR3TkybLqqbIoWveU4Ji7Q==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "glob": "^7.2.3",
+ "yargs": "^15.3.1"
+ },
+ "bin": {
+ "glob-all": "bin/glob-all"
+ }
+ },
+ "node_modules/graceful-fs": {
+ "version": "4.2.11",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+ "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+ "dev": true,
+ "license": "ISC"
+ },
+ "node_modules/immediate": {
+ "version": "3.0.6",
+ "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
+ "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==",
+ "dev": true,
+ "license": "MIT"
+ },
+ "node_modules/inflight": {
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+ "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+ "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+ "dev": true,
+ "license": "ISC",
+ "dependencies": {
+ "once": "^1.3.0",
+ "wrappy": "1"
+ }
+ },
+ "node_modules/inherits": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+ "dev": true,
+ "license": "ISC"
+ },
+ "node_modules/is-docker": {
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+ "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+ "dev": true,
+ "license": "MIT",
+ "bin": {
+ "is-docker": "cli.js"
+ },
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/is-fullwidth-code-point": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/is-plain-object": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+ "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "isobject": "^3.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/is-primitive": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-3.0.1.tgz",
+ "integrity": "sha512-GljRxhWvlCNRfZyORiH77FwdFwGcMO620o37EOYC0ORWdq+WYNVqW0w2Juzew4M+L81l6/QS3t5gkkihyRqv9w==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/is-stream": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+ "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/is-wsl": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+ "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "is-docker": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/isarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+ "dev": true,
+ "license": "MIT"
+ },
+ "node_modules/isexe": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+ "dev": true,
+ "license": "ISC"
+ },
+ "node_modules/isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/jsonfile": {
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+ "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "universalify": "^2.0.0"
+ },
+ "optionalDependencies": {
+ "graceful-fs": "^4.1.6"
+ }
+ },
+ "node_modules/jszip": {
+ "version": "3.10.1",
+ "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz",
+ "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==",
+ "dev": true,
+ "license": "(MIT OR GPL-3.0-or-later)",
+ "dependencies": {
+ "lie": "~3.3.0",
+ "pako": "~1.0.2",
+ "readable-stream": "~2.3.6",
+ "setimmediate": "^1.0.5"
+ }
+ },
+ "node_modules/lie": {
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",
+ "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "immediate": "~3.0.5"
+ }
+ },
+ "node_modules/locate-path": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "p-locate": "^4.1.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/lodash.get": {
+ "version": "4.4.2",
+ "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+ "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==",
+ "deprecated": "This package is deprecated. Use the optional chaining (?.) operator instead.",
+ "dev": true,
+ "license": "MIT"
+ },
+ "node_modules/lodash.uniqby": {
+ "version": "4.7.0",
+ "resolved": "https://registry.npmjs.org/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz",
+ "integrity": "sha512-e/zcLx6CSbmaEgFHCA7BnoQKyCtKMxnuWrJygbwPs/AIn+IMKl66L8/s+wBUn5LRw2pZx3bUHibiV1b6aTWIww==",
+ "dev": true,
+ "license": "MIT"
+ },
+ "node_modules/lodash.values": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/lodash.values/-/lodash.values-4.3.0.tgz",
+ "integrity": "sha512-r0RwvdCv8id9TUblb/O7rYPwVy6lerCbcawrfdo9iC/1t1wsNMJknO79WNBgwkH0hIeJ08jmvvESbFpNb4jH0Q==",
+ "dev": true,
+ "license": "MIT"
+ },
+ "node_modules/log": {
+ "version": "6.3.2",
+ "resolved": "https://registry.npmjs.org/log/-/log-6.3.2.tgz",
+ "integrity": "sha512-ek8NRg/OPvS9ISOJNWNAz5vZcpYacWNFDWNJjj5OXsc6YuKacfey6wF04cXz/tOJIVrZ2nGSkHpAY5qKtF6ISg==",
+ "dev": true,
+ "license": "ISC",
+ "dependencies": {
+ "d": "^1.0.2",
+ "duration": "^0.2.2",
+ "es5-ext": "^0.10.64",
+ "event-emitter": "^0.3.5",
+ "sprintf-kit": "^2.0.2",
+ "type": "^2.7.3",
+ "uni-global": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=0.12"
+ }
+ },
+ "node_modules/minimatch": {
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+ "dev": true,
+ "license": "ISC",
+ "dependencies": {
+ "brace-expansion": "^1.1.7"
+ },
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/next-tick": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
+ "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==",
+ "dev": true,
+ "license": "ISC"
+ },
+ "node_modules/nice-try": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+ "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+ "dev": true,
+ "license": "MIT"
+ },
+ "node_modules/once": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+ "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+ "dev": true,
+ "license": "ISC",
+ "dependencies": {
+ "wrappy": "1"
+ }
+ },
+ "node_modules/p-limit": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "p-try": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=6"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/p-locate": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "p-limit": "^2.2.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/p-try": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+ "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/pako": {
+ "version": "1.0.11",
+ "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+ "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
+ "dev": true,
+ "license": "(MIT AND Zlib)"
+ },
+ "node_modules/path-exists": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/path-is-absolute": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+ "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/path-key": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+ "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/process-nextick-args": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+ "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+ "dev": true,
+ "license": "MIT"
+ },
+ "node_modules/readable-stream": {
+ "version": "2.3.8",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "node_modules/require-directory": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+ "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/require-main-filename": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+ "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+ "dev": true,
+ "license": "ISC"
+ },
+ "node_modules/rimraf": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+ "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+ "deprecated": "Rimraf versions prior to v4 are no longer supported",
+ "dev": true,
+ "license": "ISC",
+ "dependencies": {
+ "glob": "^7.1.3"
+ },
+ "bin": {
+ "rimraf": "bin.js"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ }
+ },
+ "node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true,
+ "license": "MIT"
+ },
+ "node_modules/semver": {
+ "version": "7.6.3",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+ "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+ "dev": true,
+ "license": "ISC",
+ "bin": {
+ "semver": "bin/semver.js"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/serverless-plugin-datadog": {
+ "version": "2.18.0",
+ "resolved": "https://registry.npmjs.org/serverless-plugin-datadog/-/serverless-plugin-datadog-2.18.0.tgz",
+ "integrity": "sha512-RUdCNjUk+uUKQYgQBjK0WNeYJ7lM2/RScqg/LjVSfv5EACeJ3iIUPz1c4bS2jtiH05al8qXudNb6QDkv9zxG7w==",
+ "dev": true,
+ "license": "Apache-2.0"
+ },
+ "node_modules/serverless-python-requirements": {
+ "version": "6.1.2",
+ "resolved": "https://registry.npmjs.org/serverless-python-requirements/-/serverless-python-requirements-6.1.2.tgz",
+ "integrity": "sha512-pas27CBxxaLTU5XMYnCVPJc+LVdm65Ys5olNvRWRqfUaZwTfD/7KSSt2XPSRme8BeJubroslaiOtWPP+IrxTVA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@iarna/toml": "^2.2.5",
+ "appdirectory": "^0.1.0",
+ "bluebird": "^3.7.2",
+ "child-process-ext": "^2.1.1",
+ "fs-extra": "^10.1.0",
+ "glob-all": "^3.3.1",
+ "is-wsl": "^2.2.0",
+ "jszip": "^3.10.1",
+ "lodash.get": "^4.4.2",
+ "lodash.uniqby": "^4.7.0",
+ "lodash.values": "^4.3.0",
+ "rimraf": "^3.0.2",
+ "semver": "^7.6.0",
+ "set-value": "^4.1.0",
+ "sha256-file": "1.0.0",
+ "shell-quote": "^1.8.1"
+ },
+ "engines": {
+ "node": ">=12.0"
+ }
+ },
+ "node_modules/set-blocking": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+ "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
+ "dev": true,
+ "license": "ISC"
+ },
+ "node_modules/set-value": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/set-value/-/set-value-4.1.0.tgz",
+ "integrity": "sha512-zTEg4HL0RwVrqcWs3ztF+x1vkxfm0lP+MQQFPiMJTKVceBwEV0A569Ou8l9IYQG8jOZdMVI1hGsc0tmeD2o/Lw==",
+ "dev": true,
+ "funding": [
+ "https://github.com/sponsors/jonschlinkert",
+ "https://paypal.me/jonathanschlinkert",
+ "https://jonschlinkert.dev/sponsor"
+ ],
+ "license": "MIT",
+ "dependencies": {
+ "is-plain-object": "^2.0.4",
+ "is-primitive": "^3.0.1"
+ },
+ "engines": {
+ "node": ">=11.0"
+ }
+ },
+ "node_modules/setimmediate": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+ "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==",
+ "dev": true,
+ "license": "MIT"
+ },
+ "node_modules/sha256-file": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/sha256-file/-/sha256-file-1.0.0.tgz",
+ "integrity": "sha512-nqf+g0veqgQAkDx0U2y2Tn2KWyADuuludZTw9A7J3D+61rKlIIl9V5TS4mfnwKuXZOH9B7fQyjYJ9pKRHIsAyg==",
+ "dev": true,
+ "license": "MIT"
+ },
+ "node_modules/shebang-command": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+ "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "shebang-regex": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/shebang-regex": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+ "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/shell-quote": {
+ "version": "1.8.2",
+ "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.2.tgz",
+ "integrity": "sha512-AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/split2": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
+ "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==",
+ "dev": true,
+ "license": "ISC",
+ "dependencies": {
+ "readable-stream": "^3.0.0"
+ }
+ },
+ "node_modules/split2/node_modules/readable-stream": {
+ "version": "3.6.2",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+ "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "inherits": "^2.0.3",
+ "string_decoder": "^1.1.1",
+ "util-deprecate": "^1.0.1"
+ },
+ "engines": {
+ "node": ">= 6"
+ }
+ },
+ "node_modules/sprintf-kit": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/sprintf-kit/-/sprintf-kit-2.0.2.tgz",
+ "integrity": "sha512-lnapdj6W4LflHZGKvl9eVkz5YF0xaTrqpRWVA4cNVOTedwqifIP8ooGImldzT/4IAN5KXFQAyXTdLidYVQdyag==",
+ "dev": true,
+ "license": "ISC",
+ "dependencies": {
+ "es5-ext": "^0.10.64"
+ },
+ "engines": {
+ "node": ">=0.12"
+ }
+ },
+ "node_modules/stream-promise": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/stream-promise/-/stream-promise-3.2.0.tgz",
+ "integrity": "sha512-P+7muTGs2C8yRcgJw/PPt61q7O517tDHiwYEzMWo1GSBCcZedUMT/clz7vUNsSxFphIlJ6QUL4GexQKlfJoVtA==",
+ "dev": true,
+ "license": "ISC",
+ "dependencies": {
+ "2-thenable": "^1.0.0",
+ "es5-ext": "^0.10.49",
+ "is-stream": "^1.1.0"
+ }
+ },
+ "node_modules/string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "safe-buffer": "~5.1.0"
+ }
+ },
+ "node_modules/string-width": {
+ "version": "4.2.3",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+ "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "emoji-regex": "^8.0.0",
+ "is-fullwidth-code-point": "^3.0.0",
+ "strip-ansi": "^6.0.1"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/strip-ansi": {
+ "version": "6.0.1",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+ "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "ansi-regex": "^5.0.1"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/type": {
+ "version": "2.7.3",
+ "resolved": "https://registry.npmjs.org/type/-/type-2.7.3.tgz",
+ "integrity": "sha512-8j+1QmAbPvLZow5Qpi6NCaN8FB60p/6x8/vfNqOk/hC+HuvFZhL4+WfekuhQLiqFZXOgQdrs3B+XxEmCc6b3FQ==",
+ "dev": true,
+ "license": "ISC"
+ },
+ "node_modules/uni-global": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/uni-global/-/uni-global-1.0.0.tgz",
+ "integrity": "sha512-WWM3HP+siTxzIWPNUg7hZ4XO8clKi6NoCAJJWnuRL+BAqyFXF8gC03WNyTefGoUXYc47uYgXxpKLIEvo65PEHw==",
+ "dev": true,
+ "license": "ISC",
+ "dependencies": {
+ "type": "^2.5.0"
+ }
+ },
+ "node_modules/universalify": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+ "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">= 10.0.0"
+ }
+ },
+ "node_modules/util-deprecate": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+ "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+ "dev": true,
+ "license": "MIT"
+ },
+ "node_modules/which": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+ "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+ "dev": true,
+ "license": "ISC",
+ "dependencies": {
+ "isexe": "^2.0.0"
+ },
+ "bin": {
+ "which": "bin/which"
+ }
+ },
+ "node_modules/which-module": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz",
+ "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==",
+ "dev": true,
+ "license": "ISC"
+ },
+ "node_modules/wrap-ansi": {
+ "version": "6.2.0",
+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+ "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "ansi-styles": "^4.0.0",
+ "string-width": "^4.1.0",
+ "strip-ansi": "^6.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/wrappy": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+ "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+ "dev": true,
+ "license": "ISC"
+ },
+ "node_modules/y18n": {
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+ "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
+ "dev": true,
+ "license": "ISC"
+ },
+ "node_modules/yargs": {
+ "version": "15.4.1",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+ "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "cliui": "^6.0.0",
+ "decamelize": "^1.2.0",
+ "find-up": "^4.1.0",
+ "get-caller-file": "^2.0.1",
+ "require-directory": "^2.1.1",
+ "require-main-filename": "^2.0.0",
+ "set-blocking": "^2.0.0",
+ "string-width": "^4.2.0",
+ "which-module": "^2.0.0",
+ "y18n": "^4.0.0",
+ "yargs-parser": "^18.1.2"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/yargs-parser": {
+ "version": "18.1.3",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+ "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+ "dev": true,
+ "license": "ISC",
+ "dependencies": {
+ "camelcase": "^5.0.0",
+ "decamelize": "^1.2.0"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ }
+ }
+}
diff --git a/tests/integration/package.json b/tests/integration/package.json
index 1a1784620..8dae6acaa 100644
--- a/tests/integration/package.json
+++ b/tests/integration/package.json
@@ -1,6 +1,6 @@
{
"devDependencies": {
"serverless-plugin-datadog": "^2.18.0",
- "serverless-python-requirements": "^6.1.1"
+ "serverless-python-requirements": "^6.1.2"
}
}
diff --git a/tests/integration/requirements.txt b/tests/integration/requirements.txt
index 5678a66cd..343ea0257 100644
--- a/tests/integration/requirements.txt
+++ b/tests/integration/requirements.txt
@@ -1,4 +1,4 @@
certifi==2024.12.14
charset-normalizer==3.4.1
idna==3.10
-requests==2.32.3
+requests==2.32.4
diff --git a/tests/integration/snapshots/logs/async-metrics_python310.log b/tests/integration/snapshots/logs/async-metrics_python310.log
index 24d3fb5b0..6779d7ddb 100644
--- a/tests/integration/snapshots/logs/async-metrics_python310.log
+++ b/tests/integration/snapshots/logs/async-metrics_python310.log
@@ -55,10 +55,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"operation_name": "aws.apigateway.rest",
- "http.url": "XXXX.execute-api.us-east-2.amazonaws.com/",
+ "http.url": "https://xxxx.execute-api.us-east-2.amazonaws.com/",
"endpoint": "/",
"http.method": "GET",
"resource_names": "GET /",
+ "span.kind": "server",
"apiid": "XXXX",
"apiname": "XXXX",
"stage": "Prod",
@@ -66,9 +67,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.synchronicity": "sync",
"_inferred_span.tag_source": "self",
"http.status_code": "200",
+ "http.route": "/",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -84,7 +85,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python310",
"name": "aws.lambda",
"error": 0,
@@ -103,12 +104,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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/",
+ "span.kind": "server",
+ "http.url": "https://xxxx.execute-api.us-east-2.amazonaws.com/Prod/",
"http.method": "GET",
"http.route": "/",
- "http.status_code": "200",
- "_dd.base_service": "integration-tests-python"
+ "http.status_code": "200"
},
"metrics": {
"_dd.top_level": 1
@@ -119,7 +119,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -145,7 +145,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -188,6 +188,134 @@ START
"dd_lambda_layer:datadog-python310_X.X.X"
]
}
+{
+ "m": "hello.dog",
+ "v": 1,
+ "e": XXXX,
+ "t": [
+ "team:serverless",
+ "role:hello",
+ "dd_lambda_layer:datadog-python310_X.X.X"
+ ]
+}
+{
+ "m": "tests.integration.count",
+ "v": 21,
+ "e": XXXX,
+ "t": [
+ "test:integration",
+ "role:hello",
+ "dd_lambda_layer:datadog-python310_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": "integration-tests-python",
+ "resource": "integration-tests-python-XXXX-async-metrics_python310",
+ "name": "aws.lambda",
+ "error": 0,
+ "start": "XXXX",
+ "duration": "XXXX",
+ "meta": {
+ "runtime-id": "XXXX",
+ "_dd.origin": "lambda",
+ "cold_start": "false",
+ "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python310",
+ "function_version": "$LATEST",
+ "request_id": "XXXX",
+ "resource_names": "integration-tests-python-XXXX-async-metrics_python310",
+ "functionname": "integration-tests-python-XXXX-async-metrics_python310",
+ "datadog_lambda": "X.X.X",
+ "dd_trace": "X.X.X",
+ "span.name": "aws.lambda",
+ "language": "python"
+ },
+ "metrics": {
+ "process_id": XXXX,
+ "_dd.top_level": 1,
+ "_sampling_priority_v1": 1
+ },
+ "type": "serverless"
+ },
+ {
+ "trace_id": "XXXX",
+ "parent_id": "XXXX",
+ "span_id": "XXXX",
+ "service": "requests",
+ "resource": "GET /",
+ "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": "requests",
+ "resource": "GET /",
+ "name": "requests.request",
+ "error": 0,
+ "start": "XXXX",
+ "duration": "XXXX",
+ "meta": {
+ "_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_python310",
+ "resource:integration-tests-python-XXXX-async-metrics_python310",
+ "memorysize:1024",
+ "cold_start:false",
+ "runtime:python3.10",
+ "datadog_lambda:vXX",
+ "dd_lambda_layer:datadog-python310_X.X.X"
+ ]
+}
{
"m": "datadog.serverless.dynamodb.stream.type",
"v": 1,
@@ -226,7 +354,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "dynamodb",
+ "service": "ExampleTableWithStream",
"resource": "ExampleTableWithStream",
"name": "aws.dynamodb",
"error": 0,
@@ -237,6 +365,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.dynamodb",
"resource_names": "ExampleTableWithStream",
+ "span.kind": "server",
"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",
@@ -248,7 +377,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -296,7 +424,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python310",
"name": "aws.lambda",
"error": 0,
@@ -314,8 +442,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -326,7 +453,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -352,7 +479,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -424,7 +551,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "eventbridge",
+ "service": "eventbridge.custom.event.sender",
"resource": "eventbridge.custom.event.sender",
"name": "aws.eventbridge",
"error": 0,
@@ -435,12 +562,12 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.eventbridge",
"resource_names": "eventbridge.custom.event.sender",
+ "span.kind": "server",
"detail_type": "testdetail",
"_inferred_span.synchronicity": "async",
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -456,7 +583,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python310",
"name": "aws.lambda",
"error": 0,
@@ -473,8 +600,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source": "eventbridge"
},
"metrics": {
"_dd.top_level": 1
@@ -485,7 +611,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -511,7 +637,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -594,7 +720,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.httpapi",
"endpoint": "/httpapi/get",
- "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com/httpapi/get",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com/httpapi/get",
"http.method": "GET",
"http.protocol": "HTTP/1.1",
"http.source_ip": "XXXX",
@@ -607,9 +733,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.synchronicity": "sync",
"_inferred_span.tag_source": "self",
"http.status_code": "200",
+ "http.route": "/httpapi/get",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -625,7 +751,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python310",
"name": "aws.lambda",
"error": 0,
@@ -644,12 +770,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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",
+ "span.kind": "server",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com/httpapi/get",
"http.method": "GET",
"http.route": "/httpapi/get",
- "http.status_code": "200",
- "_dd.base_service": "integration-tests-python"
+ "http.status_code": "200"
},
"metrics": {
"_dd.top_level": 1
@@ -660,7 +785,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -686,7 +811,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -758,7 +883,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "kinesis",
+ "service": "EXAMPLE",
"resource": "EXAMPLE",
"name": "aws.kinesis",
"error": 0,
@@ -769,6 +894,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.kinesis",
"resource_names": "EXAMPLE",
+ "span.kind": "server",
"streamname": "EXAMPLE",
"shardid": "shardId-XXXX",
"event_source_arn": "arn:aws:kinesis:EXAMPLE",
@@ -780,7 +906,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -796,7 +921,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python310",
"name": "aws.lambda",
"error": 0,
@@ -814,8 +939,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -826,7 +950,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -852,7 +976,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -924,7 +1048,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "s3",
+ "service": "example-bucket",
"resource": "example-bucket",
"name": "aws.s3",
"error": 0,
@@ -933,6 +1057,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.s3",
"resource_names": "example-bucket",
+ "span.kind": "server",
"event_name": "ObjectCreated:Put",
"bucketname": "example-bucket",
"bucket_arn": "arn:aws:s3:::example-bucket",
@@ -943,7 +1068,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -971,7 +1095,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python310",
"name": "aws.lambda",
"error": 0,
@@ -989,8 +1113,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -1001,7 +1124,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1027,7 +1150,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1099,7 +1222,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "sns",
+ "service": "sns-lambda",
"resource": "sns-lambda",
"name": "aws.sns",
"error": 0,
@@ -1110,6 +1233,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.sns",
"resource_names": "sns-lambda",
+ "span.kind": "server",
"topicname": "sns-lambda",
"topic_arn": "arn:aws:sns:us-east-2:XXXX:us-east-2-lambda",
"message_id": "XXXX",
@@ -1119,7 +1243,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -1135,7 +1258,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python310",
"name": "aws.lambda",
"error": 0,
@@ -1153,8 +1276,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -1165,7 +1287,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1191,7 +1313,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1263,7 +1385,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "sqs",
+ "service": "my-queue",
"resource": "my-queue",
"name": "aws.sqs",
"error": 0,
@@ -1274,6 +1396,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.sqs",
"resource_names": "my-queue",
+ "span.kind": "server",
"queuename": "my-queue",
"event_source_arn": "arn:aws:sqs:us-east-2:XXXX:us-east-2-queue",
"receipt_handle": "AQEBwJnKyrHigUMZj6rYigCgxlaS3SLy0a...",
@@ -1282,7 +1405,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -1298,7 +1420,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python310",
"name": "aws.lambda",
"error": 0,
@@ -1316,8 +1438,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -1328,7 +1449,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1354,7 +1475,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1436,9 +1557,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"operation_name": "aws.apigateway.websocket",
- "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com$default",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com$default/",
"endpoint": "$default",
"resource_names": "$default",
+ "span.kind": "server",
"apiid": "XXXX",
"apiname": "XXXX",
"stage": "dev",
@@ -1451,7 +1573,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"http.status_code": "200",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -1467,7 +1588,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python310",
"name": "aws.lambda",
"error": 0,
@@ -1486,9 +1607,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "span.kind": "server",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com/",
+ "http.status_code": "200"
},
"metrics": {
"_dd.top_level": 1
@@ -1499,7 +1620,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1525,7 +1646,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
diff --git a/tests/integration/snapshots/logs/async-metrics_python311.log b/tests/integration/snapshots/logs/async-metrics_python311.log
index e4fa66bce..9f14ff15c 100644
--- a/tests/integration/snapshots/logs/async-metrics_python311.log
+++ b/tests/integration/snapshots/logs/async-metrics_python311.log
@@ -55,10 +55,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"operation_name": "aws.apigateway.rest",
- "http.url": "XXXX.execute-api.us-east-2.amazonaws.com/",
+ "http.url": "https://xxxx.execute-api.us-east-2.amazonaws.com/",
"endpoint": "/",
"http.method": "GET",
"resource_names": "GET /",
+ "span.kind": "server",
"apiid": "XXXX",
"apiname": "XXXX",
"stage": "Prod",
@@ -66,9 +67,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.synchronicity": "sync",
"_inferred_span.tag_source": "self",
"http.status_code": "200",
+ "http.route": "/",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -84,7 +85,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python311",
"name": "aws.lambda",
"error": 0,
@@ -103,12 +104,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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/",
+ "span.kind": "server",
+ "http.url": "https://xxxx.execute-api.us-east-2.amazonaws.com/Prod/",
"http.method": "GET",
"http.route": "/",
- "http.status_code": "200",
- "_dd.base_service": "integration-tests-python"
+ "http.status_code": "200"
},
"metrics": {
"_dd.top_level": 1
@@ -119,7 +119,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -145,7 +145,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -188,6 +188,134 @@ START
"dd_lambda_layer:datadog-python311_X.X.X"
]
}
+{
+ "m": "hello.dog",
+ "v": 1,
+ "e": XXXX,
+ "t": [
+ "team:serverless",
+ "role:hello",
+ "dd_lambda_layer:datadog-python311_X.X.X"
+ ]
+}
+{
+ "m": "tests.integration.count",
+ "v": 21,
+ "e": XXXX,
+ "t": [
+ "test:integration",
+ "role:hello",
+ "dd_lambda_layer:datadog-python311_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": "integration-tests-python",
+ "resource": "integration-tests-python-XXXX-async-metrics_python311",
+ "name": "aws.lambda",
+ "error": 0,
+ "start": "XXXX",
+ "duration": "XXXX",
+ "meta": {
+ "runtime-id": "XXXX",
+ "_dd.origin": "lambda",
+ "cold_start": "false",
+ "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python311",
+ "function_version": "$LATEST",
+ "request_id": "XXXX",
+ "resource_names": "integration-tests-python-XXXX-async-metrics_python311",
+ "functionname": "integration-tests-python-XXXX-async-metrics_python311",
+ "datadog_lambda": "X.X.X",
+ "dd_trace": "X.X.X",
+ "span.name": "aws.lambda",
+ "language": "python"
+ },
+ "metrics": {
+ "process_id": XXXX,
+ "_dd.top_level": 1,
+ "_sampling_priority_v1": 1
+ },
+ "type": "serverless"
+ },
+ {
+ "trace_id": "XXXX",
+ "parent_id": "XXXX",
+ "span_id": "XXXX",
+ "service": "requests",
+ "resource": "GET /",
+ "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": "requests",
+ "resource": "GET /",
+ "name": "requests.request",
+ "error": 0,
+ "start": "XXXX",
+ "duration": "XXXX",
+ "meta": {
+ "_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_python311",
+ "resource:integration-tests-python-XXXX-async-metrics_python311",
+ "memorysize:1024",
+ "cold_start:false",
+ "runtime:python3.11",
+ "datadog_lambda:vXX",
+ "dd_lambda_layer:datadog-python311_X.X.X"
+ ]
+}
{
"m": "datadog.serverless.dynamodb.stream.type",
"v": 1,
@@ -226,7 +354,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "dynamodb",
+ "service": "ExampleTableWithStream",
"resource": "ExampleTableWithStream",
"name": "aws.dynamodb",
"error": 0,
@@ -237,6 +365,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.dynamodb",
"resource_names": "ExampleTableWithStream",
+ "span.kind": "server",
"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",
@@ -248,7 +377,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -296,7 +424,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python311",
"name": "aws.lambda",
"error": 0,
@@ -314,8 +442,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -326,7 +453,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -352,7 +479,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -424,7 +551,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "eventbridge",
+ "service": "eventbridge.custom.event.sender",
"resource": "eventbridge.custom.event.sender",
"name": "aws.eventbridge",
"error": 0,
@@ -435,12 +562,12 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.eventbridge",
"resource_names": "eventbridge.custom.event.sender",
+ "span.kind": "server",
"detail_type": "testdetail",
"_inferred_span.synchronicity": "async",
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -456,7 +583,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python311",
"name": "aws.lambda",
"error": 0,
@@ -473,8 +600,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source": "eventbridge"
},
"metrics": {
"_dd.top_level": 1
@@ -485,7 +611,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -511,7 +637,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -594,7 +720,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.httpapi",
"endpoint": "/httpapi/get",
- "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com/httpapi/get",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com/httpapi/get",
"http.method": "GET",
"http.protocol": "HTTP/1.1",
"http.source_ip": "XXXX",
@@ -607,9 +733,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.synchronicity": "sync",
"_inferred_span.tag_source": "self",
"http.status_code": "200",
+ "http.route": "/httpapi/get",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -625,7 +751,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python311",
"name": "aws.lambda",
"error": 0,
@@ -644,12 +770,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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",
+ "span.kind": "server",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com/httpapi/get",
"http.method": "GET",
"http.route": "/httpapi/get",
- "http.status_code": "200",
- "_dd.base_service": "integration-tests-python"
+ "http.status_code": "200"
},
"metrics": {
"_dd.top_level": 1
@@ -660,7 +785,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -686,7 +811,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -758,7 +883,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "kinesis",
+ "service": "EXAMPLE",
"resource": "EXAMPLE",
"name": "aws.kinesis",
"error": 0,
@@ -769,6 +894,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.kinesis",
"resource_names": "EXAMPLE",
+ "span.kind": "server",
"streamname": "EXAMPLE",
"shardid": "shardId-XXXX",
"event_source_arn": "arn:aws:kinesis:EXAMPLE",
@@ -780,7 +906,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -796,7 +921,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python311",
"name": "aws.lambda",
"error": 0,
@@ -814,8 +939,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -826,7 +950,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -852,7 +976,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -924,7 +1048,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "s3",
+ "service": "example-bucket",
"resource": "example-bucket",
"name": "aws.s3",
"error": 0,
@@ -933,6 +1057,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.s3",
"resource_names": "example-bucket",
+ "span.kind": "server",
"event_name": "ObjectCreated:Put",
"bucketname": "example-bucket",
"bucket_arn": "arn:aws:s3:::example-bucket",
@@ -943,7 +1068,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -971,7 +1095,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python311",
"name": "aws.lambda",
"error": 0,
@@ -989,8 +1113,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -1001,7 +1124,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1027,7 +1150,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1099,7 +1222,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "sns",
+ "service": "sns-lambda",
"resource": "sns-lambda",
"name": "aws.sns",
"error": 0,
@@ -1110,6 +1233,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.sns",
"resource_names": "sns-lambda",
+ "span.kind": "server",
"topicname": "sns-lambda",
"topic_arn": "arn:aws:sns:us-east-2:XXXX:us-east-2-lambda",
"message_id": "XXXX",
@@ -1119,7 +1243,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -1135,7 +1258,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python311",
"name": "aws.lambda",
"error": 0,
@@ -1153,8 +1276,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -1165,7 +1287,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1191,7 +1313,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1263,7 +1385,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "sqs",
+ "service": "my-queue",
"resource": "my-queue",
"name": "aws.sqs",
"error": 0,
@@ -1274,6 +1396,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.sqs",
"resource_names": "my-queue",
+ "span.kind": "server",
"queuename": "my-queue",
"event_source_arn": "arn:aws:sqs:us-east-2:XXXX:us-east-2-queue",
"receipt_handle": "AQEBwJnKyrHigUMZj6rYigCgxlaS3SLy0a...",
@@ -1282,7 +1405,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -1298,7 +1420,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python311",
"name": "aws.lambda",
"error": 0,
@@ -1316,8 +1438,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -1328,7 +1449,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1354,7 +1475,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1436,9 +1557,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"operation_name": "aws.apigateway.websocket",
- "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com$default",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com$default/",
"endpoint": "$default",
"resource_names": "$default",
+ "span.kind": "server",
"apiid": "XXXX",
"apiname": "XXXX",
"stage": "dev",
@@ -1451,7 +1573,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"http.status_code": "200",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -1467,7 +1588,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python311",
"name": "aws.lambda",
"error": 0,
@@ -1486,9 +1607,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "span.kind": "server",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com/",
+ "http.status_code": "200"
},
"metrics": {
"_dd.top_level": 1
@@ -1499,7 +1620,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1525,7 +1646,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
diff --git a/tests/integration/snapshots/logs/async-metrics_python312.log b/tests/integration/snapshots/logs/async-metrics_python312.log
index 0d632c6c9..789a39551 100644
--- a/tests/integration/snapshots/logs/async-metrics_python312.log
+++ b/tests/integration/snapshots/logs/async-metrics_python312.log
@@ -55,10 +55,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"operation_name": "aws.apigateway.rest",
- "http.url": "XXXX.execute-api.us-east-2.amazonaws.com/",
+ "http.url": "https://xxxx.execute-api.us-east-2.amazonaws.com/",
"endpoint": "/",
"http.method": "GET",
"resource_names": "GET /",
+ "span.kind": "server",
"apiid": "XXXX",
"apiname": "XXXX",
"stage": "Prod",
@@ -66,9 +67,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.synchronicity": "sync",
"_inferred_span.tag_source": "self",
"http.status_code": "200",
+ "http.route": "/",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -84,7 +85,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python312",
"name": "aws.lambda",
"error": 0,
@@ -103,12 +104,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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/",
+ "span.kind": "server",
+ "http.url": "https://xxxx.execute-api.us-east-2.amazonaws.com/Prod/",
"http.method": "GET",
"http.route": "/",
- "http.status_code": "200",
- "_dd.base_service": "integration-tests-python"
+ "http.status_code": "200"
},
"metrics": {
"_dd.top_level": 1
@@ -119,7 +119,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -145,7 +145,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -188,6 +188,134 @@ START
"dd_lambda_layer:datadog-python312_X.X.X"
]
}
+{
+ "m": "hello.dog",
+ "v": 1,
+ "e": XXXX,
+ "t": [
+ "team:serverless",
+ "role:hello",
+ "dd_lambda_layer:datadog-python312_X.X.X"
+ ]
+}
+{
+ "m": "tests.integration.count",
+ "v": 21,
+ "e": XXXX,
+ "t": [
+ "test:integration",
+ "role:hello",
+ "dd_lambda_layer:datadog-python312_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": "integration-tests-python",
+ "resource": "integration-tests-python-XXXX-async-metrics_python312",
+ "name": "aws.lambda",
+ "error": 0,
+ "start": "XXXX",
+ "duration": "XXXX",
+ "meta": {
+ "runtime-id": "XXXX",
+ "_dd.origin": "lambda",
+ "cold_start": "false",
+ "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python312",
+ "function_version": "$LATEST",
+ "request_id": "XXXX",
+ "resource_names": "integration-tests-python-XXXX-async-metrics_python312",
+ "functionname": "integration-tests-python-XXXX-async-metrics_python312",
+ "datadog_lambda": "X.X.X",
+ "dd_trace": "X.X.X",
+ "span.name": "aws.lambda",
+ "language": "python"
+ },
+ "metrics": {
+ "process_id": XXXX,
+ "_dd.top_level": 1,
+ "_sampling_priority_v1": 1
+ },
+ "type": "serverless"
+ },
+ {
+ "trace_id": "XXXX",
+ "parent_id": "XXXX",
+ "span_id": "XXXX",
+ "service": "requests",
+ "resource": "GET /",
+ "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": "requests",
+ "resource": "GET /",
+ "name": "requests.request",
+ "error": 0,
+ "start": "XXXX",
+ "duration": "XXXX",
+ "meta": {
+ "_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_python312",
+ "resource:integration-tests-python-XXXX-async-metrics_python312",
+ "memorysize:1024",
+ "cold_start:false",
+ "runtime:python3.12",
+ "datadog_lambda:vXX",
+ "dd_lambda_layer:datadog-python312_X.X.X"
+ ]
+}
{
"m": "datadog.serverless.dynamodb.stream.type",
"v": 1,
@@ -226,7 +354,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "dynamodb",
+ "service": "ExampleTableWithStream",
"resource": "ExampleTableWithStream",
"name": "aws.dynamodb",
"error": 0,
@@ -237,6 +365,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.dynamodb",
"resource_names": "ExampleTableWithStream",
+ "span.kind": "server",
"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",
@@ -248,7 +377,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -296,7 +424,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python312",
"name": "aws.lambda",
"error": 0,
@@ -314,8 +442,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -326,7 +453,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -352,7 +479,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -424,7 +551,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "eventbridge",
+ "service": "eventbridge.custom.event.sender",
"resource": "eventbridge.custom.event.sender",
"name": "aws.eventbridge",
"error": 0,
@@ -435,12 +562,12 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.eventbridge",
"resource_names": "eventbridge.custom.event.sender",
+ "span.kind": "server",
"detail_type": "testdetail",
"_inferred_span.synchronicity": "async",
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -456,7 +583,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python312",
"name": "aws.lambda",
"error": 0,
@@ -473,8 +600,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source": "eventbridge"
},
"metrics": {
"_dd.top_level": 1
@@ -485,7 +611,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -511,7 +637,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -594,7 +720,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.httpapi",
"endpoint": "/httpapi/get",
- "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com/httpapi/get",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com/httpapi/get",
"http.method": "GET",
"http.protocol": "HTTP/1.1",
"http.source_ip": "XXXX",
@@ -607,9 +733,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.synchronicity": "sync",
"_inferred_span.tag_source": "self",
"http.status_code": "200",
+ "http.route": "/httpapi/get",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -625,7 +751,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python312",
"name": "aws.lambda",
"error": 0,
@@ -644,12 +770,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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",
+ "span.kind": "server",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com/httpapi/get",
"http.method": "GET",
"http.route": "/httpapi/get",
- "http.status_code": "200",
- "_dd.base_service": "integration-tests-python"
+ "http.status_code": "200"
},
"metrics": {
"_dd.top_level": 1
@@ -660,7 +785,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -686,7 +811,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -758,7 +883,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "kinesis",
+ "service": "EXAMPLE",
"resource": "EXAMPLE",
"name": "aws.kinesis",
"error": 0,
@@ -769,6 +894,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.kinesis",
"resource_names": "EXAMPLE",
+ "span.kind": "server",
"streamname": "EXAMPLE",
"shardid": "shardId-XXXX",
"event_source_arn": "arn:aws:kinesis:EXAMPLE",
@@ -780,7 +906,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -796,7 +921,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python312",
"name": "aws.lambda",
"error": 0,
@@ -814,8 +939,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -826,7 +950,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -852,7 +976,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -924,7 +1048,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "s3",
+ "service": "example-bucket",
"resource": "example-bucket",
"name": "aws.s3",
"error": 0,
@@ -933,6 +1057,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.s3",
"resource_names": "example-bucket",
+ "span.kind": "server",
"event_name": "ObjectCreated:Put",
"bucketname": "example-bucket",
"bucket_arn": "arn:aws:s3:::example-bucket",
@@ -943,7 +1068,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -971,7 +1095,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python312",
"name": "aws.lambda",
"error": 0,
@@ -989,8 +1113,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -1001,7 +1124,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1027,7 +1150,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1099,7 +1222,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "sns",
+ "service": "sns-lambda",
"resource": "sns-lambda",
"name": "aws.sns",
"error": 0,
@@ -1110,6 +1233,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.sns",
"resource_names": "sns-lambda",
+ "span.kind": "server",
"topicname": "sns-lambda",
"topic_arn": "arn:aws:sns:us-east-2:XXXX:us-east-2-lambda",
"message_id": "XXXX",
@@ -1119,7 +1243,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -1135,7 +1258,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python312",
"name": "aws.lambda",
"error": 0,
@@ -1153,8 +1276,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -1165,7 +1287,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1191,7 +1313,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1263,7 +1385,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "sqs",
+ "service": "my-queue",
"resource": "my-queue",
"name": "aws.sqs",
"error": 0,
@@ -1274,6 +1396,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.sqs",
"resource_names": "my-queue",
+ "span.kind": "server",
"queuename": "my-queue",
"event_source_arn": "arn:aws:sqs:us-east-2:XXXX:us-east-2-queue",
"receipt_handle": "AQEBwJnKyrHigUMZj6rYigCgxlaS3SLy0a...",
@@ -1282,7 +1405,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -1298,7 +1420,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python312",
"name": "aws.lambda",
"error": 0,
@@ -1316,8 +1438,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -1328,7 +1449,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1354,7 +1475,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1436,9 +1557,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"operation_name": "aws.apigateway.websocket",
- "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com$default",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com$default/",
"endpoint": "$default",
"resource_names": "$default",
+ "span.kind": "server",
"apiid": "XXXX",
"apiname": "XXXX",
"stage": "dev",
@@ -1451,7 +1573,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"http.status_code": "200",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -1467,7 +1588,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python312",
"name": "aws.lambda",
"error": 0,
@@ -1486,9 +1607,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "span.kind": "server",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com/",
+ "http.status_code": "200"
},
"metrics": {
"_dd.top_level": 1
@@ -1499,7 +1620,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1525,7 +1646,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
diff --git a/tests/integration/snapshots/logs/async-metrics_python313.log b/tests/integration/snapshots/logs/async-metrics_python313.log
index 090707096..78ade6a7a 100644
--- a/tests/integration/snapshots/logs/async-metrics_python313.log
+++ b/tests/integration/snapshots/logs/async-metrics_python313.log
@@ -55,10 +55,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"operation_name": "aws.apigateway.rest",
- "http.url": "XXXX.execute-api.us-east-2.amazonaws.com/",
+ "http.url": "https://xxxx.execute-api.us-east-2.amazonaws.com/",
"endpoint": "/",
"http.method": "GET",
"resource_names": "GET /",
+ "span.kind": "server",
"apiid": "XXXX",
"apiname": "XXXX",
"stage": "Prod",
@@ -66,9 +67,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.synchronicity": "sync",
"_inferred_span.tag_source": "self",
"http.status_code": "200",
+ "http.route": "/",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -84,7 +85,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python313",
"name": "aws.lambda",
"error": 0,
@@ -103,12 +104,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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/",
+ "span.kind": "server",
+ "http.url": "https://xxxx.execute-api.us-east-2.amazonaws.com/Prod/",
"http.method": "GET",
"http.route": "/",
- "http.status_code": "200",
- "_dd.base_service": "integration-tests-python"
+ "http.status_code": "200"
},
"metrics": {
"_dd.top_level": 1
@@ -119,7 +119,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -145,7 +145,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -188,6 +188,134 @@ START
"dd_lambda_layer:datadog-python313_X.X.X"
]
}
+{
+ "m": "hello.dog",
+ "v": 1,
+ "e": XXXX,
+ "t": [
+ "team:serverless",
+ "role:hello",
+ "dd_lambda_layer:datadog-python313_X.X.X"
+ ]
+}
+{
+ "m": "tests.integration.count",
+ "v": 21,
+ "e": XXXX,
+ "t": [
+ "test:integration",
+ "role:hello",
+ "dd_lambda_layer:datadog-python313_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": "integration-tests-python",
+ "resource": "integration-tests-python-XXXX-async-metrics_python313",
+ "name": "aws.lambda",
+ "error": 0,
+ "start": "XXXX",
+ "duration": "XXXX",
+ "meta": {
+ "runtime-id": "XXXX",
+ "_dd.origin": "lambda",
+ "cold_start": "false",
+ "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python313",
+ "function_version": "$LATEST",
+ "request_id": "XXXX",
+ "resource_names": "integration-tests-python-XXXX-async-metrics_python313",
+ "functionname": "integration-tests-python-XXXX-async-metrics_python313",
+ "datadog_lambda": "X.X.X",
+ "dd_trace": "X.X.X",
+ "span.name": "aws.lambda",
+ "language": "python"
+ },
+ "metrics": {
+ "process_id": XXXX,
+ "_dd.top_level": 1,
+ "_sampling_priority_v1": 1
+ },
+ "type": "serverless"
+ },
+ {
+ "trace_id": "XXXX",
+ "parent_id": "XXXX",
+ "span_id": "XXXX",
+ "service": "requests",
+ "resource": "GET /",
+ "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": "requests",
+ "resource": "GET /",
+ "name": "requests.request",
+ "error": 0,
+ "start": "XXXX",
+ "duration": "XXXX",
+ "meta": {
+ "_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_python313",
+ "resource:integration-tests-python-XXXX-async-metrics_python313",
+ "memorysize:1024",
+ "cold_start:false",
+ "runtime:python3.13",
+ "datadog_lambda:vXX",
+ "dd_lambda_layer:datadog-python313_X.X.X"
+ ]
+}
{
"m": "datadog.serverless.dynamodb.stream.type",
"v": 1,
@@ -226,7 +354,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "dynamodb",
+ "service": "ExampleTableWithStream",
"resource": "ExampleTableWithStream",
"name": "aws.dynamodb",
"error": 0,
@@ -237,6 +365,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.dynamodb",
"resource_names": "ExampleTableWithStream",
+ "span.kind": "server",
"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",
@@ -248,7 +377,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -296,7 +424,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python313",
"name": "aws.lambda",
"error": 0,
@@ -314,8 +442,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -326,7 +453,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -352,7 +479,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -424,7 +551,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "eventbridge",
+ "service": "eventbridge.custom.event.sender",
"resource": "eventbridge.custom.event.sender",
"name": "aws.eventbridge",
"error": 0,
@@ -435,12 +562,12 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.eventbridge",
"resource_names": "eventbridge.custom.event.sender",
+ "span.kind": "server",
"detail_type": "testdetail",
"_inferred_span.synchronicity": "async",
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -456,7 +583,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python313",
"name": "aws.lambda",
"error": 0,
@@ -473,8 +600,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source": "eventbridge"
},
"metrics": {
"_dd.top_level": 1
@@ -485,7 +611,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -511,7 +637,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -594,7 +720,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.httpapi",
"endpoint": "/httpapi/get",
- "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com/httpapi/get",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com/httpapi/get",
"http.method": "GET",
"http.protocol": "HTTP/1.1",
"http.source_ip": "XXXX",
@@ -607,9 +733,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.synchronicity": "sync",
"_inferred_span.tag_source": "self",
"http.status_code": "200",
+ "http.route": "/httpapi/get",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -625,7 +751,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python313",
"name": "aws.lambda",
"error": 0,
@@ -644,12 +770,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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",
+ "span.kind": "server",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com/httpapi/get",
"http.method": "GET",
"http.route": "/httpapi/get",
- "http.status_code": "200",
- "_dd.base_service": "integration-tests-python"
+ "http.status_code": "200"
},
"metrics": {
"_dd.top_level": 1
@@ -660,7 +785,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -686,7 +811,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -758,7 +883,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "kinesis",
+ "service": "EXAMPLE",
"resource": "EXAMPLE",
"name": "aws.kinesis",
"error": 0,
@@ -769,6 +894,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.kinesis",
"resource_names": "EXAMPLE",
+ "span.kind": "server",
"streamname": "EXAMPLE",
"shardid": "shardId-XXXX",
"event_source_arn": "arn:aws:kinesis:EXAMPLE",
@@ -780,7 +906,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -796,7 +921,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python313",
"name": "aws.lambda",
"error": 0,
@@ -814,8 +939,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -826,7 +950,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -852,7 +976,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -924,7 +1048,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "s3",
+ "service": "example-bucket",
"resource": "example-bucket",
"name": "aws.s3",
"error": 0,
@@ -933,6 +1057,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.s3",
"resource_names": "example-bucket",
+ "span.kind": "server",
"event_name": "ObjectCreated:Put",
"bucketname": "example-bucket",
"bucket_arn": "arn:aws:s3:::example-bucket",
@@ -943,7 +1068,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -971,7 +1095,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python313",
"name": "aws.lambda",
"error": 0,
@@ -989,8 +1113,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -1001,7 +1124,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1027,7 +1150,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1099,7 +1222,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "sns",
+ "service": "sns-lambda",
"resource": "sns-lambda",
"name": "aws.sns",
"error": 0,
@@ -1110,6 +1233,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.sns",
"resource_names": "sns-lambda",
+ "span.kind": "server",
"topicname": "sns-lambda",
"topic_arn": "arn:aws:sns:us-east-2:XXXX:us-east-2-lambda",
"message_id": "XXXX",
@@ -1119,7 +1243,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -1135,7 +1258,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python313",
"name": "aws.lambda",
"error": 0,
@@ -1153,8 +1276,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -1165,7 +1287,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1191,7 +1313,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1263,7 +1385,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "sqs",
+ "service": "my-queue",
"resource": "my-queue",
"name": "aws.sqs",
"error": 0,
@@ -1274,6 +1396,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.sqs",
"resource_names": "my-queue",
+ "span.kind": "server",
"queuename": "my-queue",
"event_source_arn": "arn:aws:sqs:us-east-2:XXXX:us-east-2-queue",
"receipt_handle": "AQEBwJnKyrHigUMZj6rYigCgxlaS3SLy0a...",
@@ -1282,7 +1405,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -1298,7 +1420,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python313",
"name": "aws.lambda",
"error": 0,
@@ -1316,8 +1438,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -1328,7 +1449,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1354,7 +1475,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1436,9 +1557,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"operation_name": "aws.apigateway.websocket",
- "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com$default",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com$default/",
"endpoint": "$default",
"resource_names": "$default",
+ "span.kind": "server",
"apiid": "XXXX",
"apiname": "XXXX",
"stage": "dev",
@@ -1451,7 +1573,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"http.status_code": "200",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -1467,7 +1588,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python313",
"name": "aws.lambda",
"error": 0,
@@ -1486,9 +1607,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "span.kind": "server",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com/",
+ "http.status_code": "200"
},
"metrics": {
"_dd.top_level": 1
@@ -1499,7 +1620,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1525,7 +1646,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
diff --git a/tests/integration/snapshots/logs/async-metrics_python38.log b/tests/integration/snapshots/logs/async-metrics_python38.log
index 4a5069309..5375fafec 100644
--- a/tests/integration/snapshots/logs/async-metrics_python38.log
+++ b/tests/integration/snapshots/logs/async-metrics_python38.log
@@ -55,10 +55,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"operation_name": "aws.apigateway.rest",
- "http.url": "XXXX.execute-api.us-east-2.amazonaws.com/",
+ "http.url": "https://xxxx.execute-api.us-east-2.amazonaws.com/",
"endpoint": "/",
"http.method": "GET",
"resource_names": "GET /",
+ "span.kind": "server",
"apiid": "XXXX",
"apiname": "XXXX",
"stage": "Prod",
@@ -66,9 +67,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.synchronicity": "sync",
"_inferred_span.tag_source": "self",
"http.status_code": "200",
+ "http.route": "/",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -84,7 +85,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python38",
"name": "aws.lambda",
"error": 0,
@@ -103,12 +104,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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/",
+ "span.kind": "server",
+ "http.url": "https://xxxx.execute-api.us-east-2.amazonaws.com/Prod/",
"http.method": "GET",
"http.route": "/",
- "http.status_code": "200",
- "_dd.base_service": "integration-tests-python"
+ "http.status_code": "200"
},
"metrics": {
"_dd.top_level": 1
@@ -119,7 +119,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -145,7 +145,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -188,6 +188,134 @@ START
"dd_lambda_layer:datadog-python38_X.X.X"
]
}
+{
+ "m": "hello.dog",
+ "v": 1,
+ "e": XXXX,
+ "t": [
+ "team:serverless",
+ "role:hello",
+ "dd_lambda_layer:datadog-python38_X.X.X"
+ ]
+}
+{
+ "m": "tests.integration.count",
+ "v": 21,
+ "e": XXXX,
+ "t": [
+ "test:integration",
+ "role:hello",
+ "dd_lambda_layer:datadog-python38_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": "integration-tests-python",
+ "resource": "integration-tests-python-XXXX-async-metrics_python38",
+ "name": "aws.lambda",
+ "error": 0,
+ "start": "XXXX",
+ "duration": "XXXX",
+ "meta": {
+ "runtime-id": "XXXX",
+ "_dd.origin": "lambda",
+ "cold_start": "false",
+ "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python38",
+ "function_version": "$LATEST",
+ "request_id": "XXXX",
+ "resource_names": "integration-tests-python-XXXX-async-metrics_python38",
+ "functionname": "integration-tests-python-XXXX-async-metrics_python38",
+ "datadog_lambda": "X.X.X",
+ "dd_trace": "X.X.X",
+ "span.name": "aws.lambda",
+ "language": "python"
+ },
+ "metrics": {
+ "process_id": XXXX,
+ "_dd.top_level": 1,
+ "_sampling_priority_v1": 1
+ },
+ "type": "serverless"
+ },
+ {
+ "trace_id": "XXXX",
+ "parent_id": "XXXX",
+ "span_id": "XXXX",
+ "service": "requests",
+ "resource": "GET /",
+ "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": "requests",
+ "resource": "GET /",
+ "name": "requests.request",
+ "error": 0,
+ "start": "XXXX",
+ "duration": "XXXX",
+ "meta": {
+ "_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_python38",
+ "resource:integration-tests-python-XXXX-async-metrics_python38",
+ "memorysize:1024",
+ "cold_start:false",
+ "runtime:python3.8",
+ "datadog_lambda:vXX",
+ "dd_lambda_layer:datadog-python38_X.X.X"
+ ]
+}
{
"m": "datadog.serverless.dynamodb.stream.type",
"v": 1,
@@ -226,7 +354,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "dynamodb",
+ "service": "ExampleTableWithStream",
"resource": "ExampleTableWithStream",
"name": "aws.dynamodb",
"error": 0,
@@ -237,6 +365,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.dynamodb",
"resource_names": "ExampleTableWithStream",
+ "span.kind": "server",
"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",
@@ -248,7 +377,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -296,7 +424,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python38",
"name": "aws.lambda",
"error": 0,
@@ -314,8 +442,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -326,7 +453,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -352,7 +479,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -424,7 +551,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "eventbridge",
+ "service": "eventbridge.custom.event.sender",
"resource": "eventbridge.custom.event.sender",
"name": "aws.eventbridge",
"error": 0,
@@ -435,12 +562,12 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.eventbridge",
"resource_names": "eventbridge.custom.event.sender",
+ "span.kind": "server",
"detail_type": "testdetail",
"_inferred_span.synchronicity": "async",
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -456,7 +583,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python38",
"name": "aws.lambda",
"error": 0,
@@ -473,8 +600,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source": "eventbridge"
},
"metrics": {
"_dd.top_level": 1
@@ -485,7 +611,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -511,7 +637,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -594,7 +720,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.httpapi",
"endpoint": "/httpapi/get",
- "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com/httpapi/get",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com/httpapi/get",
"http.method": "GET",
"http.protocol": "HTTP/1.1",
"http.source_ip": "XXXX",
@@ -607,9 +733,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.synchronicity": "sync",
"_inferred_span.tag_source": "self",
"http.status_code": "200",
+ "http.route": "/httpapi/get",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -625,7 +751,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python38",
"name": "aws.lambda",
"error": 0,
@@ -644,12 +770,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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",
+ "span.kind": "server",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com/httpapi/get",
"http.method": "GET",
"http.route": "/httpapi/get",
- "http.status_code": "200",
- "_dd.base_service": "integration-tests-python"
+ "http.status_code": "200"
},
"metrics": {
"_dd.top_level": 1
@@ -660,7 +785,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -686,7 +811,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -758,7 +883,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "kinesis",
+ "service": "EXAMPLE",
"resource": "EXAMPLE",
"name": "aws.kinesis",
"error": 0,
@@ -769,6 +894,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.kinesis",
"resource_names": "EXAMPLE",
+ "span.kind": "server",
"streamname": "EXAMPLE",
"shardid": "shardId-XXXX",
"event_source_arn": "arn:aws:kinesis:EXAMPLE",
@@ -780,7 +906,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -796,7 +921,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python38",
"name": "aws.lambda",
"error": 0,
@@ -814,8 +939,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -826,7 +950,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -852,7 +976,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -924,7 +1048,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "s3",
+ "service": "example-bucket",
"resource": "example-bucket",
"name": "aws.s3",
"error": 0,
@@ -933,6 +1057,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.s3",
"resource_names": "example-bucket",
+ "span.kind": "server",
"event_name": "ObjectCreated:Put",
"bucketname": "example-bucket",
"bucket_arn": "arn:aws:s3:::example-bucket",
@@ -943,7 +1068,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -971,7 +1095,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python38",
"name": "aws.lambda",
"error": 0,
@@ -989,8 +1113,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -1001,7 +1124,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1027,7 +1150,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1099,7 +1222,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "sns",
+ "service": "sns-lambda",
"resource": "sns-lambda",
"name": "aws.sns",
"error": 0,
@@ -1110,6 +1233,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.sns",
"resource_names": "sns-lambda",
+ "span.kind": "server",
"topicname": "sns-lambda",
"topic_arn": "arn:aws:sns:us-east-2:XXXX:us-east-2-lambda",
"message_id": "XXXX",
@@ -1119,7 +1243,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -1135,7 +1258,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python38",
"name": "aws.lambda",
"error": 0,
@@ -1153,8 +1276,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -1165,7 +1287,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1191,7 +1313,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1263,7 +1385,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "sqs",
+ "service": "my-queue",
"resource": "my-queue",
"name": "aws.sqs",
"error": 0,
@@ -1274,6 +1396,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.sqs",
"resource_names": "my-queue",
+ "span.kind": "server",
"queuename": "my-queue",
"event_source_arn": "arn:aws:sqs:us-east-2:XXXX:us-east-2-queue",
"receipt_handle": "AQEBwJnKyrHigUMZj6rYigCgxlaS3SLy0a...",
@@ -1282,7 +1405,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -1298,7 +1420,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python38",
"name": "aws.lambda",
"error": 0,
@@ -1316,8 +1438,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -1328,7 +1449,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1354,7 +1475,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1436,9 +1557,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"operation_name": "aws.apigateway.websocket",
- "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com$default",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com$default/",
"endpoint": "$default",
"resource_names": "$default",
+ "span.kind": "server",
"apiid": "XXXX",
"apiname": "XXXX",
"stage": "dev",
@@ -1451,7 +1573,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"http.status_code": "200",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -1467,7 +1588,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python38",
"name": "aws.lambda",
"error": 0,
@@ -1486,9 +1607,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "span.kind": "server",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com/",
+ "http.status_code": "200"
},
"metrics": {
"_dd.top_level": 1
@@ -1499,7 +1620,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1525,7 +1646,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
diff --git a/tests/integration/snapshots/logs/async-metrics_python39.log b/tests/integration/snapshots/logs/async-metrics_python39.log
index 54081402d..f16e9e2d5 100644
--- a/tests/integration/snapshots/logs/async-metrics_python39.log
+++ b/tests/integration/snapshots/logs/async-metrics_python39.log
@@ -55,10 +55,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"operation_name": "aws.apigateway.rest",
- "http.url": "XXXX.execute-api.us-east-2.amazonaws.com/",
+ "http.url": "https://xxxx.execute-api.us-east-2.amazonaws.com/",
"endpoint": "/",
"http.method": "GET",
"resource_names": "GET /",
+ "span.kind": "server",
"apiid": "XXXX",
"apiname": "XXXX",
"stage": "Prod",
@@ -66,9 +67,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.synchronicity": "sync",
"_inferred_span.tag_source": "self",
"http.status_code": "200",
+ "http.route": "/",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -84,7 +85,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python39",
"name": "aws.lambda",
"error": 0,
@@ -103,12 +104,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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/",
+ "span.kind": "server",
+ "http.url": "https://xxxx.execute-api.us-east-2.amazonaws.com/Prod/",
"http.method": "GET",
"http.route": "/",
- "http.status_code": "200",
- "_dd.base_service": "integration-tests-python"
+ "http.status_code": "200"
},
"metrics": {
"_dd.top_level": 1
@@ -119,7 +119,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -145,7 +145,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -188,6 +188,134 @@ START
"dd_lambda_layer:datadog-python39_X.X.X"
]
}
+{
+ "m": "hello.dog",
+ "v": 1,
+ "e": XXXX,
+ "t": [
+ "team:serverless",
+ "role:hello",
+ "dd_lambda_layer:datadog-python39_X.X.X"
+ ]
+}
+{
+ "m": "tests.integration.count",
+ "v": 21,
+ "e": XXXX,
+ "t": [
+ "test:integration",
+ "role:hello",
+ "dd_lambda_layer:datadog-python39_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": "integration-tests-python",
+ "resource": "integration-tests-python-XXXX-async-metrics_python39",
+ "name": "aws.lambda",
+ "error": 0,
+ "start": "XXXX",
+ "duration": "XXXX",
+ "meta": {
+ "runtime-id": "XXXX",
+ "_dd.origin": "lambda",
+ "cold_start": "false",
+ "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python39",
+ "function_version": "$LATEST",
+ "request_id": "XXXX",
+ "resource_names": "integration-tests-python-XXXX-async-metrics_python39",
+ "functionname": "integration-tests-python-XXXX-async-metrics_python39",
+ "datadog_lambda": "X.X.X",
+ "dd_trace": "X.X.X",
+ "span.name": "aws.lambda",
+ "language": "python"
+ },
+ "metrics": {
+ "process_id": XXXX,
+ "_dd.top_level": 1,
+ "_sampling_priority_v1": 1
+ },
+ "type": "serverless"
+ },
+ {
+ "trace_id": "XXXX",
+ "parent_id": "XXXX",
+ "span_id": "XXXX",
+ "service": "requests",
+ "resource": "GET /",
+ "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": "requests",
+ "resource": "GET /",
+ "name": "requests.request",
+ "error": 0,
+ "start": "XXXX",
+ "duration": "XXXX",
+ "meta": {
+ "_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_python39",
+ "resource:integration-tests-python-XXXX-async-metrics_python39",
+ "memorysize:1024",
+ "cold_start:false",
+ "runtime:python3.9",
+ "datadog_lambda:vXX",
+ "dd_lambda_layer:datadog-python39_X.X.X"
+ ]
+}
{
"m": "datadog.serverless.dynamodb.stream.type",
"v": 1,
@@ -226,7 +354,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "dynamodb",
+ "service": "ExampleTableWithStream",
"resource": "ExampleTableWithStream",
"name": "aws.dynamodb",
"error": 0,
@@ -237,6 +365,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.dynamodb",
"resource_names": "ExampleTableWithStream",
+ "span.kind": "server",
"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",
@@ -248,7 +377,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -296,7 +424,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python39",
"name": "aws.lambda",
"error": 0,
@@ -314,8 +442,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -326,7 +453,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -352,7 +479,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -424,7 +551,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "eventbridge",
+ "service": "eventbridge.custom.event.sender",
"resource": "eventbridge.custom.event.sender",
"name": "aws.eventbridge",
"error": 0,
@@ -435,12 +562,12 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.eventbridge",
"resource_names": "eventbridge.custom.event.sender",
+ "span.kind": "server",
"detail_type": "testdetail",
"_inferred_span.synchronicity": "async",
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -456,7 +583,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python39",
"name": "aws.lambda",
"error": 0,
@@ -473,8 +600,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source": "eventbridge"
},
"metrics": {
"_dd.top_level": 1
@@ -485,7 +611,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -511,7 +637,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -594,7 +720,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.httpapi",
"endpoint": "/httpapi/get",
- "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com/httpapi/get",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com/httpapi/get",
"http.method": "GET",
"http.protocol": "HTTP/1.1",
"http.source_ip": "XXXX",
@@ -607,9 +733,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.synchronicity": "sync",
"_inferred_span.tag_source": "self",
"http.status_code": "200",
+ "http.route": "/httpapi/get",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -625,7 +751,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python39",
"name": "aws.lambda",
"error": 0,
@@ -644,12 +770,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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",
+ "span.kind": "server",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com/httpapi/get",
"http.method": "GET",
"http.route": "/httpapi/get",
- "http.status_code": "200",
- "_dd.base_service": "integration-tests-python"
+ "http.status_code": "200"
},
"metrics": {
"_dd.top_level": 1
@@ -660,7 +785,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -686,7 +811,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -758,7 +883,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "kinesis",
+ "service": "EXAMPLE",
"resource": "EXAMPLE",
"name": "aws.kinesis",
"error": 0,
@@ -769,6 +894,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.kinesis",
"resource_names": "EXAMPLE",
+ "span.kind": "server",
"streamname": "EXAMPLE",
"shardid": "shardId-XXXX",
"event_source_arn": "arn:aws:kinesis:EXAMPLE",
@@ -780,7 +906,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -796,7 +921,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python39",
"name": "aws.lambda",
"error": 0,
@@ -814,8 +939,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -826,7 +950,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -852,7 +976,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -924,7 +1048,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "s3",
+ "service": "example-bucket",
"resource": "example-bucket",
"name": "aws.s3",
"error": 0,
@@ -933,6 +1057,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.s3",
"resource_names": "example-bucket",
+ "span.kind": "server",
"event_name": "ObjectCreated:Put",
"bucketname": "example-bucket",
"bucket_arn": "arn:aws:s3:::example-bucket",
@@ -943,7 +1068,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -971,7 +1095,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python39",
"name": "aws.lambda",
"error": 0,
@@ -989,8 +1113,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -1001,7 +1124,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1027,7 +1150,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1099,7 +1222,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "sns",
+ "service": "sns-lambda",
"resource": "sns-lambda",
"name": "aws.sns",
"error": 0,
@@ -1110,6 +1233,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.sns",
"resource_names": "sns-lambda",
+ "span.kind": "server",
"topicname": "sns-lambda",
"topic_arn": "arn:aws:sns:us-east-2:XXXX:us-east-2-lambda",
"message_id": "XXXX",
@@ -1119,7 +1243,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -1135,7 +1258,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python39",
"name": "aws.lambda",
"error": 0,
@@ -1153,8 +1276,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -1165,7 +1287,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1191,7 +1313,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1263,7 +1385,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "sqs",
+ "service": "my-queue",
"resource": "my-queue",
"name": "aws.sqs",
"error": 0,
@@ -1274,6 +1396,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.sqs",
"resource_names": "my-queue",
+ "span.kind": "server",
"queuename": "my-queue",
"event_source_arn": "arn:aws:sqs:us-east-2:XXXX:us-east-2-queue",
"receipt_handle": "AQEBwJnKyrHigUMZj6rYigCgxlaS3SLy0a...",
@@ -1282,7 +1405,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -1298,7 +1420,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python39",
"name": "aws.lambda",
"error": 0,
@@ -1316,8 +1438,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -1328,7 +1449,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1354,7 +1475,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1436,9 +1557,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"operation_name": "aws.apigateway.websocket",
- "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com$default",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com$default/",
"endpoint": "$default",
"resource_names": "$default",
+ "span.kind": "server",
"apiid": "XXXX",
"apiname": "XXXX",
"stage": "dev",
@@ -1451,7 +1573,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"http.status_code": "200",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -1467,7 +1588,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-async-metrics_python39",
"name": "aws.lambda",
"error": 0,
@@ -1486,9 +1607,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "span.kind": "server",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com/",
+ "http.status_code": "200"
},
"metrics": {
"_dd.top_level": 1
@@ -1499,7 +1620,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1525,7 +1646,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
diff --git a/tests/integration/snapshots/logs/sync-metrics_python310.log b/tests/integration/snapshots/logs/sync-metrics_python310.log
index e25697756..1cbd91dd8 100644
--- a/tests/integration/snapshots/logs/sync-metrics_python310.log
+++ b/tests/integration/snapshots/logs/sync-metrics_python310.log
@@ -35,10 +35,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"operation_name": "aws.apigateway.rest",
- "http.url": "XXXX.execute-api.us-east-2.amazonaws.com/",
+ "http.url": "https://xxxx.execute-api.us-east-2.amazonaws.com/",
"endpoint": "/",
"http.method": "GET",
"resource_names": "GET /",
+ "span.kind": "server",
"apiid": "XXXX",
"apiname": "XXXX",
"stage": "Prod",
@@ -46,9 +47,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.synchronicity": "sync",
"_inferred_span.tag_source": "self",
"http.status_code": "200",
+ "http.route": "/",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -64,7 +65,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python310",
"name": "aws.lambda",
"error": 0,
@@ -83,12 +84,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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/",
+ "span.kind": "server",
+ "http.url": "https://xxxx.execute-api.us-east-2.amazonaws.com/Prod/",
"http.method": "GET",
"http.route": "/",
- "http.status_code": "200",
- "_dd.base_service": "integration-tests-python"
+ "http.status_code": "200"
},
"metrics": {
"_dd.top_level": 1
@@ -99,7 +99,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -125,7 +125,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -158,7 +158,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -207,6 +207,153 @@ START
"dd_lambda_layer:datadog-python310_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": "integration-tests-python",
+ "resource": "integration-tests-python-XXXX-sync-metrics_python310",
+ "name": "aws.lambda",
+ "error": 0,
+ "start": "XXXX",
+ "duration": "XXXX",
+ "meta": {
+ "runtime-id": "XXXX",
+ "_dd.origin": "lambda",
+ "cold_start": "false",
+ "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python310",
+ "function_version": "$LATEST",
+ "request_id": "XXXX",
+ "resource_names": "integration-tests-python-XXXX-sync-metrics_python310",
+ "functionname": "integration-tests-python-XXXX-sync-metrics_python310",
+ "datadog_lambda": "X.X.X",
+ "dd_trace": "X.X.X",
+ "span.name": "aws.lambda",
+ "language": "python"
+ },
+ "metrics": {
+ "process_id": XXXX,
+ "_dd.top_level": 1,
+ "_sampling_priority_v1": 1
+ },
+ "type": "serverless"
+ },
+ {
+ "trace_id": "XXXX",
+ "parent_id": "XXXX",
+ "span_id": "XXXX",
+ "service": "requests",
+ "resource": "GET /",
+ "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": "requests",
+ "resource": "GET /",
+ "name": "requests.request",
+ "error": 0,
+ "start": "XXXX",
+ "duration": "XXXX",
+ "meta": {
+ "_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 XXXX)","traceparent:XXX","tracestate:XXX
+{
+ "traces": [
+ [
+ {
+ "trace_id": "XXXX",
+ "parent_id": "XXXX",
+ "span_id": "XXXX",
+ "service": "requests",
+ "resource": "POST /api/v1/distribution_points",
+ "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 XXXX)",
+ "_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_python310",
+ "resource:integration-tests-python-XXXX-sync-metrics_python310",
+ "memorysize:1024",
+ "cold_start:false",
+ "runtime:python3.10",
+ "datadog_lambda:vXX",
+ "dd_lambda_layer:datadog-python310_X.X.X"
+ ]
+}
{
"m": "datadog.serverless.dynamodb.stream.type",
"v": 1,
@@ -225,7 +372,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "dynamodb",
+ "service": "ExampleTableWithStream",
"resource": "ExampleTableWithStream",
"name": "aws.dynamodb",
"error": 0,
@@ -236,6 +383,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.dynamodb",
"resource_names": "ExampleTableWithStream",
+ "span.kind": "server",
"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",
@@ -247,7 +395,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -295,7 +442,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python310",
"name": "aws.lambda",
"error": 0,
@@ -313,8 +460,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -325,7 +471,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -351,7 +497,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -384,7 +530,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -442,7 +588,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "eventbridge",
+ "service": "eventbridge.custom.event.sender",
"resource": "eventbridge.custom.event.sender",
"name": "aws.eventbridge",
"error": 0,
@@ -453,12 +599,12 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.eventbridge",
"resource_names": "eventbridge.custom.event.sender",
+ "span.kind": "server",
"detail_type": "testdetail",
"_inferred_span.synchronicity": "async",
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -474,7 +620,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python310",
"name": "aws.lambda",
"error": 0,
@@ -491,8 +637,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source": "eventbridge"
},
"metrics": {
"_dd.top_level": 1
@@ -503,7 +648,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -529,7 +674,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -562,7 +707,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -631,7 +776,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.httpapi",
"endpoint": "/httpapi/get",
- "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com/httpapi/get",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com/httpapi/get",
"http.method": "GET",
"http.protocol": "HTTP/1.1",
"http.source_ip": "XXXX",
@@ -644,9 +789,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.synchronicity": "sync",
"_inferred_span.tag_source": "self",
"http.status_code": "200",
+ "http.route": "/httpapi/get",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -662,7 +807,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python310",
"name": "aws.lambda",
"error": 0,
@@ -681,12 +826,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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",
+ "span.kind": "server",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com/httpapi/get",
"http.method": "GET",
"http.route": "/httpapi/get",
- "http.status_code": "200",
- "_dd.base_service": "integration-tests-python"
+ "http.status_code": "200"
},
"metrics": {
"_dd.top_level": 1
@@ -697,7 +841,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -723,7 +867,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -756,7 +900,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -814,7 +958,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "kinesis",
+ "service": "EXAMPLE",
"resource": "EXAMPLE",
"name": "aws.kinesis",
"error": 0,
@@ -825,6 +969,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.kinesis",
"resource_names": "EXAMPLE",
+ "span.kind": "server",
"streamname": "EXAMPLE",
"shardid": "shardId-XXXX",
"event_source_arn": "arn:aws:kinesis:EXAMPLE",
@@ -836,7 +981,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -852,7 +996,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python310",
"name": "aws.lambda",
"error": 0,
@@ -870,8 +1014,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -882,7 +1025,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -908,7 +1051,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -941,7 +1084,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -999,7 +1142,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "s3",
+ "service": "example-bucket",
"resource": "example-bucket",
"name": "aws.s3",
"error": 0,
@@ -1008,6 +1151,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.s3",
"resource_names": "example-bucket",
+ "span.kind": "server",
"event_name": "ObjectCreated:Put",
"bucketname": "example-bucket",
"bucket_arn": "arn:aws:s3:::example-bucket",
@@ -1018,7 +1162,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -1046,7 +1189,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python310",
"name": "aws.lambda",
"error": 0,
@@ -1064,8 +1207,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -1076,7 +1218,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1102,7 +1244,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1135,7 +1277,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -1193,7 +1335,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "sns",
+ "service": "sns-lambda",
"resource": "sns-lambda",
"name": "aws.sns",
"error": 0,
@@ -1204,6 +1346,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.sns",
"resource_names": "sns-lambda",
+ "span.kind": "server",
"topicname": "sns-lambda",
"topic_arn": "arn:aws:sns:us-east-2:XXXX:us-east-2-lambda",
"message_id": "XXXX",
@@ -1213,7 +1356,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -1229,7 +1371,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python310",
"name": "aws.lambda",
"error": 0,
@@ -1247,8 +1389,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -1259,7 +1400,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1285,7 +1426,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1318,7 +1459,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -1376,7 +1517,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "sqs",
+ "service": "my-queue",
"resource": "my-queue",
"name": "aws.sqs",
"error": 0,
@@ -1387,6 +1528,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.sqs",
"resource_names": "my-queue",
+ "span.kind": "server",
"queuename": "my-queue",
"event_source_arn": "arn:aws:sqs:us-east-2:XXXX:us-east-2-queue",
"receipt_handle": "AQEBwJnKyrHigUMZj6rYigCgxlaS3SLy0a...",
@@ -1395,7 +1537,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -1411,7 +1552,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python310",
"name": "aws.lambda",
"error": 0,
@@ -1429,8 +1570,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -1441,7 +1581,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1467,7 +1607,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1500,7 +1640,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -1568,9 +1708,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"operation_name": "aws.apigateway.websocket",
- "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com$default",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com$default/",
"endpoint": "$default",
"resource_names": "$default",
+ "span.kind": "server",
"apiid": "XXXX",
"apiname": "XXXX",
"stage": "dev",
@@ -1583,7 +1724,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"http.status_code": "200",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -1599,7 +1739,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python310",
"name": "aws.lambda",
"error": 0,
@@ -1618,9 +1758,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "span.kind": "server",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com/",
+ "http.status_code": "200"
},
"metrics": {
"_dd.top_level": 1
@@ -1631,7 +1771,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1657,7 +1797,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1690,7 +1830,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
diff --git a/tests/integration/snapshots/logs/sync-metrics_python311.log b/tests/integration/snapshots/logs/sync-metrics_python311.log
index 69d4a6952..b043a8f47 100644
--- a/tests/integration/snapshots/logs/sync-metrics_python311.log
+++ b/tests/integration/snapshots/logs/sync-metrics_python311.log
@@ -35,10 +35,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"operation_name": "aws.apigateway.rest",
- "http.url": "XXXX.execute-api.us-east-2.amazonaws.com/",
+ "http.url": "https://xxxx.execute-api.us-east-2.amazonaws.com/",
"endpoint": "/",
"http.method": "GET",
"resource_names": "GET /",
+ "span.kind": "server",
"apiid": "XXXX",
"apiname": "XXXX",
"stage": "Prod",
@@ -46,9 +47,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.synchronicity": "sync",
"_inferred_span.tag_source": "self",
"http.status_code": "200",
+ "http.route": "/",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -64,7 +65,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python311",
"name": "aws.lambda",
"error": 0,
@@ -83,12 +84,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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/",
+ "span.kind": "server",
+ "http.url": "https://xxxx.execute-api.us-east-2.amazonaws.com/Prod/",
"http.method": "GET",
"http.route": "/",
- "http.status_code": "200",
- "_dd.base_service": "integration-tests-python"
+ "http.status_code": "200"
},
"metrics": {
"_dd.top_level": 1
@@ -99,7 +99,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -125,7 +125,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -158,7 +158,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -207,6 +207,153 @@ START
"dd_lambda_layer:datadog-python311_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": "integration-tests-python",
+ "resource": "integration-tests-python-XXXX-sync-metrics_python311",
+ "name": "aws.lambda",
+ "error": 0,
+ "start": "XXXX",
+ "duration": "XXXX",
+ "meta": {
+ "runtime-id": "XXXX",
+ "_dd.origin": "lambda",
+ "cold_start": "false",
+ "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python311",
+ "function_version": "$LATEST",
+ "request_id": "XXXX",
+ "resource_names": "integration-tests-python-XXXX-sync-metrics_python311",
+ "functionname": "integration-tests-python-XXXX-sync-metrics_python311",
+ "datadog_lambda": "X.X.X",
+ "dd_trace": "X.X.X",
+ "span.name": "aws.lambda",
+ "language": "python"
+ },
+ "metrics": {
+ "process_id": XXXX,
+ "_dd.top_level": 1,
+ "_sampling_priority_v1": 1
+ },
+ "type": "serverless"
+ },
+ {
+ "trace_id": "XXXX",
+ "parent_id": "XXXX",
+ "span_id": "XXXX",
+ "service": "requests",
+ "resource": "GET /",
+ "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": "requests",
+ "resource": "GET /",
+ "name": "requests.request",
+ "error": 0,
+ "start": "XXXX",
+ "duration": "XXXX",
+ "meta": {
+ "_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 XXXX)","traceparent:XXX","tracestate:XXX
+{
+ "traces": [
+ [
+ {
+ "trace_id": "XXXX",
+ "parent_id": "XXXX",
+ "span_id": "XXXX",
+ "service": "requests",
+ "resource": "POST /api/v1/distribution_points",
+ "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 XXXX)",
+ "_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_python311",
+ "resource:integration-tests-python-XXXX-sync-metrics_python311",
+ "memorysize:1024",
+ "cold_start:false",
+ "runtime:python3.11",
+ "datadog_lambda:vXX",
+ "dd_lambda_layer:datadog-python311_X.X.X"
+ ]
+}
{
"m": "datadog.serverless.dynamodb.stream.type",
"v": 1,
@@ -225,7 +372,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "dynamodb",
+ "service": "ExampleTableWithStream",
"resource": "ExampleTableWithStream",
"name": "aws.dynamodb",
"error": 0,
@@ -236,6 +383,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.dynamodb",
"resource_names": "ExampleTableWithStream",
+ "span.kind": "server",
"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",
@@ -247,7 +395,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -295,7 +442,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python311",
"name": "aws.lambda",
"error": 0,
@@ -313,8 +460,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -325,7 +471,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -351,7 +497,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -384,7 +530,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -442,7 +588,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "eventbridge",
+ "service": "eventbridge.custom.event.sender",
"resource": "eventbridge.custom.event.sender",
"name": "aws.eventbridge",
"error": 0,
@@ -453,12 +599,12 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.eventbridge",
"resource_names": "eventbridge.custom.event.sender",
+ "span.kind": "server",
"detail_type": "testdetail",
"_inferred_span.synchronicity": "async",
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -474,7 +620,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python311",
"name": "aws.lambda",
"error": 0,
@@ -491,8 +637,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source": "eventbridge"
},
"metrics": {
"_dd.top_level": 1
@@ -503,7 +648,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -529,7 +674,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -562,7 +707,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -631,7 +776,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.httpapi",
"endpoint": "/httpapi/get",
- "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com/httpapi/get",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com/httpapi/get",
"http.method": "GET",
"http.protocol": "HTTP/1.1",
"http.source_ip": "XXXX",
@@ -644,9 +789,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.synchronicity": "sync",
"_inferred_span.tag_source": "self",
"http.status_code": "200",
+ "http.route": "/httpapi/get",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -662,7 +807,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python311",
"name": "aws.lambda",
"error": 0,
@@ -681,12 +826,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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",
+ "span.kind": "server",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com/httpapi/get",
"http.method": "GET",
"http.route": "/httpapi/get",
- "http.status_code": "200",
- "_dd.base_service": "integration-tests-python"
+ "http.status_code": "200"
},
"metrics": {
"_dd.top_level": 1
@@ -697,7 +841,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -723,7 +867,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -756,7 +900,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -814,7 +958,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "kinesis",
+ "service": "EXAMPLE",
"resource": "EXAMPLE",
"name": "aws.kinesis",
"error": 0,
@@ -825,6 +969,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.kinesis",
"resource_names": "EXAMPLE",
+ "span.kind": "server",
"streamname": "EXAMPLE",
"shardid": "shardId-XXXX",
"event_source_arn": "arn:aws:kinesis:EXAMPLE",
@@ -836,7 +981,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -852,7 +996,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python311",
"name": "aws.lambda",
"error": 0,
@@ -870,8 +1014,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -882,7 +1025,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -908,7 +1051,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -941,7 +1084,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -999,7 +1142,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "s3",
+ "service": "example-bucket",
"resource": "example-bucket",
"name": "aws.s3",
"error": 0,
@@ -1008,6 +1151,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.s3",
"resource_names": "example-bucket",
+ "span.kind": "server",
"event_name": "ObjectCreated:Put",
"bucketname": "example-bucket",
"bucket_arn": "arn:aws:s3:::example-bucket",
@@ -1018,7 +1162,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -1046,7 +1189,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python311",
"name": "aws.lambda",
"error": 0,
@@ -1064,8 +1207,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -1076,7 +1218,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1102,7 +1244,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1135,7 +1277,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -1193,7 +1335,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "sns",
+ "service": "sns-lambda",
"resource": "sns-lambda",
"name": "aws.sns",
"error": 0,
@@ -1204,6 +1346,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.sns",
"resource_names": "sns-lambda",
+ "span.kind": "server",
"topicname": "sns-lambda",
"topic_arn": "arn:aws:sns:us-east-2:XXXX:us-east-2-lambda",
"message_id": "XXXX",
@@ -1213,7 +1356,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -1229,7 +1371,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python311",
"name": "aws.lambda",
"error": 0,
@@ -1247,8 +1389,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -1259,7 +1400,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1285,7 +1426,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1318,7 +1459,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -1376,7 +1517,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "sqs",
+ "service": "my-queue",
"resource": "my-queue",
"name": "aws.sqs",
"error": 0,
@@ -1387,6 +1528,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.sqs",
"resource_names": "my-queue",
+ "span.kind": "server",
"queuename": "my-queue",
"event_source_arn": "arn:aws:sqs:us-east-2:XXXX:us-east-2-queue",
"receipt_handle": "AQEBwJnKyrHigUMZj6rYigCgxlaS3SLy0a...",
@@ -1395,7 +1537,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -1411,7 +1552,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python311",
"name": "aws.lambda",
"error": 0,
@@ -1429,8 +1570,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -1441,7 +1581,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1467,7 +1607,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1500,7 +1640,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -1568,9 +1708,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"operation_name": "aws.apigateway.websocket",
- "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com$default",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com$default/",
"endpoint": "$default",
"resource_names": "$default",
+ "span.kind": "server",
"apiid": "XXXX",
"apiname": "XXXX",
"stage": "dev",
@@ -1583,7 +1724,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"http.status_code": "200",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -1599,7 +1739,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python311",
"name": "aws.lambda",
"error": 0,
@@ -1618,9 +1758,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "span.kind": "server",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com/",
+ "http.status_code": "200"
},
"metrics": {
"_dd.top_level": 1
@@ -1631,7 +1771,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1657,7 +1797,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1690,7 +1830,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
diff --git a/tests/integration/snapshots/logs/sync-metrics_python312.log b/tests/integration/snapshots/logs/sync-metrics_python312.log
index 49bae0a2a..ff9bbdb75 100644
--- a/tests/integration/snapshots/logs/sync-metrics_python312.log
+++ b/tests/integration/snapshots/logs/sync-metrics_python312.log
@@ -35,10 +35,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"operation_name": "aws.apigateway.rest",
- "http.url": "XXXX.execute-api.us-east-2.amazonaws.com/",
+ "http.url": "https://xxxx.execute-api.us-east-2.amazonaws.com/",
"endpoint": "/",
"http.method": "GET",
"resource_names": "GET /",
+ "span.kind": "server",
"apiid": "XXXX",
"apiname": "XXXX",
"stage": "Prod",
@@ -46,9 +47,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.synchronicity": "sync",
"_inferred_span.tag_source": "self",
"http.status_code": "200",
+ "http.route": "/",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -64,7 +65,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python312",
"name": "aws.lambda",
"error": 0,
@@ -83,12 +84,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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/",
+ "span.kind": "server",
+ "http.url": "https://xxxx.execute-api.us-east-2.amazonaws.com/Prod/",
"http.method": "GET",
"http.route": "/",
- "http.status_code": "200",
- "_dd.base_service": "integration-tests-python"
+ "http.status_code": "200"
},
"metrics": {
"_dd.top_level": 1
@@ -99,7 +99,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -125,7 +125,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -158,7 +158,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -207,6 +207,153 @@ START
"dd_lambda_layer:datadog-python312_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": "integration-tests-python",
+ "resource": "integration-tests-python-XXXX-sync-metrics_python312",
+ "name": "aws.lambda",
+ "error": 0,
+ "start": "XXXX",
+ "duration": "XXXX",
+ "meta": {
+ "runtime-id": "XXXX",
+ "_dd.origin": "lambda",
+ "cold_start": "false",
+ "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python312",
+ "function_version": "$LATEST",
+ "request_id": "XXXX",
+ "resource_names": "integration-tests-python-XXXX-sync-metrics_python312",
+ "functionname": "integration-tests-python-XXXX-sync-metrics_python312",
+ "datadog_lambda": "X.X.X",
+ "dd_trace": "X.X.X",
+ "span.name": "aws.lambda",
+ "language": "python"
+ },
+ "metrics": {
+ "process_id": XXXX,
+ "_dd.top_level": 1,
+ "_sampling_priority_v1": 1
+ },
+ "type": "serverless"
+ },
+ {
+ "trace_id": "XXXX",
+ "parent_id": "XXXX",
+ "span_id": "XXXX",
+ "service": "requests",
+ "resource": "GET /",
+ "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": "requests",
+ "resource": "GET /",
+ "name": "requests.request",
+ "error": 0,
+ "start": "XXXX",
+ "duration": "XXXX",
+ "meta": {
+ "_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 XXXX)","traceparent:XXX","tracestate:XXX
+{
+ "traces": [
+ [
+ {
+ "trace_id": "XXXX",
+ "parent_id": "XXXX",
+ "span_id": "XXXX",
+ "service": "requests",
+ "resource": "POST /api/v1/distribution_points",
+ "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 XXXX)",
+ "_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_python312",
+ "resource:integration-tests-python-XXXX-sync-metrics_python312",
+ "memorysize:1024",
+ "cold_start:false",
+ "runtime:python3.12",
+ "datadog_lambda:vXX",
+ "dd_lambda_layer:datadog-python312_X.X.X"
+ ]
+}
{
"m": "datadog.serverless.dynamodb.stream.type",
"v": 1,
@@ -225,7 +372,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "dynamodb",
+ "service": "ExampleTableWithStream",
"resource": "ExampleTableWithStream",
"name": "aws.dynamodb",
"error": 0,
@@ -236,6 +383,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.dynamodb",
"resource_names": "ExampleTableWithStream",
+ "span.kind": "server",
"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",
@@ -247,7 +395,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -295,7 +442,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python312",
"name": "aws.lambda",
"error": 0,
@@ -313,8 +460,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -325,7 +471,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -351,7 +497,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -384,7 +530,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -442,7 +588,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "eventbridge",
+ "service": "eventbridge.custom.event.sender",
"resource": "eventbridge.custom.event.sender",
"name": "aws.eventbridge",
"error": 0,
@@ -453,12 +599,12 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.eventbridge",
"resource_names": "eventbridge.custom.event.sender",
+ "span.kind": "server",
"detail_type": "testdetail",
"_inferred_span.synchronicity": "async",
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -474,7 +620,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python312",
"name": "aws.lambda",
"error": 0,
@@ -491,8 +637,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source": "eventbridge"
},
"metrics": {
"_dd.top_level": 1
@@ -503,7 +648,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -529,7 +674,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -562,7 +707,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -631,7 +776,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.httpapi",
"endpoint": "/httpapi/get",
- "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com/httpapi/get",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com/httpapi/get",
"http.method": "GET",
"http.protocol": "HTTP/1.1",
"http.source_ip": "XXXX",
@@ -644,9 +789,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.synchronicity": "sync",
"_inferred_span.tag_source": "self",
"http.status_code": "200",
+ "http.route": "/httpapi/get",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -662,7 +807,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python312",
"name": "aws.lambda",
"error": 0,
@@ -681,12 +826,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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",
+ "span.kind": "server",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com/httpapi/get",
"http.method": "GET",
"http.route": "/httpapi/get",
- "http.status_code": "200",
- "_dd.base_service": "integration-tests-python"
+ "http.status_code": "200"
},
"metrics": {
"_dd.top_level": 1
@@ -697,7 +841,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -723,7 +867,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -756,7 +900,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -814,7 +958,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "kinesis",
+ "service": "EXAMPLE",
"resource": "EXAMPLE",
"name": "aws.kinesis",
"error": 0,
@@ -825,6 +969,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.kinesis",
"resource_names": "EXAMPLE",
+ "span.kind": "server",
"streamname": "EXAMPLE",
"shardid": "shardId-XXXX",
"event_source_arn": "arn:aws:kinesis:EXAMPLE",
@@ -836,7 +981,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -852,7 +996,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python312",
"name": "aws.lambda",
"error": 0,
@@ -870,8 +1014,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -882,7 +1025,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -908,7 +1051,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -941,7 +1084,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -999,7 +1142,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "s3",
+ "service": "example-bucket",
"resource": "example-bucket",
"name": "aws.s3",
"error": 0,
@@ -1008,6 +1151,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.s3",
"resource_names": "example-bucket",
+ "span.kind": "server",
"event_name": "ObjectCreated:Put",
"bucketname": "example-bucket",
"bucket_arn": "arn:aws:s3:::example-bucket",
@@ -1018,7 +1162,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -1046,7 +1189,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python312",
"name": "aws.lambda",
"error": 0,
@@ -1064,8 +1207,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -1076,7 +1218,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1102,7 +1244,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1135,7 +1277,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -1193,7 +1335,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "sns",
+ "service": "sns-lambda",
"resource": "sns-lambda",
"name": "aws.sns",
"error": 0,
@@ -1204,6 +1346,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.sns",
"resource_names": "sns-lambda",
+ "span.kind": "server",
"topicname": "sns-lambda",
"topic_arn": "arn:aws:sns:us-east-2:XXXX:us-east-2-lambda",
"message_id": "XXXX",
@@ -1213,7 +1356,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -1229,7 +1371,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python312",
"name": "aws.lambda",
"error": 0,
@@ -1247,8 +1389,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -1259,7 +1400,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1285,7 +1426,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1318,7 +1459,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -1376,7 +1517,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "sqs",
+ "service": "my-queue",
"resource": "my-queue",
"name": "aws.sqs",
"error": 0,
@@ -1387,6 +1528,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.sqs",
"resource_names": "my-queue",
+ "span.kind": "server",
"queuename": "my-queue",
"event_source_arn": "arn:aws:sqs:us-east-2:XXXX:us-east-2-queue",
"receipt_handle": "AQEBwJnKyrHigUMZj6rYigCgxlaS3SLy0a...",
@@ -1395,7 +1537,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -1411,7 +1552,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python312",
"name": "aws.lambda",
"error": 0,
@@ -1429,8 +1570,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -1441,7 +1581,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1467,7 +1607,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1500,7 +1640,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -1568,9 +1708,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"operation_name": "aws.apigateway.websocket",
- "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com$default",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com$default/",
"endpoint": "$default",
"resource_names": "$default",
+ "span.kind": "server",
"apiid": "XXXX",
"apiname": "XXXX",
"stage": "dev",
@@ -1583,7 +1724,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"http.status_code": "200",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -1599,7 +1739,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python312",
"name": "aws.lambda",
"error": 0,
@@ -1618,9 +1758,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "span.kind": "server",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com/",
+ "http.status_code": "200"
},
"metrics": {
"_dd.top_level": 1
@@ -1631,7 +1771,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1657,7 +1797,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1690,7 +1830,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
diff --git a/tests/integration/snapshots/logs/sync-metrics_python313.log b/tests/integration/snapshots/logs/sync-metrics_python313.log
index 2f461f6fe..87352f25e 100644
--- a/tests/integration/snapshots/logs/sync-metrics_python313.log
+++ b/tests/integration/snapshots/logs/sync-metrics_python313.log
@@ -35,10 +35,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"operation_name": "aws.apigateway.rest",
- "http.url": "XXXX.execute-api.us-east-2.amazonaws.com/",
+ "http.url": "https://xxxx.execute-api.us-east-2.amazonaws.com/",
"endpoint": "/",
"http.method": "GET",
"resource_names": "GET /",
+ "span.kind": "server",
"apiid": "XXXX",
"apiname": "XXXX",
"stage": "Prod",
@@ -46,9 +47,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.synchronicity": "sync",
"_inferred_span.tag_source": "self",
"http.status_code": "200",
+ "http.route": "/",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -64,7 +65,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python313",
"name": "aws.lambda",
"error": 0,
@@ -83,12 +84,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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/",
+ "span.kind": "server",
+ "http.url": "https://xxxx.execute-api.us-east-2.amazonaws.com/Prod/",
"http.method": "GET",
"http.route": "/",
- "http.status_code": "200",
- "_dd.base_service": "integration-tests-python"
+ "http.status_code": "200"
},
"metrics": {
"_dd.top_level": 1
@@ -99,7 +99,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -125,7 +125,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -158,7 +158,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -207,6 +207,153 @@ START
"dd_lambda_layer:datadog-python313_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": "integration-tests-python",
+ "resource": "integration-tests-python-XXXX-sync-metrics_python313",
+ "name": "aws.lambda",
+ "error": 0,
+ "start": "XXXX",
+ "duration": "XXXX",
+ "meta": {
+ "runtime-id": "XXXX",
+ "_dd.origin": "lambda",
+ "cold_start": "false",
+ "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python313",
+ "function_version": "$LATEST",
+ "request_id": "XXXX",
+ "resource_names": "integration-tests-python-XXXX-sync-metrics_python313",
+ "functionname": "integration-tests-python-XXXX-sync-metrics_python313",
+ "datadog_lambda": "X.X.X",
+ "dd_trace": "X.X.X",
+ "span.name": "aws.lambda",
+ "language": "python"
+ },
+ "metrics": {
+ "process_id": XXXX,
+ "_dd.top_level": 1,
+ "_sampling_priority_v1": 1
+ },
+ "type": "serverless"
+ },
+ {
+ "trace_id": "XXXX",
+ "parent_id": "XXXX",
+ "span_id": "XXXX",
+ "service": "requests",
+ "resource": "GET /",
+ "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": "requests",
+ "resource": "GET /",
+ "name": "requests.request",
+ "error": 0,
+ "start": "XXXX",
+ "duration": "XXXX",
+ "meta": {
+ "_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 XXXX)","traceparent:XXX","tracestate:XXX
+{
+ "traces": [
+ [
+ {
+ "trace_id": "XXXX",
+ "parent_id": "XXXX",
+ "span_id": "XXXX",
+ "service": "requests",
+ "resource": "POST /api/v1/distribution_points",
+ "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 XXXX)",
+ "_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_python313",
+ "resource:integration-tests-python-XXXX-sync-metrics_python313",
+ "memorysize:1024",
+ "cold_start:false",
+ "runtime:python3.13",
+ "datadog_lambda:vXX",
+ "dd_lambda_layer:datadog-python313_X.X.X"
+ ]
+}
{
"m": "datadog.serverless.dynamodb.stream.type",
"v": 1,
@@ -225,7 +372,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "dynamodb",
+ "service": "ExampleTableWithStream",
"resource": "ExampleTableWithStream",
"name": "aws.dynamodb",
"error": 0,
@@ -236,6 +383,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.dynamodb",
"resource_names": "ExampleTableWithStream",
+ "span.kind": "server",
"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",
@@ -247,7 +395,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -295,7 +442,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python313",
"name": "aws.lambda",
"error": 0,
@@ -313,8 +460,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -325,7 +471,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -351,7 +497,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -384,7 +530,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -442,7 +588,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "eventbridge",
+ "service": "eventbridge.custom.event.sender",
"resource": "eventbridge.custom.event.sender",
"name": "aws.eventbridge",
"error": 0,
@@ -453,12 +599,12 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.eventbridge",
"resource_names": "eventbridge.custom.event.sender",
+ "span.kind": "server",
"detail_type": "testdetail",
"_inferred_span.synchronicity": "async",
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -474,7 +620,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python313",
"name": "aws.lambda",
"error": 0,
@@ -491,8 +637,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source": "eventbridge"
},
"metrics": {
"_dd.top_level": 1
@@ -503,7 +648,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -529,7 +674,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -562,7 +707,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -631,7 +776,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.httpapi",
"endpoint": "/httpapi/get",
- "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com/httpapi/get",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com/httpapi/get",
"http.method": "GET",
"http.protocol": "HTTP/1.1",
"http.source_ip": "XXXX",
@@ -644,9 +789,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.synchronicity": "sync",
"_inferred_span.tag_source": "self",
"http.status_code": "200",
+ "http.route": "/httpapi/get",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -662,7 +807,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python313",
"name": "aws.lambda",
"error": 0,
@@ -681,12 +826,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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",
+ "span.kind": "server",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com/httpapi/get",
"http.method": "GET",
"http.route": "/httpapi/get",
- "http.status_code": "200",
- "_dd.base_service": "integration-tests-python"
+ "http.status_code": "200"
},
"metrics": {
"_dd.top_level": 1
@@ -697,7 +841,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -723,7 +867,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -756,7 +900,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -814,7 +958,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "kinesis",
+ "service": "EXAMPLE",
"resource": "EXAMPLE",
"name": "aws.kinesis",
"error": 0,
@@ -825,6 +969,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.kinesis",
"resource_names": "EXAMPLE",
+ "span.kind": "server",
"streamname": "EXAMPLE",
"shardid": "shardId-XXXX",
"event_source_arn": "arn:aws:kinesis:EXAMPLE",
@@ -836,7 +981,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -852,7 +996,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python313",
"name": "aws.lambda",
"error": 0,
@@ -870,8 +1014,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -882,7 +1025,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -908,7 +1051,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -941,7 +1084,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -999,7 +1142,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "s3",
+ "service": "example-bucket",
"resource": "example-bucket",
"name": "aws.s3",
"error": 0,
@@ -1008,6 +1151,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.s3",
"resource_names": "example-bucket",
+ "span.kind": "server",
"event_name": "ObjectCreated:Put",
"bucketname": "example-bucket",
"bucket_arn": "arn:aws:s3:::example-bucket",
@@ -1018,7 +1162,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -1046,7 +1189,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python313",
"name": "aws.lambda",
"error": 0,
@@ -1064,8 +1207,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -1076,7 +1218,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1102,7 +1244,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1135,7 +1277,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -1193,7 +1335,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "sns",
+ "service": "sns-lambda",
"resource": "sns-lambda",
"name": "aws.sns",
"error": 0,
@@ -1204,6 +1346,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.sns",
"resource_names": "sns-lambda",
+ "span.kind": "server",
"topicname": "sns-lambda",
"topic_arn": "arn:aws:sns:us-east-2:XXXX:us-east-2-lambda",
"message_id": "XXXX",
@@ -1213,7 +1356,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -1229,7 +1371,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python313",
"name": "aws.lambda",
"error": 0,
@@ -1247,8 +1389,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -1259,7 +1400,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1285,7 +1426,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1318,7 +1459,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -1376,7 +1517,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "sqs",
+ "service": "my-queue",
"resource": "my-queue",
"name": "aws.sqs",
"error": 0,
@@ -1387,6 +1528,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.sqs",
"resource_names": "my-queue",
+ "span.kind": "server",
"queuename": "my-queue",
"event_source_arn": "arn:aws:sqs:us-east-2:XXXX:us-east-2-queue",
"receipt_handle": "AQEBwJnKyrHigUMZj6rYigCgxlaS3SLy0a...",
@@ -1395,7 +1537,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -1411,7 +1552,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python313",
"name": "aws.lambda",
"error": 0,
@@ -1429,8 +1570,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -1441,7 +1581,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1467,7 +1607,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1500,7 +1640,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -1568,9 +1708,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"operation_name": "aws.apigateway.websocket",
- "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com$default",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com$default/",
"endpoint": "$default",
"resource_names": "$default",
+ "span.kind": "server",
"apiid": "XXXX",
"apiname": "XXXX",
"stage": "dev",
@@ -1583,7 +1724,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"http.status_code": "200",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -1599,7 +1739,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python313",
"name": "aws.lambda",
"error": 0,
@@ -1618,9 +1758,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "span.kind": "server",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com/",
+ "http.status_code": "200"
},
"metrics": {
"_dd.top_level": 1
@@ -1631,7 +1771,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1657,7 +1797,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1690,7 +1830,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
diff --git a/tests/integration/snapshots/logs/sync-metrics_python38.log b/tests/integration/snapshots/logs/sync-metrics_python38.log
index 83e33d336..ae41bc18d 100644
--- a/tests/integration/snapshots/logs/sync-metrics_python38.log
+++ b/tests/integration/snapshots/logs/sync-metrics_python38.log
@@ -35,10 +35,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"operation_name": "aws.apigateway.rest",
- "http.url": "XXXX.execute-api.us-east-2.amazonaws.com/",
+ "http.url": "https://xxxx.execute-api.us-east-2.amazonaws.com/",
"endpoint": "/",
"http.method": "GET",
"resource_names": "GET /",
+ "span.kind": "server",
"apiid": "XXXX",
"apiname": "XXXX",
"stage": "Prod",
@@ -46,9 +47,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.synchronicity": "sync",
"_inferred_span.tag_source": "self",
"http.status_code": "200",
+ "http.route": "/",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -64,7 +65,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python38",
"name": "aws.lambda",
"error": 0,
@@ -83,12 +84,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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/",
+ "span.kind": "server",
+ "http.url": "https://xxxx.execute-api.us-east-2.amazonaws.com/Prod/",
"http.method": "GET",
"http.route": "/",
- "http.status_code": "200",
- "_dd.base_service": "integration-tests-python"
+ "http.status_code": "200"
},
"metrics": {
"_dd.top_level": 1
@@ -99,7 +99,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -125,7 +125,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -158,7 +158,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -207,6 +207,153 @@ START
"dd_lambda_layer:datadog-python38_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": "integration-tests-python",
+ "resource": "integration-tests-python-XXXX-sync-metrics_python38",
+ "name": "aws.lambda",
+ "error": 0,
+ "start": "XXXX",
+ "duration": "XXXX",
+ "meta": {
+ "runtime-id": "XXXX",
+ "_dd.origin": "lambda",
+ "cold_start": "false",
+ "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python38",
+ "function_version": "$LATEST",
+ "request_id": "XXXX",
+ "resource_names": "integration-tests-python-XXXX-sync-metrics_python38",
+ "functionname": "integration-tests-python-XXXX-sync-metrics_python38",
+ "datadog_lambda": "X.X.X",
+ "dd_trace": "X.X.X",
+ "span.name": "aws.lambda",
+ "language": "python"
+ },
+ "metrics": {
+ "process_id": XXXX,
+ "_dd.top_level": 1,
+ "_sampling_priority_v1": 1
+ },
+ "type": "serverless"
+ },
+ {
+ "trace_id": "XXXX",
+ "parent_id": "XXXX",
+ "span_id": "XXXX",
+ "service": "requests",
+ "resource": "GET /",
+ "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": "requests",
+ "resource": "GET /",
+ "name": "requests.request",
+ "error": 0,
+ "start": "XXXX",
+ "duration": "XXXX",
+ "meta": {
+ "_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 XXXX)","traceparent:XXX","tracestate:XXX
+{
+ "traces": [
+ [
+ {
+ "trace_id": "XXXX",
+ "parent_id": "XXXX",
+ "span_id": "XXXX",
+ "service": "requests",
+ "resource": "POST /api/v1/distribution_points",
+ "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 XXXX)",
+ "_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_python38",
+ "resource:integration-tests-python-XXXX-sync-metrics_python38",
+ "memorysize:1024",
+ "cold_start:false",
+ "runtime:python3.8",
+ "datadog_lambda:vXX",
+ "dd_lambda_layer:datadog-python38_X.X.X"
+ ]
+}
{
"m": "datadog.serverless.dynamodb.stream.type",
"v": 1,
@@ -225,7 +372,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "dynamodb",
+ "service": "ExampleTableWithStream",
"resource": "ExampleTableWithStream",
"name": "aws.dynamodb",
"error": 0,
@@ -236,6 +383,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.dynamodb",
"resource_names": "ExampleTableWithStream",
+ "span.kind": "server",
"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",
@@ -247,7 +395,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -295,7 +442,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python38",
"name": "aws.lambda",
"error": 0,
@@ -313,8 +460,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -325,7 +471,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -351,7 +497,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -384,7 +530,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -442,7 +588,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "eventbridge",
+ "service": "eventbridge.custom.event.sender",
"resource": "eventbridge.custom.event.sender",
"name": "aws.eventbridge",
"error": 0,
@@ -453,12 +599,12 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.eventbridge",
"resource_names": "eventbridge.custom.event.sender",
+ "span.kind": "server",
"detail_type": "testdetail",
"_inferred_span.synchronicity": "async",
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -474,7 +620,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python38",
"name": "aws.lambda",
"error": 0,
@@ -491,8 +637,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source": "eventbridge"
},
"metrics": {
"_dd.top_level": 1
@@ -503,7 +648,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -529,7 +674,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -562,7 +707,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -631,7 +776,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.httpapi",
"endpoint": "/httpapi/get",
- "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com/httpapi/get",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com/httpapi/get",
"http.method": "GET",
"http.protocol": "HTTP/1.1",
"http.source_ip": "XXXX",
@@ -644,9 +789,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.synchronicity": "sync",
"_inferred_span.tag_source": "self",
"http.status_code": "200",
+ "http.route": "/httpapi/get",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -662,7 +807,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python38",
"name": "aws.lambda",
"error": 0,
@@ -681,12 +826,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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",
+ "span.kind": "server",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com/httpapi/get",
"http.method": "GET",
"http.route": "/httpapi/get",
- "http.status_code": "200",
- "_dd.base_service": "integration-tests-python"
+ "http.status_code": "200"
},
"metrics": {
"_dd.top_level": 1
@@ -697,7 +841,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -723,7 +867,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -756,7 +900,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -814,7 +958,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "kinesis",
+ "service": "EXAMPLE",
"resource": "EXAMPLE",
"name": "aws.kinesis",
"error": 0,
@@ -825,6 +969,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.kinesis",
"resource_names": "EXAMPLE",
+ "span.kind": "server",
"streamname": "EXAMPLE",
"shardid": "shardId-XXXX",
"event_source_arn": "arn:aws:kinesis:EXAMPLE",
@@ -836,7 +981,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -852,7 +996,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python38",
"name": "aws.lambda",
"error": 0,
@@ -870,8 +1014,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -882,7 +1025,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -908,7 +1051,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -941,7 +1084,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -999,7 +1142,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "s3",
+ "service": "example-bucket",
"resource": "example-bucket",
"name": "aws.s3",
"error": 0,
@@ -1008,6 +1151,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.s3",
"resource_names": "example-bucket",
+ "span.kind": "server",
"event_name": "ObjectCreated:Put",
"bucketname": "example-bucket",
"bucket_arn": "arn:aws:s3:::example-bucket",
@@ -1018,7 +1162,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -1046,7 +1189,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python38",
"name": "aws.lambda",
"error": 0,
@@ -1064,8 +1207,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -1076,7 +1218,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1102,7 +1244,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1135,7 +1277,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -1193,7 +1335,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "sns",
+ "service": "sns-lambda",
"resource": "sns-lambda",
"name": "aws.sns",
"error": 0,
@@ -1204,6 +1346,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.sns",
"resource_names": "sns-lambda",
+ "span.kind": "server",
"topicname": "sns-lambda",
"topic_arn": "arn:aws:sns:us-east-2:XXXX:us-east-2-lambda",
"message_id": "XXXX",
@@ -1213,7 +1356,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -1229,7 +1371,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python38",
"name": "aws.lambda",
"error": 0,
@@ -1247,8 +1389,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -1259,7 +1400,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1285,7 +1426,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1318,7 +1459,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -1376,7 +1517,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "sqs",
+ "service": "my-queue",
"resource": "my-queue",
"name": "aws.sqs",
"error": 0,
@@ -1387,6 +1528,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.sqs",
"resource_names": "my-queue",
+ "span.kind": "server",
"queuename": "my-queue",
"event_source_arn": "arn:aws:sqs:us-east-2:XXXX:us-east-2-queue",
"receipt_handle": "AQEBwJnKyrHigUMZj6rYigCgxlaS3SLy0a...",
@@ -1395,7 +1537,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -1411,7 +1552,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python38",
"name": "aws.lambda",
"error": 0,
@@ -1429,8 +1570,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -1441,7 +1581,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1467,7 +1607,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1500,7 +1640,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -1568,9 +1708,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"operation_name": "aws.apigateway.websocket",
- "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com$default",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com$default/",
"endpoint": "$default",
"resource_names": "$default",
+ "span.kind": "server",
"apiid": "XXXX",
"apiname": "XXXX",
"stage": "dev",
@@ -1583,7 +1724,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"http.status_code": "200",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -1599,7 +1739,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python38",
"name": "aws.lambda",
"error": 0,
@@ -1618,9 +1758,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "span.kind": "server",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com/",
+ "http.status_code": "200"
},
"metrics": {
"_dd.top_level": 1
@@ -1631,7 +1771,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1657,7 +1797,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1690,7 +1830,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
diff --git a/tests/integration/snapshots/logs/sync-metrics_python39.log b/tests/integration/snapshots/logs/sync-metrics_python39.log
index 0a433c346..1acb7f0da 100644
--- a/tests/integration/snapshots/logs/sync-metrics_python39.log
+++ b/tests/integration/snapshots/logs/sync-metrics_python39.log
@@ -35,10 +35,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"operation_name": "aws.apigateway.rest",
- "http.url": "XXXX.execute-api.us-east-2.amazonaws.com/",
+ "http.url": "https://xxxx.execute-api.us-east-2.amazonaws.com/",
"endpoint": "/",
"http.method": "GET",
"resource_names": "GET /",
+ "span.kind": "server",
"apiid": "XXXX",
"apiname": "XXXX",
"stage": "Prod",
@@ -46,9 +47,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.synchronicity": "sync",
"_inferred_span.tag_source": "self",
"http.status_code": "200",
+ "http.route": "/",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -64,7 +65,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python39",
"name": "aws.lambda",
"error": 0,
@@ -83,12 +84,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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/",
+ "span.kind": "server",
+ "http.url": "https://xxxx.execute-api.us-east-2.amazonaws.com/Prod/",
"http.method": "GET",
"http.route": "/",
- "http.status_code": "200",
- "_dd.base_service": "integration-tests-python"
+ "http.status_code": "200"
},
"metrics": {
"_dd.top_level": 1
@@ -99,7 +99,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -125,7 +125,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -158,7 +158,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -207,6 +207,153 @@ START
"dd_lambda_layer:datadog-python39_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": "integration-tests-python",
+ "resource": "integration-tests-python-XXXX-sync-metrics_python39",
+ "name": "aws.lambda",
+ "error": 0,
+ "start": "XXXX",
+ "duration": "XXXX",
+ "meta": {
+ "runtime-id": "XXXX",
+ "_dd.origin": "lambda",
+ "cold_start": "false",
+ "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python39",
+ "function_version": "$LATEST",
+ "request_id": "XXXX",
+ "resource_names": "integration-tests-python-XXXX-sync-metrics_python39",
+ "functionname": "integration-tests-python-XXXX-sync-metrics_python39",
+ "datadog_lambda": "X.X.X",
+ "dd_trace": "X.X.X",
+ "span.name": "aws.lambda",
+ "language": "python"
+ },
+ "metrics": {
+ "process_id": XXXX,
+ "_dd.top_level": 1,
+ "_sampling_priority_v1": 1
+ },
+ "type": "serverless"
+ },
+ {
+ "trace_id": "XXXX",
+ "parent_id": "XXXX",
+ "span_id": "XXXX",
+ "service": "requests",
+ "resource": "GET /",
+ "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": "requests",
+ "resource": "GET /",
+ "name": "requests.request",
+ "error": 0,
+ "start": "XXXX",
+ "duration": "XXXX",
+ "meta": {
+ "_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 XXXX)","traceparent:XXX","tracestate:XXX
+{
+ "traces": [
+ [
+ {
+ "trace_id": "XXXX",
+ "parent_id": "XXXX",
+ "span_id": "XXXX",
+ "service": "requests",
+ "resource": "POST /api/v1/distribution_points",
+ "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 XXXX)",
+ "_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_python39",
+ "resource:integration-tests-python-XXXX-sync-metrics_python39",
+ "memorysize:1024",
+ "cold_start:false",
+ "runtime:python3.9",
+ "datadog_lambda:vXX",
+ "dd_lambda_layer:datadog-python39_X.X.X"
+ ]
+}
{
"m": "datadog.serverless.dynamodb.stream.type",
"v": 1,
@@ -225,7 +372,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "dynamodb",
+ "service": "ExampleTableWithStream",
"resource": "ExampleTableWithStream",
"name": "aws.dynamodb",
"error": 0,
@@ -236,6 +383,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.dynamodb",
"resource_names": "ExampleTableWithStream",
+ "span.kind": "server",
"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",
@@ -247,7 +395,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -295,7 +442,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python39",
"name": "aws.lambda",
"error": 0,
@@ -313,8 +460,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -325,7 +471,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -351,7 +497,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -377,7 +523,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
]
}
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 XXXX)","traceparent:XXX","tracestate:XXX
-END Duration: XXXX ms Memory Used: XXXX MB
{
"traces": [
[
@@ -385,7 +530,7 @@ END Duration: XXXX ms Memory Used: XXXX MB
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -416,6 +561,7 @@ END Duration: XXXX ms Memory Used: XXXX MB
]
]
}
+END Duration: XXXX ms Memory Used: XXXX MB
START
{
"m": "aws.lambda.enhanced.invocations",
@@ -442,7 +588,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "eventbridge",
+ "service": "eventbridge.custom.event.sender",
"resource": "eventbridge.custom.event.sender",
"name": "aws.eventbridge",
"error": 0,
@@ -453,12 +599,12 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.eventbridge",
"resource_names": "eventbridge.custom.event.sender",
+ "span.kind": "server",
"detail_type": "testdetail",
"_inferred_span.synchronicity": "async",
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -474,7 +620,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python39",
"name": "aws.lambda",
"error": 0,
@@ -491,8 +637,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source": "eventbridge"
},
"metrics": {
"_dd.top_level": 1
@@ -503,7 +648,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -529,7 +674,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -562,7 +707,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -631,7 +776,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.httpapi",
"endpoint": "/httpapi/get",
- "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com/httpapi/get",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com/httpapi/get",
"http.method": "GET",
"http.protocol": "HTTP/1.1",
"http.source_ip": "XXXX",
@@ -644,9 +789,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.synchronicity": "sync",
"_inferred_span.tag_source": "self",
"http.status_code": "200",
+ "http.route": "/httpapi/get",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -662,7 +807,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python39",
"name": "aws.lambda",
"error": 0,
@@ -681,12 +826,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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",
+ "span.kind": "server",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com/httpapi/get",
"http.method": "GET",
"http.route": "/httpapi/get",
- "http.status_code": "200",
- "_dd.base_service": "integration-tests-python"
+ "http.status_code": "200"
},
"metrics": {
"_dd.top_level": 1
@@ -697,7 +841,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -723,7 +867,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -756,7 +900,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -814,7 +958,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "kinesis",
+ "service": "EXAMPLE",
"resource": "EXAMPLE",
"name": "aws.kinesis",
"error": 0,
@@ -825,6 +969,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.kinesis",
"resource_names": "EXAMPLE",
+ "span.kind": "server",
"streamname": "EXAMPLE",
"shardid": "shardId-XXXX",
"event_source_arn": "arn:aws:kinesis:EXAMPLE",
@@ -836,7 +981,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -852,7 +996,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python39",
"name": "aws.lambda",
"error": 0,
@@ -870,8 +1014,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -882,7 +1025,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -908,7 +1051,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -941,7 +1084,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -999,7 +1142,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "s3",
+ "service": "example-bucket",
"resource": "example-bucket",
"name": "aws.s3",
"error": 0,
@@ -1008,6 +1151,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.s3",
"resource_names": "example-bucket",
+ "span.kind": "server",
"event_name": "ObjectCreated:Put",
"bucketname": "example-bucket",
"bucket_arn": "arn:aws:s3:::example-bucket",
@@ -1018,7 +1162,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -1046,7 +1189,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python39",
"name": "aws.lambda",
"error": 0,
@@ -1064,8 +1207,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -1076,7 +1218,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1102,7 +1244,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1135,7 +1277,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -1193,7 +1335,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "sns",
+ "service": "sns-lambda",
"resource": "sns-lambda",
"name": "aws.sns",
"error": 0,
@@ -1204,6 +1346,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.sns",
"resource_names": "sns-lambda",
+ "span.kind": "server",
"topicname": "sns-lambda",
"topic_arn": "arn:aws:sns:us-east-2:XXXX:us-east-2-lambda",
"message_id": "XXXX",
@@ -1213,7 +1356,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -1229,7 +1371,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python39",
"name": "aws.lambda",
"error": 0,
@@ -1247,8 +1389,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -1259,7 +1400,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1285,7 +1426,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1318,7 +1459,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -1376,7 +1517,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "sqs",
+ "service": "my-queue",
"resource": "my-queue",
"name": "aws.sqs",
"error": 0,
@@ -1387,6 +1528,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.sqs",
"resource_names": "my-queue",
+ "span.kind": "server",
"queuename": "my-queue",
"event_source_arn": "arn:aws:sqs:us-east-2:XXXX:us-east-2-queue",
"receipt_handle": "AQEBwJnKyrHigUMZj6rYigCgxlaS3SLy0a...",
@@ -1395,7 +1537,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_inferred_span.tag_source": "self",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -1411,7 +1552,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python39",
"name": "aws.lambda",
"error": 0,
@@ -1429,8 +1570,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "function_trigger.event_source_arn": "XXXX"
},
"metrics": {
"_dd.top_level": 1
@@ -1441,7 +1581,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1467,7 +1607,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1500,7 +1640,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
@@ -1568,9 +1708,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"operation_name": "aws.apigateway.websocket",
- "http.url": "XXXX.execute-api.eu-west-1.amazonaws.com$default",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com$default/",
"endpoint": "$default",
"resource_names": "$default",
+ "span.kind": "server",
"apiid": "XXXX",
"apiname": "XXXX",
"stage": "dev",
@@ -1583,7 +1724,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"http.status_code": "200",
"peer.service": "integration-tests-python",
"_dd.peer.service.source": "peer.service",
- "_dd.base_service": "integration-tests-python",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
"language": "python"
@@ -1599,7 +1739,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "aws.lambda",
+ "service": "integration-tests-python",
"resource": "integration-tests-python-XXXX-sync-metrics_python39",
"name": "aws.lambda",
"error": 0,
@@ -1618,9 +1758,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"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"
+ "span.kind": "server",
+ "http.url": "https://xxxx.execute-api.eu-west-1.amazonaws.com/",
+ "http.status_code": "200"
},
"metrics": {
"_dd.top_level": 1
@@ -1631,7 +1771,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1657,7 +1797,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "GET /",
"name": "requests.request",
"error": 0,
@@ -1690,7 +1830,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"trace_id": "XXXX",
"parent_id": "XXXX",
"span_id": "XXXX",
- "service": "integration-tests-python",
+ "service": "requests",
"resource": "POST /api/v1/distribution_points",
"name": "requests.request",
"error": 0,
diff --git a/tests/integration/snapshots/return_values/async-metrics_appsync.json b/tests/integration/snapshots/return_values/async-metrics_appsync.json
new file mode 100644
index 000000000..1ad668ecc
--- /dev/null
+++ b/tests/integration/snapshots/return_values/async-metrics_appsync.json
@@ -0,0 +1,8 @@
+{
+ "statusCode": 200,
+ "body": {
+ "message": "hello, dog!",
+ "request_id": null,
+ "event_record_ids": []
+ }
+}
diff --git a/tests/integration/snapshots/return_values/sync-metrics_appsync.json b/tests/integration/snapshots/return_values/sync-metrics_appsync.json
new file mode 100644
index 000000000..1ad668ecc
--- /dev/null
+++ b/tests/integration/snapshots/return_values/sync-metrics_appsync.json
@@ -0,0 +1,8 @@
+{
+ "statusCode": 200,
+ "body": {
+ "message": "hello, dog!",
+ "request_id": null,
+ "event_record_ids": []
+ }
+}
diff --git a/tests/integration/yarn.lock b/tests/integration/yarn.lock
index f96feb522..7477e8dae 100644
--- a/tests/integration/yarn.lock
+++ b/tests/integration/yarn.lock
@@ -7,23 +7,6 @@
resolved "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.5.tgz"
integrity sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==
-"@isaacs/cliui@^8.0.2":
- version "8.0.2"
- resolved "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz"
- integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==
- dependencies:
- string-width "^5.1.2"
- string-width-cjs "npm:string-width@^4.2.0"
- strip-ansi "^7.0.1"
- strip-ansi-cjs "npm:strip-ansi@^6.0.1"
- wrap-ansi "^8.1.0"
- wrap-ansi-cjs "npm:wrap-ansi@^7.0.0"
-
-"@pkgjs/parseargs@^0.11.0":
- version "0.11.0"
- resolved "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz"
- integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
-
"2-thenable@^1.0.0":
version "1.0.0"
resolved "https://registry.npmjs.org/2-thenable/-/2-thenable-1.0.0.tgz"
@@ -37,11 +20,6 @@ ansi-regex@^5.0.1:
resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"
integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
-ansi-regex@^6.0.1:
- version "6.1.0"
- resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz"
- integrity sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==
-
ansi-styles@^4.0.0:
version "4.3.0"
resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"
@@ -49,37 +27,11 @@ ansi-styles@^4.0.0:
dependencies:
color-convert "^2.0.1"
-ansi-styles@^6.1.0:
- version "6.2.1"
- resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz"
- integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
-
appdirectory@^0.1.0:
version "0.1.0"
resolved "https://registry.npmjs.org/appdirectory/-/appdirectory-0.1.0.tgz"
integrity sha512-DJ5DV8vZXBbusyiyPlH28xppwS8eAMRuuyMo88xeEcf4bV64lbLtbxRxqixZuJBXsZzLtXFmA13GwVjJc7vdQw==
-asynckit@^0.4.0:
- version "0.4.0"
- resolved "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"
- integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
-
-axios-proxy-builder@^0.1.2:
- version "0.1.2"
- resolved "https://registry.npmjs.org/axios-proxy-builder/-/axios-proxy-builder-0.1.2.tgz"
- integrity sha512-6uBVsBZzkB3tCC8iyx59mCjQckhB8+GQrI9Cop8eC7ybIsvs/KtnNgEBfRMSEa7GqK2VBGUzgjNYMdPIfotyPA==
- dependencies:
- tunnel "^0.0.6"
-
-axios@^1.7.4:
- version "1.7.9"
- resolved "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz"
- integrity sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==
- dependencies:
- follow-redirects "^1.15.6"
- form-data "^4.0.0"
- proxy-from-env "^1.1.0"
-
balanced-match@^1.0.0:
version "1.0.2"
resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"
@@ -91,20 +43,13 @@ bluebird@^3.7.2:
integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
brace-expansion@^1.1.7:
- version "1.1.11"
- resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"
- integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+ version "1.1.12"
+ resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz"
+ integrity sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==
dependencies:
balanced-match "^1.0.0"
concat-map "0.0.1"
-brace-expansion@^2.0.1:
- version "2.0.1"
- resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz"
- integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
- dependencies:
- balanced-match "^1.0.0"
-
camelcase@^5.0.0:
version "5.3.1"
resolved "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz"
@@ -142,13 +87,6 @@ color-name@~1.1.4:
resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
-combined-stream@^1.0.8:
- version "1.0.8"
- resolved "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"
- integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
- dependencies:
- delayed-stream "~1.0.0"
-
concat-map@0.0.1:
version "0.0.1"
resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
@@ -170,15 +108,6 @@ cross-spawn@^6.0.5:
shebang-command "^1.2.0"
which "^1.2.9"
-cross-spawn@^7.0.0:
- version "7.0.6"
- resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz"
- integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
- dependencies:
- path-key "^3.1.0"
- shebang-command "^2.0.0"
- which "^2.0.1"
-
d@^1.0.1, d@^1.0.2, d@1:
version "1.0.2"
resolved "https://registry.npmjs.org/d/-/d-1.0.2.tgz"
@@ -192,11 +121,6 @@ decamelize@^1.2.0:
resolved "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"
integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
-delayed-stream@~1.0.0:
- version "1.0.0"
- resolved "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
- integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
-
duration@^0.2.2:
version "0.2.2"
resolved "https://registry.npmjs.org/duration/-/duration-0.2.2.tgz"
@@ -205,21 +129,11 @@ duration@^0.2.2:
d "1"
es5-ext "~0.10.46"
-eastasianwidth@^0.2.0:
- version "0.2.0"
- resolved "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz"
- integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
-
emoji-regex@^8.0.0:
version "8.0.0"
resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"
integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
-emoji-regex@^9.2.2:
- version "9.2.2"
- resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz"
- integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
-
es5-ext@^0.10.35, es5-ext@^0.10.47, es5-ext@^0.10.49, es5-ext@^0.10.53, es5-ext@^0.10.62, es5-ext@^0.10.64, es5-ext@~0.10.14, es5-ext@~0.10.46:
version "0.10.64"
resolved "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.64.tgz"
@@ -280,28 +194,6 @@ find-up@^4.1.0:
locate-path "^5.0.0"
path-exists "^4.0.0"
-follow-redirects@^1.15.6:
- version "1.15.9"
- resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz"
- integrity sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==
-
-foreground-child@^3.1.0:
- version "3.3.0"
- resolved "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz"
- integrity sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==
- dependencies:
- cross-spawn "^7.0.0"
- signal-exit "^4.0.1"
-
-form-data@^4.0.0:
- version "4.0.1"
- resolved "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz"
- integrity sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==
- dependencies:
- asynckit "^0.4.0"
- combined-stream "^1.0.8"
- mime-types "^2.1.12"
-
fs-extra@^10.1.0:
version "10.1.0"
resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz"
@@ -329,31 +221,7 @@ glob-all@^3.3.1:
glob "^7.2.3"
yargs "^15.3.1"
-glob@^10.3.7:
- version "10.4.5"
- resolved "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz"
- integrity sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==
- dependencies:
- foreground-child "^3.1.0"
- jackspeak "^3.1.2"
- minimatch "^9.0.4"
- minipass "^7.1.2"
- package-json-from-dist "^1.0.0"
- path-scurry "^1.11.1"
-
-glob@^7.1.3:
- version "7.2.3"
- resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz"
- integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
- dependencies:
- fs.realpath "^1.0.0"
- inflight "^1.0.4"
- inherits "2"
- minimatch "^3.1.1"
- once "^1.3.0"
- path-is-absolute "^1.0.0"
-
-glob@^7.2.3:
+glob@^7.1.3, glob@^7.2.3:
version "7.2.3"
resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz"
integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -437,15 +305,6 @@ isobject@^3.0.1:
resolved "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz"
integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
-jackspeak@^3.1.2:
- version "3.4.3"
- resolved "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz"
- integrity sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==
- dependencies:
- "@isaacs/cliui" "^8.0.2"
- optionalDependencies:
- "@pkgjs/parseargs" "^0.11.0"
-
jsonfile@^6.0.1:
version "6.1.0"
resolved "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz"
@@ -507,23 +366,6 @@ log@^6.0.0:
type "^2.7.3"
uni-global "^1.0.0"
-lru-cache@^10.2.0:
- version "10.4.3"
- resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz"
- integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==
-
-mime-db@1.52.0:
- version "1.52.0"
- resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz"
- integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
-
-mime-types@^2.1.12:
- version "2.1.35"
- resolved "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz"
- integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
- dependencies:
- mime-db "1.52.0"
-
minimatch@^3.1.1:
version "3.1.2"
resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"
@@ -531,18 +373,6 @@ minimatch@^3.1.1:
dependencies:
brace-expansion "^1.1.7"
-minimatch@^9.0.4:
- version "9.0.5"
- resolved "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz"
- integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==
- dependencies:
- brace-expansion "^2.0.1"
-
-"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.1.2:
- version "7.1.2"
- resolved "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz"
- integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==
-
next-tick@^1.1.0:
version "1.1.0"
resolved "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz"
@@ -579,11 +409,6 @@ p-try@^2.0.0:
resolved "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"
integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
-package-json-from-dist@^1.0.0:
- version "1.0.1"
- resolved "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz"
- integrity sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==
-
pako@~1.0.2:
version "1.0.11"
resolved "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz"
@@ -604,29 +429,11 @@ path-key@^2.0.1:
resolved "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz"
integrity sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==
-path-key@^3.1.0:
- version "3.1.1"
- resolved "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz"
- integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
-
-path-scurry@^1.11.1:
- version "1.11.1"
- resolved "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz"
- integrity sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==
- dependencies:
- lru-cache "^10.2.0"
- minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
-
process-nextick-args@~2.0.0:
version "2.0.1"
resolved "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"
integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
-proxy-from-env@^1.1.0:
- version "1.1.0"
- resolved "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz"
- integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
-
readable-stream@^3.0.0:
version "3.6.2"
resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz"
@@ -666,23 +473,11 @@ rimraf@^3.0.2:
dependencies:
glob "^7.1.3"
-rimraf@^5.0.5:
- version "5.0.10"
- resolved "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz"
- integrity sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ==
- dependencies:
- glob "^10.3.7"
-
safe-buffer@~5.1.0, safe-buffer@~5.1.1:
version "5.1.2"
resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"
integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
-sax@>=0.6.0:
- version "1.4.1"
- resolved "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz"
- integrity sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==
-
semver@^5.5.0:
version "5.7.2"
resolved "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz"
@@ -698,10 +493,10 @@ serverless-plugin-datadog@^2.18.0:
resolved "https://registry.npmjs.org/serverless-plugin-datadog/-/serverless-plugin-datadog-2.18.0.tgz"
integrity sha512-RUdCNjUk+uUKQYgQBjK0WNeYJ7lM2/RScqg/LjVSfv5EACeJ3iIUPz1c4bS2jtiH05al8qXudNb6QDkv9zxG7w==
-serverless-python-requirements@^6.1.1:
- version "6.1.1"
- resolved "https://registry.npmjs.org/serverless-python-requirements/-/serverless-python-requirements-6.1.1.tgz"
- integrity sha512-SQsDKjoZXWvRJNsKL7NvHiMM+B6kG0a4RkVexhPCxId/rVMLVyz0UHg7v34kzaklfsXTQIkez+9x7HP3FwdRVQ==
+serverless-python-requirements@^6.1.2:
+ version "6.1.2"
+ resolved "https://registry.npmjs.org/serverless-python-requirements/-/serverless-python-requirements-6.1.2.tgz"
+ integrity sha512-pas27CBxxaLTU5XMYnCVPJc+LVdm65Ys5olNvRWRqfUaZwTfD/7KSSt2XPSRme8BeJubroslaiOtWPP+IrxTVA==
dependencies:
"@iarna/toml" "^2.2.5"
appdirectory "^0.1.0"
@@ -720,16 +515,6 @@ serverless-python-requirements@^6.1.1:
sha256-file "1.0.0"
shell-quote "^1.8.1"
-serverless@>=2.32:
- version "4.5.0"
- resolved "https://registry.npmjs.org/serverless/-/serverless-4.5.0.tgz"
- integrity sha512-msbs5I/fuPiW0ZfBuFA7lpKazCTFtF0AhOCA0HsrJBGVaOrNbwzlC/krZKXn1YgDR2+cw/izKRNupZJXtpyxJQ==
- dependencies:
- axios "^1.7.4"
- axios-proxy-builder "^0.1.2"
- rimraf "^5.0.5"
- xml2js "0.6.2"
-
set-blocking@^2.0.0:
version "2.0.0"
resolved "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"
@@ -760,33 +545,16 @@ shebang-command@^1.2.0:
dependencies:
shebang-regex "^1.0.0"
-shebang-command@^2.0.0:
- version "2.0.0"
- resolved "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz"
- integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
- dependencies:
- shebang-regex "^3.0.0"
-
shebang-regex@^1.0.0:
version "1.0.0"
resolved "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"
integrity sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==
-shebang-regex@^3.0.0:
- version "3.0.0"
- resolved "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz"
- integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
-
shell-quote@^1.8.1:
version "1.8.2"
resolved "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.2.tgz"
integrity sha512-AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA==
-signal-exit@^4.0.1:
- version "4.1.0"
- resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz"
- integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
-
split2@^3.1.1:
version "3.2.2"
resolved "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz"
@@ -817,15 +585,6 @@ string_decoder@^1.1.1, string_decoder@~1.1.1:
dependencies:
safe-buffer "~5.1.0"
-"string-width-cjs@npm:string-width@^4.2.0":
- version "4.2.3"
- resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
- integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
- dependencies:
- emoji-regex "^8.0.0"
- is-fullwidth-code-point "^3.0.0"
- strip-ansi "^6.0.1"
-
string-width@^4.1.0, string-width@^4.2.0:
version "4.2.3"
resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
@@ -835,22 +594,6 @@ string-width@^4.1.0, string-width@^4.2.0:
is-fullwidth-code-point "^3.0.0"
strip-ansi "^6.0.1"
-string-width@^5.0.1, string-width@^5.1.2:
- version "5.1.2"
- resolved "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz"
- integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==
- dependencies:
- eastasianwidth "^0.2.0"
- emoji-regex "^9.2.2"
- strip-ansi "^7.0.1"
-
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
- version "6.0.1"
- resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
- integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
- dependencies:
- ansi-regex "^5.0.1"
-
strip-ansi@^6.0.0, strip-ansi@^6.0.1:
version "6.0.1"
resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
@@ -858,18 +601,6 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:
dependencies:
ansi-regex "^5.0.1"
-strip-ansi@^7.0.1:
- version "7.1.0"
- resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz"
- integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==
- dependencies:
- ansi-regex "^6.0.1"
-
-tunnel@^0.0.6:
- version "0.0.6"
- resolved "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz"
- integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==
-
type@^2.5.0, type@^2.7.2, type@^2.7.3:
version "2.7.3"
resolved "https://registry.npmjs.org/type/-/type-2.7.3.tgz"
@@ -904,22 +635,6 @@ which@^1.2.9:
dependencies:
isexe "^2.0.0"
-which@^2.0.1:
- version "2.0.2"
- resolved "https://registry.npmjs.org/which/-/which-2.0.2.tgz"
- integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
- dependencies:
- isexe "^2.0.0"
-
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
- version "7.0.0"
- resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"
- integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
- dependencies:
- ansi-styles "^4.0.0"
- string-width "^4.1.0"
- strip-ansi "^6.0.0"
-
wrap-ansi@^6.2.0:
version "6.2.0"
resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz"
@@ -929,33 +644,11 @@ wrap-ansi@^6.2.0:
string-width "^4.1.0"
strip-ansi "^6.0.0"
-wrap-ansi@^8.1.0:
- version "8.1.0"
- resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz"
- integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==
- dependencies:
- ansi-styles "^6.1.0"
- string-width "^5.0.1"
- strip-ansi "^7.0.1"
-
wrappy@1:
version "1.0.2"
resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
-xml2js@0.6.2:
- version "0.6.2"
- resolved "https://registry.npmjs.org/xml2js/-/xml2js-0.6.2.tgz"
- integrity sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA==
- dependencies:
- sax ">=0.6.0"
- xmlbuilder "~11.0.0"
-
-xmlbuilder@~11.0.0:
- version "11.0.1"
- resolved "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz"
- integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==
-
y18n@^4.0.0:
version "4.0.3"
resolved "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz"
diff --git a/tests/test_api.py b/tests/test_api.py
index c98d91eb2..7fcc3c221 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -1,6 +1,6 @@
import os
import unittest
-from unittest.mock import patch, MagicMock
+from unittest.mock import MagicMock, patch
import datadog_lambda.api as api
@@ -22,6 +22,10 @@ def setUp(self):
)
self.env_patcher.start()
+ def tearDown(self):
+ del os.environ["AWS_REGION"]
+
+ @patch("datadog_lambda.config.Config.fips_mode_enabled", True)
@patch("botocore.session.Session.create_client")
def test_secrets_manager_fips_endpoint(self, mock_boto3_client):
mock_client = MagicMock()
@@ -62,6 +66,28 @@ def test_secrets_manager_different_region(self, mock_boto3_client):
)
self.assertEqual(api_key, "test-api-key")
+ @patch("datadog_lambda.config.Config.fips_mode_enabled", True)
+ @patch("botocore.session.Session.create_client")
+ def test_secrets_manager_different_region_but_still_fips(self, mock_boto3_client):
+ mock_client = MagicMock()
+ mock_client.get_secret_value.return_value = {"SecretString": "test-api-key"}
+ mock_boto3_client.return_value = mock_client
+
+ os.environ["AWS_REGION"] = "us-east-1"
+ os.environ[
+ "DD_API_KEY_SECRET_ARN"
+ ] = "arn:aws:secretsmanager:us-west-1:1234567890:secret:key-name-123ABC"
+
+ api_key = api.get_api_key()
+
+ mock_boto3_client.assert_called_with(
+ "secretsmanager",
+ endpoint_url="https://secretsmanager-fips.us-west-1.amazonaws.com/",
+ region_name="us-west-1",
+ )
+ self.assertEqual(api_key, "test-api-key")
+
+ @patch("datadog_lambda.config.Config.fips_mode_enabled", True)
@patch("botocore.session.Session.create_client")
def test_ssm_fips_endpoint(self, mock_boto3_client):
mock_client = MagicMock()
@@ -80,6 +106,7 @@ def test_ssm_fips_endpoint(self, mock_boto3_client):
)
self.assertEqual(api_key, "test-api-key")
+ @patch("datadog_lambda.config.Config.fips_mode_enabled", True)
@patch("botocore.session.Session.create_client")
@patch("datadog_lambda.api.decrypt_kms_api_key")
def test_kms_fips_endpoint(self, mock_decrypt_kms, mock_boto3_client):
diff --git a/tests/test_asm.py b/tests/test_asm.py
new file mode 100644
index 000000000..3aab8dd73
--- /dev/null
+++ b/tests/test_asm.py
@@ -0,0 +1,429 @@
+import json
+import pytest
+from unittest.mock import MagicMock, patch
+
+from datadog_lambda.asm import (
+ asm_start_request,
+ asm_start_response,
+ get_asm_blocked_response,
+)
+from datadog_lambda.trigger import (
+ EventSubtypes,
+ EventTypes,
+ _EventSource,
+ extract_trigger_tags,
+ parse_event_source,
+)
+from tests.utils import get_mock_context
+
+event_samples = "tests/event_samples/"
+
+
+# Test cases for ASM start request
+ASM_START_REQUEST_TEST_CASES = [
+ (
+ "application_load_balancer",
+ "application-load-balancer.json",
+ "72.12.164.125",
+ "/lambda?query=1234ABCD",
+ "GET",
+ "",
+ False,
+ {"query": "1234ABCD"},
+ None,
+ None,
+ ),
+ (
+ "application_load_balancer_multivalue_headers",
+ "application-load-balancer-multivalue-headers.json",
+ "72.12.164.125",
+ "/lambda?query=1234ABCD",
+ "GET",
+ "",
+ False,
+ {"query": "1234ABCD"},
+ None,
+ None,
+ ),
+ (
+ "lambda_function_url",
+ "lambda-url.json",
+ "71.195.30.42",
+ "/",
+ "GET",
+ None,
+ False,
+ None,
+ None,
+ None,
+ ),
+ (
+ "api_gateway",
+ "api-gateway.json",
+ "127.0.0.1",
+ "/path/to/resource?foo=bar",
+ "POST",
+ "eyJ0ZXN0IjoiYm9keSJ9",
+ True,
+ {"foo": ["bar"]},
+ {"proxy": "/path/to/resource"},
+ "/{proxy+}",
+ ),
+ (
+ "api_gateway_v2_parametrized",
+ "api-gateway-v2-parametrized.json",
+ "76.115.124.192",
+ "/user/42",
+ "GET",
+ None,
+ False,
+ None,
+ {"id": "42"},
+ "/user/{id}",
+ ),
+ (
+ "api_gateway_websocket",
+ "api-gateway-websocket-default.json",
+ "38.122.226.210",
+ None,
+ None,
+ '"What\'s good in the hood?"',
+ False,
+ None,
+ None,
+ None,
+ ),
+]
+
+
+# Test cases for ASM start response
+ASM_START_RESPONSE_TEST_CASES = [
+ (
+ "application_load_balancer",
+ "application-load-balancer.json",
+ {
+ "statusCode": 200,
+ "headers": {"Content-Type": "text/html"},
+ },
+ "200",
+ {"Content-Type": "text/html"},
+ None,
+ True,
+ ),
+ (
+ "application_load_balancer_multivalue_headers",
+ "application-load-balancer-multivalue-headers.json",
+ {
+ "statusCode": 404,
+ "multiValueHeaders": {
+ "Content-Type": ["text/plain"],
+ "X-Error": ["Not Found"],
+ },
+ },
+ "404",
+ {
+ "Content-Type": "text/plain",
+ "X-Error": "Not Found",
+ },
+ None,
+ True,
+ ),
+ (
+ "lambda_function_url",
+ "lambda-url.json",
+ {
+ "statusCode": 201,
+ "headers": {
+ "Location": "/user/123",
+ "Content-Type": "application/json",
+ },
+ },
+ "201",
+ {
+ "Location": "/user/123",
+ "Content-Type": "application/json",
+ },
+ None,
+ True,
+ ),
+ (
+ "api_gateway",
+ "api-gateway.json",
+ {
+ "statusCode": 200,
+ "headers": {
+ "Content-Type": "application/json",
+ "X-Custom-Header": "test-value",
+ },
+ "body": '{"message": "success"}',
+ },
+ "200",
+ {
+ "Content-Type": "application/json",
+ "X-Custom-Header": "test-value",
+ },
+ '{"message": "success"}',
+ True,
+ ),
+ (
+ "api_gateway_v2_parametrized",
+ "api-gateway-v2-parametrized.json",
+ {
+ "statusCode": 200,
+ "headers": {"Content-Type": "application/json"},
+ },
+ "200",
+ {"Content-Type": "application/json"},
+ None,
+ True,
+ ),
+ (
+ "api_gateway_websocket",
+ "api-gateway-websocket-default.json",
+ {
+ "statusCode": 200,
+ "headers": {"Content-Type": "text/plain"},
+ },
+ "200",
+ {"Content-Type": "text/plain"},
+ None,
+ True,
+ ),
+ (
+ "non_http_event_s3",
+ "s3.json",
+ {"statusCode": 200},
+ "200",
+ {},
+ None,
+ False, # Should not dispatch for non-HTTP events
+ ),
+ (
+ "api_gateway_v2_string_response",
+ "api-gateway-v2-parametrized.json",
+ "Hello, World!",
+ "200",
+ {"content-type": "application/json"},
+ "Hello, World!",
+ True,
+ ),
+ (
+ "api_gateway_v2_dict_response",
+ "api-gateway-v2-parametrized.json",
+ {"message": "Hello, World!"},
+ "200",
+ {"content-type": "application/json"},
+ {"message": "Hello, World!"},
+ True,
+ ),
+]
+
+ASM_BLOCKED_RESPONSE_TEST_CASES = [
+ # JSON blocking response
+ (
+ {"status_code": 403, "type": "auto", "content-type": "application/json"},
+ 403,
+ {"content-type": "application/json"},
+ ),
+ # HTML blocking response
+ (
+ {
+ "status_code": 401,
+ "type": "html",
+ "content-type": "text/html",
+ },
+ 401,
+ {"content-type": "text/html"},
+ ),
+ # Plain text redirect response
+ (
+ {"status_code": 301, "type": "none", "location": "https://example.com/blocked"},
+ 301,
+ {
+ "content-type": "text/plain; charset=utf-8",
+ "location": "https://example.com/blocked",
+ },
+ ),
+ # Default to content-type application/json and status code 403 when not provided
+ (
+ {"type": "auto"},
+ 403,
+ {"content-type": "application/json"},
+ ),
+]
+
+
+@pytest.mark.parametrize(
+ "name,file,expected_ip,expected_uri,expected_method,expected_body,expected_base64,expected_query,expected_path_params,expected_route",
+ ASM_START_REQUEST_TEST_CASES,
+)
+@patch("datadog_lambda.asm.core")
+def test_asm_start_request_parametrized(
+ mock_core,
+ name,
+ file,
+ expected_ip,
+ expected_uri,
+ expected_method,
+ expected_body,
+ expected_base64,
+ expected_query,
+ expected_path_params,
+ expected_route,
+):
+ """Test ASM start request for various HTTP event types using parametrization"""
+ mock_span = MagicMock()
+ ctx = get_mock_context()
+
+ # Reset mock for each test
+ mock_core.reset_mock()
+ mock_span.reset_mock()
+
+ test_file = event_samples + file
+ with open(test_file, "r") as f:
+ event = json.load(f)
+
+ event_source = parse_event_source(event)
+ trigger_tags = extract_trigger_tags(event, ctx)
+
+ asm_start_request(mock_span, event, event_source, trigger_tags)
+
+ # Verify core.dispatch was called
+ mock_core.dispatch.assert_called_once()
+ call_args = mock_core.dispatch.call_args
+ dispatch_args = call_args[0][1]
+ (
+ span,
+ request_headers,
+ request_ip,
+ body,
+ is_base64_encoded,
+ raw_uri,
+ http_route,
+ http_method,
+ parsed_query,
+ request_path_parameters,
+ ) = dispatch_args
+
+ # Common assertions
+ assert span == mock_span
+ assert isinstance(request_headers, dict)
+
+ # Specific assertions based on test case
+ assert request_ip == expected_ip
+ assert raw_uri == expected_uri
+ assert http_method == expected_method
+ assert body == expected_body
+ assert is_base64_encoded == expected_base64
+
+ if expected_query is not None:
+ assert parsed_query == expected_query
+ else:
+ assert parsed_query is None
+
+ if expected_path_params is not None:
+ assert request_path_parameters == expected_path_params
+ else:
+ assert request_path_parameters is None
+
+ # Check route is correctly extracted and passed
+ assert http_route == expected_route
+
+ # Check IP tags were set if IP is present
+ if expected_ip:
+ mock_span.set_tag.assert_any_call("http.client_ip", expected_ip)
+ mock_span.set_tag.assert_any_call("network.client.ip", expected_ip)
+
+
+@pytest.mark.parametrize(
+ "name,event_file,response,status_code,expected_headers,expected_body,should_dispatch",
+ ASM_START_RESPONSE_TEST_CASES,
+)
+@patch("datadog_lambda.asm.core")
+def test_asm_start_response_parametrized(
+ mock_core,
+ name,
+ event_file,
+ response,
+ status_code,
+ expected_headers,
+ expected_body,
+ should_dispatch,
+):
+ """Test ASM start response for various HTTP event types using parametrization"""
+ mock_span = MagicMock()
+
+ # Reset mock for each test
+ mock_core.reset_mock()
+ mock_span.reset_mock()
+
+ test_file = event_samples + event_file
+ with open(test_file, "r") as f:
+ event = json.load(f)
+
+ event_source = parse_event_source(event)
+
+ asm_start_response(mock_span, status_code, event_source, response)
+
+ if should_dispatch:
+ assert mock_core.dispatch.call_count == 2
+
+ assert mock_core.dispatch.call_args_list[0].args == (
+ "aws_lambda.start_response",
+ (mock_span, status_code, expected_headers),
+ )
+
+ assert mock_core.dispatch.call_args_list[1].args == (
+ "aws_lambda.parse_body",
+ (expected_body,),
+ )
+ else:
+ # Verify core.dispatch was not called for non-HTTP events
+ mock_core.dispatch.assert_not_called()
+
+
+@pytest.mark.parametrize(
+ "blocked_config, expected_status, expected_headers",
+ ASM_BLOCKED_RESPONSE_TEST_CASES,
+)
+@patch("datadog_lambda.asm.get_blocked")
+def test_get_asm_blocked_response_blocked(
+ mock_get_blocked,
+ blocked_config,
+ expected_status,
+ expected_headers,
+):
+ mock_get_blocked.return_value = blocked_config
+ event_source = _EventSource(event_type=EventTypes.API_GATEWAY)
+ response = get_asm_blocked_response(event_source)
+ assert response["statusCode"] == expected_status
+ assert response["headers"] == expected_headers
+ assert "multiValueHeaders" not in response
+
+
+@patch("datadog_lambda.asm.get_blocked")
+def test_get_asm_blocked_response_blocked_multi_value_headers(
+ mock_get_blocked,
+):
+ # HTML blocking response
+ mock_get_blocked.return_value = {
+ "status_code": 401,
+ "type": "html",
+ "content-type": "text/html",
+ }
+
+ event_source = _EventSource(EventTypes.ALB, EventSubtypes.ALB_MULTI_VALUE_HEADERS)
+ response = get_asm_blocked_response(event_source)
+ assert response["statusCode"] == 401
+ assert response["multiValueHeaders"] == {"content-type": ["text/html"]}
+ assert "headers" not in response
+
+
+@patch("datadog_lambda.asm.get_blocked")
+def test_get_asm_blocked_response_not_blocked(
+ mock_get_blocked,
+):
+ mock_get_blocked.return_value = None
+ event_source = _EventSource(event_type=EventTypes.API_GATEWAY)
+ response = get_asm_blocked_response(event_source)
+ assert response is None
diff --git a/tests/test_cold_start.py b/tests/test_cold_start.py
index c7444c49e..d75b5f43a 100644
--- a/tests/test_cold_start.py
+++ b/tests/test_cold_start.py
@@ -8,6 +8,8 @@
import datadog_lambda.cold_start as cold_start
import datadog_lambda.wrapper as wrapper
+from tests.utils import get_mock_context
+
class TestColdStartTracingSetup(unittest.TestCase):
def test_proactive_init(self):
@@ -247,7 +249,7 @@ def finish(span):
monkeypatch.setattr(wrapper.tracer, "_on_span_finish", finish)
monkeypatch.setattr(wrapper, "is_new_sandbox", lambda: True)
- monkeypatch.setattr("datadog_lambda.wrapper.dd_tracing_enabled", True)
+ monkeypatch.setattr("datadog_lambda.config.Config.trace_enabled", True)
monkeypatch.setenv(
"DD_COLD_START_TRACE_SKIP_LIB", "ddtrace.contrib.logging,datadog_lambda.wrapper"
)
@@ -257,10 +259,7 @@ def finish(span):
def handler(event, context):
import tabnanny
- lambda_context = MagicMock()
- lambda_context.invoked_function_arn = (
- "arn:aws:lambda:us-west-1:123457598159:function:python-layer-test:1"
- )
+ lambda_context = get_mock_context()
handler.cold_start_tracing = True
handler({}, lambda_context)
diff --git a/tests/test_config.py b/tests/test_config.py
new file mode 100644
index 000000000..9c5da63a2
--- /dev/null
+++ b/tests/test_config.py
@@ -0,0 +1,262 @@
+import importlib
+import sys
+
+import pytest
+
+from datadog_lambda.config import config, _get_env, Config
+
+
+@pytest.fixture
+def setenv(monkeypatch):
+ def set_env(key, value):
+ if value is None:
+ monkeypatch.delenv(key, raising=False)
+ else:
+ monkeypatch.setenv(key, value)
+
+ return set_env
+
+
+def test_config_import_does_not_import_ddtrace(monkeypatch):
+ import datadog_lambda
+
+ with monkeypatch.context() as mp:
+ for name in list(sys.modules):
+ if name == "ddtrace" or name.startswith("ddtrace."):
+ mp.delitem(sys.modules, name, raising=False)
+
+ class _BlockDdtrace(importlib.abc.MetaPathFinder):
+ def find_spec(self, fullname, path=None, target=None):
+ if fullname == "ddtrace" or fullname.startswith("ddtrace."):
+ raise ImportError("ddtrace must not be imported during this test")
+ return None
+
+ blocker = _BlockDdtrace()
+ mp.setattr(sys, "meta_path", [blocker] + sys.meta_path, raising=False)
+
+ mp.delattr(datadog_lambda, "config", raising=False)
+ mp.delitem(sys.modules, "datadog_lambda.config", raising=False)
+ importlib.invalidate_caches()
+ importlib.import_module("datadog_lambda.config")
+
+
+def _test_as_bool(env_key, conf_key, default):
+ return (
+ (env_key, conf_key, None, default),
+ (env_key, conf_key, "", False),
+ (env_key, conf_key, "true", True),
+ (env_key, conf_key, "TRUE", True),
+ (env_key, conf_key, "false", False),
+ (env_key, conf_key, "FALSE", False),
+ (env_key, conf_key, "1", True),
+ (env_key, conf_key, "0", False),
+ (env_key, conf_key, "purple", False),
+ )
+
+
+def _test_int(env_key, conf_key, default):
+ return (
+ (env_key, conf_key, None, default),
+ (env_key, conf_key, "", default),
+ (env_key, conf_key, "5", 5),
+ (env_key, conf_key, "0", 0),
+ (env_key, conf_key, "2.5", default),
+ (env_key, conf_key, "-1", -1),
+ (env_key, conf_key, "purple", default),
+ )
+
+
+def _test_as_list(env_key, conf_key, default):
+ return (
+ (env_key, conf_key, None, default.split(",")),
+ (env_key, conf_key, "", []),
+ (env_key, conf_key, " ", []),
+ (env_key, conf_key, ",", []),
+ (env_key, conf_key, " , ", []),
+ (env_key, conf_key, "a", ["a"]),
+ (env_key, conf_key, "a,", ["a"]),
+ (env_key, conf_key, "a, ", ["a"]),
+ (env_key, conf_key, "a,b", ["a", "b"]),
+ (env_key, conf_key, "a, b", ["a", "b"]),
+ )
+
+
+_test_config_from_environ = (
+ *_test_as_bool("DD_FLUSH_TO_LOG", "flush_to_log", default=False),
+ *_test_as_bool("DD_LOGS_INJECTION", "logs_injection", default=True),
+ *_test_as_bool("DD_TRACE_ENABLED", "trace_enabled", default=True),
+ *_test_as_bool("DD_COLD_START_TRACING", "cold_start_tracing", default=True),
+ *_test_as_bool("DD_TRACE_MANAGED_SERVICES", "make_inferred_span", default=True),
+ *_test_as_bool(
+ "DD_ENCODE_AUTHORIZER_CONTEXT", "encode_authorizer_context", default=True
+ ),
+ *_test_as_bool(
+ "DD_DECODE_AUTHORIZER_CONTEXT", "decode_authorizer_context", default=True
+ ),
+ *_test_as_bool("DD_FLUSH_IN_THREAD", "flush_in_thread", default=False),
+ *_test_as_bool("DD_ENHANCED_METRICS", "enhanced_metrics_enabled", default=True),
+ *_test_as_bool("DD_INTEGRATION_TEST", "integration_test", default=False),
+ *_test_as_bool("DD_BOTOCORE_ADD_SPAN_POINTERS", "add_span_pointers", default=True),
+ *_test_as_bool("DD_TRACE_OTEL_ENABLED", "otel_enabled", default=False),
+ *_test_as_bool("DD_MERGE_XRAY_TRACES", "merge_xray_traces", default=False),
+ *_test_as_bool("DD_PROFILING_ENABLED", "profiling_enabled", default=False),
+ *_test_as_bool("DD_LLMOBS_ENABLED", "llmobs_enabled", default=False),
+ *_test_as_bool(
+ "DD_EXCEPTION_REPLAY_ENABLED", "exception_replay_enabled", default=False
+ ),
+ *_test_as_bool(
+ "DD_CAPTURE_LAMBDA_PAYLOAD", "capture_payload_enabled", default=False
+ ),
+ *_test_as_bool("DD_LOCAL_TEST", "local_test", default=False),
+ *_test_as_bool("DD_DATA_STREAMS_ENABLED", "data_streams_enabled", default=False),
+ *_test_as_bool("DD_APPSEC_ENABLED", "appsec_enabled", default=False),
+ *_test_as_bool("DD_APPSEC_SCA_ENABLED", "sca_enabled", default=False),
+ *_test_int(
+ "DD_CAPTURE_LAMBDA_PAYLOAD_MAX_DEPTH", "capture_payload_max_depth", default=10
+ ),
+ *_test_int(
+ "DD_MIN_COLD_START_DURATION", "min_cold_start_trace_duration", default=3
+ ),
+ *_test_as_list(
+ "DD_COLD_START_TRACE_SKIP_LIB",
+ "cold_start_trace_skip_lib",
+ default="ddtrace.internal.compat,ddtrace.filters",
+ ),
+ ("DD_SERVICE", "service", None, None),
+ ("DD_SERVICE", "service", "", ""),
+ ("DD_SERVICE", "service", "my_service", "my_service"),
+ ("AWS_LAMBDA_FUNCTION_NAME", "aws_lambda_function_name", None, None),
+ ("AWS_LAMBDA_FUNCTION_NAME", "aws_lambda_function_name", "", ""),
+ (
+ "AWS_LAMBDA_FUNCTION_NAME",
+ "aws_lambda_function_name",
+ "my_function",
+ "my_function",
+ ),
+ ("AWS_LAMBDA_FUNCTION_NAME", "function_name", None, "function"),
+ ("AWS_LAMBDA_FUNCTION_NAME", "function_name", "", ""),
+ ("AWS_LAMBDA_FUNCTION_NAME", "function_name", "my_function", "my_function"),
+ ("AWS_LAMBDA_FUNCTION_NAME", "is_lambda_context", None, False),
+ ("AWS_LAMBDA_FUNCTION_NAME", "is_lambda_context", "", False),
+ ("AWS_LAMBDA_FUNCTION_NAME", "is_lambda_context", "my_function", True),
+ ("AWS_REGION", "is_gov_region", None, False),
+ ("AWS_REGION", "is_gov_region", "", False),
+ ("AWS_REGION", "is_gov_region", "us-gov-1", True),
+ ("AWS_REGION", "is_gov_region", "us-est-1", False),
+ ("DD_TRACE_EXTRACTOR", "trace_extractor", None, None),
+ ("DD_TRACE_EXTRACTOR", "trace_extractor", "", ""),
+ ("DD_TRACE_EXTRACTOR", "trace_extractor", "my_extractor", "my_extractor"),
+ ("DD_ENV", "env", None, None),
+ ("DD_ENV", "env", "", ""),
+ ("DD_ENV", "env", "my_env", "my_env"),
+)
+
+
+@pytest.mark.parametrize("env_key,conf_key,env_val,conf_val", _test_config_from_environ)
+def test_config_from_environ(env_key, conf_key, env_val, conf_val, setenv):
+ setenv(env_key, env_val)
+ assert getattr(config, conf_key) == conf_val
+
+
+_test_config_from_environ_depends_on_tracing = (
+ *_test_as_bool("DD_COLD_START_TRACING", "cold_start_tracing", default=True),
+ *_test_as_bool("DD_TRACE_MANAGED_SERVICES", "make_inferred_span", default=True),
+ *_test_as_bool(
+ "DD_ENCODE_AUTHORIZER_CONTEXT", "encode_authorizer_context", default=True
+ ),
+ *_test_as_bool(
+ "DD_DECODE_AUTHORIZER_CONTEXT", "decode_authorizer_context", default=True
+ ),
+ *_test_as_bool("DD_DATA_STREAMS_ENABLED", "data_streams_enabled", default=False),
+)
+
+
+@pytest.mark.parametrize(
+ "env_key,conf_key,env_val,conf_val", _test_config_from_environ_depends_on_tracing
+)
+def test_config_from_environ_depends_on_tracing(
+ env_key, conf_key, env_val, conf_val, setenv
+):
+ setenv(env_key, env_val)
+ setenv("DD_TRACE_ENABLED", "false")
+ assert getattr(config, conf_key) is False
+
+
+def test_config_aws_lambda_function_name(setenv):
+ # these config values all access the same environment variable, test to
+ # ensure the wrong value is not cached
+ setenv("AWS_LAMBDA_FUNCTION_NAME", "my_function")
+ assert config.aws_lambda_function_name == "my_function"
+ assert config.function_name == "my_function"
+ assert config.is_lambda_context is True
+
+
+_test_fips_mode_from_environ = (
+ (None, None, False),
+ (None, "", False),
+ (None, "us-gov-1", True),
+ (None, "us-east-1", False),
+ ("", None, False),
+ ("", "", False),
+ ("", "us-gov-1", False),
+ ("", "us-east-1", False),
+ ("true", None, True),
+ ("true", "", True),
+ ("true", "us-gov-1", True),
+ ("true", "us-east-1", True),
+ ("TRUE", None, True),
+ ("TRUE", "", True),
+ ("TRUE", "us-gov-1", True),
+ ("TRUE", "us-east-1", True),
+ ("false", None, False),
+ ("false", "", False),
+ ("false", "us-gov-1", False),
+ ("false", "us-east-1", False),
+ ("FALSE", None, False),
+ ("FALSE", "", False),
+ ("FALSE", "us-gov-1", False),
+ ("FALSE", "us-east-1", False),
+ ("1", None, False),
+ ("1", "", False),
+ ("1", "us-gov-1", False),
+ ("1", "us-east-1", False),
+ ("0", None, False),
+ ("0", "", False),
+ ("0", "us-gov-1", False),
+ ("0", "us-east-1", False),
+)
+
+
+@pytest.mark.parametrize("fips_mode,region,conf_val", _test_fips_mode_from_environ)
+def test_fips_mode_from_environ(fips_mode, region, conf_val, setenv):
+ setenv("DD_LAMBDA_FIPS_MODE", fips_mode)
+ setenv("AWS_REGION", region)
+ assert config.fips_mode_enabled == conf_val
+
+
+def test__get_env_does_not_log_when_env_not_set(setenv, monkeypatch):
+ setenv("TEST_1", None)
+ setenv("TEST_2", None)
+ setenv("TEST_3", None)
+ setenv("TEST_4", None)
+
+ class Testing(Config):
+ test_1 = _get_env("TEST_1")
+ test_2 = _get_env("TEST_2", "purple")
+ test_3 = _get_env("TEST_3", "true", bool)
+ test_4 = _get_env("TEST_4", "true", bool, depends_on_tracing=True)
+
+ logs = []
+
+ def cap_warn(*args, **kwargs):
+ logs.append(args)
+
+ monkeypatch.setattr("datadog_lambda.config.logger.warning", cap_warn)
+
+ testing = Testing()
+ testing.test_1
+ testing.test_2
+ testing.test_3
+ testing.test_4
+
+ assert not logs
diff --git a/tests/test_dogstatsd.py b/tests/test_dogstatsd.py
index 149e1a707..6fe79372d 100644
--- a/tests/test_dogstatsd.py
+++ b/tests/test_dogstatsd.py
@@ -1,5 +1,5 @@
-from collections import deque
import unittest
+from collections import deque
from datadog_lambda.dogstatsd import statsd
@@ -36,16 +36,24 @@ def test_init(self):
self.assertEqual(statsd.port, 8125)
self.assertEqual(statsd.encoding, "utf-8")
- def test_distribution_no_tags(self):
- statsd.distribution("my.test.metric", 3)
+ def _checkOnlyOneMetric(self, value):
payload = self.recv()
metrics = payload.split("\n")
self.assertEqual(len(metrics), 1)
- self.assertEqual("my.test.metric:3|d", metrics[0])
+ self.assertEqual(value, metrics[0])
+
+ def test_distribution_no_tags(self):
+ statsd.distribution("my.test.metric", 3)
+ self._checkOnlyOneMetric("my.test.metric:3|d")
def test_distribution_with_tags(self):
statsd.distribution("my.test.tags.metric", 3, tags=["taga:valuea,tagb:valueb"])
- payload = self.recv()
- metrics = payload.split("\n")
- self.assertEqual(len(metrics), 1)
- self.assertEqual("my.test.tags.metric:3|d|#taga:valuea_tagb:valueb", metrics[0])
+ self._checkOnlyOneMetric("my.test.tags.metric:3|d|#taga:valuea_tagb:valueb")
+
+ def test_distribution_with_timestamp(self):
+ statsd.distribution("my.test.timestamp.metric", 9, timestamp=123456789)
+ self._checkOnlyOneMetric("my.test.timestamp.metric:9|d|T123456789")
+
+ def test_distribution_with_float_timestamp(self):
+ statsd.distribution("my.test.timestamp.metric", 9, timestamp=123456789.123)
+ self._checkOnlyOneMetric("my.test.timestamp.metric:9|d|T123456789")
diff --git a/tests/test_metric.py b/tests/test_metric.py
index d10a0f0d1..fe3df247d 100644
--- a/tests/test_metric.py
+++ b/tests/test_metric.py
@@ -1,23 +1,34 @@
import os
import unittest
-
-from unittest.mock import patch, call
+from datetime import datetime, timedelta
+from unittest.mock import call, patch
from botocore.exceptions import ClientError as BotocoreClientError
from datadog.api.exceptions import ClientError
-from datetime import datetime, timedelta
-from datadog_lambda.metric import lambda_metric, flush_stats
-from datadog_lambda.api import decrypt_kms_api_key, KMS_ENCRYPTION_CONTEXT_KEY
-from datadog_lambda.thread_stats_writer import ThreadStatsWriter
+from datadog_lambda.api import KMS_ENCRYPTION_CONTEXT_KEY, decrypt_kms_api_key
+from datadog_lambda.metric import (
+ MetricsHandler,
+ _select_metrics_handler,
+ flush_stats,
+ lambda_metric,
+ submit_batch_item_failures_metric,
+)
from datadog_lambda.tags import dd_lambda_layer_tag
+from datadog_lambda.thread_stats_writer import ThreadStatsWriter
class TestLambdaMetric(unittest.TestCase):
def setUp(self):
- patcher = patch("datadog_lambda.metric.lambda_stats")
- self.mock_metric_lambda_stats = patcher.start()
- self.addCleanup(patcher.stop)
+ lambda_stats_patcher = patch("datadog_lambda.metric.lambda_stats")
+ self.mock_metric_lambda_stats = lambda_stats_patcher.start()
+ self.addCleanup(lambda_stats_patcher.stop)
+
+ stdout_metric_patcher = patch(
+ "datadog_lambda.metric.write_metric_point_to_stdout"
+ )
+ self.mock_write_metric_point_to_stdout = stdout_metric_patcher.start()
+ self.addCleanup(stdout_metric_patcher.stop)
def test_lambda_metric_tagged_with_dd_lambda_layer(self):
lambda_metric("test", 1)
@@ -35,67 +46,122 @@ def test_lambda_metric_tagged_with_dd_lambda_layer(self):
# let's fake that the extension is present, this should override DD_FLUSH_TO_LOG
@patch("datadog_lambda.metric.should_use_extension", True)
- def test_lambda_metric_flush_to_log_with_extension(self):
+ def test_select_metrics_handler_extension_despite_flush_to_logs(self):
+ os.environ["DD_FLUSH_TO_LOG"] = "True"
+ self.assertEqual(MetricsHandler.EXTENSION, _select_metrics_handler())
+ del os.environ["DD_FLUSH_TO_LOG"]
+
+ @patch("datadog_lambda.metric.should_use_extension", False)
+ def test_select_metrics_handler_forwarder_when_flush_to_logs(self):
os.environ["DD_FLUSH_TO_LOG"] = "True"
+ self.assertEqual(MetricsHandler.FORWARDER, _select_metrics_handler())
+ del os.environ["DD_FLUSH_TO_LOG"]
+
+ @patch("datadog_lambda.metric.should_use_extension", False)
+ def test_select_metrics_handler_dd_api_fallback(self):
+ os.environ["DD_FLUSH_TO_LOG"] = "False"
+ self.assertEqual(MetricsHandler.DATADOG_API, _select_metrics_handler())
+ del os.environ["DD_FLUSH_TO_LOG"]
+
+ @patch("datadog_lambda.config.Config.fips_mode_enabled", True)
+ @patch("datadog_lambda.metric.should_use_extension", False)
+ def test_select_metrics_handler_has_no_fallback_in_fips_mode(self):
+ os.environ["DD_FLUSH_TO_LOG"] = "False"
+ self.assertEqual(MetricsHandler.NO_METRICS, _select_metrics_handler())
+ del os.environ["DD_FLUSH_TO_LOG"]
+
+ @patch("datadog_lambda.metric.metrics_handler", MetricsHandler.EXTENSION)
+ def test_lambda_metric_goes_to_extension_with_extension_handler(self):
lambda_metric("test", 1)
self.mock_metric_lambda_stats.distribution.assert_has_calls(
[call("test", 1, timestamp=None, tags=[dd_lambda_layer_tag])]
)
- del os.environ["DD_FLUSH_TO_LOG"]
- @patch("datadog_lambda.metric.should_use_extension", True)
- def test_lambda_metric_timestamp_with_extension(self):
- patcher = patch("datadog_lambda.metric.extension_thread_stats")
- self.mock_metric_extension_thread_stats = patcher.start()
- self.addCleanup(patcher.stop)
+ @patch("datadog_lambda.metric.metrics_handler", MetricsHandler.NO_METRICS)
+ def test_lambda_metric_has_nowhere_to_go_with_no_metrics_handler(self):
+ lambda_metric("test", 1)
+ self.mock_metric_lambda_stats.distribution.assert_not_called()
+ self.mock_write_metric_point_to_stdout.assert_not_called()
+ @patch("datadog_lambda.metric.metrics_handler", MetricsHandler.EXTENSION)
+ def test_lambda_metric_timestamp_with_extension(self):
delta = timedelta(minutes=1)
timestamp = int((datetime.now() - delta).timestamp())
lambda_metric("test_timestamp", 1, timestamp)
- self.mock_metric_lambda_stats.distribution.assert_not_called()
- self.mock_metric_extension_thread_stats.distribution.assert_called_with(
- "test_timestamp", 1, timestamp=timestamp, tags=[dd_lambda_layer_tag]
+ self.mock_metric_lambda_stats.distribution.assert_has_calls(
+ [call("test_timestamp", 1, timestamp=timestamp, tags=[dd_lambda_layer_tag])]
)
+ self.mock_write_metric_point_to_stdout.assert_not_called()
- @patch("datadog_lambda.metric.should_use_extension", True)
+ @patch("datadog_lambda.metric.metrics_handler", MetricsHandler.EXTENSION)
def test_lambda_metric_datetime_with_extension(self):
- patcher = patch("datadog_lambda.metric.extension_thread_stats")
- self.mock_metric_extension_thread_stats = patcher.start()
- self.addCleanup(patcher.stop)
-
- delta = timedelta(hours=5)
+ delta = timedelta(minutes=1)
timestamp = datetime.now() - delta
+ lambda_metric("test_datetime_timestamp", 0, timestamp)
+ self.mock_metric_lambda_stats.distribution.assert_has_calls(
+ [
+ call(
+ "test_datetime_timestamp",
+ 0,
+ timestamp=int(timestamp.timestamp()),
+ tags=[dd_lambda_layer_tag],
+ )
+ ]
+ )
+ self.mock_write_metric_point_to_stdout.assert_not_called()
+
+ @patch("datadog_lambda.metric.metrics_handler", MetricsHandler.EXTENSION)
+ def test_lambda_metric_float_with_extension(self):
+ delta = timedelta(minutes=1)
+ timestamp_float = (datetime.now() - delta).timestamp()
+ timestamp_int = int(timestamp_float)
+
+ lambda_metric("test_timestamp", 1, timestamp_float)
+ self.mock_metric_lambda_stats.distribution.assert_has_calls(
+ [
+ call(
+ "test_timestamp",
+ 1,
+ timestamp=timestamp_int,
+ tags=[dd_lambda_layer_tag],
+ )
+ ]
+ )
+ self.mock_write_metric_point_to_stdout.assert_not_called()
+
+ @patch("datadog_lambda.metric.metrics_handler", MetricsHandler.EXTENSION)
+ def test_lambda_metric_timestamp_junk_with_extension(self):
+ delta = timedelta(minutes=1)
+ timestamp = (datetime.now() - delta).isoformat()
+
lambda_metric("test_timestamp", 1, timestamp)
self.mock_metric_lambda_stats.distribution.assert_not_called()
- self.mock_metric_extension_thread_stats.distribution.assert_not_called()
+ self.mock_write_metric_point_to_stdout.assert_not_called()
- @patch("datadog_lambda.metric.should_use_extension", True)
+ @patch("datadog_lambda.metric.metrics_handler", MetricsHandler.EXTENSION)
def test_lambda_metric_invalid_timestamp_with_extension(self):
- patcher = patch("datadog_lambda.metric.extension_thread_stats")
- self.mock_metric_extension_thread_stats = patcher.start()
- self.addCleanup(patcher.stop)
-
delta = timedelta(hours=5)
timestamp = int((datetime.now() - delta).timestamp())
lambda_metric("test_timestamp", 1, timestamp)
self.mock_metric_lambda_stats.distribution.assert_not_called()
- self.mock_metric_extension_thread_stats.distribution.assert_not_called()
+ self.mock_write_metric_point_to_stdout.assert_not_called()
+ @patch("datadog_lambda.metric.metrics_handler", MetricsHandler.FORWARDER)
def test_lambda_metric_flush_to_log(self):
- os.environ["DD_FLUSH_TO_LOG"] = "True"
-
lambda_metric("test", 1)
self.mock_metric_lambda_stats.distribution.assert_not_called()
-
- del os.environ["DD_FLUSH_TO_LOG"]
+ self.mock_write_metric_point_to_stdout.assert_has_calls(
+ [call("test", 1, timestamp=None, tags=[dd_lambda_layer_tag])]
+ )
@patch("datadog_lambda.metric.logger.warning")
def test_lambda_metric_invalid_metric_name_none(self, mock_logger_warning):
lambda_metric(None, 1)
self.mock_metric_lambda_stats.distribution.assert_not_called()
+ self.mock_write_metric_point_to_stdout.assert_not_called()
mock_logger_warning.assert_called_once_with(
"Ignoring metric submission. Invalid metric name: %s", None
)
@@ -104,6 +170,7 @@ def test_lambda_metric_invalid_metric_name_none(self, mock_logger_warning):
def test_lambda_metric_invalid_metric_name_not_string(self, mock_logger_warning):
lambda_metric(123, 1)
self.mock_metric_lambda_stats.distribution.assert_not_called()
+ self.mock_write_metric_point_to_stdout.assert_not_called()
mock_logger_warning.assert_called_once_with(
"Ignoring metric submission. Invalid metric name: %s", 123
)
@@ -112,6 +179,7 @@ def test_lambda_metric_invalid_metric_name_not_string(self, mock_logger_warning)
def test_lambda_metric_non_numeric_value(self, mock_logger_warning):
lambda_metric("test.non_numeric", "oops")
self.mock_metric_lambda_stats.distribution.assert_not_called()
+ self.mock_write_metric_point_to_stdout.assert_not_called()
mock_logger_warning.assert_called_once_with(
"Ignoring metric submission for metric '%s' because the value is not numeric: %r",
"test.non_numeric",
@@ -127,10 +195,6 @@ def setUp(self):
self.mock_threadstats_flush_distributions = patcher.start()
self.addCleanup(patcher.stop)
- patcher = patch("datadog_lambda.metric.extension_thread_stats")
- self.mock_extension_thread_stats = patcher.start()
- self.addCleanup(patcher.stop)
-
def test_retry_on_remote_disconnected(self):
# Raise the RemoteDisconnected error
lambda_stats = ThreadStatsWriter(True)
@@ -209,10 +273,6 @@ def test_flush_temp_constant_tags(self):
lambda_stats.thread_stats.constant_tags, original_constant_tags
)
- def test_flush_stats_without_context(self):
- flush_stats(lambda_context=None)
- self.mock_extension_thread_stats.flush.assert_called_with(None)
-
MOCK_FUNCTION_NAME = "myFunction"
@@ -265,3 +325,80 @@ def decrypt(self, CiphertextBlob=None, EncryptionContext={}):
mock_kms_client, MOCK_ENCRYPTED_API_KEY_BASE64
)
self.assertEqual(decrypted_key, EXPECTED_DECRYPTED_API_KEY)
+
+
+class TestBatchItemFailuresMetric(unittest.TestCase):
+ def setUp(self):
+ patcher = patch("datadog_lambda.metric.lambda_metric")
+ self.mock_lambda_metric = patcher.start()
+ self.addCleanup(patcher.stop)
+
+ patcher = patch("datadog_lambda.config.Config.enhanced_metrics_enabled", True)
+ self.mock_enhanced_metrics_enabled = patcher.start()
+ self.addCleanup(patcher.stop)
+
+ def test_submit_batch_item_failures_with_failures(self):
+ response = {
+ "batchItemFailures": [
+ {"itemIdentifier": "msg-1"},
+ {"itemIdentifier": "msg-2"},
+ {"itemIdentifier": "msg-3"},
+ ]
+ }
+ context = unittest.mock.Mock()
+
+ with patch("datadog_lambda.metric.get_enhanced_metrics_tags") as mock_get_tags:
+ mock_get_tags.return_value = ["tag1:value1"]
+ submit_batch_item_failures_metric(response, context)
+
+ self.mock_lambda_metric.assert_called_once_with(
+ "aws.lambda.enhanced.batch_item_failures",
+ 3,
+ timestamp=None,
+ tags=["tag1:value1"],
+ force_async=True,
+ )
+
+ def test_submit_batch_item_failures_with_no_failures(self):
+ response = {"batchItemFailures": []}
+ context = unittest.mock.Mock()
+
+ with patch("datadog_lambda.metric.get_enhanced_metrics_tags") as mock_get_tags:
+ mock_get_tags.return_value = ["tag1:value1"]
+ submit_batch_item_failures_metric(response, context)
+ self.mock_lambda_metric.assert_called_once_with(
+ "aws.lambda.enhanced.batch_item_failures",
+ 0,
+ timestamp=None,
+ tags=["tag1:value1"],
+ force_async=True,
+ )
+
+ def test_submit_batch_item_failures_with_no_field(self):
+ response = {"statusCode": 200}
+ context = unittest.mock.Mock()
+ submit_batch_item_failures_metric(response, context)
+ self.mock_lambda_metric.assert_not_called()
+
+ def test_submit_batch_item_failures_with_none_response(self):
+ response = None
+ context = unittest.mock.Mock()
+ submit_batch_item_failures_metric(response, context)
+ self.mock_lambda_metric.assert_not_called()
+
+ def test_submit_batch_item_failures_with_non_list_value(self):
+ response = {"batchItemFailures": "invalid"}
+ context = unittest.mock.Mock()
+ submit_batch_item_failures_metric(response, context)
+ self.mock_lambda_metric.assert_not_called()
+
+ @patch("datadog_lambda.config.Config.enhanced_metrics_enabled", False)
+ def test_submit_batch_item_failures_enhanced_metrics_disabled(self):
+ response = {
+ "batchItemFailures": [
+ {"itemIdentifier": "msg-1"},
+ ]
+ }
+ context = unittest.mock.Mock()
+ submit_batch_item_failures_metric(response, context)
+ self.mock_lambda_metric.assert_not_called()
diff --git a/tests/test_patch.py b/tests/test_patch.py
index bf9248756..b03d2e23e 100644
--- a/tests/test_patch.py
+++ b/tests/test_patch.py
@@ -1,3 +1,4 @@
+import pytest
import unittest
from unittest.mock import patch, MagicMock
@@ -5,6 +6,13 @@
from datadog_lambda.patch import _patch_http, _ensure_patch_requests
from datadog_lambda.constants import TraceHeader
+from ddtrace.contrib.internal.requests.patch import unpatch as unpatch_requests
+
+
+@pytest.fixture(scope="module", autouse=True)
+def reset_patches():
+ unpatch_requests()
+
class TestPatchHTTPClients(unittest.TestCase):
def setUp(self):
diff --git a/tests/test_tag_object.py b/tests/test_tag_object.py
index 77512164f..574bb331a 100644
--- a/tests/test_tag_object.py
+++ b/tests/test_tag_object.py
@@ -29,6 +29,7 @@ def test_tag_object(self):
True,
)
+ @patch("datadog_lambda.config.Config.capture_payload_max_depth", 2)
def test_tag_object_max_depth(self):
payload = {
"hello": "world",
@@ -41,11 +42,8 @@ def test_tag_object_max_depth(self):
"vals": [{"thingOne": 1}, {"thingTwo": 2}],
}
spanMock = MagicMock()
- import datadog_lambda.tag_object as lib_ref
- lib_ref.max_depth = 2 # setting up the test
tag_object(spanMock, "function.request", payload)
- lib_ref.max_depth = 10 # revert the setup
spanMock.set_tag.assert_has_calls(
[
call("function.request.vals.0", "{'thingOne': 1}"),
@@ -62,6 +60,7 @@ def test_tag_object_max_depth(self):
True,
)
+ @patch("datadog_lambda.config.Config.capture_payload_max_depth", 0)
def test_tag_object_max_depth_0(self):
payload = {
"hello": "world",
@@ -74,11 +73,8 @@ def test_tag_object_max_depth_0(self):
"vals": [{"thingOne": 1}, {"thingTwo": 2}],
}
spanMock = MagicMock()
- import datadog_lambda.tag_object as lib_ref
- lib_ref.max_depth = 0 # setting up the test
tag_object(spanMock, "function.request", payload)
- lib_ref.max_depth = 10 # revert the setup
spanMock.set_tag.assert_has_calls(
[
call(
diff --git a/tests/test_tracing.py b/tests/test_tracing.py
index 0a961a62a..0fddd52ba 100644
--- a/tests/test_tracing.py
+++ b/tests/test_tracing.py
@@ -1,3 +1,4 @@
+import base64
import copy
import functools
import json
@@ -6,7 +7,7 @@
import os
import unittest
-from unittest.mock import Mock, patch, call
+from unittest.mock import Mock, patch, call, ANY
import ddtrace
@@ -41,9 +42,13 @@
service_mapping as global_service_mapping,
propagator,
emit_telemetry_on_exception_outside_of_handler,
+ _dsm_set_checkpoint,
+ extract_context_from_kinesis_event,
+ extract_context_from_sqs_or_sns_event_or_context,
)
-from tests.utils import get_mock_context
+from datadog_lambda.trigger import parse_event_source
+from tests.utils import get_mock_context, ClientContext
function_arn = "arn:aws:lambda:us-west-1:123457598159:function:python-layer-test"
@@ -174,6 +179,16 @@ def _wrap(*args, **kwargs):
),
),
("lambda-url", None),
+ (
+ "rum-appsync",
+ Context(
+ trace_id=12345,
+ span_id=67890,
+ sampling_priority=1,
+ ),
+ ),
+ ("rum-appsync-no-headers", None),
+ ("rum-appsync-request-not-dict", None),
("s3", None),
(
"sns-b64-msg-attribute",
@@ -251,20 +266,16 @@ def test_extract_dd_trace_context(event, expect):
class TestExtractAndGetDDTraceContext(unittest.TestCase):
def setUp(self):
- global dd_tracing_enabled
- dd_tracing_enabled = False
os.environ["_X_AMZN_TRACE_ID"] = fake_xray_header_value
patcher = patch("datadog_lambda.tracing.send_segment")
self.mock_send_segment = patcher.start()
self.addCleanup(patcher.stop)
- patcher = patch("datadog_lambda.tracing.is_lambda_context")
+ patcher = patch("datadog_lambda.config.Config.is_lambda_context")
self.mock_is_lambda_context = patcher.start()
self.mock_is_lambda_context.return_value = True
self.addCleanup(patcher.stop)
def tearDown(self):
- global dd_tracing_enabled
- dd_tracing_enabled = False
del os.environ["_X_AMZN_TRACE_ID"]
@with_trace_propagation_style("datadog")
@@ -610,6 +621,42 @@ def test_with_complete_datadog_trace_headers_with_trigger_tags(self):
]
)
+ def test_request_header_malformed(self):
+ """Testing that if a RUM AppSync event is malformed, the tracer will attempt
+ to get the trace context from the lambda context in the
+ extract_context_from_request_header_or_context function."""
+ lambda_ctx = get_mock_context()
+ lambda_ctx.client_context = ClientContext(
+ custom={
+ "_datadog": {
+ "x-datadog-parent-id": "67890",
+ "x-datadog-sampling-priority": "1",
+ "x-datadog-trace-id": "12345",
+ }
+ }
+ )
+ request_header_event = {
+ "identity": "None",
+ "info": {
+ "fieldName": "getItems",
+ "parentTypeName": "Query",
+ "selectionSetGraphQL": "{\n id\n}",
+ "selectionSetList": ["id"],
+ },
+ "prev": "None",
+ "request": "hello",
+ "source": "None",
+ }
+ ctx, source, _ = extract_dd_trace_context(request_header_event, lambda_ctx)
+ expected_context = Context(
+ trace_id=12345,
+ span_id=67890,
+ sampling_priority=1,
+ )
+
+ self.assertEqual(ctx, expected_context)
+ self.assertEqual(source, "event")
+
def _test_step_function_trace_data_common(
self, event, expected_trace_id, expected_span_id, expected_tid
):
@@ -984,11 +1031,12 @@ def setUp(self):
)
self.addCleanup(patcher.stop)
- patcher = patch("datadog_lambda.tracing.is_lambda_context")
+ patcher = patch("datadog_lambda.config.Config.is_lambda_context")
self.mock_is_lambda_context = patcher.start()
self.mock_is_lambda_context.return_value = True
self.addCleanup(patcher.stop)
+ @patch("datadog_lambda.config.Config.trace_enabled", False)
def test_set_correlation_ids(self):
set_correlation_ids()
span = tracer.current_span()
@@ -1124,13 +1172,11 @@ def test_function_with_span_pointers(self):
class TestSetTraceRootSpan(unittest.TestCase):
def setUp(self):
- global dd_tracing_enabled
- dd_tracing_enabled = False
os.environ["_X_AMZN_TRACE_ID"] = fake_xray_header_value
patcher = patch("datadog_lambda.tracing.send_segment")
self.mock_send_segment = patcher.start()
self.addCleanup(patcher.stop)
- patcher = patch("datadog_lambda.tracing.is_lambda_context")
+ patcher = patch("datadog_lambda.config.Config.is_lambda_context")
self.mock_is_lambda_context = patcher.start()
self.mock_is_lambda_context.return_value = True
self.addCleanup(patcher.stop)
@@ -1143,8 +1189,6 @@ def setUp(self):
self.addCleanup(patcher.stop)
def tearDown(self):
- global dd_tracing_enabled
- dd_tracing_enabled = False
del os.environ["_X_AMZN_TRACE_ID"]
def test_mixed_parent_context_when_merging(self):
@@ -1245,6 +1289,7 @@ def test_get_service_mapping(self):
create_service_mapping(os.environ["DD_SERVICE_MAPPING"])
)
self.assertEqual(self.get_service_mapping(), expected_output)
+ del os.environ["DD_SERVICE_MAPPING"]
def test_set_service_mapping(self):
new_service_mapping = {"api3": "service3", "api4": "service4"}
@@ -1285,6 +1330,44 @@ def test_determine_service_name(self):
"default",
)
+ # Test with DD_TRACE_AWS_SERVICE_REPRESENTATION_ENABLED set to false
+ os.environ["DD_TRACE_AWS_SERVICE_REPRESENTATION_ENABLED"] = "false"
+ self.assertEqual(
+ determine_service_name(
+ self.get_service_mapping(), "api4", "api4", "extracted", "fallback"
+ ),
+ "fallback",
+ )
+
+ # Test with DD_TRACE_AWS_SERVICE_REPRESENTATION_ENABLED set to 0
+ os.environ["DD_TRACE_AWS_SERVICE_REPRESENTATION_ENABLED"] = "0"
+ self.assertEqual(
+ determine_service_name(
+ self.get_service_mapping(), "api4", "api4", "extracted", "fallback"
+ ),
+ "fallback",
+ )
+
+ # Test with DD_TRACE_AWS_SERVICE_REPRESENTATION_ENABLED not set (default behavior)
+ if "DD_TRACE_AWS_SERVICE_REPRESENTATION_ENABLED" in os.environ:
+ del os.environ["DD_TRACE_AWS_SERVICE_REPRESENTATION_ENABLED"]
+ self.assertEqual(
+ determine_service_name(
+ self.get_service_mapping(), "api4", "api4", "extracted", "fallback"
+ ),
+ "extracted",
+ )
+
+ # Test with empty extracted key
+ self.assertEqual(
+ determine_service_name(
+ self.get_service_mapping(), "api4", "api4", " ", "fallback"
+ ),
+ "fallback",
+ )
+
+ del os.environ["DD_SERVICE_MAPPING"]
+
def test_remaps_all_inferred_span_service_names_from_api_gateway_event(self):
new_service_mapping = {"lambda_api_gateway": "new-name"}
self.set_service_mapping(new_service_mapping)
@@ -1477,7 +1560,7 @@ def test_remaps_specific_inferred_span_service_names_from_sqs_event(self):
] = "arn:aws:sqs:eu-west-1:123456789012:different-sqs-url"
span2 = create_inferred_span(event2, ctx)
self.assertEqual(span2.get_tag("operation_name"), "aws.sqs")
- self.assertEqual(span2.service, "sqs")
+ self.assertEqual(span2.service, "different-sqs-url")
def test_remaps_all_inferred_span_service_names_from_sns_event(self):
self.set_service_mapping({"lambda_sns": "new-name"})
@@ -1523,7 +1606,7 @@ def test_remaps_specific_inferred_span_service_names_from_sns_event(self):
] = "arn:aws:sns:us-west-2:123456789012:different-sns-topic"
span2 = create_inferred_span(event2, ctx)
self.assertEqual(span2.get_tag("operation_name"), "aws.sns")
- self.assertEqual(span2.service, "sns")
+ self.assertEqual(span2.service, "different-sns-topic")
def test_remaps_all_inferred_span_service_names_from_kinesis_event(self):
self.set_service_mapping({"lambda_kinesis": "new-name"})
@@ -1560,7 +1643,7 @@ def test_remaps_specific_inferred_span_service_names_from_kinesis_event(self):
span1 = create_inferred_span(original_event, ctx)
self.assertEqual(span1.get_tag("operation_name"), "aws.kinesis")
- self.assertEqual(span1.service, "kinesis")
+ self.assertEqual(span1.service, "kinesisStream")
# Testing the second event
event2 = copy.deepcopy(original_event)
@@ -1569,7 +1652,7 @@ def test_remaps_specific_inferred_span_service_names_from_kinesis_event(self):
] = "arn:aws:kinesis:eu-west-1:601427279990:stream/DifferentKinesisStream"
span2 = create_inferred_span(event2, ctx)
self.assertEqual(span2.get_tag("operation_name"), "aws.kinesis")
- self.assertEqual(span2.service, "kinesis")
+ self.assertEqual(span2.service, "DifferentKinesisStream")
def test_remaps_all_inferred_span_service_names_from_s3_event(self):
self.set_service_mapping({"lambda_s3": "new-name"})
@@ -1613,7 +1696,7 @@ def test_remaps_specific_inferred_span_service_names_from_s3_event(self):
event2["Records"][0]["s3"]["bucket"]["name"] = "different-example-bucket"
span2 = create_inferred_span(event2, ctx)
self.assertEqual(span2.get_tag("operation_name"), "aws.s3")
- self.assertEqual(span2.service, "s3")
+ self.assertEqual(span2.service, "different-example-bucket")
def test_remaps_all_inferred_span_service_names_from_dynamodb_event(self):
self.set_service_mapping({"lambda_dynamodb": "new-name"})
@@ -1659,7 +1742,7 @@ def test_remaps_specific_inferred_span_service_names_from_dynamodb_event(self):
] = "arn:aws:dynamodb:us-east-1:123456789012:table/DifferentExampleTableWithStream/stream/2015-06-27T00:48:05.899"
span2 = create_inferred_span(event2, ctx)
self.assertEqual(span2.get_tag("operation_name"), "aws.dynamodb")
- self.assertEqual(span2.service, "dynamodb")
+ self.assertEqual(span2.service, "DifferentExampleTableWithStream")
def test_remaps_all_inferred_span_service_names_from_eventbridge_event(self):
self.set_service_mapping({"lambda_eventbridge": "new-name"})
@@ -1703,7 +1786,7 @@ def test_remaps_specific_inferred_span_service_names_from_eventbridge_event(
event2["source"] = "different.eventbridge.custom.event.sender"
span2 = create_inferred_span(event2, ctx)
self.assertEqual(span2.get_tag("operation_name"), "aws.eventbridge")
- self.assertEqual(span2.service, "eventbridge")
+ self.assertEqual(span2.service, "different.eventbridge.custom.event.sender")
class _Span(object):
@@ -1730,7 +1813,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
"apiname": "1234567890",
"endpoint": "/path/to/resource",
"http.method": "POST",
- "http.url": "70ixmpl4fl.execute-api.us-east-2.amazonaws.com/path/to/resource",
+ "http.url": "https://70ixmpl4fl.execute-api.us-east-2.amazonaws.com/path/to/resource",
"operation_name": "aws.apigateway.rest",
"request_id": "123",
"resource_names": "POST /{proxy+}",
@@ -1752,7 +1835,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
"apiname": "lgxbo6a518",
"endpoint": "/http/get",
"http.method": "GET",
- "http.url": "lgxbo6a518.execute-api.eu-west-1.amazonaws.com/http/get",
+ "http.url": "https://lgxbo6a518.execute-api.eu-west-1.amazonaws.com/http/get",
"operation_name": "aws.apigateway.rest",
"request_id": "123",
"resource_names": "GET /http/get",
@@ -1774,7 +1857,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
"apiname": "lgxbo6a518",
"endpoint": "/http/get",
"http.method": "GET",
- "http.url": "lgxbo6a518.execute-api.eu-west-1.amazonaws.com/http/get",
+ "http.url": "https://lgxbo6a518.execute-api.eu-west-1.amazonaws.com/http/get",
"operation_name": "aws.apigateway.rest",
"request_id": "123",
"resource_names": "GET /http/get",
@@ -1798,7 +1881,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
"http.method": "GET",
"http.protocol": "HTTP/1.1",
"http.source_ip": "38.122.226.210",
- "http.url": "x02yirxc7a.execute-api.eu-west-1.amazonaws.com/httpapi/get",
+ "http.url": "https://x02yirxc7a.execute-api.eu-west-1.amazonaws.com/httpapi/get",
"http.user_agent": "curl/7.64.1",
"operation_name": "aws.httpapi",
"request_id": "123",
@@ -1821,7 +1904,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
"apiname": "mcwkra0ya4",
"endpoint": "/user/42",
"http.method": "GET",
- "http.url": "mcwkra0ya4.execute-api.sa-east-1.amazonaws.com/user/42",
+ "http.url": "https://mcwkra0ya4.execute-api.sa-east-1.amazonaws.com/user/42",
"operation_name": "aws.apigateway.rest",
"request_id": "123",
"resource_names": "GET /user/{id}",
@@ -1843,7 +1926,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
"apiname": "9vj54we5ih",
"endpoint": "/user/42",
"http.method": "GET",
- "http.url": "9vj54we5ih.execute-api.sa-east-1.amazonaws.com/user/42",
+ "http.url": "https://9vj54we5ih.execute-api.sa-east-1.amazonaws.com/user/42",
"operation_name": "aws.httpapi",
"request_id": "123",
"resource_names": "GET /user/{id}",
@@ -1866,7 +1949,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
"connection_id": "Fc5SzcoYGjQCJlg=",
"endpoint": "$default",
"event_type": "MESSAGE",
- "http.url": "p62c47itsb.execute-api.eu-west-1.amazonaws.com$default",
+ "http.url": "https://p62c47itsb.execute-api.eu-west-1.amazonaws.com$default/",
"message_direction": "IN",
"operation_name": "aws.apigateway.websocket",
"request_id": "123",
@@ -1890,7 +1973,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
"connection_id": "Fc2tgfl3mjQCJfA=",
"endpoint": "$connect",
"event_type": "CONNECT",
- "http.url": "p62c47itsb.execute-api.eu-west-1.amazonaws.com$connect",
+ "http.url": "https://p62c47itsb.execute-api.eu-west-1.amazonaws.com$connect/",
"message_direction": "IN",
"operation_name": "aws.apigateway.websocket",
"request_id": "123",
@@ -1914,7 +1997,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
"connection_id": "Fc2tgfl3mjQCJfA=",
"endpoint": "$disconnect",
"event_type": "DISCONNECT",
- "http.url": "p62c47itsb.execute-api.eu-west-1.amazonaws.com$disconnect",
+ "http.url": "https://p62c47itsb.execute-api.eu-west-1.amazonaws.com$disconnect/",
"message_direction": "IN",
"operation_name": "aws.apigateway.websocket",
"request_id": "123",
@@ -1926,7 +2009,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
(
"sqs-string-msg-attribute",
_Span(
- service="sqs",
+ service="InferredSpansQueueNode",
start=1634662094.538,
span_type="web",
tags={
@@ -1944,7 +2027,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
(
"sns-string-msg-attribute",
_Span(
- service="sns",
+ service="serverlessTracingTopicPy",
start=1643638421.637,
span_type="web",
tags={
@@ -1963,7 +2046,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
(
"sns-b64-msg-attribute",
_Span(
- service="sns",
+ service="serverlessTracingTopicPy",
start=1643638421.637,
span_type="web",
tags={
@@ -1980,9 +2063,9 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
),
),
(
- "kinesis",
+ "kinesisStream",
_Span(
- service="kinesis",
+ service="kinesisStream",
start=1643638425.163,
span_type="web",
tags={
@@ -1999,16 +2082,16 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
"operation_name": "aws.kinesis",
"partition_key": "partitionkey",
"request_id": None,
- "resource_names": "stream/kinesisStream",
+ "resource_names": "kinesisStream",
"shardid": "shardId-000000000002",
- "streamname": "stream/kinesisStream",
+ "streamname": "kinesisStream",
},
),
),
(
"dynamodb",
_Span(
- service="dynamodb",
+ service="ExampleTableWithStream",
start=1428537600.0,
span_type="web",
tags={
@@ -2034,7 +2117,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
(
"s3",
_Span(
- service="s3",
+ service="example-bucket",
start=0.0,
span_type="web",
tags={
@@ -2059,7 +2142,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
(
"eventbridge-custom",
_Span(
- service="eventbridge",
+ service="eventbridge.custom.event.sender",
start=1635989865.0,
span_type="web",
tags={
@@ -2078,7 +2161,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
(
"eventbridge-sqs",
_Span(
- service="sqs",
+ service="eventbridge-sqs-queue",
start=1691102943.638,
span_type="web",
parent_name="aws.eventbridge",
@@ -2112,7 +2195,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
"apiname": "None",
"endpoint": "/path/to/resource",
"http.method": "POST",
- "http.url": "70ixmpl4fl.execute-api.us-east-2.amazonaws.com/path/to/resource",
+ "http.url": "https://70ixmpl4fl.execute-api.us-east-2.amazonaws.com/path/to/resource",
"operation_name": "aws.apigateway.rest",
"request_id": "123",
"resource_names": "POST /{proxy+}",
@@ -2135,7 +2218,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
"apiname": "amddr1rix9",
"endpoint": "/hello",
"http.method": "GET",
- "http.url": "amddr1rix9.execute-api.eu-west-1.amazonaws.com/hello",
+ "http.url": "https://amddr1rix9.execute-api.eu-west-1.amazonaws.com/hello",
"operation_name": "aws.apigateway.rest",
"request_id": "123",
"resource_names": "GET /hello",
@@ -2157,7 +2240,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
"apiname": "amddr1rix9",
"endpoint": "/hello",
"http.method": "GET",
- "http.url": "amddr1rix9.execute-api.eu-west-1.amazonaws.com/hello",
+ "http.url": "https://amddr1rix9.execute-api.eu-west-1.amazonaws.com/hello",
"operation_name": "aws.apigateway.rest",
"request_id": "123",
"resource_names": "GET /hello",
@@ -2180,7 +2263,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
"apiname": "amddr1rix9",
"endpoint": "/hello",
"http.method": "GET",
- "http.url": "amddr1rix9.execute-api.eu-west-1.amazonaws.com/hello",
+ "http.url": "https://amddr1rix9.execute-api.eu-west-1.amazonaws.com/hello",
"operation_name": "aws.apigateway.rest",
"request_id": "123",
"resource_names": "GET /hello",
@@ -2202,7 +2285,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
"apiname": "amddr1rix9",
"endpoint": "/hello",
"http.method": "GET",
- "http.url": "amddr1rix9.execute-api.eu-west-1.amazonaws.com/hello",
+ "http.url": "https://amddr1rix9.execute-api.eu-west-1.amazonaws.com/hello",
"operation_name": "aws.apigateway.rest",
"request_id": "123",
"resource_names": "GET /hello",
@@ -2224,7 +2307,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
"apiname": "amddr1rix9",
"endpoint": "/hello",
"http.method": "GET",
- "http.url": "amddr1rix9.execute-api.eu-west-1.amazonaws.com/hello",
+ "http.url": "https://amddr1rix9.execute-api.eu-west-1.amazonaws.com/hello",
"operation_name": "aws.httpapi",
"request_id": "123",
"resource_names": "GET /hello",
@@ -2246,7 +2329,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
"apiname": "amddr1rix9",
"endpoint": "/hello",
"http.method": "GET",
- "http.url": "amddr1rix9.execute-api.eu-west-1.amazonaws.com/hello",
+ "http.url": "https://amddr1rix9.execute-api.eu-west-1.amazonaws.com/hello",
"operation_name": "aws.httpapi",
"request_id": "123",
"resource_names": "GET /hello",
@@ -2270,7 +2353,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
"connection_id": "ZLr9QeNLmjQCIZA=",
"endpoint": "$connect",
"event_type": "CONNECT",
- "http.url": "amddr1rix9.execute-api.eu-west-1.amazonaws.com$connect",
+ "http.url": "https://amddr1rix9.execute-api.eu-west-1.amazonaws.com$connect/",
"message_direction": "IN",
"operation_name": "aws.apigateway.websocket",
"request_id": "123",
@@ -2294,7 +2377,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
"connection_id": "ZLwtceO1mjQCI8Q=",
"endpoint": "main",
"event_type": "MESSAGE",
- "http.url": "amddr1rix9.execute-api.eu-west-1.amazonaws.commain",
+ "http.url": "https://amddr1rix9.execute-api.eu-west-1.amazonaws.commain/",
"message_direction": "IN",
"operation_name": "aws.apigateway.websocket",
"request_id": "123",
@@ -2386,7 +2469,7 @@ def test_deterministic_m5_hash__always_leading_with_zero(self):
class TestExceptionOutsideHandler(unittest.TestCase):
- @patch("datadog_lambda.tracing.dd_tracing_enabled", True)
+ @patch("datadog_lambda.config.Config.trace_enabled", True)
@patch("datadog_lambda.tracing.submit_errors_metric")
@patch("time.time_ns", return_value=42)
def test_exception_outside_handler_tracing_enabled(
@@ -2427,7 +2510,7 @@ def test_exception_outside_handler_tracing_enabled(
assert mock_span.error == 1
assert mock_span.start_ns == 42
- @patch("datadog_lambda.tracing.dd_tracing_enabled", False)
+ @patch("datadog_lambda.config.Config.trace_enabled", False)
@patch("datadog_lambda.tracing.submit_errors_metric")
@patch("time.time_ns", return_value=42)
def test_exception_outside_handler_tracing_disabled(
@@ -2442,3 +2525,928 @@ def test_exception_outside_handler_tracing_disabled(
mock_submit_errors_metric.assert_called_once_with(None)
mock_trace.assert_not_called()
+
+
+class TestExtractDDContextWithDSMLogic(unittest.TestCase):
+ def setUp(self):
+ checkpoint_patcher = patch("ddtrace.data_streams.set_consume_checkpoint")
+ self.mock_checkpoint = checkpoint_patcher.start()
+ self.addCleanup(checkpoint_patcher.stop)
+ self.lambda_context = get_mock_context()
+ config_patcher = patch(
+ "datadog_lambda.config.Config.data_streams_enabled", True
+ )
+ config_patcher.start()
+ self.addCleanup(config_patcher.stop)
+
+ # SQS TESTS
+
+ def test_sqs_context_propagated_string_value(self):
+ dd_data = {"dd-pathway-ctx-base64": "12345"}
+ dd_json_data = json.dumps(dd_data)
+
+ event = {
+ "Records": [
+ {
+ "eventSourceARN": "arn:aws:sqs:us-east-1:123456789012:test-queue",
+ "messageAttributes": {
+ "_datadog": {"dataType": "String", "stringValue": dd_json_data}
+ },
+ "eventSource": "aws:sqs",
+ }
+ ]
+ }
+
+ extract_context_from_sqs_or_sns_event_or_context(
+ event, self.lambda_context, parse_event_source(event)
+ )
+
+ self.assertEqual(self.mock_checkpoint.call_count, 1)
+ args, _ = self.mock_checkpoint.call_args
+ self.assertEqual(args[0], "sqs")
+ self.assertEqual(args[1], "arn:aws:sqs:us-east-1:123456789012:test-queue")
+ carrier_get = args[2]
+ self.assertEqual(carrier_get("dd-pathway-ctx-base64"), "12345")
+
+ def test_sqs_context_propagated_binary_value(self):
+ dd_data = {"dd-pathway-ctx-base64": "12345"}
+ dd_json_data = json.dumps(dd_data)
+ encoded_data = base64.b64encode(dd_json_data.encode()).decode()
+
+ event = {
+ "Records": [
+ {
+ "eventSourceARN": "arn:aws:sqs:us-east-1:123456789012:test-queue",
+ "messageAttributes": {
+ "_datadog": {"dataType": "Binary", "binaryValue": encoded_data}
+ },
+ "eventSource": "aws:sqs",
+ }
+ ]
+ }
+
+ extract_context_from_sqs_or_sns_event_or_context(
+ event, self.lambda_context, parse_event_source(event)
+ )
+
+ self.assertEqual(self.mock_checkpoint.call_count, 1)
+ args, _ = self.mock_checkpoint.call_args
+ self.assertEqual(args[0], "sqs")
+ self.assertEqual(args[1], "arn:aws:sqs:us-east-1:123456789012:test-queue")
+ carrier_get = args[2]
+ self.assertEqual(carrier_get("dd-pathway-ctx-base64"), "12345")
+
+ def test_sqs_no_datadog_message_attribute(self):
+ event = {
+ "Records": [
+ {
+ "eventSourceARN": "arn:aws:sqs:us-east-1:123456789012:test-queue",
+ "messageAttributes": {}, # No _datadog key
+ "eventSource": "aws:sqs",
+ }
+ ]
+ }
+
+ extract_context_from_sqs_or_sns_event_or_context(
+ event, self.lambda_context, parse_event_source(event)
+ )
+ self.assertEqual(self.mock_checkpoint.call_count, 1)
+ args, _ = self.mock_checkpoint.call_args
+ self.assertEqual(args[0], "sqs")
+ self.assertEqual(args[1], "arn:aws:sqs:us-east-1:123456789012:test-queue")
+ carrier_get = args[2]
+ # None indicates no DSM context propagation
+ self.assertEqual(carrier_get("dd-pathway-ctx-base64"), None)
+
+ def test_sqs_empty_datadog_message_attribute(self):
+ event = {
+ "Records": [
+ {
+ "eventSourceARN": "arn:aws:sqs:us-east-1:123456789012:test-queue",
+ "messageAttributes": {
+ "_datadog": {
+ "dataType": "String",
+ "stringValue": "null",
+ } # json.loads("null") => None
+ },
+ "eventSource": "aws:sqs",
+ }
+ ]
+ }
+
+ extract_context_from_sqs_or_sns_event_or_context(
+ event, self.lambda_context, parse_event_source(event)
+ )
+ self.assertEqual(self.mock_checkpoint.call_count, 1)
+ args, _ = self.mock_checkpoint.call_args
+ self.assertEqual(args[0], "sqs")
+ self.assertEqual(args[1], "arn:aws:sqs:us-east-1:123456789012:test-queue")
+ carrier_get = args[2]
+ # None indicates no DSM context propagation
+ self.assertEqual(carrier_get("dd-pathway-ctx-base64"), None)
+
+ def test_sqs_no_DSM_context_in_message_attribute(self):
+ dd_data = {"NOT-DSM-KEY": "12345"}
+ dd_json_data = json.dumps(dd_data)
+ event = {
+ "Records": [
+ {
+ "eventSourceARN": "arn:aws:sqs:us-east-1:123456789012:test-queue",
+ "messageAttributes": {
+ "_datadog": {"dataType": "String", "stringValue": dd_json_data}
+ },
+ "eventSource": "aws:sqs",
+ }
+ ]
+ }
+
+ extract_context_from_sqs_or_sns_event_or_context(
+ event, self.lambda_context, parse_event_source(event)
+ )
+
+ self.assertEqual(self.mock_checkpoint.call_count, 1)
+ args, _ = self.mock_checkpoint.call_args
+ self.assertEqual(args[0], "sqs")
+ self.assertEqual(args[1], "arn:aws:sqs:us-east-1:123456789012:test-queue")
+ carrier_get = args[2]
+ # None indicates no DSM context propagation
+ self.assertEqual(carrier_get("dd-pathway-ctx-base64"), None)
+
+ @patch("datadog_lambda.tracing.logger")
+ def test_sqs_invalid_datadog_message_attribute(self, mock_logger):
+ test_cases = [
+ {
+ "name": "invalid_base64",
+ "event": {
+ "Records": [
+ {
+ "eventSourceARN": "arn:aws:sqs:us-east-1:123456789012:test-queue",
+ "messageAttributes": {
+ "_datadog": {
+ "dataType": "Binary",
+ "binaryValue": "invalid-base64",
+ }
+ },
+ "eventSource": "aws:sqs",
+ }
+ ]
+ },
+ "expected_log": ("The trace extractor returned with error %s", ANY),
+ },
+ {
+ "name": "unsupported_datatype",
+ "event": {
+ "Records": [
+ {
+ "eventSourceARN": "arn:aws:sqs:us-east-1:123456789012:test-queue",
+ "messageAttributes": {
+ "_datadog": {
+ "dataType": "Number",
+ "numberValue": 123,
+ } # Unsupported type
+ },
+ "eventSource": "aws:sqs",
+ }
+ ]
+ },
+ "expected_log": (
+ "Datadog Lambda Python only supports extracting trace"
+ "context from String or Binary SQS/SNS message attributes",
+ ),
+ },
+ ]
+
+ for test_case in test_cases:
+ with self.subTest(test_case=test_case["name"]):
+ mock_logger.reset_mock()
+ self.mock_checkpoint.reset_mock()
+
+ extract_context_from_sqs_or_sns_event_or_context(
+ test_case["event"],
+ self.lambda_context,
+ parse_event_source(test_case["event"]),
+ )
+
+ # Exception triggers logger
+ mock_logger.debug.assert_any_call(*test_case["expected_log"])
+
+ self.assertEqual(self.mock_checkpoint.call_count, 1)
+ args, _ = self.mock_checkpoint.call_args
+ self.assertEqual(args[0], "sqs")
+ self.assertEqual(
+ args[1], "arn:aws:sqs:us-east-1:123456789012:test-queue"
+ )
+ carrier_get = args[2]
+ # None indicates no DSM context propagation
+ self.assertEqual(carrier_get("dd-pathway-ctx-base64"), None)
+
+ def test_sqs_source_arn_not_found(self):
+ event = {
+ "Records": [
+ {
+ "eventSourceARN": "",
+ "messageAttributes": {},
+ "eventSource": "aws:sqs",
+ }
+ ]
+ }
+
+ extract_context_from_sqs_or_sns_event_or_context(
+ event, self.lambda_context, parse_event_source(event)
+ )
+
+ self.mock_checkpoint.assert_not_called()
+
+ @patch("datadog_lambda.config.Config.data_streams_enabled", False)
+ def test_sqs_data_streams_disabled(self):
+ context_json = {"dd-pathway-ctx-base64": "12345"}
+ event_type = "sqs"
+ arn = "arn:aws:sqs:us-east-1:123456789012:test-queue"
+
+ _dsm_set_checkpoint(context_json, event_type, arn)
+
+ self.mock_checkpoint.assert_not_called()
+
+ # SNS TESTS
+
+ def test_sns_context_propagated_string_value(self):
+ dd_data = {"dd-pathway-ctx-base64": "12345"}
+ dd_json_data = json.dumps(dd_data)
+
+ event = {
+ "Records": [
+ {
+ "eventSourceARN": "",
+ "Sns": {
+ "TopicArn": "arn:aws:sns:us-east-1:123456789012:test-topic",
+ "MessageAttributes": {
+ "_datadog": {"Type": "String", "Value": dd_json_data}
+ },
+ },
+ "eventSource": "aws:sns",
+ }
+ ]
+ }
+
+ extract_context_from_sqs_or_sns_event_or_context(
+ event, self.lambda_context, parse_event_source(event)
+ )
+
+ self.assertEqual(self.mock_checkpoint.call_count, 1)
+ args, _ = self.mock_checkpoint.call_args
+ self.assertEqual(args[0], "sns")
+ self.assertEqual(args[1], "arn:aws:sns:us-east-1:123456789012:test-topic")
+ carrier_get = args[2]
+ self.assertEqual(carrier_get("dd-pathway-ctx-base64"), "12345")
+
+ def test_sns_context_propagated_binary_value(self):
+ dd_data = {"dd-pathway-ctx-base64": "12345"}
+ dd_json_data = json.dumps(dd_data)
+ encoded_data = base64.b64encode(dd_json_data.encode()).decode()
+
+ event = {
+ "Records": [
+ {
+ "eventSourceARN": "",
+ "Sns": {
+ "TopicArn": "arn:aws:sns:us-east-1:123456789012:test-topic",
+ "MessageAttributes": {
+ "_datadog": {"Type": "Binary", "Value": encoded_data}
+ },
+ },
+ "eventSource": "aws:sns",
+ }
+ ]
+ }
+
+ extract_context_from_sqs_or_sns_event_or_context(
+ event, self.lambda_context, parse_event_source(event)
+ )
+
+ self.assertEqual(self.mock_checkpoint.call_count, 1)
+ args, _ = self.mock_checkpoint.call_args
+ self.assertEqual(args[0], "sns")
+ self.assertEqual(args[1], "arn:aws:sns:us-east-1:123456789012:test-topic")
+ carrier_get = args[2]
+ self.assertEqual(carrier_get("dd-pathway-ctx-base64"), "12345")
+
+ def test_sns_no_datadog_message_attribute(self):
+ event = {
+ "Records": [
+ {
+ "Sns": {
+ "TopicArn": "arn:aws:sns:us-east-1:123456789012:test-topic",
+ "MessageAttributes": {}, # No _datadog key
+ },
+ "eventSource": "aws:sns",
+ }
+ ]
+ }
+
+ extract_context_from_sqs_or_sns_event_or_context(
+ event, self.lambda_context, parse_event_source(event)
+ )
+ self.assertEqual(self.mock_checkpoint.call_count, 1)
+ args, _ = self.mock_checkpoint.call_args
+ self.assertEqual(args[0], "sns")
+ self.assertEqual(args[1], "arn:aws:sns:us-east-1:123456789012:test-topic")
+ carrier_get = args[2]
+ # None indicates no DSM context propagation
+ self.assertEqual(carrier_get("dd-pathway-ctx-base64"), None)
+
+ def test_sns_empty_datadog_message_attribute(self):
+ event = {
+ "Records": [
+ {
+ "Sns": {
+ "TopicArn": "arn:aws:sns:us-east-1:123456789012:test-topic",
+ "MessageAttributes": {
+ "_datadog": {
+ "Type": "String",
+ "Value": "null",
+ } # json.loads("null") => None
+ },
+ },
+ "eventSource": "aws:sns",
+ }
+ ]
+ }
+
+ extract_context_from_sqs_or_sns_event_or_context(
+ event, self.lambda_context, parse_event_source(event)
+ )
+ self.assertEqual(self.mock_checkpoint.call_count, 1)
+ args, _ = self.mock_checkpoint.call_args
+ self.assertEqual(args[0], "sns")
+ self.assertEqual(args[1], "arn:aws:sns:us-east-1:123456789012:test-topic")
+ carrier_get = args[2]
+ # None indicates no DSM context propagation
+ self.assertEqual(carrier_get("dd-pathway-ctx-base64"), None)
+
+ def test_sns_no_DSM_context_in_message_attribute(self):
+ dd_data = {"NOT-DSM-KEY": "12345"}
+ dd_json_data = json.dumps(dd_data)
+
+ event = {
+ "Records": [
+ {
+ "eventSourceARN": "",
+ "Sns": {
+ "TopicArn": "arn:aws:sns:us-east-1:123456789012:test-topic",
+ "MessageAttributes": {
+ "_datadog": {"Type": "String", "Value": dd_json_data}
+ },
+ },
+ "eventSource": "aws:sns",
+ }
+ ]
+ }
+
+ extract_context_from_sqs_or_sns_event_or_context(
+ event, self.lambda_context, parse_event_source(event)
+ )
+
+ self.assertEqual(self.mock_checkpoint.call_count, 1)
+ args, _ = self.mock_checkpoint.call_args
+ self.assertEqual(args[0], "sns")
+ self.assertEqual(args[1], "arn:aws:sns:us-east-1:123456789012:test-topic")
+ carrier_get = args[2]
+ # None indicates no DSM context propagation
+ self.assertEqual(carrier_get("dd-pathway-ctx-base64"), None)
+
+ @patch("datadog_lambda.tracing.logger")
+ def test_sns_invalid_datadog_message_attribute(self, mock_logger):
+ test_cases = [
+ {
+ "name": "invalid_base64",
+ "event": {
+ "Records": [
+ {
+ "Sns": {
+ "TopicArn": "arn:aws:sns:us-east-1:123456789012:test-topic",
+ "MessageAttributes": {
+ "_datadog": {
+ "Type": "Binary",
+ "Value": "invalid-base64",
+ }
+ },
+ },
+ "eventSource": "aws:sns",
+ }
+ ]
+ },
+ "expected_log": ("The trace extractor returned with error %s", ANY),
+ },
+ {
+ "name": "unsupported_datatype",
+ "event": {
+ "Records": [
+ {
+ "Sns": {
+ "TopicArn": "arn:aws:sns:us-east-1:123456789012:test-topic",
+ "MessageAttributes": {
+ "_datadog": {
+ "Type": "Number",
+ "numberValue": 123,
+ } # Unsupported type
+ },
+ },
+ "eventSource": "aws:sns",
+ }
+ ]
+ },
+ "expected_log": (
+ "Datadog Lambda Python only supports extracting trace"
+ "context from String or Binary SQS/SNS message attributes",
+ ),
+ },
+ ]
+
+ for test_case in test_cases:
+ with self.subTest(test_case=test_case["name"]):
+ mock_logger.reset_mock()
+ self.mock_checkpoint.reset_mock()
+
+ extract_context_from_sqs_or_sns_event_or_context(
+ test_case["event"],
+ self.lambda_context,
+ parse_event_source(test_case["event"]),
+ )
+
+ # Exception triggers logger
+ mock_logger.debug.assert_any_call(*test_case["expected_log"])
+
+ self.assertEqual(self.mock_checkpoint.call_count, 1)
+ args, _ = self.mock_checkpoint.call_args
+ self.assertEqual(args[0], "sns")
+ self.assertEqual(
+ args[1], "arn:aws:sns:us-east-1:123456789012:test-topic"
+ )
+ carrier_get = args[2]
+ # None indicates no DSM context propagation
+ self.assertEqual(carrier_get("dd-pathway-ctx-base64"), None)
+
+ def test_sns_source_arn_not_found(self):
+ event = {
+ "Records": [
+ {
+ "Sns": {
+ "TopicArn": "",
+ "MessageAttributes": {},
+ },
+ "eventSource": "aws:sns",
+ "eventSourceARN": "",
+ }
+ ]
+ }
+
+ extract_context_from_sqs_or_sns_event_or_context(
+ event, self.lambda_context, parse_event_source(event)
+ )
+
+ self.mock_checkpoint.assert_not_called()
+
+ @patch("datadog_lambda.config.Config.data_streams_enabled", False)
+ def test_sns_data_streams_disabled(self):
+ context_json = {"dd-pathway-ctx-base64": "12345"}
+ event_type = "sns"
+ arn = "arn:aws:sns:us-east-1:123456789012:test-topic"
+
+ _dsm_set_checkpoint(context_json, event_type, arn)
+
+ self.mock_checkpoint.assert_not_called()
+
+ # SNS -> SQS TESTS
+
+ def test_sns_to_sqs_context_propagated_string_value(self):
+ dd_data = {"dd-pathway-ctx-base64": "12345"}
+ dd_json_data = json.dumps(dd_data)
+
+ sns_notification = {
+ "Type": "Notification",
+ "TopicArn": "arn:aws:sns:us-east-1:123456789012:test-topic",
+ "MessageAttributes": {
+ "_datadog": {"Type": "String", "Value": dd_json_data}
+ },
+ "Message": "test message",
+ }
+
+ event = {
+ "Records": [
+ {
+ "eventSourceARN": "arn:aws:sqs:us-east-1:123456789012:test-queue",
+ "body": json.dumps(sns_notification),
+ "eventSource": "aws:sqs",
+ }
+ ]
+ }
+
+ extract_context_from_sqs_or_sns_event_or_context(
+ event, self.lambda_context, parse_event_source(event)
+ )
+
+ self.assertEqual(self.mock_checkpoint.call_count, 1)
+ args, _ = self.mock_checkpoint.call_args
+ self.assertEqual(args[0], "sqs")
+ # Should use SQS ARN, not SNS ARN
+ self.assertEqual(args[1], "arn:aws:sqs:us-east-1:123456789012:test-queue")
+ carrier_get = args[2]
+ self.assertEqual(carrier_get("dd-pathway-ctx-base64"), "12345")
+
+ def test_sns_to_sqs_context_propagated_binary_value(self):
+ dd_data = {"dd-pathway-ctx-base64": "12345"}
+ dd_json_data = json.dumps(dd_data)
+ encoded_data = base64.b64encode(dd_json_data.encode()).decode()
+
+ sns_notification = {
+ "Type": "Notification",
+ "TopicArn": "arn:aws:sns:us-east-1:123456789012:test-topic",
+ "MessageAttributes": {
+ "_datadog": {"Type": "Binary", "Value": encoded_data}
+ },
+ "Message": "test message",
+ }
+
+ event = {
+ "Records": [
+ {
+ "eventSourceARN": "arn:aws:sqs:us-east-1:123456789012:test-queue",
+ "body": json.dumps(sns_notification),
+ "eventSource": "aws:sqs",
+ }
+ ]
+ }
+
+ extract_context_from_sqs_or_sns_event_or_context(
+ event, self.lambda_context, parse_event_source(event)
+ )
+ self.assertEqual(self.mock_checkpoint.call_count, 1)
+ args, _ = self.mock_checkpoint.call_args
+ self.assertEqual(args[0], "sqs")
+ # Should use SQS ARN, not SNS ARN
+ self.assertEqual(args[1], "arn:aws:sqs:us-east-1:123456789012:test-queue")
+ carrier_get = args[2]
+ self.assertEqual(carrier_get("dd-pathway-ctx-base64"), "12345")
+
+ def test_sns_to_sqs_no_datadog_message_attribute(self):
+ sns_notification = {
+ "Type": "Notification",
+ "TopicArn": "arn:aws:sns:us-east-1:123456789012:test-topic",
+ "MessageAttributes": {}, # No _datadog key
+ "Message": "test message",
+ }
+
+ event = {
+ "Records": [
+ {
+ "eventSourceARN": "arn:aws:sqs:us-east-1:123456789012:test-queue",
+ "body": json.dumps(sns_notification),
+ "eventSource": "aws:sqs",
+ }
+ ]
+ }
+
+ extract_context_from_sqs_or_sns_event_or_context(
+ event, self.lambda_context, parse_event_source(event)
+ )
+ self.assertEqual(self.mock_checkpoint.call_count, 1)
+ args, _ = self.mock_checkpoint.call_args
+ self.assertEqual(args[0], "sqs")
+ # Should use SQS ARN, not SNS ARN
+ self.assertEqual(args[1], "arn:aws:sqs:us-east-1:123456789012:test-queue")
+ carrier_get = args[2]
+ # None indicates no DSM context propagation
+ self.assertEqual(carrier_get("dd-pathway-ctx-base64"), None)
+
+ def test_sns_to_sqs_empty_datadog_message_attribute(self):
+ sns_notification = {
+ "Type": "Notification",
+ "TopicArn": "arn:aws:sns:us-east-1:123456789012:test-topic",
+ "MessageAttributes": {
+ "_datadog": {
+ "Type": "String",
+ "Value": "null",
+ } # json.loads("null") => None
+ },
+ "Message": "test message",
+ }
+
+ event = {
+ "Records": [
+ {
+ "eventSourceARN": "arn:aws:sqs:us-east-1:123456789012:test-queue",
+ "body": json.dumps(sns_notification),
+ "eventSource": "aws:sqs",
+ }
+ ]
+ }
+
+ extract_context_from_sqs_or_sns_event_or_context(
+ event, self.lambda_context, parse_event_source(event)
+ )
+ self.assertEqual(self.mock_checkpoint.call_count, 1)
+ args, _ = self.mock_checkpoint.call_args
+ self.assertEqual(args[0], "sqs")
+ # Should use SQS ARN, not SNS ARN
+ self.assertEqual(args[1], "arn:aws:sqs:us-east-1:123456789012:test-queue")
+ carrier_get = args[2]
+ # None indicates no DSM context propagation
+ self.assertEqual(carrier_get("dd-pathway-ctx-base64"), None)
+
+ def test_sns_to_sqs_no_DSM_context_in_message_attribute(self):
+ dd_data = {"NOT-DSM-KEY": "12345"}
+ dd_json_data = json.dumps(dd_data)
+ encoded_data = base64.b64encode(dd_json_data.encode()).decode()
+
+ sns_notification = {
+ "Type": "Notification",
+ "TopicArn": "arn:aws:sns:us-east-1:123456789012:test-topic",
+ "MessageAttributes": {
+ "_datadog": {"Type": "Binary", "Value": encoded_data}
+ },
+ "Message": "test message",
+ }
+
+ event = {
+ "Records": [
+ {
+ "eventSourceARN": "arn:aws:sqs:us-east-1:123456789012:test-queue",
+ "body": json.dumps(sns_notification),
+ "eventSource": "aws:sqs",
+ }
+ ]
+ }
+
+ extract_context_from_sqs_or_sns_event_or_context(
+ event, self.lambda_context, parse_event_source(event)
+ )
+
+ self.assertEqual(self.mock_checkpoint.call_count, 1)
+ args, _ = self.mock_checkpoint.call_args
+ self.assertEqual(args[0], "sqs")
+ # Should use SQS ARN, not SNS ARN
+ self.assertEqual(args[1], "arn:aws:sqs:us-east-1:123456789012:test-queue")
+ carrier_get = args[2]
+ # None indicates no DSM context propagation
+ self.assertEqual(carrier_get("dd-pathway-ctx-base64"), None)
+
+ @patch("datadog_lambda.tracing.logger")
+ def test_sns_to_sqs_invalid_datadog_message_attribute(self, mock_logger):
+ test_cases = [
+ {
+ "name": "invalid_base64",
+ "sns_notification": {
+ "Type": "Notification",
+ "TopicArn": "arn:aws:sns:us-east-1:123456789012:test-topic",
+ "MessageAttributes": {
+ "_datadog": {"Type": "Binary", "Value": "not-base64"}
+ },
+ "Message": "test message",
+ },
+ "expected_log": ("The trace extractor returned with error %s", ANY),
+ },
+ {
+ "name": "unsupported_datatype",
+ "sns_notification": {
+ "Type": "Notification",
+ "TopicArn": "arn:aws:sns:us-east-1:123456789012:test-topic",
+ "MessageAttributes": {
+ "_datadog": {
+ "Type": "Number",
+ "numberValue": 123,
+ } # Unsupported type
+ },
+ "Message": "test message",
+ },
+ "expected_log": (
+ "Datadog Lambda Python only supports extracting trace"
+ "context from String or Binary SQS/SNS message attributes",
+ ),
+ },
+ ]
+
+ for test_case in test_cases:
+ with self.subTest(test_case=test_case["name"]):
+ mock_logger.reset_mock()
+ self.mock_checkpoint.reset_mock()
+
+ event = {
+ "Records": [
+ {
+ "eventSourceARN": "arn:aws:sqs:us-east-1:123456789012:test-queue",
+ "body": json.dumps(test_case["sns_notification"]),
+ "eventSource": "aws:sqs",
+ }
+ ]
+ }
+
+ extract_context_from_sqs_or_sns_event_or_context(
+ event, self.lambda_context, parse_event_source(event)
+ )
+
+ # Exception triggers logger
+ mock_logger.debug.assert_any_call(*test_case["expected_log"])
+
+ self.assertEqual(self.mock_checkpoint.call_count, 1)
+ args, _ = self.mock_checkpoint.call_args
+ self.assertEqual(args[0], "sqs")
+ # Should use SQS ARN, not SNS ARN
+ self.assertEqual(
+ args[1], "arn:aws:sqs:us-east-1:123456789012:test-queue"
+ )
+ carrier_get = args[2]
+ # None indicates no DSM context propagation
+ self.assertEqual(carrier_get("dd-pathway-ctx-base64"), None)
+
+ def test_sns_to_sqs_source_arn_not_found(self):
+ sns_notification = {
+ "Type": "Notification",
+ "TopicArn": "arn:aws:sns:us-east-1:123456789012:test-topic",
+ "MessageAttributes": {},
+ "Message": "test message",
+ }
+
+ event = {
+ "Records": [
+ {
+ "eventSourceARN": "", # Empty SQS ARN
+ "body": json.dumps(sns_notification),
+ "eventSource": "aws:sqs",
+ }
+ ]
+ }
+
+ extract_context_from_sqs_or_sns_event_or_context(
+ event, self.lambda_context, parse_event_source(event)
+ )
+
+ self.mock_checkpoint.assert_not_called()
+
+ @patch("datadog_lambda.config.Config.data_streams_enabled", False)
+ def test_sns_to_sqs_data_streams_disabled(self):
+ context_json = {"dd-pathway-ctx-base64": "12345"}
+ event_type = "sqs"
+ arn = "arn:aws:sqs:us-east-1:123456789012:test-queue"
+
+ _dsm_set_checkpoint(context_json, event_type, arn)
+
+ self.mock_checkpoint.assert_not_called()
+
+ # KINESIS TESTS
+
+ def test_kinesis_context_propagated_binary_value(self):
+ dd_data = {"dd-pathway-ctx-base64": "12345"}
+ kinesis_data = {"_datadog": dd_data, "message": "test"}
+ kinesis_data_str = json.dumps(kinesis_data)
+ encoded_data = base64.b64encode(kinesis_data_str.encode()).decode()
+
+ event = {
+ "Records": [
+ {
+ "eventSourceARN": "arn:aws:kinesis:us-east-1:123456789012:stream/test-stream",
+ "kinesis": {"data": encoded_data},
+ }
+ ]
+ }
+
+ extract_context_from_kinesis_event(event, self.lambda_context)
+
+ self.assertEqual(self.mock_checkpoint.call_count, 1)
+ args, _ = self.mock_checkpoint.call_args
+ self.assertEqual(args[0], "kinesis")
+ self.assertEqual(
+ args[1], "arn:aws:kinesis:us-east-1:123456789012:stream/test-stream"
+ )
+ carrier_get = args[2]
+ self.assertEqual(carrier_get("dd-pathway-ctx-base64"), "12345")
+
+ def test_kinesis_no_datadog_message_attribute(self):
+ kinesis_data = {"message": "test"} # No _datadog key
+ kinesis_data_str = json.dumps(kinesis_data)
+ encoded_data = base64.b64encode(kinesis_data_str.encode()).decode()
+
+ event = {
+ "Records": [
+ {
+ "eventSourceARN": "arn:aws:kinesis:us-east-1:123456789012:stream/test-stream",
+ "kinesis": {"data": encoded_data},
+ }
+ ]
+ }
+
+ extract_context_from_kinesis_event(event, self.lambda_context)
+
+ self.assertEqual(self.mock_checkpoint.call_count, 1)
+ args, _ = self.mock_checkpoint.call_args
+ self.assertEqual(args[0], "kinesis")
+ self.assertEqual(
+ args[1], "arn:aws:kinesis:us-east-1:123456789012:stream/test-stream"
+ )
+ carrier_get = args[2]
+ # None indicates no DSM context propagation
+ self.assertEqual(carrier_get("dd-pathway-ctx-base64"), None)
+
+ def test_kinesis_empty_message_attribute(self):
+ kinesis_data = {"_datadog": None, "message": "test"} # _datadog is None
+ kinesis_data_str = json.dumps(kinesis_data)
+ encoded_data = base64.b64encode(kinesis_data_str.encode()).decode()
+
+ event = {
+ "Records": [
+ {
+ "eventSourceARN": "arn:aws:kinesis:us-east-1:123456789012:stream/test-stream",
+ "kinesis": {"data": encoded_data},
+ }
+ ]
+ }
+
+ extract_context_from_kinesis_event(event, self.lambda_context)
+ self.assertEqual(self.mock_checkpoint.call_count, 1)
+ args, _ = self.mock_checkpoint.call_args
+ self.assertEqual(args[0], "kinesis")
+ self.assertEqual(
+ args[1], "arn:aws:kinesis:us-east-1:123456789012:stream/test-stream"
+ )
+ carrier_get = args[2]
+ # None indicates no DSM context propagation
+ self.assertEqual(carrier_get("dd-pathway-ctx-base64"), None)
+
+ def test_kinesis_no_DSM_context_in_message_attribute(self):
+ dd_data = {"NOT-DSM-KEY": "12345"}
+ kinesis_data = {"_datadog": dd_data, "message": "test"}
+ kinesis_data_str = json.dumps(kinesis_data)
+ encoded_data = base64.b64encode(kinesis_data_str.encode()).decode()
+
+ event = {
+ "Records": [
+ {
+ "eventSourceARN": "arn:aws:kinesis:us-east-1:123456789012:stream/test-stream",
+ "kinesis": {"data": encoded_data},
+ }
+ ]
+ }
+
+ extract_context_from_kinesis_event(event, self.lambda_context)
+
+ self.assertEqual(self.mock_checkpoint.call_count, 1)
+ args, _ = self.mock_checkpoint.call_args
+ self.assertEqual(args[0], "kinesis")
+ self.assertEqual(
+ args[1], "arn:aws:kinesis:us-east-1:123456789012:stream/test-stream"
+ )
+ carrier_get = args[2]
+ # None indicates no DSM context propagation
+ self.assertEqual(carrier_get("dd-pathway-ctx-base64"), None)
+
+ @patch("datadog_lambda.tracing.logger")
+ def test_kinesis_invalid_datadog_message_attribute(self, mock_logger):
+ event = {
+ "Records": [
+ {
+ "eventSourceARN": "arn:aws:kinesis:us-east-1:123456789012:stream/test-stream",
+ "kinesis": {"data": "invalid-base64"},
+ }
+ ]
+ }
+
+ extract_context_from_kinesis_event(event, self.lambda_context)
+ # Exception triggers logger
+ mock_logger.debug.assert_any_call(
+ "The trace extractor returned with error %s",
+ ANY,
+ )
+ self.assertEqual(self.mock_checkpoint.call_count, 1)
+ args, _ = self.mock_checkpoint.call_args
+ self.assertEqual(args[0], "kinesis")
+ self.assertEqual(
+ args[1], "arn:aws:kinesis:us-east-1:123456789012:stream/test-stream"
+ )
+ carrier_get = args[2]
+ # None indicates no DSM context propagation
+ self.assertEqual(carrier_get("dd-pathway-ctx-base64"), None)
+
+ def test_kinesis_source_arn_not_found(self):
+ kinesis_data = {"message": "test"}
+ kinesis_data_str = json.dumps(kinesis_data)
+ encoded_data = base64.b64encode(kinesis_data_str.encode()).decode()
+
+ event = {
+ "Records": [
+ {
+ "eventSourceARN": "",
+ "kinesis": {"data": encoded_data},
+ }
+ ]
+ }
+
+ extract_context_from_kinesis_event(event, self.lambda_context)
+
+ self.mock_checkpoint.assert_not_called()
+
+ @patch("datadog_lambda.config.Config.data_streams_enabled", False)
+ def test_kinesis_data_streams_disabled(self):
+ context_json = {"dd-pathway-ctx-base64": "12345"}
+ event_type = "kinesis"
+ arn = "arn:aws:kinesis:us-east-1:123456789012:stream/test-stream"
+
+ _dsm_set_checkpoint(context_json, event_type, arn)
diff --git a/tests/test_trigger.py b/tests/test_trigger.py
index 9cb088f1c..f10fcbbf0 100644
--- a/tests/test_trigger.py
+++ b/tests/test_trigger.py
@@ -5,6 +5,7 @@
from datadog_lambda.trigger import (
EventSubtypes,
+ EventTypes,
parse_event_source,
get_event_source_arn,
extract_trigger_tags,
@@ -117,6 +118,22 @@ def test_event_source_application_load_balancer(self):
event_source = parse_event_source(event)
event_source_arn = get_event_source_arn(event_source, event, ctx)
self.assertEqual(event_source.to_string(), event_sample_source)
+ self.assertEqual(event_source.subtype, EventSubtypes.ALB)
+ self.assertEqual(
+ event_source_arn,
+ "arn:aws:elasticloadbalancing:us-east-2:123456789012:targetgroup/lambda-xyz/123abc",
+ )
+
+ def test_event_source_application_load_balancer_multi_value_headers(self):
+ event_sample_source = "application-load-balancer-multivalue-headers"
+ test_file = event_samples + event_sample_source + ".json"
+ with open(test_file, "r") as event:
+ event = json.load(event)
+ ctx = get_mock_context()
+ event_source = parse_event_source(event)
+ event_source_arn = get_event_source_arn(event_source, event, ctx)
+ self.assertEqual(event_source.event_type, EventTypes.ALB)
+ self.assertEqual(event_source.subtype, EventSubtypes.ALB_MULTI_VALUE_HEADERS)
self.assertEqual(
event_source_arn,
"arn:aws:elasticloadbalancing:us-east-2:123456789012:targetgroup/lambda-xyz/123abc",
@@ -256,6 +273,37 @@ def test_event_source_unsupported(self):
self.assertEqual(event_source.to_string(), "unknown")
self.assertEqual(event_source_arn, None)
+ def test_event_source_with_non_dict_request_context(self):
+ # Test with requestContext as a string instead of a dict
+ event = {"requestContext": "not_a_dict"}
+ event_source = parse_event_source(event)
+ # Should still return a valid event source (unknown in this case)
+ self.assertEqual(event_source.to_string(), "unknown")
+
+ def test_event_source_with_invalid_domain_name(self):
+ # Test with domainName that isn't a string
+ event = {"requestContext": {"stage": "prod", "domainName": 12345}}
+ event_source = parse_event_source(event)
+ # Should detect as API Gateway since stage is present
+ self.assertEqual(event_source.to_string(), "api-gateway")
+
+ def test_detect_lambda_function_url_domain_with_invalid_input(self):
+ from datadog_lambda.trigger import detect_lambda_function_url_domain
+
+ # Test with non-string input
+ self.assertFalse(detect_lambda_function_url_domain(None))
+ self.assertFalse(detect_lambda_function_url_domain(12345))
+ self.assertFalse(detect_lambda_function_url_domain({"not": "a-string"}))
+ # Test with string that would normally cause an exception when split
+ self.assertFalse(detect_lambda_function_url_domain(""))
+
+ def test_event_source_with_non_dict_event_record(self):
+ # Test with event_record that's not a dictionary
+ event = {"Records": "not_a_dict"}
+ event_source = parse_event_source(event)
+ # Should handle the first non-dict record gracefully and return unknown
+ self.assertEqual(event_source.to_string(), "unknown")
+
class GetTriggerTags(unittest.TestCase):
def test_extract_trigger_tags_api_gateway(self):
@@ -270,10 +318,10 @@ def test_extract_trigger_tags_api_gateway(self):
{
"function_trigger.event_source": "api-gateway",
"function_trigger.event_source_arn": "arn:aws:apigateway:us-west-1::/restapis/1234567890/stages/prod",
- "http.url": "70ixmpl4fl.execute-api.us-east-2.amazonaws.com",
- "http.url_details.path": "/prod/path/to/resource",
+ "http.url": "https://70ixmpl4fl.execute-api.us-east-2.amazonaws.com/prod/path/to/resource",
"http.method": "POST",
"http.route": "/{proxy+}",
+ "span.kind": "server",
},
)
@@ -289,10 +337,10 @@ def test_extract_trigger_tags_api_gateway_non_proxy(self):
{
"function_trigger.event_source": "api-gateway",
"function_trigger.event_source_arn": "arn:aws:apigateway:us-west-1::/restapis/lgxbo6a518/stages/dev",
- "http.url": "lgxbo6a518.execute-api.eu-west-1.amazonaws.com",
- "http.url_details.path": "/dev/http/get",
+ "http.url": "https://lgxbo6a518.execute-api.eu-west-1.amazonaws.com/dev/http/get",
"http.method": "GET",
"http.route": "/http/get",
+ "span.kind": "server",
},
)
@@ -308,7 +356,8 @@ def test_extract_trigger_tags_api_gateway_websocket_connect(self):
{
"function_trigger.event_source": "api-gateway",
"function_trigger.event_source_arn": "arn:aws:apigateway:us-west-1::/restapis/p62c47itsb/stages/dev",
- "http.url": "p62c47itsb.execute-api.eu-west-1.amazonaws.com",
+ "http.url": "https://p62c47itsb.execute-api.eu-west-1.amazonaws.com/",
+ "span.kind": "server",
},
)
@@ -324,7 +373,8 @@ def test_extract_trigger_tags_api_gateway_websocket_default(self):
{
"function_trigger.event_source": "api-gateway",
"function_trigger.event_source_arn": "arn:aws:apigateway:us-west-1::/restapis/p62c47itsb/stages/dev",
- "http.url": "p62c47itsb.execute-api.eu-west-1.amazonaws.com",
+ "http.url": "https://p62c47itsb.execute-api.eu-west-1.amazonaws.com/",
+ "span.kind": "server",
},
)
@@ -340,7 +390,8 @@ def test_extract_trigger_tags_api_gateway_websocket_disconnect(self):
{
"function_trigger.event_source": "api-gateway",
"function_trigger.event_source_arn": "arn:aws:apigateway:us-west-1::/restapis/p62c47itsb/stages/dev",
- "http.url": "p62c47itsb.execute-api.eu-west-1.amazonaws.com",
+ "http.url": "https://p62c47itsb.execute-api.eu-west-1.amazonaws.com/",
+ "span.kind": "server",
},
)
@@ -356,9 +407,9 @@ def test_extract_trigger_tags_api_gateway_http_api(self):
{
"function_trigger.event_source": "api-gateway",
"function_trigger.event_source_arn": "arn:aws:apigateway:us-west-1::/restapis/x02yirxc7a/stages/$default",
- "http.url": "x02yirxc7a.execute-api.eu-west-1.amazonaws.com",
- "http.url_details.path": "/httpapi/get",
+ "http.url": "https://x02yirxc7a.execute-api.eu-west-1.amazonaws.com/httpapi/get",
"http.method": "GET",
+ "span.kind": "server",
"http.route": "/httpapi/get",
},
)
@@ -375,8 +426,8 @@ def test_extract_trigger_tags_application_load_balancer(self):
{
"function_trigger.event_source": "application-load-balancer",
"function_trigger.event_source_arn": "arn:aws:elasticloadbalancing:us-east-2:123456789012:targetgroup/lambda-xyz/123abc",
- "http.url_details.path": "/lambda",
"http.method": "GET",
+ "span.kind": "server",
},
)
@@ -530,6 +581,51 @@ def test_extract_trigger_tags_list_type_event(self):
tags = extract_trigger_tags(event, ctx)
self.assertEqual(tags, {})
+ def test_extract_http_tags_with_invalid_request_context(self):
+ from datadog_lambda.trigger import extract_http_tags
+
+ # Test with requestContext as a string instead of a dict
+ event = {"requestContext": "not_a_dict", "path": "/test", "httpMethod": "GET"}
+ http_tags = extract_http_tags(event)
+ # Should still extract valid tags from the event
+ self.assertEqual(
+ http_tags,
+ {
+ "span.kind": "server",
+ "http.method": "GET",
+ },
+ )
+
+ def test_extract_http_tags_with_invalid_apigateway_http(self):
+ from datadog_lambda.trigger import extract_http_tags
+
+ # Test with http in requestContext that's not a dict
+ event = {
+ "requestContext": {"stage": "prod", "http": "not_a_dict"},
+ "version": "2.0",
+ }
+ http_tags = extract_http_tags(event)
+ # Should not raise an exception
+ self.assertEqual(http_tags, {"span.kind": "server"})
+
+ def test_extract_http_tags_with_invalid_headers(self):
+ from datadog_lambda.trigger import extract_http_tags
+
+ # Test with headers that's not a dict
+ event = {"headers": "not_a_dict"}
+ http_tags = extract_http_tags(event)
+ # Should not raise an exception
+ self.assertEqual(http_tags, {"span.kind": "server"})
+
+ def test_extract_http_tags_with_invalid_route(self):
+ from datadog_lambda.trigger import extract_http_tags
+
+ # Test with routeKey that would cause a split error
+ event = {"routeKey": 12345} # Not a string
+ http_tags = extract_http_tags(event)
+ # Should not raise an exception
+ self.assertEqual(http_tags, {"span.kind": "server"})
+
class ExtractHTTPStatusCodeTag(unittest.TestCase):
def test_extract_http_status_code_tag_from_response_dict(self):
diff --git a/tests/test_wrapper.py b/tests/test_wrapper.py
index 4b2430362..512a51f89 100644
--- a/tests/test_wrapper.py
+++ b/tests/test_wrapper.py
@@ -2,12 +2,15 @@
import json
import os
import unittest
+import importlib
-from unittest.mock import patch, call, ANY
+from unittest.mock import MagicMock, patch, call, ANY
from datadog_lambda.constants import TraceHeader
import datadog_lambda.wrapper as wrapper
import datadog_lambda.xray as xray
+
+from datadog_lambda.config import config
from datadog_lambda.metric import lambda_metric
from datadog_lambda.thread_stats_writer import ThreadStatsWriter
from ddtrace.trace import Span, tracer
@@ -24,7 +27,6 @@ def setUp(self):
patch("ddtrace.internal.writer.AgentWriter.flush_queue").start()
wrapper.datadog_lambda_wrapper._force_wrap = True
- wrapper.dd_tracing_enabled = True
patcher = patch(
"datadog.threadstats.reporters.HttpReporter.flush_distributions"
)
@@ -44,10 +46,6 @@ def setUp(self):
self.mock_inject_correlation_ids = patcher.start()
self.addCleanup(patcher.stop)
- patcher = patch("datadog_lambda.wrapper.patch_all")
- self.mock_patch_all = patcher.start()
- self.addCleanup(patcher.stop)
-
patcher = patch("datadog_lambda.tags.get_cold_start_tag")
self.mock_get_cold_start_tag = patcher.start()
self.mock_get_cold_start_tag.return_value = "cold_start:true"
@@ -76,9 +74,8 @@ def setUp(self):
self.mock_dd_lambda_layer_tag = patcher.start()
self.addCleanup(patcher.stop)
+ @patch("datadog_lambda.config.Config.trace_enabled", False)
def test_datadog_lambda_wrapper(self):
- wrapper.dd_tracing_enabled = False
-
@wrapper.datadog_lambda_wrapper
def lambda_handler(event, context):
lambda_metric("test.metric", 100)
@@ -88,7 +85,6 @@ def lambda_handler(event, context):
lambda_context = get_mock_context()
lambda_handler(lambda_event, lambda_context)
- wrapper.dd_tracing_enabled = True
self.mock_threadstats_flush_distributions.assert_has_calls(
[
call(
@@ -114,7 +110,6 @@ def lambda_handler(event, context):
)
self.mock_set_correlation_ids.assert_called()
self.mock_inject_correlation_ids.assert_called()
- self.mock_patch_all.assert_called()
def test_datadog_lambda_wrapper_flush_to_log(self):
os.environ["DD_FLUSH_TO_LOG"] = "True"
@@ -185,9 +180,9 @@ def lambda_handler(event, context):
metric_module.lambda_stats.stop()
metric_module.lambda_stats = ThreadStatsWriter(False)
+ @patch("datadog_lambda.config.Config.trace_enabled", False)
def test_datadog_lambda_wrapper_inject_correlation_ids(self):
os.environ["DD_LOGS_INJECTION"] = "True"
- wrapper.dd_tracing_enabled = False
@wrapper.datadog_lambda_wrapper
def lambda_handler(event, context):
@@ -195,7 +190,6 @@ def lambda_handler(event, context):
lambda_event = {}
lambda_handler(lambda_event, get_mock_context())
- wrapper.dd_tracing_enabled = True
self.mock_set_correlation_ids.assert_called()
self.mock_inject_correlation_ids.assert_called()
@@ -283,7 +277,7 @@ def test_5xx_sends_errors_metric_and_set_tags(self, mock_extract_trigger_tags):
mock_extract_trigger_tags.return_value = {
"function_trigger.event_source": "api-gateway",
"function_trigger.event_source_arn": "arn:aws:apigateway:us-west-1::/restapis/1234567890/stages/prod",
- "http.url": "70ixmpl4fl.execute-api.us-east-2.amazonaws.com",
+ "http.url": "https://70ixmpl4fl.execute-api.us-east-2.amazonaws.com/",
"http.url_details.path": "/prod/path/to/resource",
"http.method": "GET",
}
@@ -453,11 +447,8 @@ def lambda_handler(event, context):
]
)
+ @patch("datadog_lambda.config.Config.enhanced_metrics_enabled", False)
def test_no_enhanced_metrics_without_env_var(self):
- patcher = patch("datadog_lambda.metric.enhanced_metrics_enabled", False)
- patcher.start()
- self.addCleanup(patcher.stop)
-
@wrapper.datadog_lambda_wrapper
def lambda_handler(event, context):
raise RuntimeError()
@@ -488,7 +479,6 @@ def lambda_handler(event, context):
lambda_handler_double_wrapped(lambda_event, get_mock_context())
- self.mock_patch_all.assert_called_once()
self.mock_submit_invocations_metric.assert_called_once()
def test_dd_requests_service_name_default(self):
@@ -511,6 +501,7 @@ def lambda_handler(event, context):
self.assertEqual(os.environ.get("DD_REQUESTS_SERVICE_NAME"), "myAwesomeService")
del os.environ["DD_SERVICE"]
+ @patch("datadog_lambda.config.Config.make_inferred_span", False)
def test_encode_authorizer_span(self):
@wrapper.datadog_lambda_wrapper
def lambda_handler(event, context):
@@ -537,7 +528,6 @@ def lambda_handler(event, context):
trace_ctx.sampling_priority = 1
test_span.finish()
lambda_handler.inferred_span = test_span
- lambda_handler.make_inferred_span = False
result = lambda_handler(lambda_event, lambda_context)
raw_inject_data = result["context"]["_datadog"]
self.assertIsInstance(raw_inject_data, str)
@@ -564,18 +554,6 @@ def return_type_test(event, context):
self.assertFalse(MockPrintExc.called)
-class TestLambdaDecoratorSettings(unittest.TestCase):
- def test_some_envs_should_depend_on_dd_tracing_enabled(self):
- wrapper.dd_tracing_enabled = False
- os.environ[wrapper.DD_TRACE_MANAGED_SERVICES] = "true"
- os.environ[wrapper.DD_ENCODE_AUTHORIZER_CONTEXT] = "true"
- os.environ[wrapper.DD_DECODE_AUTHORIZER_CONTEXT] = "true"
- decorator = wrapper._LambdaDecorator(func=None)
- self.assertFalse(decorator.make_inferred_span)
- self.assertFalse(decorator.encode_authorizer_context)
- self.assertFalse(decorator.decode_authorizer_context)
-
-
class TestLambdaWrapperWithTraceContext(unittest.TestCase):
xray_root = "1-5e272390-8c398be037738dc042009320"
xray_parent = "94ae789b969f1cc5"
@@ -646,14 +624,28 @@ def handler(event, context):
class TestLambdaWrapperFlushExtension(unittest.TestCase):
- def setUp(self):
- self.orig_environ = os.environ
+ @patch("datadog_lambda.config.Config.local_test", True)
+ @patch("datadog_lambda.wrapper.should_use_extension", True)
+ def test_local_test_true_flushing(self):
+ flushes = []
+ lambda_event = {}
+ lambda_context = get_mock_context()
- def tearDown(self):
- os.environ = self.orig_environ
+ def flush():
+ flushes.append(1)
+ @patch("datadog_lambda.wrapper.flush_extension", flush)
+ @wrapper.datadog_lambda_wrapper
+ def lambda_handler(event, context):
+ pass
+
+ lambda_handler(lambda_event, lambda_context)
+
+ self.assertEqual(len(flushes), 1)
+
+ @patch("datadog_lambda.config.Config.local_test", False)
@patch("datadog_lambda.wrapper.should_use_extension", True)
- def test_local_test_envvar_flushing(self):
+ def test_local_test_false_flushing(self):
flushes = []
lambda_event = {}
lambda_context = get_mock_context()
@@ -661,24 +653,307 @@ def test_local_test_envvar_flushing(self):
def flush():
flushes.append(1)
- for environ, flush_called in (
- ({"DD_LOCAL_TEST": "True"}, True),
- ({"DD_LOCAL_TEST": "true"}, True),
- ({"DD_LOCAL_TEST": "1"}, True),
- ({"DD_LOCAL_TEST": "False"}, False),
- ({"DD_LOCAL_TEST": "false"}, False),
- ({"DD_LOCAL_TEST": "0"}, False),
- ({"DD_LOCAL_TEST": ""}, False),
- ({}, False),
- ):
- os.environ = environ
- flushes.clear()
-
- @patch("datadog_lambda.wrapper.flush_extension", flush)
- @wrapper.datadog_lambda_wrapper
- def lambda_handler(event, context):
- pass
+ @patch("datadog_lambda.wrapper.flush_extension", flush)
+ @wrapper.datadog_lambda_wrapper
+ def lambda_handler(event, context):
+ pass
+
+ lambda_handler(lambda_event, lambda_context)
+
+ self.assertEqual(len(flushes), 0)
+
+
+class TestLambdaWrapperAppsecBlocking(unittest.TestCase):
+ def setUp(self):
+ os.environ["DD_APPSEC_ENABLED"] = "true"
+ os.environ["DD_TRACE_ENABLED"] = "true"
+
+ importlib.reload(wrapper)
+
+ self.addCleanup(os.environ.pop, "DD_APPSEC_ENABLED", None)
+ self.addCleanup(os.environ.pop, "DD_TRACE_ENABLED", None)
+ self.addCleanup(lambda: importlib.reload(wrapper))
+
+ patcher = patch("datadog_lambda.wrapper.asm_set_context")
+ self.mock_asm_set_context = patcher.start()
+ self.addCleanup(patcher.stop)
+
+ patcher = patch("datadog_lambda.wrapper.asm_start_request")
+ self.mock_asm_start_request = patcher.start()
+ self.addCleanup(patcher.stop)
+
+ patcher = patch("datadog_lambda.wrapper.asm_start_response")
+ self.mock_asm_start_response = patcher.start()
+ self.addCleanup(patcher.stop)
+
+ patcher = patch("datadog_lambda.wrapper.get_asm_blocked_response")
+ self.mock_get_asm_blocking_response = patcher.start()
+ self.addCleanup(patcher.stop)
+
+ with open("tests/event_samples/api-gateway.json") as f:
+ self.api_gateway_request = json.loads(f.read())
+
+ self.fake_blocking_response = {
+ "statusCode": "403",
+ "headers": {
+ "Content-Type": "application/json",
+ },
+ "body": '{"message": "Blocked by AppSec"}',
+ "isBase64Encoded": False,
+ }
+
+ def test_blocking_before(self):
+ self.mock_get_asm_blocking_response.return_value = self.fake_blocking_response
+
+ mock_handler = MagicMock()
+
+ lambda_handler = wrapper.datadog_lambda_wrapper(mock_handler)
+
+ response = lambda_handler(self.api_gateway_request, get_mock_context())
+ self.assertEqual(response, self.fake_blocking_response)
+
+ mock_handler.assert_not_called()
+
+ self.mock_asm_set_context.assert_called_once()
+ self.mock_asm_start_request.assert_called_once()
+ self.mock_asm_start_response.assert_not_called()
+
+ assert lambda_handler.span.get_tag("http.status_code") == "403"
+
+ def test_blocking_during(self):
+ self.mock_get_asm_blocking_response.return_value = None
+
+ def lambda_handler(event, context):
+ self.mock_get_asm_blocking_response.return_value = (
+ self.fake_blocking_response
+ )
+ raise wrapper.BlockingException()
+
+ lambda_handler = wrapper.datadog_lambda_wrapper(lambda_handler)
+
+ response = lambda_handler(self.api_gateway_request, get_mock_context())
+ self.assertEqual(response, self.fake_blocking_response)
+
+ self.mock_asm_set_context.assert_called_once()
+ self.mock_asm_start_request.assert_called_once()
+ self.mock_asm_start_response.assert_not_called()
+
+ assert lambda_handler.span.get_tag("http.status_code") == "403"
+
+ def test_blocking_after(self):
+ self.mock_get_asm_blocking_response.return_value = None
+
+ def lambda_handler(event, context):
+ self.mock_get_asm_blocking_response.return_value = (
+ self.fake_blocking_response
+ )
+ return {
+ "statusCode": 200,
+ "body": "This should not be returned",
+ }
- lambda_handler(lambda_event, lambda_context)
+ lambda_handler = wrapper.datadog_lambda_wrapper(lambda_handler)
+
+ response = lambda_handler(self.api_gateway_request, get_mock_context())
+ self.assertEqual(response, self.fake_blocking_response)
+
+ self.mock_asm_set_context.assert_called_once()
+ self.mock_asm_start_request.assert_called_once()
+ self.mock_asm_start_response.assert_called_once()
+
+ assert lambda_handler.span.get_tag("http.status_code") == "403"
+
+ def test_no_blocking_appsec_disabled(self):
+ os.environ["DD_APPSEC_ENABLED"] = "false"
+
+ importlib.reload(wrapper)
+
+ self.mock_get_asm_blocking_response.return_value = self.fake_blocking_response
+
+ expected_response = {
+ "statusCode": 200,
+ "body": "This should be returned",
+ }
+
+ def lambda_handler(event, context):
+ return expected_response
+
+ lambda_handler = wrapper.datadog_lambda_wrapper(lambda_handler)
+
+ response = lambda_handler(self.api_gateway_request, get_mock_context())
+ self.assertEqual(response, expected_response)
+
+ self.mock_get_asm_blocking_response.assert_not_called()
+ self.mock_asm_set_context.assert_not_called()
+ self.mock_asm_start_request.assert_not_called()
+ self.mock_asm_start_response.assert_not_called()
+
+ assert lambda_handler.span.get_tag("http.status_code") == "200"
+
+
+@patch("datadog_lambda.config.Config.exception_replay_enabled", True)
+def test_exception_replay_enabled(monkeypatch):
+ importlib.reload(wrapper)
+
+ original_SpanExceptionHandler_enable = wrapper.SpanExceptionHandler.enable
+ SpanExceptionHandler_enable_calls = []
+
+ def SpanExceptionHandler_enable(*args, **kwargs):
+ SpanExceptionHandler_enable_calls.append((args, kwargs))
+ return original_SpanExceptionHandler_enable(*args, **kwargs)
+
+ original_SignalUploader_periodic = wrapper.SignalUploader.periodic
+ SignalUploader_periodic_calls = []
+
+ def SignalUploader_periodic(*args, **kwargs):
+ SignalUploader_periodic_calls.append((args, kwargs))
+ return original_SignalUploader_periodic(*args, **kwargs)
+
+ monkeypatch.setattr(
+ "datadog_lambda.wrapper.SpanExceptionHandler.enable",
+ SpanExceptionHandler_enable,
+ )
+ monkeypatch.setattr(
+ "datadog_lambda.wrapper.SignalUploader.periodic", SignalUploader_periodic
+ )
+
+ expected_response = {
+ "statusCode": 200,
+ "body": "This should be returned",
+ }
+
+ @wrapper.datadog_lambda_wrapper
+ def lambda_handler(event, context):
+ return expected_response
+
+ response = lambda_handler({}, get_mock_context())
+
+ assert response == expected_response
+ assert len(SpanExceptionHandler_enable_calls) == 1
+ assert len(SignalUploader_periodic_calls) == 1
+
+
+@patch("datadog_lambda.config.Config.profiling_enabled", True)
+def test_profiling_enabled(monkeypatch):
+ importlib.reload(wrapper)
+
+ original_Profiler_start = wrapper.profiler.Profiler.start
+ Profiler_start_calls = []
+
+ def Profiler_start(*args, **kwargs):
+ Profiler_start_calls.append((args, kwargs))
+ return original_Profiler_start(*args, **kwargs)
+
+ monkeypatch.setattr("datadog_lambda.wrapper.is_new_sandbox", lambda: True)
+ monkeypatch.setattr(
+ "datadog_lambda.wrapper.profiler.Profiler.start", Profiler_start
+ )
+
+ expected_response = {
+ "statusCode": 200,
+ "body": "This should be returned",
+ }
+
+ @wrapper.datadog_lambda_wrapper
+ def lambda_handler(event, context):
+ return expected_response
+
+ response = lambda_handler({}, get_mock_context())
+
+ assert response == expected_response
+ assert len(Profiler_start_calls) == 1
+
+
+@patch("datadog_lambda.config.Config.llmobs_enabled", True)
+def test_llmobs_enabled(monkeypatch):
+ importlib.reload(wrapper)
+
+ original_LLMObs_enable = wrapper.LLMObs.enable
+ LLMObs_enable_calls = []
+
+ def LLMObs_enable(*args, **kwargs):
+ LLMObs_enable_calls.append((args, kwargs))
+ return original_LLMObs_enable(*args, **kwargs)
+
+ original_LLMObs_flush = wrapper.LLMObs.flush
+ LLMObs_flush_calls = []
+
+ def LLMObs_flush(*args, **kwargs):
+ LLMObs_flush_calls.append((args, kwargs))
+ return original_LLMObs_flush(*args, **kwargs)
+
+ monkeypatch.setattr("datadog_lambda.wrapper.LLMObs.enable", LLMObs_enable)
+ monkeypatch.setattr("datadog_lambda.wrapper.LLMObs.flush", LLMObs_flush)
+
+ expected_response = {
+ "statusCode": 200,
+ "body": "This should be returned",
+ }
+
+ @wrapper.datadog_lambda_wrapper
+ def lambda_handler(event, context):
+ return expected_response
+
+ response = lambda_handler({}, get_mock_context())
+
+ assert response == expected_response
+ assert len(LLMObs_enable_calls) == 1
+ assert len(LLMObs_flush_calls) == 1
+
+
+@patch("datadog_lambda.config.Config.trace_enabled", False)
+def test_batch_item_failures_metric():
+ with patch(
+ "datadog_lambda.metric.submit_batch_item_failures_metric"
+ ) as mock_submit:
+
+ @wrapper.datadog_lambda_wrapper
+ def lambda_handler(event, context):
+ return {
+ "batchItemFailures": [
+ {"itemIdentifier": "msg-1"},
+ {"itemIdentifier": "msg-2"},
+ ]
+ }
+
+ lambda_handler({}, get_mock_context())
+ mock_submit.assert_called_once()
+ call_args = mock_submit.call_args[0]
+ assert call_args[0] == {
+ "batchItemFailures": [
+ {"itemIdentifier": "msg-1"},
+ {"itemIdentifier": "msg-2"},
+ ]
+ }
+
+
+@patch("datadog_lambda.config.Config.trace_enabled", False)
+def test_batch_item_failures_metric_no_failures():
+ with patch(
+ "datadog_lambda.metric.submit_batch_item_failures_metric"
+ ) as mock_submit:
+
+ @wrapper.datadog_lambda_wrapper
+ def lambda_handler(event, context):
+ return {"batchItemFailures": []}
+
+ lambda_handler({}, get_mock_context())
+ mock_submit.assert_called_once()
+ call_args = mock_submit.call_args[0]
+ assert call_args[0] == {"batchItemFailures": []}
+
+
+@patch("datadog_lambda.config.Config.trace_enabled", False)
+def test_batch_item_failures_metric_no_response():
+ with patch(
+ "datadog_lambda.metric.submit_batch_item_failures_metric"
+ ) as mock_submit:
+
+ @wrapper.datadog_lambda_wrapper
+ def lambda_handler(event, context):
+ return None
- self.assertEqual(flush_called, len(flushes) == 1)
+ lambda_handler({}, get_mock_context())
+ mock_submit.assert_called_once()
+ call_args = mock_submit.call_args[0]
+ assert call_args[0] is None
diff --git a/tests/utils.py b/tests/utils.py
index 0f246e68f..2d56ca0c0 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -22,6 +22,7 @@ def get_mock_context(
lambda_context.invoked_function_arn = invoked_function_arn
lambda_context.function_version = function_version
lambda_context.function_name = function_name
+ lambda_context.get_remaining_time_in_millis = lambda: 100
lambda_context.client_context = ClientContext(custom)
return lambda_context