v5.18.0

.github/workflows/appsec.yml

@@ -39,7 +39,9 @@ jobs:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/node/setup
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '18'
       - run: yarn install
       - run: yarn test:appsec:ci
       - uses: codecov/codecov-action@v3
@@ -207,9 +209,11 @@ jobs:
         version:
           - 18
           - latest
+        range: ['9.5.0', '11.1.4', '13.2.0', '*']
     runs-on: ubuntu-latest
     env:
       PLUGINS: next
+      PACKAGE_VERSION_RANGE: ${{ matrix.range }}
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/testagent/start

.github/workflows/datadog-static-analysis.yml

@@ -0,0 +1,24 @@
+name: Datadog Static Analysis
+
+on:
+  pull_request:
+  push:
+    branches: [master]
+
+jobs:
+  static-analysis:
+    runs-on: ubuntu-latest
+    name: Datadog Static Analyzer
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+    - name: Check code meets quality and security standards
+      id: datadog-static-analysis
+      uses: DataDog/datadog-static-analyzer-github-action@v1
+      with:
+        dd_api_key: ${{ secrets.DD_STATIC_ANALYSIS_API_KEY }}
+        dd_app_key: ${{ secrets.DD_STATIC_ANALYSIS_APP_KEY }}
+        dd_service: dd-trace-js
+        dd_env: ci
+        dd_site: datadoghq.com
+        cpu_count: 2

.github/workflows/plugins.yml

@@ -15,60 +15,6 @@ concurrency:
 
 
 jobs:
-  aerospike-node-14:
-    runs-on: ubuntu-latest
-    container:
-      image: ubuntu:18.04
-    services:
-      aerospike:
-        image: aerospike:ce-5.3.0.16
-        ports:
-          - 3000:3000
-      testagent:
-        image: ghcr.io/datadog/dd-apm-test-agent/ddapm-test-agent:v1.16.0
-        env:
-          LOG_LEVEL: DEBUG
-          TRACE_LANGUAGE: javascript
-          ENABLED_CHECKS: trace_stall,meta_tracer_version_header,trace_count_header,trace_peer_service
-          PORT: 9126
-        ports:
-          - 9126:9126
-    env:
-      PLUGINS: aerospike
-      SERVICES: aerospike
-      PACKAGE_VERSION_RANGE: '3.16.2 - 3.16.7'
-      DD_TEST_AGENT_URL: http://testagent:9126
-      AEROSPIKE_HOST_ADDRESS: aerospike
-    steps:
-      # Needs to remain on v3 for now due to GLIBC version
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-        with:
-          node-version: '14'
-      - id: pkg
-        run: |
-          content=`cat ./package.json | tr '\n' ' '`
-          echo "json=$content" >> $GITHUB_OUTPUT
-      - id: extract
-        run: |
-          version="${{fromJson(steps.pkg.outputs.json).version}}"
-          majorVersion=$(echo "$version" | cut -d '.' -f 1)
-          echo "Major Version: $majorVersion"
-          echo "MAJOR_VERSION=$majorVersion" >> $GITHUB_ENV
-      - name: Install dependencies and run tests
-        if: env.MAJOR_VERSION == '3'
-        run: |
-          apt-get update && \
-          apt-get install -y \
-            python3 python3-pip \
-            wget \
-            g++ libssl1.0.0 libssl-dev zlib1g-dev && \
-          npm install -g yarn
-          yarn install --ignore-engines
-          yarn test:plugins:ci
-      - if: always()
-        uses: codecov/codecov-action@v2
-
   aerospike-node-16:
     runs-on: ubuntu-latest
     services:
@@ -222,6 +168,9 @@ jobs:
       - uses: codecov/codecov-action@v3
 
   aws-sdk:
+    strategy:
+      matrix:
+        node-version: ['18', 'latest']
     runs-on: ubuntu-latest
     services:
       localstack:
@@ -262,9 +211,9 @@ jobs:
       - uses: ./.github/actions/testagent/start
       - uses: ./.github/actions/node/setup
       - run: yarn install
-      - uses: ./.github/actions/node/oldest
-      - run: yarn test:plugins:ci
-      - uses: ./.github/actions/node/latest
+      - uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
       - run: yarn test:plugins:ci
       - if: always()
         uses: ./.github/actions/testagent/logs
@@ -327,9 +276,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       cassandra:
-        image: spotify/cassandra
-        env:
-          CASSANDRA_TOKEN: '-9223372036854775808'
+        image: cassandra:3-focal
         ports:
           - 9042:9042
     env:
@@ -365,6 +312,9 @@ jobs:
       - uses: codecov/codecov-action@v2
 
   couchbase:
+    strategy:
+      matrix:
+        range: ['^2.6.12', '^3.0.7', '>=4.2.0']
     runs-on: ubuntu-latest
     services:
       couchbase:
@@ -375,6 +325,7 @@ jobs:
     env:
       PLUGINS: couchbase
       SERVICES: couchbase
+      PACKAGE_VERSION_RANGE: ${{ matrix.range }}
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/testagent/start
@@ -458,7 +409,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       elasticsearch:
-        image: elasticsearch:7.14.0
+        image: elasticsearch:7.17.22
         env:
           discovery.type: single-node
         ports:
@@ -622,6 +573,9 @@ jobs:
       - uses: codecov/codecov-action@v3
 
   http:
+    strategy:
+      matrix:
+        node-version: ['18', '20', 'latest']
     runs-on: ubuntu-latest
     env:
       PLUGINS: http
@@ -630,11 +584,9 @@ jobs:
       - uses: ./.github/actions/testagent/start
       - uses: ./.github/actions/node/setup
       - run: yarn install
-      - uses: ./.github/actions/node/18
-      - run: yarn test:plugins:ci
-      - uses: ./.github/actions/node/20
-      - run: yarn test:plugins:ci
-      - uses: ./.github/actions/node/latest
+      - uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
       - run: yarn test:plugins:ci
       - if: always()
         uses: ./.github/actions/testagent/logs
@@ -940,9 +892,11 @@ jobs:
         version:
           - 18
           - latest
+        range: ['9.5.0', '11.1.4', '13.2.0', '*']
     runs-on: ubuntu-latest
     env:
       PLUGINS: next
+      PACKAGE_VERSION_RANGE: ${{ matrix.range }}
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/testagent/start
@@ -1022,6 +976,8 @@ jobs:
       PLUGINS: oracledb
       SERVICES: oracledb
       DD_TEST_AGENT_URL: http://testagent:9126
+      # Needed to fix issue with `actions/checkout@v3: https://github.com/actions/checkout/issues/1590
+      ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3

.github/workflows/profiling.yml

@@ -43,7 +43,9 @@ jobs:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/node/setup
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '18'
       - run: yarn install
       - run: yarn test:profiler:ci
       - run: yarn test:integration:profiler

.github/workflows/project.yml

@@ -30,11 +30,25 @@ jobs:
       - run: sudo sysctl -w kernel.core_pattern='|/bin/false'
       - run: yarn test:integration
 
+  # We'll run these separately for earlier (i.e. unsupported) versions
+  integration-guardrails:
+    strategy:
+      matrix:
+        version: [12, 14, 16]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.version }}
+      - run: yarn install --ignore-engines
+      - run: node node_modules/.bin/mocha --colors --timeout 30000 -r packages/dd-trace/test/setup/core.js integration-tests/init.spec.js
+
   integration-ci:
     strategy:
       matrix:
         version: [18, latest]
-        framework: [cucumber, playwright, selenium]
+        framework: [cucumber, playwright, selenium, jest, mocha]
     runs-on: ubuntu-latest
     env:
       DD_SERVICE: dd-trace-js-integration-tests
@@ -78,6 +92,7 @@ jobs:
         version: [16, latest]
         # 6.7.0 is the minimum version we support
         cypress-version: [6.7.0, latest]
+        module-type: ['commonJS', 'esm']
     runs-on: ubuntu-latest
     env:
       DD_SERVICE: dd-trace-js-integration-tests
@@ -95,6 +110,24 @@ jobs:
         env:
           CYPRESS_VERSION: ${{ matrix.cypress-version }}
           NODE_OPTIONS: '-r ./ci/init'
+          CYPRESS_MODULE_TYPE: ${{ matrix.module-type }}
+
+  integration-vitest:
+    runs-on: ubuntu-latest
+    env:
+      DD_SERVICE: dd-trace-js-integration-tests
+      DD_CIVISIBILITY_AGENTLESS_ENABLED: 1
+      DD_API_KEY: ${{ secrets.DD_API_KEY_CI_APP }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/node/setup
+      - run: yarn install
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 20
+      - run: yarn test:integration:vitest
+        env:
+          NODE_OPTIONS: '-r ./ci/init'
 
   lint:
     runs-on: ubuntu-latest

.github/workflows/release-dev.yml

@@ -1,12 +1,14 @@
 name: Release dev release line
 
 on:
-  push:
+  pull_request_target:
+    types: [labeled]
     branches:
       - master
 
 jobs:
   dev_release:
+    if: ${{ github.event.label.name == 'release-dev' }}
     runs-on: ubuntu-latest
     environment: npm
     permissions:

.github/workflows/system-tests.yml

@@ -11,6 +11,19 @@ on:
     - cron:  '00 04 * * 2-6'
 
 jobs:
+  build-artifacts:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout dd-trace-js
+        uses: actions/checkout@v4
+        with:
+          path: dd-trace-js
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: system_tests_binaries
+          path: .
+
   get-essential-scenarios:
     runs-on: ubuntu-latest
     outputs:
@@ -71,31 +84,12 @@ jobs:
           path: artifact.tar.gz
 
   parametric:
-    runs-on: ubuntu-latest
-    env:
-      TEST_LIBRARY: nodejs
-    steps:
-      - name: Checkout system tests
-        uses: actions/checkout@v4
-        with:
-          repository: 'DataDog/system-tests'
-      - uses: actions/setup-python@v4
-        with:
-          python-version: '3.9'
-      - name: Checkout dd-trace-js
-        uses: actions/checkout@v4
-        with:
-          path: 'binaries/dd-trace-js'
-      - name: Build
-        run: ./build.sh -i runner
-      - name: Run
-        run: ./run.sh PARAMETRIC
-      - name: Compress artifact
-        if: ${{ always() }}
-        run: tar -czvf artifact.tar.gz $(ls | grep logs)
-      - name: Upload artifact
-        uses: actions/upload-artifact@v3
-        if: ${{ always() }}
-        with:
-          name: logs_parametric
-          path: artifact.tar.gz
+    needs:
+      - build-artifacts
+    uses: DataDog/system-tests/.github/workflows/run-parametric.yml@main
+    secrets: inherit
+    with:
+      library: nodejs
+      binaries_artifact: system_tests_binaries
+      _experimental_job_count: 8
+      _experimental_job_matrix: '[1,2,3,4,5,6,7,8]'

.github/workflows/tracing.yml

@@ -39,7 +39,10 @@ jobs:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/node/setup
+      - uses: actions/setup-node@v3
+        with:
+          cache: yarn
+          node-version: '18'
       - run: yarn install
       - run: yarn test:trace:core:ci
       - uses: codecov/codecov-action@v3

.gitlab-ci.yml

@@ -5,11 +5,13 @@ stages:
   - benchmarks-pr-comment
   - single-step-instrumentation-tests
   - manual_images
+  - macrobenchmarks
 
 include:
   - remote: https://gitlab-templates.ddbuild.io/apm/packaging.yml
   - local: ".gitlab/benchmarks.yml"
   - local: ".gitlab/single-step-instrumentation-tests.yml"
+  - local: ".gitlab/macrobenchmarks.yml"
 
 variables: