v5.99.0 proposal

.github/CODEOWNERS

@@ -216,6 +216,7 @@
 /.github/workflows/aiguard.yml @DataDog/asm-js
 /.github/workflows/appsec.yml @DataDog/asm-js
 /.github/workflows/debugger.yml @DataDog/debugger-nodejs
+/.github/workflows/instrumentation.yml @DataDog/apm-idm-js
 /.github/workflows/serverless.yml @DataDog/serverless-aws @DataDog/apm-serverless
 /.github/workflows/llmobs.yml @DataDog/ml-observability
 /.github/workflows/profiling.yml @DataDog/profiling-js

.github/actions/install/action.yml

@@ -9,7 +9,7 @@ runs:
   using: composite
   steps:
     - id: yarn-cache
-      uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+      uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
       with:
         key: yarn-cache-${{ github.workflow }}-${{ github.job }}-${{ hashFiles('yarn.lock') }}-v2
         path: node_modules.tar

.github/actions/install/branch-diff/action.yml

@@ -7,7 +7,7 @@ inputs:
 runs:
   using: composite
   steps:
-    - uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+    - uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
       with:
         path: ~/.npm
         key: ${{ github.workflow }}-branch-diff-3.1.1

.github/actions/node/action.yml

@@ -29,7 +29,7 @@ runs:
       id: cache-key
       shell: bash
       run: echo "block=$(( $(date -u +%s) / 1200 ))" >> "$GITHUB_OUTPUT"
-    - uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+    - uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
       id: node-version-cache
       with:
         path: /tmp/.node-resolved-version-${{ steps.node-version.outputs.version }}

.github/actions/plugins/test-and-upstream/action.yml

@@ -1,12 +1,20 @@
 name: Plugin and Upstream Tests
 description: Run plugin tests and upstream test suite
+inputs:
+  node-floor:
+    description: 'Lower Node alias: oldest-maintenance-lts or newest-maintenance-lts.'
+    required: false
+    default: oldest-maintenance-lts
 runs:
   using: composite
   steps:
     - uses: ./.github/actions/dd-sts-api-key
       id: dd-sts
     - uses: ./.github/actions/testagent/start
-    - uses: ./.github/actions/node/oldest-maintenance-lts
+    - if: ${{ inputs.node-floor == 'oldest-maintenance-lts' }}
+      uses: ./.github/actions/node/oldest-maintenance-lts
+    - if: ${{ inputs.node-floor == 'newest-maintenance-lts' }}
+      uses: ./.github/actions/node/newest-maintenance-lts
     - uses: ./.github/actions/install
     - run: yarn test:plugins:ci
       shell: bash

.github/actions/plugins/test/action.yml

@@ -1,12 +1,20 @@
 name: Plugin Tests
 description: Run plugin tests
+inputs:
+  node-floor:
+    description: 'Lower Node alias: oldest-maintenance-lts or newest-maintenance-lts.'
+    required: false
+    default: oldest-maintenance-lts
 runs:
   using: composite
   steps:
     - uses: ./.github/actions/dd-sts-api-key
       id: dd-sts
     - uses: ./.github/actions/testagent/start
-    - uses: ./.github/actions/node/oldest-maintenance-lts
+    - if: ${{ inputs.node-floor == 'oldest-maintenance-lts' }}
+      uses: ./.github/actions/node/oldest-maintenance-lts
+    - if: ${{ inputs.node-floor == 'newest-maintenance-lts' }}
+      uses: ./.github/actions/node/newest-maintenance-lts
     - uses: ./.github/actions/install
     - run: yarn test:plugins:ci
       shell: bash

.github/actions/plugins/upstream/action.yml

@@ -1,12 +1,20 @@
 name: Plugin Upstream Tests
 description: Run upstream test suite
+inputs:
+  node-floor:
+    description: 'Lower Node alias: oldest-maintenance-lts or newest-maintenance-lts.'
+    required: false
+    default: oldest-maintenance-lts
 runs:
   using: composite
   steps:
     - uses: ./.github/actions/dd-sts-api-key
       id: dd-sts
     - uses: ./.github/actions/testagent/start
-    - uses: ./.github/actions/node/oldest-maintenance-lts
+    - if: ${{ inputs.node-floor == 'oldest-maintenance-lts' }}
+      uses: ./.github/actions/node/oldest-maintenance-lts
+    - if: ${{ inputs.node-floor == 'newest-maintenance-lts' }}
+      uses: ./.github/actions/node/newest-maintenance-lts
     - uses: ./.github/actions/install
     - run: yarn test:plugins:upstream
       shell: bash

.github/actions/push_to_test_optimization/action.yml

@@ -17,4 +17,7 @@ runs:
       uses: DataDog/junit-upload-github-action@24449d01fc01e721fa36ccd2caa3caae6922f0e8 # v3.0.0
       with:
         api_key: ${{ inputs.dd_api_key }}
+        # TODO: remove once https://github.com/DataDog/junit-upload-github-action/pull/54 lands
+        # and junit-upload-github-action releases are tied to datadog-ci releases.
+        datadog-ci-version: 5.13.1
         service: dd-trace-js-tests

.github/workflows/aiguard.yml

@@ -8,8 +8,8 @@ on:
     - cron: 0 4 * * *
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
+  group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/master' && github.run_id || github.ref }}
+  cancel-in-progress: true
 
 env:
   MOCHA_OPTIONS: ${{ github.ref == 'refs/heads/master' && '--retries 1' || '' }}

.github/workflows/all-green.yml

@@ -8,8 +8,8 @@ on:
     - cron: 0 4 * * *
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
+  group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/master' && github.run_id || github.ref }}
+  cancel-in-progress: true
 
 jobs:
   all-green:

.github/workflows/apm-capabilities.yml

@@ -14,8 +14,8 @@ on:
         type: string
 
 concurrency:
-  group: ${{ github.workflow }}-${{ inputs.latest-version }}-${{ github.ref || github.run_id }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
+  group: ${{ github.workflow }}-${{ inputs.latest-version }}-${{ github.ref == 'refs/heads/master' && github.run_id || github.ref }}
+  cancel-in-progress: true
 
 env:
   MOCHA_OPTIONS: ${{ github.ref == 'refs/heads/master' && '--retries 1' || '' }}
@@ -46,22 +46,21 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       id-token: write
+    strategy:
+      matrix:
+        node-version: [oldest, maintenance, active, latest]
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - uses: ./.github/actions/dd-sts-api-key
         id: dd-sts
-      - uses: ./.github/actions/node/oldest-maintenance-lts
+      - uses: ./.github/actions/node
+        with:
+          version: ${{ matrix.node-version }}
       - uses: ./.github/actions/install
       - run: yarn test:trace:core:ci
-      - uses: ./.github/actions/node/newest-maintenance-lts
-      - run: yarn test:trace:core:ci
-      - uses: ./.github/actions/node/active-lts
-      - run: yarn test:trace:core:ci
-      - uses: ./.github/actions/node/latest
-      - run: yarn test:trace:core:ci
       - uses: ./.github/actions/coverage
         with:
-          flags: apm-capabilities-tracing-ubuntu
+          flags: apm-capabilities-tracing-ubuntu-${{ matrix.node-version }}
           dd_api_key: ${{ steps.dd-sts.outputs.api_key }}
       - uses: ./.github/actions/push_to_test_optimization
         if: "!cancelled()"

.github/workflows/apm-integrations.yml

@@ -14,8 +14,8 @@ on:
         type: string
 
 concurrency:
-  group: ${{ github.workflow }}-${{ inputs.latest-version }}-${{ github.ref || github.run_id }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
+  group: ${{ github.workflow }}-${{ inputs.latest-version }}-${{ github.ref == 'refs/heads/master' && github.run_id || github.ref }}
+  cancel-in-progress: true
 
 env:
   MOCHA_OPTIONS: ${{ github.ref == 'refs/heads/master' && '--retries 1' || '' }}
@@ -1106,27 +1106,9 @@ jobs:
       PLUGINS: pino
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-      - uses: ./.github/actions/dd-sts-api-key
-        id: dd-sts
-      - uses: ./.github/actions/testagent/start
-      - uses: ./.github/actions/node/newest-maintenance-lts
-      - uses: ./.github/actions/install
-      - run: yarn test:plugins:ci
-      - uses: ./.github/actions/node/latest
-      - run: yarn test:plugins:ci
-      # - run: yarn test:plugins:upstream
-      - if: always()
-        uses: ./.github/actions/testagent/logs
-        with:
-          suffix: plugins-${{ github.job }}
-      - uses: ./.github/actions/coverage
-        with:
-          flags: apm-integrations-pino
-          dd_api_key: ${{ steps.dd-sts.outputs.api_key }}
-      - uses: ./.github/actions/push_to_test_optimization
-        if: "!cancelled()"
+      - uses: ./.github/actions/plugins/test
         with:
-          dd_api_key: ${{ steps.dd-sts.outputs.api_key }}
+          node-floor: newest-maintenance-lts
 
   passport-http:
     runs-on: ubuntu-latest

.github/workflows/appsec.yml

@@ -14,8 +14,8 @@ on:
         type: string
 
 concurrency:
-  group: ${{ github.workflow }}-${{ inputs.latest-version }}-${{ github.ref || github.run_id }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
+  group: ${{ github.workflow }}-${{ inputs.latest-version }}-${{ github.ref == 'refs/heads/master' && github.run_id || github.ref }}
+  cancel-in-progress: true
 
 env:
   MOCHA_OPTIONS: ${{ github.ref == 'refs/heads/master' && '--retries 1' || '' }}

.github/workflows/audit.yml

@@ -6,8 +6,8 @@ on:
       - dependabot/**
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
+  group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/master' && github.run_id || github.ref }}
+  cancel-in-progress: true
 
 jobs:
   dependencies:

.github/workflows/codeql-analysis.yml

@@ -38,7 +38,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
+        uses: github/codeql-action/init@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2
         with:
           languages: ${{ matrix.language }}
           config-file: .github/codeql_config.yml
@@ -48,7 +48,7 @@ jobs:
           # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
+        uses: github/codeql-action/autobuild@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
+        uses: github/codeql-action/analyze@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2

.github/workflows/debugger.yml

@@ -8,8 +8,8 @@ on:
     - cron: 0 4 * * *
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
+  group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/master' && github.run_id || github.ref }}
+  cancel-in-progress: true
 
 env:
   MOCHA_OPTIONS: ${{ github.ref == 'refs/heads/master' && '--retries 1' || '' }}

.github/workflows/eslint-rules.yml

@@ -10,8 +10,8 @@ on:
       - "eslint-rules/**"
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
+  group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/master' && github.run_id || github.ref }}
+  cancel-in-progress: true
 
 jobs:
   eslint-rules: