DataDog · rochdev · May 12, 2026 · May 16, 2026 · May 16, 2026 · May 16, 2026
@@ -88,6 +88,7 @@ jobs:
       _build_proxy_image: ${{ contains(github.event.pull_request.labels.*.name, 'build-proxy-image') }}
       _build_python_base_images: ${{ contains(github.event.pull_request.labels.*.name, 'build-python-base-images') }}
       _build_php_base_images: ${{ contains(github.event.pull_request.labels.*.name, 'build-php-base-images') }}
+      _build_nodejs_base_images: ${{ contains(github.event.pull_request.labels.*.name, 'build-nodejs-base-images') }}
       _enable_replay_scenarios: true
       _system_tests_dev_mode: ${{ matrix.version == 'dev' }}
       _system_tests_library_target_branch_map: ${{ needs.compute_libraries_and_scenarios.outputs.target-branch-map }}

@@ -52,6 +52,11 @@ on:
         default: ''
         required: false
         type: string
+      _build_weblog_images:
+        description: "When true, weblogs get a build job to save artifacts. When false, parallel_weblogs is empty and run jobs rebuild from Docker Hub."
+        default: true
+        required: false
+        type: boolean
 
     # Map the workflow outputs to job outputs
     outputs:
@@ -137,6 +142,7 @@ jobs:
           --parametric-job-count ${{ inputs.parametric_job_count }} \
           --explicit-binaries-artifact "${{ inputs.binaries_artifact }}" \
           --system-tests-dev-mode "${{ inputs._system_tests_dev_mode }}" \
+          --build-weblog-images "${{ inputs._build_weblog_images }}" \
           --output $GITHUB_OUTPUT
     - name: log
       run: |

@@ -54,6 +54,11 @@ on:
         default: false
         required: false
         type: boolean
+      _build_nodejs_base_images:
+        description: "Shall we build Node.js base images for tests on Node.js tracer"
+        default: false
+        required: false
+        type: boolean
       _build_buddies_images:
         description: "Shall we build buddies images"
         default: false
@@ -168,6 +173,7 @@ jobs:
       binaries_artifact: ${{ inputs.binaries_artifact }}
       _system_tests_dev_mode: ${{ inputs._system_tests_dev_mode }}
       _system_tests_library_target_branch_map: ${{ inputs._system_tests_library_target_branch_map }}
+      _build_weblog_images: ${{ inputs.library != 'nodejs' || inputs._build_nodejs_base_images }}
 
   parametric:
     needs:
@@ -236,6 +242,10 @@ jobs:
         if: inputs.library == 'php' && inputs._build_php_base_images
         run: |
           ./utils/build/build_php_base_images.sh
+      - name: Build nodejs weblog base images
+        if: inputs.library == 'nodejs' && inputs._build_nodejs_base_images
+        run: |
+          ./utils/build/build_nodejs_base_images.sh
       - name: Build weblog
         id: build
         run: SYSTEM_TEST_BUILD_ATTEMPTS=3 ./build.sh ${{ inputs.library }} -i weblog -w ${{ matrix.weblog.name }} -s --github-token-file "$RUNNER_TEMP/github_token.txt"

@@ -6,7 +6,7 @@ TODO=(
   utils/scripts/docker_base_image.sh
   utils/build/docker/postgres-init-db.sh
   utils/build/docker/nodejs/app.sh
-  utils/build/docker/nodejs/install_ddtrace.sh
+
   utils/build/docker/set-uds-transport.sh
   utils/build/docker/python/flask/app.sh
   utils/build/docker/python/install_ddtrace.sh

@@ -6,5 +6,6 @@ If you need to update them, you will need to follow those
 2. create your PR, and add the relevant label to rebuild the image in the CI
   * `build-python-base-images` for python weblogs
   * `build-php-base-images` for PHP weblogs
+  * `build-nodejs-base-images` for Node.js weblogs
   * `build-proxy-image` for proxy image
 3. just before merging your PR, ping somebody from Reliability & Performance team to push your image to hub.docker.com (`#apm-shared-testing` on slack)
@@ -958,7 +958,7 @@ def get_image_list(self, library: str | None, weblog: str | None) -> list[str]:
         """Returns images needed to build the weblog"""
 
         # If an image is saved as a file in binaries, we don't need any image
-        filename = f"binaries/{library}-{weblog}-weblog.tar.gz"
+        filename = f"binaries/{library}-{weblog}-weblog.tar.zst"
         if Path(filename).is_file():
             return []
 

@@ -20,10 +20,10 @@ readonly ALIAS_CACHE_TO="W" #write cache
 readonly DEFAULT_TEST_LIBRARY=nodejs
 readonly DEFAULT_BUILD_IMAGES=weblog,runner
 readonly DEFAULT_DOCKER_MODE=0
-readonly DEFAULT_SAVE_TO_BINARIES=0
 
 # Define default weblog variants.
 # XXX: Avoid associative arrays for Bash 3 compatibility.
+readonly DEFAULT_SAVE_TO_BINARIES=0
 readonly DEFAULT_nodejs=express4
 readonly DEFAULT_python=flask-poc
 readonly DEFAULT_ruby=rails72
@@ -72,7 +72,7 @@ print_usage() {
     echo -e "  ${CYAN}--default-weblog${NC}             Prints the name of the default weblog for a given library and exits."
     echo -e "  ${CYAN}--binary-path${NC}                Optional. Path of a directory binaries will be copied from. Should be used for local development only."
     echo -e "  ${CYAN}--binary-url${NC}                 Optional. Url of the client library redistributable. Should be used for local development only."
-    echo -e "  ${CYAN}--save-to-binaries${NC}           Optional. Save image in binaries folder as a tar.gz file."
+    echo -e "  ${CYAN}--save-to-binaries${NC}           Optional. Save image in binaries folder as a tar.zst file."
     echo -e "  ${CYAN}--help${NC}                       Prints this message and exits."
     echo
     echo -e "${WHITE_BOLD}EXAMPLES${NC}"
@@ -257,11 +257,22 @@ build() {
             fi
 
             # keep this name consistent with WeblogContainer.get_image_list()
-            BINARIES_FILENAME=binaries/${TEST_LIBRARY}-${WEBLOG_VARIANT}-weblog.tar.gz
+            BINARIES_FILENAME=binaries/${TEST_LIBRARY}-${WEBLOG_VARIANT}-weblog.tar.zst
+
+            if [[ $TEST_LIBRARY == nodejs ]] && [[ $SAVE_TO_BINARIES == 1 ]]; then
+                BASE_IMAGE=$(awk '/^FROM/{print $2; exit}' "utils/build/docker/nodejs/${WEBLOG_VARIANT}.Dockerfile")
+                echo "Saving base image $BASE_IMAGE to $BINARIES_FILENAME"
+                docker save "$BASE_IMAGE" | zstd > "$BINARIES_FILENAME"
+                continue
+            fi
 
-            if [ -f $BINARIES_FILENAME ]; then
+            if [ -f "$BINARIES_FILENAME" ]; then
                 echo "Loading image from $BINARIES_FILENAME"
-                docker load --input $BINARIES_FILENAME
+                zstd -d -c "$BINARIES_FILENAME" | docker load
+            fi
+
+            if docker image inspect system_tests/weblog >/dev/null 2>&1; then
+                echo "Using pre-loaded weblog image"
             else
 
                 if [[ $TEST_LIBRARY == python ]]; then
@@ -339,8 +350,9 @@ build() {
 
                 if [[ $SAVE_TO_BINARIES == 1 ]]; then
                     echo "Saving image to $BINARIES_FILENAME"
-                    docker save system_tests/weblog | gzip > $BINARIES_FILENAME
+                    docker save system_tests/weblog | zstd > "$BINARIES_FILENAME"
                 fi
+
             fi
         elif [[ $IMAGE_NAME == lambda-proxy ]]; then
             run_build_command docker buildx build \
@@ -370,13 +382,13 @@ while [[ "$#" -gt 0 ]]; do
         -e|--extra-docker-args) EXTRA_DOCKER_ARGS="$2"; shift ;;
         -c|--cache-mode) DOCKER_CACHE_MODE="$2"; shift ;;
         -p|--docker-platform) DOCKER_PLATFORM="--platform $2"; shift ;;
-        -s|--save-to-binaries) SAVE_TO_BINARIES=1 ;;
         --github-token-file) GITHUB_TOKEN_FILE="$2"; shift ;;
         --binary-url) BINARY_URL="$2"; shift ;;
         --binary-path) BINARY_PATH="$2"; shift ;;
         --list-libraries) COMMAND=list-libraries ;;
         --list-weblogs) COMMAND=list-weblogs ;;
         --default-weblog) COMMAND=default-weblog ;;
+        -s|--save-to-binaries) SAVE_TO_BINARIES=1 ;;
         -h|--help) print_usage; exit 0 ;;
         --agent-base-image) AGENT_BASE_IMAGE="$2"; shift ;;  # deprecated
         *)
@@ -395,11 +407,11 @@ DOCKER_CACHE_MODE="${DOCKER_CACHE_MODE:-}"
 EXTRA_DOCKER_ARGS="${EXTRA_DOCKER_ARGS:-}"
 DOCKER_PLATFORM="${DOCKER_PLATFORM:-}"
 DOCKER_MODE="${DOCKER_MODE:-${DEFAULT_DOCKER_MODE}}"
-SAVE_TO_BINARIES="${SAVE_TO_BINARIES:-${DEFAULT_SAVE_TO_BINARIES}}"
 BUILD_IMAGES="${BUILD_IMAGES:-${DEFAULT_BUILD_IMAGES}}"
 TEST_LIBRARY="${TEST_LIBRARY:-${DEFAULT_TEST_LIBRARY}}"
 BINARY_PATH="${BINARY_PATH:-}"
 BINARY_URL="${BINARY_URL:-}"
+SAVE_TO_BINARIES="${SAVE_TO_BINARIES:-${DEFAULT_SAVE_TO_BINARIES}}"
 GITHUB_TOKEN_FILE="${GITHUB_TOKEN_FILE:-}"
 
 if [[ "${BUILD_IMAGES}" =~ /weblog/ && ! -d "${SCRIPT_DIR}/docker/${TEST_LIBRARY}" ]]; then

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -e
+
+if [ "$1" = "--push" ]; then
+    exec docker buildx bake --progress=plain -f "utils/build/docker/nodejs/docker-bake.hcl" "$@"
+else
+    exec docker buildx bake --progress=plain --load -f "utils/build/docker/nodejs/docker-bake.hcl" "$@"
+fi
@@ -1,22 +1,24 @@
 FROM node:22-alpine
 ARG FRAMEWORK_VERSION
 
+COPY --from=oven/bun:1.3.13-alpine /usr/local/bin/bun /usr/local/bin/bun
+
 RUN apk add --no-cache bash curl git jq
 
 RUN uname -r
 
 # print versions
-RUN node --version && npm --version && curl --version
+RUN node --version && npm --version && bun --version && curl --version
 
 WORKDIR /usr/app
 
 COPY utils/build/docker/nodejs/anthropic_app /usr/app
-RUN npm ci || (sleep 30 && npm ci)
+RUN bun install --frozen-lockfile --network-concurrency 8 --linker=hoisted
 
 RUN if [ "$FRAMEWORK_VERSION" = "latest" ]; then \
-        npm install @anthropic-ai/sdk; \
+        bun add --network-concurrency 8 @anthropic-ai/sdk; \
     else \
-        npm install @anthropic-ai/sdk@$FRAMEWORK_VERSION; \
+        bun add --network-concurrency 8 @anthropic-ai/sdk@$FRAMEWORK_VERSION; \
     fi
 
 COPY utils/build/docker/nodejs/install_ddtrace.sh binaries* /binaries/
@@ -25,4 +27,4 @@ RUN /binaries/install_ddtrace.sh
 # docker startup
 COPY utils/build/docker/nodejs/app.sh app.sh
 RUN printf 'node app.js' >> app.sh
-CMD ./app.sh
+CMD ./app.sh