Merge branch 'main' into ccapell/APPSEC-60752/in-app-waf-port

Author: CarlesDD

.gitignore

@@ -14,3 +14,6 @@ package-lock.json
 /.idea/
 
 .gitlab/build-*.yaml
+
+# Local datadog-lambda-js tarballs produced for container integration tests
+integration_tests/container/*/datadog-lambda-js-local.tgz

.gitlab/input_files/build.yaml.tpl

@@ -81,7 +81,11 @@ unit test ({{ $runtime.name }}):
 
 integration test ({{ $runtime.name }}):
   stage: test
-  tags: ["arch:amd64"]
+  # `docker-in-docker:<arch>` routes the job to a runner with a live Docker
+  # daemon (vs. plain `arch:amd64` which only has the docker CLI). Required by
+  # the container-image integration tests, which build & push ECR images for
+  # the `container-{cjs,esm}_node*` functions.
+  tags: ["docker-in-docker:amd64"]
   image: ${CI_DOCKER_TARGET_IMAGE}:${CI_DOCKER_TARGET_VERSION}
   needs: 
     - build layer ({{ $runtime.name }})

.gitlab/scripts/publish_npm.sh

@@ -29,5 +29,4 @@ if [ -d "./dist" ]; then
     rm -rf ./dist
 fi
 yarn build
-cp ./dist/handler.cjs ./dist/handler.js
 npm publish

README.md

@@ -30,6 +30,7 @@ Besides the environment variables supported by dd-trace-js, the datadog-lambda-j
 | DD_COLD_START_TRACE_SKIP_LIB | optionally skip creating Cold Start Spans for a comma-separated list of libraries. Useful to limit depth or skip known libraries. | `./opentracing/tracer` |
 | DD_CAPTURE_LAMBDA_PAYLOAD | [Captures incoming and outgoing AWS Lambda payloads][1] in the Datadog APM spans for Lambda invocations. | `false` |
 | DD_CAPTURE_LAMBDA_PAYLOAD_MAX_DEPTH | Determines the level of detail captured from AWS Lambda payloads, which are then assigned as tags for the `aws.lambda` span. It specifies the nesting depth of the JSON payload structure to process. Once the specified maximum depth is reached, the tag's value is set to the stringified value of any nested elements beyond this level.  <br> For example, given the input payload: <pre>{<br>  "lv1" : {<br>    "lv2": {<br>      "lv3": "val"<br>    }<br>  }<br>}</pre> If the depth is set to `2`, the resulting tag's key is set to `function.request.lv1.lv2` and the value is `{\"lv3\": \"val\"}`. <br> If the depth is set to `0`, the resulting tag's key is set to `function.request` and value is `{\"lv1\":{\"lv2\":{\"lv3\": \"val\"}}}` | `10` |
+| DD_DURABLE_CROSS_INVOCATION_TRACING_ENABLED | For AWS Durable functions, the tracer creates extra checkpoints named `_datadog_{N}` to propagate trace context across function invocations, keeping spans from multiple invocations in one intact trace for each durable execution. | `true` |
 
 
 ## Lambda Profiling Beta

integration_tests/container/cjs/Dockerfile

@@ -0,0 +1,11 @@
+ARG NODE_VERSION=22
+FROM public.ecr.aws/lambda/nodejs:${NODE_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} \
+    && npm install --omit=dev \
+    && npm install --no-save /tmp/datadog-lambda-js-local.tgz \
+    && rm /tmp/datadog-lambda-js-local.tgz
+
+CMD ["node_modules/datadog-lambda-js/dist/handler.handler"]

integration_tests/container/cjs/handler.js

@@ -0,0 +1,3 @@
+exports.handle = (event) => {
+  return { message: "hello, dog!" };
+};

integration_tests/container/cjs/package.json

@@ -0,0 +1,8 @@
+{
+  "name": "container-cjs-test",
+  "version": "1.0.0",
+  "private": true,
+  "dependencies": {
+    "dd-trace": "5.105.0"
+  }
+}

integration_tests/container/esm/Dockerfile

@@ -0,0 +1,11 @@
+ARG NODE_VERSION=22
+FROM public.ecr.aws/lambda/nodejs:${NODE_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} \
+    && npm install --omit=dev \
+    && npm install --no-save /tmp/datadog-lambda-js-local.tgz \
+    && rm /tmp/datadog-lambda-js-local.tgz
+
+CMD ["node_modules/datadog-lambda-js/dist/handler.handler"]

integration_tests/container/esm/handler.mjs

@@ -0,0 +1,8 @@
+import { promisify } from "util";
+
+// Verify top-level await works in the container-image ESM path
+await promisify(setTimeout)(50);
+
+export function handle(event) {
+  return { message: "hello, dog!" };
+}

integration_tests/container/esm/package.json

@@ -0,0 +1,9 @@
+{
+  "name": "container-esm-test",
+  "version": "1.0.0",
+  "private": true,
+  "type": "module",
+  "dependencies": {
+    "dd-trace": "5.105.0"
+  }
+}