diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f85d1846..b3dcc3a7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,7 @@ jobs: restore-keys: | ${{ runner.os }}-yarn- - name: Install dependencies - run: yarn install + run: ./scripts/install_deps.sh - name: Check formatting run: yarn check-formatting @@ -67,7 +67,7 @@ jobs: restore-keys: | ${{ runner.os }}-yarn- - name: Install dependencies - run: yarn install + run: ./scripts/install_deps.sh - name: Build run: yarn build diff --git a/.github/workflows/update-deps.yml b/.github/workflows/update-deps.yml index b993c09a..6a88e0d1 100644 --- a/.github/workflows/update-deps.yml +++ b/.github/workflows/update-deps.yml @@ -24,12 +24,12 @@ jobs: - uses: actions/setup-node@3235b876344d2a9aa001b8d1453c930bba69e610 # v3.9.1 with: - node-version: "20.x" + node-version: "22.x" - name: Update Dependencies run: | - yarn install - yarn upgrade + yarn install --ignore-engines + yarn upgrade --ignore-engines - name: Create Pull Request uses: peter-evans/create-pull-request@18f7dc018cc2cd597073088f7c7591b9d1c02672 # v3.14.0 diff --git a/.gitlab/input_files/build.yaml.tpl b/.gitlab/input_files/build.yaml.tpl index 5dbd2c00..c2bc6575 100644 --- a/.gitlab/input_files/build.yaml.tpl +++ b/.gitlab/input_files/build.yaml.tpl @@ -23,7 +23,8 @@ default: - yarn --version - echo 'yarn-offline-mirror ".yarn-cache/"' >> .yarnrc - echo 'yarn-offline-mirror-pruning true' >> .yarnrc - - yarn install --frozen-lockfile --no-progress + # Resolves dd-trace v5 or v6 from the Node major of the job's image. + - ./scripts/install_deps.sh --no-progress {{ range $runtime := (ds "runtimes").runtimes }} @@ -179,6 +180,9 @@ publish npm package: tags: ["arch:amd64"] image: ${CI_DOCKER_TARGET_IMAGE}:${CI_DOCKER_TARGET_VERSION} cache: [] + variables: + # The CI image runs Node 18, but the published package tracks the v6 line. + TARGET_NODE_MAJOR: "22" rules: - if: '$CI_COMMIT_TAG =~ /^v.*/' when: manual diff --git a/Dockerfile b/Dockerfile index 868ad47a..5ef67f82 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,8 @@ COPY . datadog-lambda-js WORKDIR /datadog-lambda-js # Node.js 26+ official images no longer bundle Yarn v1. RUN command -v yarn >/dev/null 2>&1 || npm install -g yarn@1.22.22 -RUN yarn install --ignore-engines +# Installs dd-trace v5 instead of v6 for Node versions < 22. +RUN ./scripts/install_deps.sh # Build the lambda layer RUN yarn build diff --git a/integration_tests/container/cjs/Dockerfile b/integration_tests/container/cjs/Dockerfile index b217121e..6f6baec8 100644 --- a/integration_tests/container/cjs/Dockerfile +++ b/integration_tests/container/cjs/Dockerfile @@ -1,9 +1,14 @@ ARG NODE_VERSION=22 FROM public.ecr.aws/lambda/nodejs:${NODE_VERSION} +# Overrides the dd-trace pin in package.json so this image tracks the same +# tracer line as the layer built for NODE_VERSION (v5 below Node 22, v6 above). +ARG DD_TRACE_VERSION="" + COPY package.json handler.js ${LAMBDA_TASK_ROOT}/ COPY datadog-lambda-js-local.tgz /tmp/datadog-lambda-js-local.tgz RUN cd ${LAMBDA_TASK_ROOT} \ + && if [ -n "$DD_TRACE_VERSION" ]; then npm pkg set dependencies.dd-trace="$DD_TRACE_VERSION"; fi \ && npm install --omit=dev \ && npm install --no-save /tmp/datadog-lambda-js-local.tgz \ && rm /tmp/datadog-lambda-js-local.tgz diff --git a/integration_tests/container/cjs/package.json b/integration_tests/container/cjs/package.json index 2868ec7c..92f0efaa 100644 --- a/integration_tests/container/cjs/package.json +++ b/integration_tests/container/cjs/package.json @@ -3,6 +3,6 @@ "version": "1.0.0", "private": true, "dependencies": { - "dd-trace": "5.105.0" + "dd-trace": "6.12.0" } } diff --git a/integration_tests/container/esm/Dockerfile b/integration_tests/container/esm/Dockerfile index e6c96712..3ce1b02f 100644 --- a/integration_tests/container/esm/Dockerfile +++ b/integration_tests/container/esm/Dockerfile @@ -1,9 +1,14 @@ ARG NODE_VERSION=22 FROM public.ecr.aws/lambda/nodejs:${NODE_VERSION} +# Overrides the dd-trace pin in package.json so this image tracks the same +# tracer line as the layer built for NODE_VERSION (v5 below Node 22, v6 above). +ARG DD_TRACE_VERSION="" + COPY package.json handler.mjs ${LAMBDA_TASK_ROOT}/ COPY datadog-lambda-js-local.tgz /tmp/datadog-lambda-js-local.tgz RUN cd ${LAMBDA_TASK_ROOT} \ + && if [ -n "$DD_TRACE_VERSION" ]; then npm pkg set dependencies.dd-trace="$DD_TRACE_VERSION"; fi \ && npm install --omit=dev \ && npm install --no-save /tmp/datadog-lambda-js-local.tgz \ && rm /tmp/datadog-lambda-js-local.tgz diff --git a/integration_tests/container/esm/package.json b/integration_tests/container/esm/package.json index 29e2e5db..d9e7e8ba 100644 --- a/integration_tests/container/esm/package.json +++ b/integration_tests/container/esm/package.json @@ -4,6 +4,6 @@ "private": true, "type": "module", "dependencies": { - "dd-trace": "5.105.0" + "dd-trace": "6.12.0" } } diff --git a/integration_tests/serverless.yml b/integration_tests/serverless.yml index f65884b7..e1c46049 100644 --- a/integration_tests/serverless.yml +++ b/integration_tests/serverless.yml @@ -9,6 +9,7 @@ provider: DD_API_KEY: ${env:DD_API_KEY} DD_SERVICE_MAPPING: "lambda_api_gateway:remappedApiGatewayServiceName,lambda_sns:remappedSnsServiceName,lambda_sqs:remappedSqsServiceName,lambda_s3:remappedS3ServiceName,lambda_eventbridge:remappedEventBridgeServiceName,lambda_kinesis:remappedKinesisServiceName,lambda_dynamodb:remappedDynamoDbServiceName,lambda_url:remappedUrlServiceName" DD_COLD_START_TRACING: false + DD_TRACE_STARTUP_LOGS: false timeout: 15 deploymentBucket: name: integration-tests-serververless-deployment-bucket @@ -25,11 +26,13 @@ provider: platform: linux/amd64 buildArgs: NODE_VERSION: ${env:NODE_MAJOR} + DD_TRACE_VERSION: ${env:DD_TRACE_VERSION} datadog-lambda-js-esm: path: ./container/esm platform: linux/amd64 buildArgs: NODE_VERSION: ${env:NODE_MAJOR} + DD_TRACE_VERSION: ${env:DD_TRACE_VERSION} layers: node: diff --git a/integration_tests/snapshots/logs/container-cjs_node18.log b/integration_tests/snapshots/logs/container-cjs_node18.log index 7b9938c0..d85d2b7d 100644 --- a/integration_tests/snapshots/logs/container-cjs_node18.log +++ b/integration_tests/snapshots/logs/container-cjs_node18.log @@ -58,8 +58,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -83,7 +82,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node18", "functionname": "integration-tests-js-XXXX-container-cjs_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "arn:aws:apigateway:eu-west-1::/restapis/wt6mne2s9k/stages/test", "http.method": "GET", @@ -98,8 +97,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -167,8 +165,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -192,7 +189,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node18", "functionname": "integration-tests-js-XXXX-container-cjs_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -204,8 +201,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -273,8 +269,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -298,7 +293,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node18", "functionname": "integration-tests-js-XXXX-container-cjs_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -310,8 +305,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -379,8 +373,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -404,7 +397,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node18", "functionname": "integration-tests-js-XXXX-container-cjs_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -416,8 +409,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -484,8 +476,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -509,7 +500,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node18", "functionname": "integration-tests-js-XXXX-container-cjs_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -521,8 +512,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -589,8 +579,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -614,7 +603,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node18", "functionname": "integration-tests-js-XXXX-container-cjs_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -626,8 +615,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -694,8 +682,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -719,7 +706,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node18", "functionname": "integration-tests-js-XXXX-container-cjs_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -731,8 +718,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -798,8 +784,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -823,7 +808,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node18", "functionname": "integration-tests-js-XXXX-container-cjs_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sns", "function_trigger.event_source_arn": "arn:aws:sns:us-east-2:123456789012:sns-lambda", "_dd.integration": "opentracing", @@ -835,8 +820,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -901,8 +885,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -926,7 +909,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node18", "functionname": "integration-tests-js-XXXX-container-cjs_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sqs", "function_trigger.event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue", "_dd.integration": "opentracing", @@ -938,8 +921,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] diff --git a/integration_tests/snapshots/logs/container-cjs_node20.log b/integration_tests/snapshots/logs/container-cjs_node20.log index fc4d67d9..4c1a1594 100644 --- a/integration_tests/snapshots/logs/container-cjs_node20.log +++ b/integration_tests/snapshots/logs/container-cjs_node20.log @@ -58,8 +58,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -83,7 +82,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node20", "functionname": "integration-tests-js-XXXX-container-cjs_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "arn:aws:apigateway:eu-west-1::/restapis/wt6mne2s9k/stages/test", "http.method": "GET", @@ -98,8 +97,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -167,8 +165,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -192,7 +189,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node20", "functionname": "integration-tests-js-XXXX-container-cjs_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -204,8 +201,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -273,8 +269,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -298,7 +293,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node20", "functionname": "integration-tests-js-XXXX-container-cjs_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -310,8 +305,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -379,8 +373,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -404,7 +397,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node20", "functionname": "integration-tests-js-XXXX-container-cjs_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -416,8 +409,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -484,8 +476,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -509,7 +500,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node20", "functionname": "integration-tests-js-XXXX-container-cjs_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -521,8 +512,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -589,8 +579,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -614,7 +603,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node20", "functionname": "integration-tests-js-XXXX-container-cjs_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -626,8 +615,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -694,8 +682,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -719,7 +706,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node20", "functionname": "integration-tests-js-XXXX-container-cjs_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -731,8 +718,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -798,8 +784,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -823,7 +808,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node20", "functionname": "integration-tests-js-XXXX-container-cjs_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sns", "function_trigger.event_source_arn": "arn:aws:sns:us-east-2:123456789012:sns-lambda", "_dd.integration": "opentracing", @@ -835,8 +820,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -901,8 +885,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -926,7 +909,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node20", "functionname": "integration-tests-js-XXXX-container-cjs_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sqs", "function_trigger.event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue", "_dd.integration": "opentracing", @@ -938,8 +921,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] diff --git a/integration_tests/snapshots/logs/container-cjs_node22.log b/integration_tests/snapshots/logs/container-cjs_node22.log index 31346875..339ed958 100644 --- a/integration_tests/snapshots/logs/container-cjs_node22.log +++ b/integration_tests/snapshots/logs/container-cjs_node22.log @@ -58,8 +58,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -83,7 +82,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node22", "functionname": "integration-tests-js-XXXX-container-cjs_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "arn:aws:apigateway:eu-west-1::/restapis/wt6mne2s9k/stages/test", "http.method": "GET", @@ -98,8 +97,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -167,8 +165,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -192,7 +189,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node22", "functionname": "integration-tests-js-XXXX-container-cjs_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -204,8 +201,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -273,8 +269,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -298,7 +293,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node22", "functionname": "integration-tests-js-XXXX-container-cjs_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -310,8 +305,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -379,8 +373,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -404,7 +397,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node22", "functionname": "integration-tests-js-XXXX-container-cjs_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -416,8 +409,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -484,8 +476,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -509,7 +500,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node22", "functionname": "integration-tests-js-XXXX-container-cjs_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -521,8 +512,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -589,8 +579,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -614,7 +603,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node22", "functionname": "integration-tests-js-XXXX-container-cjs_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -626,8 +615,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -694,8 +682,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -719,7 +706,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node22", "functionname": "integration-tests-js-XXXX-container-cjs_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -731,8 +718,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -798,8 +784,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -823,7 +808,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node22", "functionname": "integration-tests-js-XXXX-container-cjs_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sns", "function_trigger.event_source_arn": "arn:aws:sns:us-east-2:123456789012:sns-lambda", "_dd.integration": "opentracing", @@ -835,8 +820,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -901,8 +885,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -926,7 +909,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node22", "functionname": "integration-tests-js-XXXX-container-cjs_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sqs", "function_trigger.event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue", "_dd.integration": "opentracing", @@ -938,8 +921,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] diff --git a/integration_tests/snapshots/logs/container-cjs_node24.log b/integration_tests/snapshots/logs/container-cjs_node24.log index 3192354c..94c6fa00 100644 --- a/integration_tests/snapshots/logs/container-cjs_node24.log +++ b/integration_tests/snapshots/logs/container-cjs_node24.log @@ -58,8 +58,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -83,7 +82,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node24", "functionname": "integration-tests-js-XXXX-container-cjs_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "arn:aws:apigateway:eu-west-1::/restapis/wt6mne2s9k/stages/test", "http.method": "GET", @@ -98,8 +97,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -167,8 +165,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -192,7 +189,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node24", "functionname": "integration-tests-js-XXXX-container-cjs_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -204,8 +201,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -273,8 +269,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -298,7 +293,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node24", "functionname": "integration-tests-js-XXXX-container-cjs_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -310,8 +305,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -379,8 +373,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -404,7 +397,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node24", "functionname": "integration-tests-js-XXXX-container-cjs_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -416,8 +409,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -484,8 +476,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -509,7 +500,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node24", "functionname": "integration-tests-js-XXXX-container-cjs_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -521,8 +512,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -589,8 +579,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -614,7 +603,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node24", "functionname": "integration-tests-js-XXXX-container-cjs_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -626,8 +615,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -694,8 +682,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -719,7 +706,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node24", "functionname": "integration-tests-js-XXXX-container-cjs_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -731,8 +718,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -798,8 +784,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -823,7 +808,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node24", "functionname": "integration-tests-js-XXXX-container-cjs_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sns", "function_trigger.event_source_arn": "arn:aws:sns:us-east-2:123456789012:sns-lambda", "_dd.integration": "opentracing", @@ -835,8 +820,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -901,8 +885,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -926,7 +909,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node24", "functionname": "integration-tests-js-XXXX-container-cjs_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sqs", "function_trigger.event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue", "_dd.integration": "opentracing", @@ -938,8 +921,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] diff --git a/integration_tests/snapshots/logs/container-cjs_node26.log b/integration_tests/snapshots/logs/container-cjs_node26.log index ccf602d6..1b91722e 100644 --- a/integration_tests/snapshots/logs/container-cjs_node26.log +++ b/integration_tests/snapshots/logs/container-cjs_node26.log @@ -58,8 +58,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -83,7 +82,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node26", "functionname": "integration-tests-js-XXXX-container-cjs_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "arn:aws:apigateway:eu-west-1::/restapis/wt6mne2s9k/stages/test", "http.method": "GET", @@ -98,8 +97,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -167,8 +165,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -192,7 +189,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node26", "functionname": "integration-tests-js-XXXX-container-cjs_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -204,8 +201,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -273,8 +269,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -298,7 +293,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node26", "functionname": "integration-tests-js-XXXX-container-cjs_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -310,8 +305,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -379,8 +373,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -404,7 +397,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node26", "functionname": "integration-tests-js-XXXX-container-cjs_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -416,8 +409,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -484,8 +476,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -509,7 +500,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node26", "functionname": "integration-tests-js-XXXX-container-cjs_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -521,8 +512,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -589,8 +579,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -614,7 +603,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node26", "functionname": "integration-tests-js-XXXX-container-cjs_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -626,8 +615,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -694,8 +682,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -719,7 +706,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node26", "functionname": "integration-tests-js-XXXX-container-cjs_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -731,8 +718,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -798,8 +784,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -823,7 +808,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node26", "functionname": "integration-tests-js-XXXX-container-cjs_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sns", "function_trigger.event_source_arn": "arn:aws:sns:us-east-2:123456789012:sns-lambda", "_dd.integration": "opentracing", @@ -835,8 +820,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -901,8 +885,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -926,7 +909,7 @@ START "resource_names": "integration-tests-js-XXXX-container-cjs_node26", "functionname": "integration-tests-js-XXXX-container-cjs_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sqs", "function_trigger.event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue", "_dd.integration": "opentracing", @@ -938,8 +921,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] diff --git a/integration_tests/snapshots/logs/container-esm_node18.log b/integration_tests/snapshots/logs/container-esm_node18.log index 510138b3..f5f628bd 100644 --- a/integration_tests/snapshots/logs/container-esm_node18.log +++ b/integration_tests/snapshots/logs/container-esm_node18.log @@ -58,8 +58,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -83,7 +82,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node18", "functionname": "integration-tests-js-XXXX-container-esm_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "arn:aws:apigateway:eu-west-1::/restapis/wt6mne2s9k/stages/test", "http.method": "GET", @@ -98,8 +97,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -167,8 +165,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -192,7 +189,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node18", "functionname": "integration-tests-js-XXXX-container-esm_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -204,8 +201,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -273,8 +269,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -298,7 +293,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node18", "functionname": "integration-tests-js-XXXX-container-esm_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -310,8 +305,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -379,8 +373,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -404,7 +397,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node18", "functionname": "integration-tests-js-XXXX-container-esm_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -416,8 +409,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -484,8 +476,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -509,7 +500,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node18", "functionname": "integration-tests-js-XXXX-container-esm_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -521,8 +512,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -589,8 +579,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -614,7 +603,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node18", "functionname": "integration-tests-js-XXXX-container-esm_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -626,8 +615,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -694,8 +682,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -719,7 +706,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node18", "functionname": "integration-tests-js-XXXX-container-esm_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -731,8 +718,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -798,8 +784,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -823,7 +808,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node18", "functionname": "integration-tests-js-XXXX-container-esm_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sns", "function_trigger.event_source_arn": "arn:aws:sns:us-east-2:123456789012:sns-lambda", "_dd.integration": "opentracing", @@ -835,8 +820,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -901,8 +885,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -926,7 +909,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node18", "functionname": "integration-tests-js-XXXX-container-esm_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sqs", "function_trigger.event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue", "_dd.integration": "opentracing", @@ -938,8 +921,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] diff --git a/integration_tests/snapshots/logs/container-esm_node20.log b/integration_tests/snapshots/logs/container-esm_node20.log index 7d1c6cfc..a494ca7c 100644 --- a/integration_tests/snapshots/logs/container-esm_node20.log +++ b/integration_tests/snapshots/logs/container-esm_node20.log @@ -58,8 +58,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -83,7 +82,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node20", "functionname": "integration-tests-js-XXXX-container-esm_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "arn:aws:apigateway:eu-west-1::/restapis/wt6mne2s9k/stages/test", "http.method": "GET", @@ -98,8 +97,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -167,8 +165,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -192,7 +189,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node20", "functionname": "integration-tests-js-XXXX-container-esm_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -204,8 +201,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -273,8 +269,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -298,7 +293,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node20", "functionname": "integration-tests-js-XXXX-container-esm_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -310,8 +305,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -379,8 +373,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -404,7 +397,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node20", "functionname": "integration-tests-js-XXXX-container-esm_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -416,8 +409,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -484,8 +476,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -509,7 +500,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node20", "functionname": "integration-tests-js-XXXX-container-esm_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -521,8 +512,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -589,8 +579,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -614,7 +603,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node20", "functionname": "integration-tests-js-XXXX-container-esm_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -626,8 +615,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -694,8 +682,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -719,7 +706,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node20", "functionname": "integration-tests-js-XXXX-container-esm_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -731,14 +718,14 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] } END Duration: XXXX ms Memory Used: XXXX MB START +END Duration: XXXX ms Memory Used: XXXX MB { "e": XXXX, "m": "aws.lambda.enhanced.invocations", @@ -798,8 +785,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -823,7 +809,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node20", "functionname": "integration-tests-js-XXXX-container-esm_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sns", "function_trigger.event_source_arn": "arn:aws:sns:us-east-2:123456789012:sns-lambda", "_dd.integration": "opentracing", @@ -835,13 +821,11 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] } -END Duration: XXXX ms Memory Used: XXXX MB START { "e": XXXX, @@ -901,8 +885,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -926,7 +909,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node20", "functionname": "integration-tests-js-XXXX-container-esm_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sqs", "function_trigger.event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue", "_dd.integration": "opentracing", @@ -938,8 +921,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] diff --git a/integration_tests/snapshots/logs/container-esm_node22.log b/integration_tests/snapshots/logs/container-esm_node22.log index a4758255..130cb2fd 100644 --- a/integration_tests/snapshots/logs/container-esm_node22.log +++ b/integration_tests/snapshots/logs/container-esm_node22.log @@ -58,8 +58,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -83,7 +82,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node22", "functionname": "integration-tests-js-XXXX-container-esm_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "arn:aws:apigateway:eu-west-1::/restapis/wt6mne2s9k/stages/test", "http.method": "GET", @@ -98,8 +97,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -167,8 +165,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -192,7 +189,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node22", "functionname": "integration-tests-js-XXXX-container-esm_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -204,8 +201,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -273,8 +269,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -298,7 +293,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node22", "functionname": "integration-tests-js-XXXX-container-esm_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -310,8 +305,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -379,8 +373,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -404,7 +397,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node22", "functionname": "integration-tests-js-XXXX-container-esm_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -416,8 +409,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -484,8 +476,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -509,7 +500,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node22", "functionname": "integration-tests-js-XXXX-container-esm_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -521,8 +512,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -589,8 +579,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -614,7 +603,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node22", "functionname": "integration-tests-js-XXXX-container-esm_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -626,8 +615,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -694,8 +682,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -719,7 +706,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node22", "functionname": "integration-tests-js-XXXX-container-esm_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -731,8 +718,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -798,8 +784,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -823,7 +808,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node22", "functionname": "integration-tests-js-XXXX-container-esm_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sns", "function_trigger.event_source_arn": "arn:aws:sns:us-east-2:123456789012:sns-lambda", "_dd.integration": "opentracing", @@ -835,8 +820,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -901,8 +885,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -926,7 +909,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node22", "functionname": "integration-tests-js-XXXX-container-esm_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sqs", "function_trigger.event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue", "_dd.integration": "opentracing", @@ -938,8 +921,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] diff --git a/integration_tests/snapshots/logs/container-esm_node24.log b/integration_tests/snapshots/logs/container-esm_node24.log index 02b35ce9..5ceb6009 100644 --- a/integration_tests/snapshots/logs/container-esm_node24.log +++ b/integration_tests/snapshots/logs/container-esm_node24.log @@ -58,8 +58,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -83,7 +82,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node24", "functionname": "integration-tests-js-XXXX-container-esm_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "arn:aws:apigateway:eu-west-1::/restapis/wt6mne2s9k/stages/test", "http.method": "GET", @@ -98,8 +97,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -167,8 +165,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -192,7 +189,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node24", "functionname": "integration-tests-js-XXXX-container-esm_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -204,8 +201,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -273,8 +269,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -298,7 +293,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node24", "functionname": "integration-tests-js-XXXX-container-esm_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -310,8 +305,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -379,8 +373,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -404,7 +397,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node24", "functionname": "integration-tests-js-XXXX-container-esm_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -416,8 +409,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -484,8 +476,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -509,7 +500,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node24", "functionname": "integration-tests-js-XXXX-container-esm_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -521,8 +512,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -589,8 +579,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -614,7 +603,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node24", "functionname": "integration-tests-js-XXXX-container-esm_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -626,8 +615,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -694,8 +682,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -719,7 +706,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node24", "functionname": "integration-tests-js-XXXX-container-esm_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -731,8 +718,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -798,8 +784,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -823,7 +808,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node24", "functionname": "integration-tests-js-XXXX-container-esm_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sns", "function_trigger.event_source_arn": "arn:aws:sns:us-east-2:123456789012:sns-lambda", "_dd.integration": "opentracing", @@ -835,8 +820,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -901,8 +885,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -926,7 +909,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node24", "functionname": "integration-tests-js-XXXX-container-esm_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sqs", "function_trigger.event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue", "_dd.integration": "opentracing", @@ -938,8 +921,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] diff --git a/integration_tests/snapshots/logs/container-esm_node26.log b/integration_tests/snapshots/logs/container-esm_node26.log index 839968fc..6e7bba59 100644 --- a/integration_tests/snapshots/logs/container-esm_node26.log +++ b/integration_tests/snapshots/logs/container-esm_node26.log @@ -58,8 +58,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -83,7 +82,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node26", "functionname": "integration-tests-js-XXXX-container-esm_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "arn:aws:apigateway:eu-west-1::/restapis/wt6mne2s9k/stages/test", "http.method": "GET", @@ -98,8 +97,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -167,8 +165,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -192,7 +189,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node26", "functionname": "integration-tests-js-XXXX-container-esm_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -204,8 +201,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -273,8 +269,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -298,7 +293,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node26", "functionname": "integration-tests-js-XXXX-container-esm_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -310,8 +305,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -379,8 +373,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -404,7 +397,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node26", "functionname": "integration-tests-js-XXXX-container-esm_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -416,8 +409,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -484,8 +476,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -509,7 +500,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node26", "functionname": "integration-tests-js-XXXX-container-esm_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -521,8 +512,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -589,8 +579,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -614,7 +603,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node26", "functionname": "integration-tests-js-XXXX-container-esm_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -626,8 +615,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -694,8 +682,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -719,7 +706,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node26", "functionname": "integration-tests-js-XXXX-container-esm_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -731,8 +718,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -798,8 +784,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -823,7 +808,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node26", "functionname": "integration-tests-js-XXXX-container-esm_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sns", "function_trigger.event_source_arn": "arn:aws:sns:us-east-2:123456789012:sns-lambda", "_dd.integration": "opentracing", @@ -835,8 +820,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] @@ -901,8 +885,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX }, { "trace_id":"XXXX", @@ -926,7 +909,7 @@ START "resource_names": "integration-tests-js-XXXX-container-esm_node26", "functionname": "integration-tests-js-XXXX-container-esm_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sqs", "function_trigger.event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue", "_dd.integration": "opentracing", @@ -938,8 +921,7 @@ START "_sampling_priority_v1": 1 }, "start":XXXX, - "duration":XXXX, - "links": [] + "duration":XXXX } ] ] diff --git a/integration_tests/snapshots/logs/esm_node18.log b/integration_tests/snapshots/logs/esm_node18.log index ac9448c4..bb3b6048 100644 --- a/integration_tests/snapshots/logs/esm_node18.log +++ b/integration_tests/snapshots/logs/esm_node18.log @@ -83,7 +83,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node18", "functionname": "integration-tests-js-XXXX-esm_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "arn:aws:apigateway:eu-west-1::/restapis/wt6mne2s9k/stages/test", "http.method": "GET", @@ -190,7 +190,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node18", "functionname": "integration-tests-js-XXXX-esm_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -294,7 +294,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node18", "functionname": "integration-tests-js-XXXX-esm_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -398,7 +398,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node18", "functionname": "integration-tests-js-XXXX-esm_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -501,7 +501,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node18", "functionname": "integration-tests-js-XXXX-esm_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -604,7 +604,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node18", "functionname": "integration-tests-js-XXXX-esm_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -707,7 +707,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node18", "functionname": "integration-tests-js-XXXX-esm_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -809,7 +809,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node18", "functionname": "integration-tests-js-XXXX-esm_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sns", "function_trigger.event_source_arn": "arn:aws:sns:us-east-2:123456789012:sns-lambda", "_dd.integration": "opentracing", @@ -910,7 +910,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node18", "functionname": "integration-tests-js-XXXX-esm_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sqs", "function_trigger.event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue", "_dd.integration": "opentracing", diff --git a/integration_tests/snapshots/logs/esm_node20.log b/integration_tests/snapshots/logs/esm_node20.log index 30dcfa6a..f4868dd7 100644 --- a/integration_tests/snapshots/logs/esm_node20.log +++ b/integration_tests/snapshots/logs/esm_node20.log @@ -83,7 +83,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node20", "functionname": "integration-tests-js-XXXX-esm_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "arn:aws:apigateway:eu-west-1::/restapis/wt6mne2s9k/stages/test", "http.method": "GET", @@ -190,7 +190,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node20", "functionname": "integration-tests-js-XXXX-esm_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -294,7 +294,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node20", "functionname": "integration-tests-js-XXXX-esm_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -398,7 +398,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node20", "functionname": "integration-tests-js-XXXX-esm_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -501,7 +501,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node20", "functionname": "integration-tests-js-XXXX-esm_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -604,7 +604,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node20", "functionname": "integration-tests-js-XXXX-esm_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -707,7 +707,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node20", "functionname": "integration-tests-js-XXXX-esm_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -809,7 +809,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node20", "functionname": "integration-tests-js-XXXX-esm_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sns", "function_trigger.event_source_arn": "arn:aws:sns:us-east-2:123456789012:sns-lambda", "_dd.integration": "opentracing", @@ -910,7 +910,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node20", "functionname": "integration-tests-js-XXXX-esm_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sqs", "function_trigger.event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue", "_dd.integration": "opentracing", diff --git a/integration_tests/snapshots/logs/esm_node22.log b/integration_tests/snapshots/logs/esm_node22.log index 789a2079..33949e65 100644 --- a/integration_tests/snapshots/logs/esm_node22.log +++ b/integration_tests/snapshots/logs/esm_node22.log @@ -83,7 +83,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node22", "functionname": "integration-tests-js-XXXX-esm_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "arn:aws:apigateway:eu-west-1::/restapis/wt6mne2s9k/stages/test", "http.method": "GET", @@ -190,7 +190,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node22", "functionname": "integration-tests-js-XXXX-esm_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -294,7 +294,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node22", "functionname": "integration-tests-js-XXXX-esm_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -398,7 +398,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node22", "functionname": "integration-tests-js-XXXX-esm_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -501,7 +501,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node22", "functionname": "integration-tests-js-XXXX-esm_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -604,7 +604,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node22", "functionname": "integration-tests-js-XXXX-esm_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -707,7 +707,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node22", "functionname": "integration-tests-js-XXXX-esm_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -809,7 +809,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node22", "functionname": "integration-tests-js-XXXX-esm_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sns", "function_trigger.event_source_arn": "arn:aws:sns:us-east-2:123456789012:sns-lambda", "_dd.integration": "opentracing", @@ -910,7 +910,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node22", "functionname": "integration-tests-js-XXXX-esm_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sqs", "function_trigger.event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue", "_dd.integration": "opentracing", diff --git a/integration_tests/snapshots/logs/esm_node24.log b/integration_tests/snapshots/logs/esm_node24.log index 0ca773f2..1aff497e 100644 --- a/integration_tests/snapshots/logs/esm_node24.log +++ b/integration_tests/snapshots/logs/esm_node24.log @@ -83,7 +83,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node24", "functionname": "integration-tests-js-XXXX-esm_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "arn:aws:apigateway:eu-west-1::/restapis/wt6mne2s9k/stages/test", "http.method": "GET", @@ -190,7 +190,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node24", "functionname": "integration-tests-js-XXXX-esm_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -294,7 +294,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node24", "functionname": "integration-tests-js-XXXX-esm_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -398,7 +398,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node24", "functionname": "integration-tests-js-XXXX-esm_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -501,7 +501,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node24", "functionname": "integration-tests-js-XXXX-esm_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -604,7 +604,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node24", "functionname": "integration-tests-js-XXXX-esm_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -707,7 +707,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node24", "functionname": "integration-tests-js-XXXX-esm_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -809,7 +809,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node24", "functionname": "integration-tests-js-XXXX-esm_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sns", "function_trigger.event_source_arn": "arn:aws:sns:us-east-2:123456789012:sns-lambda", "_dd.integration": "opentracing", @@ -910,7 +910,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node24", "functionname": "integration-tests-js-XXXX-esm_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sqs", "function_trigger.event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue", "_dd.integration": "opentracing", diff --git a/integration_tests/snapshots/logs/esm_node26.log b/integration_tests/snapshots/logs/esm_node26.log index 57ee5c0d..7b8bff8e 100644 --- a/integration_tests/snapshots/logs/esm_node26.log +++ b/integration_tests/snapshots/logs/esm_node26.log @@ -83,7 +83,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node26", "functionname": "integration-tests-js-XXXX-esm_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "arn:aws:apigateway:eu-west-1::/restapis/wt6mne2s9k/stages/test", "http.method": "GET", @@ -190,7 +190,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node26", "functionname": "integration-tests-js-XXXX-esm_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -294,7 +294,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node26", "functionname": "integration-tests-js-XXXX-esm_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -398,7 +398,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node26", "functionname": "integration-tests-js-XXXX-esm_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -501,7 +501,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node26", "functionname": "integration-tests-js-XXXX-esm_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -604,7 +604,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node26", "functionname": "integration-tests-js-XXXX-esm_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -707,7 +707,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node26", "functionname": "integration-tests-js-XXXX-esm_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -809,7 +809,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node26", "functionname": "integration-tests-js-XXXX-esm_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sns", "function_trigger.event_source_arn": "arn:aws:sns:us-east-2:123456789012:sns-lambda", "_dd.integration": "opentracing", @@ -910,7 +910,7 @@ START "resource_names": "integration-tests-js-XXXX-esm_node26", "functionname": "integration-tests-js-XXXX-esm_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sqs", "function_trigger.event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue", "_dd.integration": "opentracing", diff --git a/integration_tests/snapshots/logs/process-input-traced_node18.log b/integration_tests/snapshots/logs/process-input-traced_node18.log index 35f00873..9ed85f5b 100644 --- a/integration_tests/snapshots/logs/process-input-traced_node18.log +++ b/integration_tests/snapshots/logs/process-input-traced_node18.log @@ -90,7 +90,7 @@ START "resource_names": "integration-tests-js-XXXX-process-input-traced_node18", "functionname": "integration-tests-js-XXXX-process-input-traced_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "arn:aws:apigateway:eu-west-1::/restapis/wt6mne2s9k/stages/test", "http.method": "GET", @@ -254,7 +254,7 @@ START "resource_names": "integration-tests-js-XXXX-process-input-traced_node18", "functionname": "integration-tests-js-XXXX-process-input-traced_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -411,7 +411,7 @@ START "resource_names": "integration-tests-js-XXXX-process-input-traced_node18", "functionname": "integration-tests-js-XXXX-process-input-traced_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -568,7 +568,7 @@ START "resource_names": "integration-tests-js-XXXX-process-input-traced_node18", "functionname": "integration-tests-js-XXXX-process-input-traced_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -724,7 +724,7 @@ START "resource_names": "integration-tests-js-XXXX-process-input-traced_node18", "functionname": "integration-tests-js-XXXX-process-input-traced_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "event_type": "S3", @@ -860,7 +860,7 @@ START "resource_names": "integration-tests-js-XXXX-process-input-traced_node18", "functionname": "integration-tests-js-XXXX-process-input-traced_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "event_type": "S3", @@ -996,7 +996,7 @@ START "resource_names": "integration-tests-js-XXXX-process-input-traced_node18", "functionname": "integration-tests-js-XXXX-process-input-traced_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "event_type": "S3", @@ -1131,7 +1131,7 @@ START "resource_names": "integration-tests-js-XXXX-process-input-traced_node18", "functionname": "integration-tests-js-XXXX-process-input-traced_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sns", "function_trigger.event_source_arn": "arn:aws:sns:us-east-2:123456789012:sns-lambda", "event_type": "SNS", @@ -1265,7 +1265,7 @@ START "resource_names": "integration-tests-js-XXXX-process-input-traced_node18", "functionname": "integration-tests-js-XXXX-process-input-traced_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sqs", "function_trigger.event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue", "event_type": "SQS", diff --git a/integration_tests/snapshots/logs/process-input-traced_node20.log b/integration_tests/snapshots/logs/process-input-traced_node20.log index 9b0ebe36..ddd0b7a7 100644 --- a/integration_tests/snapshots/logs/process-input-traced_node20.log +++ b/integration_tests/snapshots/logs/process-input-traced_node20.log @@ -90,7 +90,7 @@ START "resource_names": "integration-tests-js-XXXX-process-input-traced_node20", "functionname": "integration-tests-js-XXXX-process-input-traced_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "arn:aws:apigateway:eu-west-1::/restapis/wt6mne2s9k/stages/test", "http.method": "GET", @@ -254,7 +254,7 @@ START "resource_names": "integration-tests-js-XXXX-process-input-traced_node20", "functionname": "integration-tests-js-XXXX-process-input-traced_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -411,7 +411,7 @@ START "resource_names": "integration-tests-js-XXXX-process-input-traced_node20", "functionname": "integration-tests-js-XXXX-process-input-traced_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -568,7 +568,7 @@ START "resource_names": "integration-tests-js-XXXX-process-input-traced_node20", "functionname": "integration-tests-js-XXXX-process-input-traced_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -724,7 +724,7 @@ START "resource_names": "integration-tests-js-XXXX-process-input-traced_node20", "functionname": "integration-tests-js-XXXX-process-input-traced_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "event_type": "S3", @@ -860,7 +860,7 @@ START "resource_names": "integration-tests-js-XXXX-process-input-traced_node20", "functionname": "integration-tests-js-XXXX-process-input-traced_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "event_type": "S3", @@ -996,7 +996,7 @@ START "resource_names": "integration-tests-js-XXXX-process-input-traced_node20", "functionname": "integration-tests-js-XXXX-process-input-traced_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "event_type": "S3", @@ -1131,7 +1131,7 @@ START "resource_names": "integration-tests-js-XXXX-process-input-traced_node20", "functionname": "integration-tests-js-XXXX-process-input-traced_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sns", "function_trigger.event_source_arn": "arn:aws:sns:us-east-2:123456789012:sns-lambda", "event_type": "SNS", @@ -1265,7 +1265,7 @@ START "resource_names": "integration-tests-js-XXXX-process-input-traced_node20", "functionname": "integration-tests-js-XXXX-process-input-traced_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sqs", "function_trigger.event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue", "event_type": "SQS", diff --git a/integration_tests/snapshots/logs/process-input-traced_node22.log b/integration_tests/snapshots/logs/process-input-traced_node22.log index c49ce843..47155ef5 100644 --- a/integration_tests/snapshots/logs/process-input-traced_node22.log +++ b/integration_tests/snapshots/logs/process-input-traced_node22.log @@ -90,7 +90,7 @@ START "resource_names": "integration-tests-js-XXXX-process-input-traced_node22", "functionname": "integration-tests-js-XXXX-process-input-traced_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "arn:aws:apigateway:eu-west-1::/restapis/wt6mne2s9k/stages/test", "http.method": "GET", @@ -254,7 +254,7 @@ START "resource_names": "integration-tests-js-XXXX-process-input-traced_node22", "functionname": "integration-tests-js-XXXX-process-input-traced_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -411,7 +411,7 @@ START "resource_names": "integration-tests-js-XXXX-process-input-traced_node22", "functionname": "integration-tests-js-XXXX-process-input-traced_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -568,7 +568,7 @@ START "resource_names": "integration-tests-js-XXXX-process-input-traced_node22", "functionname": "integration-tests-js-XXXX-process-input-traced_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -724,7 +724,7 @@ START "resource_names": "integration-tests-js-XXXX-process-input-traced_node22", "functionname": "integration-tests-js-XXXX-process-input-traced_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "event_type": "S3", @@ -860,7 +860,7 @@ START "resource_names": "integration-tests-js-XXXX-process-input-traced_node22", "functionname": "integration-tests-js-XXXX-process-input-traced_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "event_type": "S3", @@ -996,7 +996,7 @@ START "resource_names": "integration-tests-js-XXXX-process-input-traced_node22", "functionname": "integration-tests-js-XXXX-process-input-traced_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "event_type": "S3", @@ -1131,7 +1131,7 @@ START "resource_names": "integration-tests-js-XXXX-process-input-traced_node22", "functionname": "integration-tests-js-XXXX-process-input-traced_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sns", "function_trigger.event_source_arn": "arn:aws:sns:us-east-2:123456789012:sns-lambda", "event_type": "SNS", @@ -1265,7 +1265,7 @@ START "resource_names": "integration-tests-js-XXXX-process-input-traced_node22", "functionname": "integration-tests-js-XXXX-process-input-traced_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sqs", "function_trigger.event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue", "event_type": "SQS", diff --git a/integration_tests/snapshots/logs/process-input-traced_node24.log b/integration_tests/snapshots/logs/process-input-traced_node24.log index 6d8e29b4..83ac2169 100644 --- a/integration_tests/snapshots/logs/process-input-traced_node24.log +++ b/integration_tests/snapshots/logs/process-input-traced_node24.log @@ -90,7 +90,7 @@ START "resource_names": "integration-tests-js-XXXX-process-input-traced_node24", "functionname": "integration-tests-js-XXXX-process-input-traced_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "arn:aws:apigateway:eu-west-1::/restapis/wt6mne2s9k/stages/test", "http.method": "GET", @@ -254,7 +254,7 @@ START "resource_names": "integration-tests-js-XXXX-process-input-traced_node24", "functionname": "integration-tests-js-XXXX-process-input-traced_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -411,7 +411,7 @@ START "resource_names": "integration-tests-js-XXXX-process-input-traced_node24", "functionname": "integration-tests-js-XXXX-process-input-traced_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -568,7 +568,7 @@ START "resource_names": "integration-tests-js-XXXX-process-input-traced_node24", "functionname": "integration-tests-js-XXXX-process-input-traced_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -724,7 +724,7 @@ START "resource_names": "integration-tests-js-XXXX-process-input-traced_node24", "functionname": "integration-tests-js-XXXX-process-input-traced_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "event_type": "S3", @@ -860,7 +860,7 @@ START "resource_names": "integration-tests-js-XXXX-process-input-traced_node24", "functionname": "integration-tests-js-XXXX-process-input-traced_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "event_type": "S3", @@ -996,7 +996,7 @@ START "resource_names": "integration-tests-js-XXXX-process-input-traced_node24", "functionname": "integration-tests-js-XXXX-process-input-traced_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "event_type": "S3", @@ -1131,7 +1131,7 @@ START "resource_names": "integration-tests-js-XXXX-process-input-traced_node24", "functionname": "integration-tests-js-XXXX-process-input-traced_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sns", "function_trigger.event_source_arn": "arn:aws:sns:us-east-2:123456789012:sns-lambda", "event_type": "SNS", @@ -1265,7 +1265,7 @@ START "resource_names": "integration-tests-js-XXXX-process-input-traced_node24", "functionname": "integration-tests-js-XXXX-process-input-traced_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sqs", "function_trigger.event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue", "event_type": "SQS", diff --git a/integration_tests/snapshots/logs/process-input-traced_node26.log b/integration_tests/snapshots/logs/process-input-traced_node26.log index 4c2fa997..75c06288 100644 --- a/integration_tests/snapshots/logs/process-input-traced_node26.log +++ b/integration_tests/snapshots/logs/process-input-traced_node26.log @@ -90,7 +90,7 @@ START "resource_names": "integration-tests-js-XXXX-process-input-traced_node26", "functionname": "integration-tests-js-XXXX-process-input-traced_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "arn:aws:apigateway:eu-west-1::/restapis/wt6mne2s9k/stages/test", "http.method": "GET", @@ -254,7 +254,7 @@ START "resource_names": "integration-tests-js-XXXX-process-input-traced_node26", "functionname": "integration-tests-js-XXXX-process-input-traced_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -411,7 +411,7 @@ START "resource_names": "integration-tests-js-XXXX-process-input-traced_node26", "functionname": "integration-tests-js-XXXX-process-input-traced_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -568,7 +568,7 @@ START "resource_names": "integration-tests-js-XXXX-process-input-traced_node26", "functionname": "integration-tests-js-XXXX-process-input-traced_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -657,7 +657,6 @@ START ], "v": 1 } -END Duration: XXXX ms Memory Used: XXXX MB { "traces": [ [ @@ -725,7 +724,7 @@ END Duration: XXXX ms Memory Used: XXXX MB "resource_names": "integration-tests-js-XXXX-process-input-traced_node26", "functionname": "integration-tests-js-XXXX-process-input-traced_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "event_type": "S3", @@ -768,6 +767,7 @@ END Duration: XXXX ms Memory Used: XXXX MB ] ] } +END Duration: XXXX ms Memory Used: XXXX MB START { "e": XXXX, @@ -860,7 +860,7 @@ START "resource_names": "integration-tests-js-XXXX-process-input-traced_node26", "functionname": "integration-tests-js-XXXX-process-input-traced_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "event_type": "S3", @@ -996,7 +996,7 @@ START "resource_names": "integration-tests-js-XXXX-process-input-traced_node26", "functionname": "integration-tests-js-XXXX-process-input-traced_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "event_type": "S3", @@ -1131,7 +1131,7 @@ START "resource_names": "integration-tests-js-XXXX-process-input-traced_node26", "functionname": "integration-tests-js-XXXX-process-input-traced_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sns", "function_trigger.event_source_arn": "arn:aws:sns:us-east-2:123456789012:sns-lambda", "event_type": "SNS", @@ -1265,7 +1265,7 @@ START "resource_names": "integration-tests-js-XXXX-process-input-traced_node26", "functionname": "integration-tests-js-XXXX-process-input-traced_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sqs", "function_trigger.event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue", "event_type": "SQS", diff --git a/integration_tests/snapshots/logs/status-code-500s_node18.log b/integration_tests/snapshots/logs/status-code-500s_node18.log index 58c1f2a1..2226f5ab 100644 --- a/integration_tests/snapshots/logs/status-code-500s_node18.log +++ b/integration_tests/snapshots/logs/status-code-500s_node18.log @@ -96,7 +96,7 @@ START "resource_names": "integration-tests-js-XXXX-status-code-500s_node18", "functionname": "integration-tests-js-XXXX-status-code-500s_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "arn:aws:apigateway:eu-west-1::/restapis/wt6mne2s9k/stages/test", "http.method": "GET", @@ -201,7 +201,7 @@ START "resource_names": "integration-tests-js-XXXX-status-code-500s_node18", "functionname": "integration-tests-js-XXXX-status-code-500s_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -303,7 +303,7 @@ START "resource_names": "integration-tests-js-XXXX-status-code-500s_node18", "functionname": "integration-tests-js-XXXX-status-code-500s_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -405,7 +405,7 @@ START "resource_names": "integration-tests-js-XXXX-status-code-500s_node18", "functionname": "integration-tests-js-XXXX-status-code-500s_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -506,7 +506,7 @@ START "resource_names": "integration-tests-js-XXXX-status-code-500s_node18", "functionname": "integration-tests-js-XXXX-status-code-500s_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -607,7 +607,7 @@ START "resource_names": "integration-tests-js-XXXX-status-code-500s_node18", "functionname": "integration-tests-js-XXXX-status-code-500s_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -708,7 +708,7 @@ START "resource_names": "integration-tests-js-XXXX-status-code-500s_node18", "functionname": "integration-tests-js-XXXX-status-code-500s_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -808,7 +808,7 @@ START "resource_names": "integration-tests-js-XXXX-status-code-500s_node18", "functionname": "integration-tests-js-XXXX-status-code-500s_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sns", "function_trigger.event_source_arn": "arn:aws:sns:us-east-2:123456789012:sns-lambda", "_dd.integration": "opentracing", @@ -907,7 +907,7 @@ START "resource_names": "integration-tests-js-XXXX-status-code-500s_node18", "functionname": "integration-tests-js-XXXX-status-code-500s_node18", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sqs", "function_trigger.event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue", "_dd.integration": "opentracing", diff --git a/integration_tests/snapshots/logs/status-code-500s_node20.log b/integration_tests/snapshots/logs/status-code-500s_node20.log index a508d089..f07923da 100644 --- a/integration_tests/snapshots/logs/status-code-500s_node20.log +++ b/integration_tests/snapshots/logs/status-code-500s_node20.log @@ -96,7 +96,7 @@ START "resource_names": "integration-tests-js-XXXX-status-code-500s_node20", "functionname": "integration-tests-js-XXXX-status-code-500s_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "arn:aws:apigateway:eu-west-1::/restapis/wt6mne2s9k/stages/test", "http.method": "GET", @@ -201,7 +201,7 @@ START "resource_names": "integration-tests-js-XXXX-status-code-500s_node20", "functionname": "integration-tests-js-XXXX-status-code-500s_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -303,7 +303,7 @@ START "resource_names": "integration-tests-js-XXXX-status-code-500s_node20", "functionname": "integration-tests-js-XXXX-status-code-500s_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -405,7 +405,7 @@ START "resource_names": "integration-tests-js-XXXX-status-code-500s_node20", "functionname": "integration-tests-js-XXXX-status-code-500s_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -506,7 +506,7 @@ START "resource_names": "integration-tests-js-XXXX-status-code-500s_node20", "functionname": "integration-tests-js-XXXX-status-code-500s_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -607,7 +607,7 @@ START "resource_names": "integration-tests-js-XXXX-status-code-500s_node20", "functionname": "integration-tests-js-XXXX-status-code-500s_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -708,7 +708,7 @@ START "resource_names": "integration-tests-js-XXXX-status-code-500s_node20", "functionname": "integration-tests-js-XXXX-status-code-500s_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -808,7 +808,7 @@ START "resource_names": "integration-tests-js-XXXX-status-code-500s_node20", "functionname": "integration-tests-js-XXXX-status-code-500s_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sns", "function_trigger.event_source_arn": "arn:aws:sns:us-east-2:123456789012:sns-lambda", "_dd.integration": "opentracing", @@ -907,7 +907,7 @@ START "resource_names": "integration-tests-js-XXXX-status-code-500s_node20", "functionname": "integration-tests-js-XXXX-status-code-500s_node20", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sqs", "function_trigger.event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue", "_dd.integration": "opentracing", diff --git a/integration_tests/snapshots/logs/status-code-500s_node22.log b/integration_tests/snapshots/logs/status-code-500s_node22.log index 0310d042..35fb3a24 100644 --- a/integration_tests/snapshots/logs/status-code-500s_node22.log +++ b/integration_tests/snapshots/logs/status-code-500s_node22.log @@ -96,7 +96,7 @@ START "resource_names": "integration-tests-js-XXXX-status-code-500s_node22", "functionname": "integration-tests-js-XXXX-status-code-500s_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "arn:aws:apigateway:eu-west-1::/restapis/wt6mne2s9k/stages/test", "http.method": "GET", @@ -201,7 +201,7 @@ START "resource_names": "integration-tests-js-XXXX-status-code-500s_node22", "functionname": "integration-tests-js-XXXX-status-code-500s_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -303,7 +303,7 @@ START "resource_names": "integration-tests-js-XXXX-status-code-500s_node22", "functionname": "integration-tests-js-XXXX-status-code-500s_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -405,7 +405,7 @@ START "resource_names": "integration-tests-js-XXXX-status-code-500s_node22", "functionname": "integration-tests-js-XXXX-status-code-500s_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -506,7 +506,7 @@ START "resource_names": "integration-tests-js-XXXX-status-code-500s_node22", "functionname": "integration-tests-js-XXXX-status-code-500s_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -607,7 +607,7 @@ START "resource_names": "integration-tests-js-XXXX-status-code-500s_node22", "functionname": "integration-tests-js-XXXX-status-code-500s_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -708,7 +708,7 @@ START "resource_names": "integration-tests-js-XXXX-status-code-500s_node22", "functionname": "integration-tests-js-XXXX-status-code-500s_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -808,7 +808,7 @@ START "resource_names": "integration-tests-js-XXXX-status-code-500s_node22", "functionname": "integration-tests-js-XXXX-status-code-500s_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sns", "function_trigger.event_source_arn": "arn:aws:sns:us-east-2:123456789012:sns-lambda", "_dd.integration": "opentracing", @@ -907,7 +907,7 @@ START "resource_names": "integration-tests-js-XXXX-status-code-500s_node22", "functionname": "integration-tests-js-XXXX-status-code-500s_node22", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sqs", "function_trigger.event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue", "_dd.integration": "opentracing", diff --git a/integration_tests/snapshots/logs/status-code-500s_node24.log b/integration_tests/snapshots/logs/status-code-500s_node24.log index ebb9a4dc..39e1422e 100644 --- a/integration_tests/snapshots/logs/status-code-500s_node24.log +++ b/integration_tests/snapshots/logs/status-code-500s_node24.log @@ -96,7 +96,7 @@ START "resource_names": "integration-tests-js-XXXX-status-code-500s_node24", "functionname": "integration-tests-js-XXXX-status-code-500s_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "arn:aws:apigateway:eu-west-1::/restapis/wt6mne2s9k/stages/test", "http.method": "GET", @@ -201,7 +201,7 @@ START "resource_names": "integration-tests-js-XXXX-status-code-500s_node24", "functionname": "integration-tests-js-XXXX-status-code-500s_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -303,7 +303,7 @@ START "resource_names": "integration-tests-js-XXXX-status-code-500s_node24", "functionname": "integration-tests-js-XXXX-status-code-500s_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -322,7 +322,6 @@ START } END Duration: XXXX ms Memory Used: XXXX MB START -END Duration: XXXX ms Memory Used: XXXX MB { "e": XXXX, "m": "aws.lambda.enhanced.invocations", @@ -406,7 +405,7 @@ END Duration: XXXX ms Memory Used: XXXX MB "resource_names": "integration-tests-js-XXXX-status-code-500s_node24", "functionname": "integration-tests-js-XXXX-status-code-500s_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -423,6 +422,7 @@ END Duration: XXXX ms Memory Used: XXXX MB ] ] } +END Duration: XXXX ms Memory Used: XXXX MB START { "e": XXXX, @@ -506,7 +506,7 @@ START "resource_names": "integration-tests-js-XXXX-status-code-500s_node24", "functionname": "integration-tests-js-XXXX-status-code-500s_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -607,7 +607,7 @@ START "resource_names": "integration-tests-js-XXXX-status-code-500s_node24", "functionname": "integration-tests-js-XXXX-status-code-500s_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -708,7 +708,7 @@ START "resource_names": "integration-tests-js-XXXX-status-code-500s_node24", "functionname": "integration-tests-js-XXXX-status-code-500s_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -808,7 +808,7 @@ START "resource_names": "integration-tests-js-XXXX-status-code-500s_node24", "functionname": "integration-tests-js-XXXX-status-code-500s_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sns", "function_trigger.event_source_arn": "arn:aws:sns:us-east-2:123456789012:sns-lambda", "_dd.integration": "opentracing", @@ -907,7 +907,7 @@ START "resource_names": "integration-tests-js-XXXX-status-code-500s_node24", "functionname": "integration-tests-js-XXXX-status-code-500s_node24", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sqs", "function_trigger.event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue", "_dd.integration": "opentracing", diff --git a/integration_tests/snapshots/logs/status-code-500s_node26.log b/integration_tests/snapshots/logs/status-code-500s_node26.log index b3217147..59390aec 100644 --- a/integration_tests/snapshots/logs/status-code-500s_node26.log +++ b/integration_tests/snapshots/logs/status-code-500s_node26.log @@ -96,7 +96,7 @@ START "resource_names": "integration-tests-js-XXXX-status-code-500s_node26", "functionname": "integration-tests-js-XXXX-status-code-500s_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "arn:aws:apigateway:eu-west-1::/restapis/wt6mne2s9k/stages/test", "http.method": "GET", @@ -201,7 +201,7 @@ START "resource_names": "integration-tests-js-XXXX-status-code-500s_node26", "functionname": "integration-tests-js-XXXX-status-code-500s_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -303,7 +303,7 @@ START "resource_names": "integration-tests-js-XXXX-status-code-500s_node26", "functionname": "integration-tests-js-XXXX-status-code-500s_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -405,7 +405,7 @@ START "resource_names": "integration-tests-js-XXXX-status-code-500s_node26", "functionname": "integration-tests-js-XXXX-status-code-500s_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "arn:aws:dynamodb:us-east-1:1234567890:table/someTableName/stream/2024-12-11T20:00:00.000", "_dd.integration": "opentracing", @@ -506,7 +506,7 @@ START "resource_names": "integration-tests-js-XXXX-status-code-500s_node26", "functionname": "integration-tests-js-XXXX-status-code-500s_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -607,7 +607,7 @@ START "resource_names": "integration-tests-js-XXXX-status-code-500s_node26", "functionname": "integration-tests-js-XXXX-status-code-500s_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -708,7 +708,7 @@ START "resource_names": "integration-tests-js-XXXX-status-code-500s_node26", "functionname": "integration-tests-js-XXXX-status-code-500s_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "arn:aws:s3:::my-bucket-name", "_dd.integration": "opentracing", @@ -808,7 +808,7 @@ START "resource_names": "integration-tests-js-XXXX-status-code-500s_node26", "functionname": "integration-tests-js-XXXX-status-code-500s_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sns", "function_trigger.event_source_arn": "arn:aws:sns:us-east-2:123456789012:sns-lambda", "_dd.integration": "opentracing", @@ -907,7 +907,7 @@ START "resource_names": "integration-tests-js-XXXX-status-code-500s_node26", "functionname": "integration-tests-js-XXXX-status-code-500s_node26", "datadog_lambda":"XXXX", - "dd_trace": "", + "dd_trace":"XXXX", "function_trigger.event_source": "sqs", "function_trigger.event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue", "_dd.integration": "opentracing", diff --git a/migration_parity.md b/migration_parity.md index e18aef9c..6541f5f8 100644 --- a/migration_parity.md +++ b/migration_parity.md @@ -54,12 +54,12 @@ Each row gates the release independently of the feature rows below. | Public types in `index.d.v5.ts` | dd:`index.d.v5.ts` | L1 (dd-trace-js, v5.x branch) | type test on v5.x | pending | — (process) | | No post-Node-18 syntax on the plugin path | dd:`packages/datadog-plugin-lambda/**` | L1 (dd-trace-js lint) | lint rule pinned to Node 18 target — new | pending | dd-trace | | Config wiring applied per-line (`config/index.js` is not cherry-pick-clean) | dd:`packages/dd-trace/src/config/index.js` × 2 lines | L1 (dd-trace-js) | config spec on both lines | pending | dd-trace | -| npm range resolves to v5 on Node 18 | shim:`package.json` | L1 (datadog-lambda-js) | install test on Node 18 — new | pending | both | +| dd-trace resolves to v5 on Node 18 (`package.json` carries the v6 line) | shim:`scripts/install_deps.sh` + `scripts/dd_trace_versions.sh` | L1 (datadog-lambda-js) | install test on Node 18 — new | ported | both | | npm range floor bumped to latest v5.x at shim release (check registry, not local tags) | shim:`package.json` | release | release checklist item — new | pending | both | | Shim declares `engines.node >=18` | shim:`package.json` | L1 (datadog-lambda-js) | package check — new | pending | datadog-lambda-js | -| Node 18/20 layers built and published (`v5.x` line) | shim:`scripts/build_layers.sh`, `scripts/move_ddtrace_dependency.js` | release | per-runtime dd-trace pin threaded from `NODE_VERSIONS` loop + test | pending | both | +| Node 18/20 layers built and published (`v5.x` line) | shim:`scripts/install_deps.sh` (invoked from `Dockerfile`) | release | pin resolved from the build image's Node major + test | ported | both | | Per-runtime dd-trace pin stamped into the release | shim:release scripts | release | release notes mapping check — new | pending | both | -| Node 22/24/26 layers built and published (`v6.x` line) | shim:`scripts/build_layers.sh`, `scripts/move_ddtrace_dependency.js` | release | same per-runtime pin plumbing; node26 must be in the `NODE_VERSIONS` loop | pending | both | +| Node 22/24/26 layers built and published (`v6.x` line) | shim:`package.json` (`dd-trace` range) | release | same per-runtime pin plumbing; node26 must be in the `NODE_VERSIONS` loop | ported | both | | `nodeMaxMajor` stays above the newest shipped runtime | dd:`package.json` (`nodeMaxMajor`) × 3 lines | release | — new: assert `max(NODE_VERSIONS major) < nodeMaxMajor` at layer build, so a new runtime cannot ship into a guardrail bail-out | pending | dd-trace | ## Entry points and shim @@ -222,7 +222,7 @@ conditional on the extension being present. | layer names, GovCloud, signing, docs automation unchanged | shim:`scripts/publish_*.sh`, `create_documentation_pr.sh` | release | pipeline dry-run | pending | both | | size gate 9 MB / 24 MB unchanged | shim:`scripts/check_layer_size.sh` | release | existing gate | pending | both | | prune list extended for v5/v6 native footprint; **each prune entry maps to a feature row** (profiling, AppSec natives — `--omit=optional` is not available) | shim:`Dockerfile` | release + L3 (Profiling/Appsec Usage rows) | — new mapping review | pending | dd-trace | -| per-runtime dd-trace resolution (v5.x for 18/20, v6.x for 22/24/26) | shim:`scripts/move_ddtrace_dependency.js` + `build_layers.sh` | release | — new: takes a list, threaded from `NODE_VERSIONS`, plus test | pending | both | +| per-runtime dd-trace resolution (v5.x for 18/20, v6.x for 22/24/26) | shim:`scripts/install_deps.sh` + `scripts/dd_trace_versions.sh` | release | — new: assert each layer ships the tracer line its runtime expects | ported | both | | shim version ↔ layer version mapping (`13.N.0` ↔ layer N) | shim:`package.json` | release | release check | pending | datadog-lambda-js | | Node 18/20/22/24/26 layers all build and publish post-migration | shim:release pipeline | release | pipeline | pending | both | | test-only layer assembler in dd-trace-js (never publishes/signs/prunes) | dd:`integration-tests/lambda/build-test-layer.sh` — new | L2 | per-PR CI; fails if run with release credentials | pending | — (process) | diff --git a/package.json b/package.json index 477a3a02..d42eb328 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "@aws-sdk/client-kms": "^3.366.0", "@aws-sdk/client-secrets-manager": "^3.721.0", "@datadog/native-appsec": "*", - "@datadog/pprof": "5.14.4", + "@datadog/pprof": "5.18.1", "@opentelemetry/api": ">=1.0.0 <1.10.0", "@opentelemetry/api-logs": "<1.0.0", "@types/aws-lambda": "^8.10.136", @@ -33,7 +33,7 @@ "@types/node": "^20.12.10", "@types/promise-retry": "^1.1.3", "@types/shimmer": "^1.0.1", - "dd-trace": "^5.113.0", + "dd-trace": "^6.12.0", "jest": "^27.0.1", "mock-fs": "4.14.0", "nock": "13.5.4", diff --git a/scripts/Dockerfile_test b/scripts/Dockerfile_test index 733e884b..afa6a55b 100644 --- a/scripts/Dockerfile_test +++ b/scripts/Dockerfile_test @@ -1,6 +1,6 @@ ARG image FROM $image COPY . . -RUN yarn install +RUN ./scripts/install_deps.sh RUN yarn build RUN yarn lint \ No newline at end of file diff --git a/scripts/dd_trace_versions.sh b/scripts/dd_trace_versions.sh new file mode 100755 index 00000000..7b3b545d --- /dev/null +++ b/scripts/dd_trace_versions.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +# 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. + +# dd-trace v6 declares `engines.node: ">=22"`, so the Node 18 and Node 20 layers +# ship the v5 line instead. The v5 pin below is bumped by hand. +DD_TRACE_V5_VERSION="5.123.0" +DD_TRACE_V6_MIN_NODE_MAJOR=22 + +# Echoes the dd-trace version to force for a given Node major, or nothing when +# the version from package.json (v6) should be used as-is. +dd_trace_version_for_node_major() { + if [ "$1" -lt "$DD_TRACE_V6_MIN_NODE_MAJOR" ]; then + echo "$DD_TRACE_V5_VERSION" + fi +} diff --git a/scripts/install_deps.sh b/scripts/install_deps.sh new file mode 100755 index 00000000..964fe233 --- /dev/null +++ b/scripts/install_deps.sh @@ -0,0 +1,46 @@ +#!/bin/bash + +# 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. + +# Installs the repo's dependencies, forcing the dd-trace v5 line on Node majors +# that dd-trace v6 doesn't support (node < 22). Every build, test and CI entry point should +# install through this script so the split is applied in exactly one place. +# +# USAGE: [TARGET_NODE_MAJOR=22] ./scripts/install_deps.sh [extra yarn args...] +# +# TARGET_NODE_MAJOR defaults to the Node major running this script. Set it +# explicitly when the host Node version differs from the runtime being built +# for, e.g. the GitLab CI image runs Node 18 but builds for every runtime. + +set -e + +scripts_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) +repo_dir=$(dirname "$scripts_dir") + +source "$scripts_dir/dd_trace_versions.sh" + +cd "$repo_dir" + +if [ -z "$TARGET_NODE_MAJOR" ]; then + TARGET_NODE_MAJOR=$(node -p "process.versions.node.split('.')[0]") +fi + +dd_trace_override=$(dd_trace_version_for_node_major "$TARGET_NODE_MAJOR") + +# --ignore-engines is needed on both paths: dd-trace v6 refuses to install on +# hosts older than Node 22 even when it is only being built for a newer runtime. +yarn_args=("--ignore-engines") + +if [ -n "$dd_trace_override" ]; then + echo "Node ${TARGET_NODE_MAJOR} is not supported by dd-trace v6, pinning dd-trace to ${dd_trace_override}" + node ./scripts/set_ddtrace_version.js "$(cat package.json)" "$dd_trace_override" > package-new.json + mv package-new.json package.json + # The lockfile pins the v6 line, so it has to be re-resolved for v5. +else + yarn_args+=("--frozen-lockfile") +fi + +yarn install "${yarn_args[@]}" "$@" diff --git a/scripts/run_integration_tests.sh b/scripts/run_integration_tests.sh index f052060b..7e23c05f 100755 --- a/scripts/run_integration_tests.sh +++ b/scripts/run_integration_tests.sh @@ -36,6 +36,8 @@ cwd=$(pwd) integration_tests_dir="$repo_dir/integration_tests" +source $scripts_dir/dd_trace_versions.sh + script_utc_start_time=$(date -u +"%Y%m%dT%H%M%S") mismatch_found=false @@ -101,18 +103,25 @@ cd $repo_dir # In CI the script is typically invoked without BUILD_LAYERS=true, so the # Docker-internal yarn install that path would do isn't reached, and the host # repo would otherwise tsc against an empty node_modules. -yarn install --frozen-lockfile +# +# The build stamps the resolved dd-trace version into dist/, so resolve it for +# the runtime under test. A run covering every runtime packs once, against v6. +TARGET_NODE_MAJOR=${RUNTIME_PARAM:-$DD_TRACE_V6_MIN_NODE_MAJOR} ./scripts/install_deps.sh yarn build npm pack mv datadog-lambda-js-*.tgz $integration_tests_dir/container/cjs/datadog-lambda-js-local.tgz cp $integration_tests_dir/container/cjs/datadog-lambda-js-local.tgz \ $integration_tests_dir/container/esm/datadog-lambda-js-local.tgz +# dd-trace version the container-image handlers install, matching the layer's. +DD_TRACE_DEFAULT_VERSION=$(node -p "require('dd-trace/package.json').version") + cd $integration_tests_dir yarn function run_serverless() { NODE_VERSION=${!nodejs_version} NODE_MAJOR=$(lambda_node_image_tag $parameters_set) RUNTIME=$parameters_set SERVERLESS_RUNTIME=${!serverless_runtime} \ + DD_TRACE_VERSION=$(container_dd_trace_version $parameters_set) \ serverless "$@" } @@ -120,6 +129,14 @@ input_event_files=$(ls ./input_events) # Sort event files by name so that snapshots stay consistent input_event_files=($(for file_name in ${input_event_files[@]}; do echo $file_name; done | sort)) +# dd-trace version to install in the container-{cjs,esm} images, so they track +# the same tracer line as the layer built for that runtime. +function container_dd_trace_version() { + local node_major="${1#node}" + local override=$(dd_trace_version_for_node_major "$node_major") + echo "${override:-$DD_TRACE_DEFAULT_VERSION}" +} + # ECR tag for public.ecr.aws/lambda/nodejs used by container-{cjs,esm} tests. # Node 26 is preview-only on ECR until GA; plain :26 does not exist yet. function lambda_node_image_tag() { diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh index 4aeb0c2e..1572d3ec 100755 --- a/scripts/run_tests.sh +++ b/scripts/run_tests.sh @@ -19,8 +19,10 @@ do -f scripts/Dockerfile_test . \ --quiet \ --build-arg image=registry.ddbuild.io/images/mirror/node:${node_major_version}-bullseye - docker run --rm -v `pwd`:/datadog-lambda-layer-node \ - -w /datadog-lambda-layer-node \ + # Run against the image's own install rather than a bind mount of the repo: + # the host node_modules holds dd-trace v6, which would shadow the v5 install + # the image resolved for Node majors below 22. + docker run --rm \ datadog-lambda-layer-node-test:$node_version \ yarn test done diff --git a/scripts/set_ddtrace_version.js b/scripts/set_ddtrace_version.js new file mode 100644 index 00000000..2db5ea8f --- /dev/null +++ b/scripts/set_ddtrace_version.js @@ -0,0 +1,15 @@ +// Pins the dd-trace devDependency to an explicit version within package.json. +// This is used to force the v5 line on runtimes that dd-trace v6 doesn't support. + +// USAGE: ./set_ddtrace_version.js "$(cat package.json)" 5.123.0 > package.json + +const file = JSON.parse(process.argv[2]); +const version = process.argv[3]; + +if (!version) { + throw new Error("A dd-trace version is required"); +} + +file.devDependencies["dd-trace"] = version; + +console.log(JSON.stringify(file, null, 2)); diff --git a/scripts/update_dist_version.sh b/scripts/update_dist_version.sh index 7e6566f4..3bf98f8d 100755 --- a/scripts/update_dist_version.sh +++ b/scripts/update_dist_version.sh @@ -2,7 +2,10 @@ set -e echo "Updating version constants" DATADOG_LAMBDA_VERSION=$(node -pe "require('./package.json').version") -DD_TRACE_VERSION=$(sed -n -E "s/dd-trace@([0-9]*\.[0-9]*\.[0-9]*):/\1/p" yarn.lock) +# Read the resolved version off the install rather than the lockfile: the layer +# builds for Node 18/20 re-resolve dd-trace to the v5 line, and a lockfile range +# such as ^6.12.0 is not a version to begin with. +DD_TRACE_VERSION=$(node -pe "require('dd-trace/package.json').version" 2>/dev/null || echo "") echo "Datadog Lambda Library Version ${DATADOG_LAMBDA_VERSION}" echo "Datadog Trace Library Version ${DD_TRACE_VERSION}" diff --git a/src/handler.mjs b/src/handler.mjs index ae586010..b01b3998 100644 --- a/src/handler.mjs +++ b/src/handler.mjs @@ -18,6 +18,11 @@ if (process.env.DD_TRACE_DISABLED_PLUGINS === undefined) { logDebug("disabled the dd-trace plugin 'fs'"); } +if (process.env.DD_TRACE_STARTUP_LOGS === undefined) { + process.env.DD_TRACE_STARTUP_LOGS = "false"; + logDebug("disabled dd-trace startup logs"); +} + // True when dd-trace's ESM loader hook is already active via NODE_OPTIONS or // execArgv. Covers every preload entry point that registers the hook: // --import dd-trace/initialize.mjs (documented ESM setup) diff --git a/yarn.lock b/yarn.lock index 0f44fd6f..d1ce271a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1191,17 +1191,10 @@ resolved "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@datadog/flagging-core@1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@datadog/flagging-core/-/flagging-core-1.2.1.tgz#1bb2d1ecfd749033ed2570eccc8fb0697b8adfac" - integrity sha512-qeDkki9fFlqyoZBrn7tneT6pZ04EKKvf3xxisYw1a74zbJihvQui/ARUsjXCurRpzpFqGGTJw/oz+HnXaKhcdw== - dependencies: - spark-md5 "^3.0.2" - -"@datadog/libdatadog@0.9.4": - version "0.9.4" - resolved "https://registry.yarnpkg.com/@datadog/libdatadog/-/libdatadog-0.9.4.tgz#3d39c3561fa11a702c0e5e7819c83f4e03c07b78" - integrity sha512-55wHHAuhHOOrBGoWV+fRuEDypN6PMJZq4LTOwExnhoDMvVcZKtqYT05xea/toRs0o75+A1IeNAQHsRLbJMf5oA== +"@datadog/libdatadog@0.12.1": + version "0.12.1" + resolved "https://registry.yarnpkg.com/@datadog/libdatadog/-/libdatadog-0.12.1.tgz#0b15c4781208a77aa08f0efb74d9deb645e800c4" + integrity sha512-4cKRaO1mB9npfklJjOizzJaNBdZvw1V62EVbSD6Y32zX92bTBq/vAno/TTN9dMAvzomXYmvADpGo4798E9fMoA== "@datadog/native-appsec@*", "@datadog/native-appsec@11.0.1": version "11.0.1" @@ -1225,40 +1218,24 @@ node-addon-api "^6.1.0" node-gyp-build "^3.9.0" -"@datadog/openfeature-node-server@2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@datadog/openfeature-node-server/-/openfeature-node-server-2.0.0.tgz#94e787f0bb0b1b0c87e728ad760950c0ea5f3328" - integrity sha512-Ummu/Bd7ZJpCCNdFnZUt/JI+L1+8OMK53+MyIXbS7dCt4JXWWwelbpzSGqmC2jWbWQ/mTo4hEfnFw3kYOINbXA== - dependencies: - "@datadog/flagging-core" "1.2.1" - -"@datadog/pprof@5.14.4": - version "5.14.4" - resolved "https://registry.npmjs.org/@datadog/pprof/-/pprof-5.14.4.tgz" - integrity sha512-egEZDD9v98RBI8ijbHyaWQeY8rW0WEu004As5D7SUkdqSMORhrnh7ZdsM46PUzQgAc85IaEZoukWS9UhMvWn9w== - dependencies: - node-gyp-build "^4.8.4" - pprof-format "^2.2.1" - source-map "^0.7.4" - -"@datadog/pprof@5.17.0": - version "5.17.0" - resolved "https://registry.yarnpkg.com/@datadog/pprof/-/pprof-5.17.0.tgz#1a40cb77243cbfccd1684c70992512f533addb67" - integrity sha512-BuedZ4vHzmQkitMMdIhVLQ+nPpHl7WRwcuumJeXt0ylhwGGwt7Kf+4CoS1tDB0FljJXi4izweFfFFTirrijP5w== +"@datadog/pprof@5.18.1": + version "5.18.1" + resolved "https://registry.yarnpkg.com/@datadog/pprof/-/pprof-5.18.1.tgz#f37d7bbf4da338df9737b9620b61e5684dc4474c" + integrity sha512-p8RnantBXCrcsT4pHvcdRtQzhqllls/t6yYb2j8hJrnnFcFfWO+u5WSdqLNxGFNjTEhfaFPu6TOoLhNk9iW9Lw== dependencies: node-gyp-build "^4.8.4" - pprof-format "^2.2.1" + pprof-format "^2.3.1" source-map "^0.8.0" -"@datadog/wasm-js-rewriter@5.0.1": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@datadog/wasm-js-rewriter/-/wasm-js-rewriter-5.0.1.tgz#f227d2e3eb0f83b8a37f190a9ff8fdbde5955782" - integrity sha512-EzbV3Lrdt3udQEsbDOVC5gB1y7yxfpBbrSIk4jaEsGjyj0Dbv2HGj7tZjs+qXzIzNonHc8h5El2bYZOGfC2wwg== +"@datadog/wasm-js-rewriter@5.0.3": + version "5.0.3" + resolved "https://registry.yarnpkg.com/@datadog/wasm-js-rewriter/-/wasm-js-rewriter-5.0.3.tgz#815b0969595628b558b1aa8235965c351edc6adb" + integrity sha512-XfumKHD5RTTvqiwMmTEWqvix472tIofPDA78+wFLMWJ6xxJBlJRbJ//sMT9bNYlSgau9JYB9S38EeMdf4xFhGw== dependencies: - js-yaml "^4.1.0" + js-yaml "^4.3.1" lru-cache "^7.14.0" - module-details-from-path "^1.0.3" - node-gyp-build "^4.5.0" + module-details-from-path "^1.0.4" + node-gyp-build "^4.8.4" "@emnapi/core@1.10.0": version "1.10.0" @@ -2660,22 +2637,21 @@ dc-polyfill@^0.1.11: resolved "https://registry.npmjs.org/dc-polyfill/-/dc-polyfill-0.1.11.tgz" integrity sha512-TyyeGcjx0YeThAI9fTFtgsvj5qd4R+aGfVmXiUhevbgzWFDr7IK4tv4YjE6jaGzLHQTchk4h7DHdr5q4WGgaZw== -dd-trace@^5.113.0: - version "5.118.0" - resolved "https://registry.yarnpkg.com/dd-trace/-/dd-trace-5.118.0.tgz#a3fbbcc21e9739d96a386dc5e4fbbca0647f7392" - integrity sha512-1VNK9st2x9He3na50/L9TrSFDhGavbAy1DEHdRhc8FBipAdVZTZPTSkQdar1z0vi0ZpmW3fMWfzAeGj328d77w== +dd-trace@^6.12.0: + version "6.12.0" + resolved "https://registry.yarnpkg.com/dd-trace/-/dd-trace-6.12.0.tgz#bbd10e16e358939f3705592759d0460f96461cfa" + integrity sha512-9tz5kapeXsEmd6/vYvRKDpp92uHJH7B30KtCfkTI2QVpHfL0kz61nUKQhXu4YGlFkeXL55S9UlMtck4p6sI5IQ== dependencies: dc-polyfill "^0.1.11" import-in-the-middle "^3.3.2" opentracing ">=0.14.7" optionalDependencies: - "@datadog/libdatadog" "0.9.4" + "@datadog/libdatadog" "0.12.1" "@datadog/native-appsec" "11.0.1" "@datadog/native-iast-taint-tracking" "4.2.0" "@datadog/native-metrics" "3.1.2" - "@datadog/openfeature-node-server" "2.0.0" - "@datadog/pprof" "5.17.0" - "@datadog/wasm-js-rewriter" "5.0.1" + "@datadog/pprof" "5.18.1" + "@datadog/wasm-js-rewriter" "5.0.3" "@opentelemetry/api" ">=1.0.0 <1.10.0" "@opentelemetry/api-logs" "<1.0.0" oxc-parser "^0.132.0" @@ -3685,7 +3661,7 @@ js-tokens@^4.0.0: resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -js-yaml@^3.13.1, js-yaml@^3.14.2, js-yaml@^4.1.0: +js-yaml@^3.13.1, js-yaml@^3.14.2, js-yaml@^4.3.1: version "3.15.0" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.15.0.tgz#586e5214eafe3e893756a41e979b50d89d3e4a67" integrity sha512-ttBQIIQPDeLjpPOohtUdXuXUVoA2uIB6fEH9HyJ7234s5mBJ5wTx20njxplLZQgLaOfpmPQA7X2t5AX6tIPbog== @@ -3868,7 +3844,7 @@ mock-fs@4.14.0: resolved "https://registry.npmjs.org/mock-fs/-/mock-fs-4.14.0.tgz" integrity sha512-qYvlv/exQ4+svI3UOvPUpLDF0OMX5euvUH0Ny4N5QyRyhNdgAgUrVH3iUINSzEPLvx0kbo/Bp28GJKIqvE7URw== -module-details-from-path@^1.0.3, module-details-from-path@^1.0.4: +module-details-from-path@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/module-details-from-path/-/module-details-from-path-1.0.4.tgz#b662fdcd93f6c83d3f25289da0ce81c8d9685b94" integrity sha512-EGWKgxALGMgzvxYF1UyGTy0HXX/2vHLkw6+NvDKW2jypWbHpjQuj4UMcqQWXHERJhVGKikolT06G3bcKe4fi7w== @@ -3902,7 +3878,7 @@ node-gyp-build@^3.9.0: resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-3.9.0.tgz#53a350187dd4d5276750da21605d1cb681d09e25" integrity sha512-zLcTg6P4AbcHPq465ZMFNXx7XpKKJh+7kkN699NiQWisR2uWYOWNWqRHAmbnmKiL4e9aLSlmy5U7rEMUXV59+A== -node-gyp-build@^4.5.0, node-gyp-build@^4.8.4: +node-gyp-build@^4.8.4: version "4.8.4" resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.8.4.tgz#8a70ee85464ae52327772a90d66c6077a900cfc8" integrity sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ== @@ -4062,10 +4038,10 @@ possible-typed-array-names@^1.0.0: resolved "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz" integrity sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q== -pprof-format@^2.2.1: - version "2.3.0" - resolved "https://registry.yarnpkg.com/pprof-format/-/pprof-format-2.3.0.tgz#d2e6843e522c6eae6231224064fdb5567db5c2f1" - integrity sha512-ovChRLoV4H3k0zKWq0AXewtnuPGskzBLjBPmF2N0DZu+H65PYuo51+6e/1GTb8Olm7oC0xvhhLdqPL4/XhCl4A== +pprof-format@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/pprof-format/-/pprof-format-2.3.1.tgz#990201155cf6d720bfbf5e50f2def3b77c004843" + integrity sha512-y51Z83qG2vEQBACPu6lkGFREVkHwQaCaNDdSFEMLIqSo3bmpADsbP6J3F2SSk7tYB741oTQ9Kt5YAdQsmiCRkA== prettier@^2.3.0: version "2.8.8" @@ -4281,21 +4257,11 @@ source-map@^0.7.3: resolved "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz" integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA== -source-map@^0.7.4: - version "0.7.6" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.6.tgz#a3658ab87e5b6429c8a1f3ba0083d4c61ca3ef02" - integrity sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ== - source-map@^0.8.0: version "0.8.0" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.8.0.tgz#72b9006383bd9fc70d52e435c91c2d73249c60a4" integrity sha512-d8EqvL+k/SOXCreS/SUzg2ciyHqBBLcN/yuRjFsbvVhHTE2pgei7oAhmPM7kWFbkX6OSMQfUq4KbkF3au9lhYQ== -spark-md5@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/spark-md5/-/spark-md5-3.0.2.tgz#7952c4a30784347abcee73268e473b9c0167e3fc" - integrity sha512-wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw== - sprintf-js@~1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"