Normalized version handling and added appsec and profiling tests

pabloerhard · pabloerhard · commit ee8a0100d72c · 2025-10-24T09:48:53.000-04:00
diff --git a/.github/actions/node/action.yml b/.github/actions/node/action.yml
@@ -10,6 +10,12 @@ runs:
   steps:
     - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
       with:
-        node-version: ${{ inputs.version == 'eol' && '16' || inputs.version == 'oldest' && '18' || inputs.version == 'maintenance' && '20' || inputs.version == 'active' && '22' || inputs.version == 'latest' && env.NIGHTLY_VERSION || '24' || inputs.version }}
+        node-version: ${{
+          inputs.version == 'eol' && '16' ||
+          inputs.version == 'oldest' && '18' ||
+          inputs.version == 'maintenance' && '20' ||
+          inputs.version == 'active' && '22' ||
+          inputs.version == 'latest' && (env.LATEST_VERSION || '24') ||
+          inputs.version }}
         check-latest: true
         registry-url: ${{ inputs.registry-url || 'https://registry.npmjs.org' }}
diff --git a/.github/workflows/apm-capabilities.yml b/.github/workflows/apm-capabilities.yml
@@ -8,20 +8,19 @@ on:
     - cron: 0 4 * * *
   workflow_dispatch:
     inputs:
-      nightly-version:
-        description: 'Nightly node version to use'
+      latest-version:
+        description: 'Node version to use'
         required: false
-        default: 'false'
         type: string
 
 
 concurrency:
-  group: ${{ inputs.nightly-version && format('{0}-{1}', github.workflow, inputs.nightly-version) || github.workflow }}-${{ github.ref || github.run_id }}"
+  group: ${{ github.workflow }}-${{ inputs.latest-version }}-${{ github.ref || github.run_id }}"
   cancel-in-progress: true
 
 env:
   MOCHA_OPTIONS: ${{ github.ref == 'refs/heads/master' && '--retries 1' || '' }}
-  NIGHTLY_VERSION: ${{ inputs.nightly-version && format('{0}-{1}', inputs.nightly-version, 'nightly') }}
+  LATEST_VERSION: ${{ inputs.latest-version }}
 
 jobs:
   tracing-macos:
diff --git a/.github/workflows/apm-integrations.yml b/.github/workflows/apm-integrations.yml
@@ -8,20 +8,19 @@ on:
     - cron: 0 4 * * *
   workflow_dispatch:
     inputs:
-      nightly-version:
-        description: 'Nightly node version to run'
+      latest-version:
+        description: 'Node version to run'
         required: false
-        default: 'false'
         type: string
 
 
 concurrency:
-  group: ${{ inputs.nightly-version == 'true' && format('{0}-{1}', github.workflow, inputs.nightly-version) || github.workflow }}-${{ github.ref || github.run_id }}"
+  group: ${{ github.workflow }}-${{ inputs.latest-version }}-${{ github.ref || github.run_id }}"
   cancel-in-progress: true
 
 env:
   MOCHA_OPTIONS: ${{ github.ref == 'refs/heads/master' && '--retries 1' || '' }}
-  NIGHTLY_VERSION: ${{ inputs.nightly-version && format('{0}-{1}', inputs.nightly-version, 'nightly') }}
+  LATEST_VERSION: ${{ inputs.latest-version }}
 
 # TODO: upstream jobs
 
diff --git a/.github/workflows/appsec.yml b/.github/workflows/appsec.yml
@@ -6,13 +6,20 @@ on:
     branches: [master]
   schedule:
     - cron: 0 4 * * *
+  workflow_dispatch:
+    inputs:
+      latest-version:
+        description: 'Node version to use'
+        required: false
+        type: string
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ inputs.latest-version }}-${{ github.ref || github.run_id }}"
   cancel-in-progress: true
 
 env:
   MOCHA_OPTIONS: ${{ github.ref == 'refs/heads/master' && '--retries 1' || '' }}
+  LATEST_VERSION: ${{ inputs.latest-version }}
 
 jobs:
   macos:
diff --git a/.github/workflows/llmobs.yml b/.github/workflows/llmobs.yml
@@ -8,19 +8,18 @@ on:
     - cron: 0 4 * * *
   workflow_dispatch:
     inputs:
-      nightly-version:
-        description: 'Nightly node version to use'
+      latest-version:
+        description: 'Node version to use'
         required: false
-        default: 'false'
         type: string
 
 concurrency:
-  group: ${{ inputs.nightly-version && format('{0}-{1}', github.workflow, inputs.nightly-version)|| github.workflow }}-${{ github.ref || github.run_id }}"
+  group: ${{ github.workflow }}-${{ inputs.latest-version }}-${{ github.ref || github.run_id }}"
   cancel-in-progress: true
 
 env:
   MOCHA_OPTIONS: ${{ github.ref == 'refs/heads/master' && '--retries 1' || '' }}
-  NIGHTLY_VERSION: ${{ inputs.nightly-version && format('{0}-{1}', inputs.nightly-version, 'nightly') }}
+  LATEST_VERSION: ${{ inputs.latest-version }}
 
 jobs:
   sdk:
diff --git a/.github/workflows/nightly-dispatch.yml b/.github/workflows/nightly-dispatch.yml
@@ -32,6 +32,16 @@ on:
         required: false
         default: true
         type: boolean
+      profiling:
+        description: 'Profiling Tests'
+        required: false
+        default: true
+        type: boolean
+      appsec:
+        description: 'AppSec Tests'
+        required: false
+        default: true
+        type: boolean
 
 permissions:
   actions: write
@@ -50,10 +60,12 @@ jobs:
           - llmobs
           - platform
           - serverless
+          - appsec
+          - profiling
     runs-on: ubuntu-latest
     steps:
       - name: Trigger ${{matrix.workflow }} workflow
         if: ${{ inputs[matrix.workflow] }}
-        run: gh workflow run ${{matrix.workflow}}.yml --repo ${{ github.repository }} --ref ${{ env.BRANCH_NAME }} -f nightly-version=${{ inputs.node-version }}
+        run: gh workflow run ${{matrix.workflow}}.yml --repo ${{ github.repository }} --ref ${{ env.BRANCH_NAME }} -f latest-version=${{ inputs.node-version }}
         env:
           GH_TOKEN: ${{ github.token }}
diff --git a/.github/workflows/platform.yml b/.github/workflows/platform.yml
@@ -8,19 +8,18 @@ on:
     - cron: 0 4 * * *
   workflow_dispatch:
     inputs:
-      nightly-version:
-        description: 'Nightly node version to use'
+      latest-version:
+        description: 'Node version to use'
         required: false
-        default: 'false'
         type: string
 
 concurrency:
-  group: ${{ inputs.nightly-version && format('{0}-{1}', github.workflow, inputs.nightly-version) || github.workflow }}-${{ github.ref || github.run_id }}"
+  group: ${{ github.workflow }}-${{ inputs.latest-version }}-${{ github.ref || github.run_id }}"
   cancel-in-progress: true
 
 env:
   MOCHA_OPTIONS: ${{ github.ref == 'refs/heads/master' && '--retries 1' || '' }}
-  NIGHTLY_VERSION: ${{ inputs.nightly-version && format('{0}-{1}', inputs.nightly-version, 'nightly') }}
+  LATEST_VERSION: ${{ inputs.latest-version }}
 
 # TODO: upstream jobs
 
diff --git a/.github/workflows/profiling.yml b/.github/workflows/profiling.yml
@@ -6,13 +6,20 @@ on:
     branches: [master]
   schedule:
     - cron: 0 4 * * *
+  workflow_dispatch:
+    inputs:
+      latest-version:
+        description: 'Node version to use'
+        required: false
+        type: string
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ inputs.latest-version }}-${{ github.ref || github.run_id }}"
   cancel-in-progress: true
 
 env:
   MOCHA_OPTIONS: ${{ github.ref == 'refs/heads/master' && '--retries 1' || '' }}
+  LATEST_VERSION: ${{ inputs.latest-version }}
 
 jobs:
   macos:
diff --git a/.github/workflows/serverless.yml b/.github/workflows/serverless.yml
@@ -8,20 +8,19 @@ on:
     - cron: 0 4 * * *
   workflow_dispatch:
     inputs:
-      nightly-version:
-        description: 'Nightly node version to use'
+      latest-version:
+        description: 'Node version to use'
         required: false
-        default: 'false'
         type: string
 
 
 concurrency:
-  group: ${{ inputs.nightly-version && format('{0}-{1}', github.workflow, inputs.nightly-version) || github.workflow }}-${{ github.ref || github.run_id }}"
+  group: ${{ github.workflow }}-${{ inputs.latest-version }}-${{ github.ref || github.run_id }}"
   cancel-in-progress: true
 
 env:
   MOCHA_OPTIONS: ${{ github.ref == 'refs/heads/master' && '--retries 1' || '' }}
-  NIGHTLY_VERSION: ${{ inputs.nightly-version && format('{0}-{1}', inputs.nightly-version, 'nightly') }}
+  LATEST_VERSION: ${{ inputs.latest-version }}
 
 
 jobs:
diff --git a/packages/datadog-plugin-avsc/test/index.spec.js b/packages/datadog-plugin-avsc/test/index.spec.js
@@ -16,7 +16,7 @@ const {
 const sinon = require('sinon')
 const { loadMessage } = require('./helpers')
 const { SchemaBuilder } = require('../../dd-trace/src/datastreams/schemas/schema_builder')
-const { IS_NIGHTLY } = require('../../../version')
+const { NODE_MAJOR } = require('../../../version')
 
 const BASIC_USER_SCHEMA_DEF = JSON.parse(
   fs.readFileSync(path.join(__dirname, 'schemas/expected_user_schema.json'), 'utf8')
@@ -41,7 +41,7 @@ describe('Plugin', () => {
     let mockTime = 0
 
     // avsc version 5.0.0 currently does not support a nodeMajor version greater than major version 24
-    withVersions('avsc', ['avsc'], IS_NIGHTLY ? '>5.0.0' : undefined, (version) => {
+    withVersions('avsc', ['avsc'], NODE_MAJOR >= 25 ? '>5.0.0' : undefined, (version) => {
       before(() => {
         tracer = require('../../dd-trace').init()
         // reset sampled schemas
diff --git a/packages/datadog-plugin-grpc/test/client.spec.js b/packages/datadog-plugin-grpc/test/client.spec.js
@@ -12,7 +12,7 @@ const loader = require('../../../versions/@grpc/proto-loader').get()
 const { withNamingSchema, withPeerService, withVersions } = require('../../dd-trace/test/setup/mocha')
 const agent = require('../../dd-trace/test/plugins/agent')
 const { ERROR_MESSAGE, ERROR_TYPE, ERROR_STACK, GRPC_CLIENT_ERROR_STATUSES } = require('../../dd-trace/src/constants')
-const { NODE_MAJOR, IS_NIGHTLY } = require('../../../version')
+const { NODE_MAJOR } = require('../../../version')
 
 const pkgs = NODE_MAJOR > 14 ? ['@grpc/grpc-js'] : ['grpc', '@grpc/grpc-js']
 
@@ -78,7 +78,7 @@ describe('Plugin', () => {
       server.forceShutdown()
     })
 
-    withVersions('grpc', pkgs, IS_NIGHTLY ? '>=1.3.0' : undefined, (version, pkg) => {
+    withVersions('grpc', pkgs, NODE_MAJOR >= 25 && '>=1.3.0', (version, pkg) => {
       for (const clientName in clientBuilders) {
         const buildClient = clientBuilders[clientName]
 
diff --git a/packages/datadog-plugin-grpc/test/integration-test/client.spec.js b/packages/datadog-plugin-grpc/test/integration-test/client.spec.js
@@ -8,14 +8,14 @@ const {
 } = require('../../../../integration-tests/helpers')
 const { withVersions } = require('../../../dd-trace/test/setup/mocha')
 const { assert } = require('chai')
-const { IS_NIGHTLY } = require('../../../../version')
+const { NODE_MAJOR } = require('../../../../version')
 
 describe('esm', () => {
   let agent
   let proc
   let sandbox
 
-  withVersions('grpc', '@grpc/grpc-js', IS_NIGHTLY ? '>=1.3.0' : undefined, version => {
+  withVersions('grpc', '@grpc/grpc-js', NODE_MAJOR >= 25 && '>=1.3.0', version => {
     before(async function () {
       this.timeout(60000)
       sandbox = await createSandbox([`'@grpc/grpc-js@${version}'`, '@grpc/proto-loader'], false, [
diff --git a/packages/datadog-plugin-grpc/test/server.spec.js b/packages/datadog-plugin-grpc/test/server.spec.js
@@ -11,7 +11,7 @@ const agent = require('../../dd-trace/test/plugins/agent')
 
 const { ERROR_MESSAGE, ERROR_TYPE, ERROR_STACK, GRPC_SERVER_ERROR_STATUSES } = require('../../dd-trace/src/constants')
 
-const { NODE_MAJOR, IS_NIGHTLY } = require('../../../version')
+const { NODE_MAJOR } = require('../../../version')
 const pkgs = NODE_MAJOR > 14 ? ['@grpc/grpc-js'] : ['grpc', '@grpc/grpc-js']
 
 describe('Plugin', () => {
@@ -65,7 +65,7 @@ describe('Plugin', () => {
       server.forceShutdown()
     })
 
-    withVersions('grpc', pkgs, IS_NIGHTLY ? '>=1.3.0' : undefined, (version, pkg) => {
+    withVersions('grpc', pkgs, NODE_MAJOR >= 25 && '>=1.3.0', (version, pkg) => {
       describe('without configuration', () => {
         before(() => {
           return agent.load('grpc', { client: false })
diff --git a/packages/datadog-plugin-next/test/index.spec.js b/packages/datadog-plugin-next/test/index.spec.js
@@ -14,20 +14,20 @@ const { writeFileSync, readdirSync } = require('node:fs')
 const { withNamingSchema, withVersions } = require('../../dd-trace/test/setup/mocha')
 const agent = require('../../dd-trace/test/plugins/agent')
 const { rawExpectedSchema } = require('./naming')
-const { IS_NIGHTLY } = require('../../../version')
+const { NODE_MAJOR } = require('../../../version')
 
-const min = IS_NIGHTLY ? '>=13' : '>=11.0'
+const min = NODE_MAJOR >= 25 ? '>=13' : '>=11.1'
 
 describe('Plugin', function () {
   let server
   let port
 
+  // These next versions have a dependency which uses a deprecated node buffer
   describe('next', () => {
-    // These next versions have a dependency which uses a deprecated node buffer
     const satisfiesStandalone = version => satisfies(version, '>=12.0.0')
 
     // TODO: Figure out why 10.x tests are failing.
-    withVersions('next', 'next', `${min}`, version => {
+    withVersions('next', 'next', `${min} <15.4.1`, version => {
       const pkg = require(`../../../versions/next@${version}/node_modules/next/package.json`)
 
       const startServer = ({ withConfig, standalone }, schemaVersion = 'v0', defaultToGlobalService = false) => {
diff --git a/packages/datadog-plugin-next/test/integration-test/client.spec.js b/packages/datadog-plugin-next/test/integration-test/client.spec.js
@@ -10,10 +10,10 @@ const {
 } = require('../../../../integration-tests/helpers')
 const { withVersions } = require('../../../dd-trace/test/setup/mocha')
 const { assert } = require('chai')
-const { IS_NIGHTLY } = require('../../../../version')
+const { NODE_MAJOR } = require('../../../../version')
 
 const hookFile = 'dd-trace/loader-hook.mjs'
-const min = IS_NIGHTLY ? '>=13' : '>=11.0'
+const min = NODE_MAJOR >= 25 ? '>=13' : '>=11.1'
 
 describe('esm', () => {
   let agent
@@ -22,7 +22,7 @@ describe('esm', () => {
   let variants
 
   // These next versions have a dependency which uses a deprecated node buffer and match versions tested with unit tests
-  withVersions('next', 'next', `${min}`, version => {
+  withVersions('next', 'next', `${min} <15.4.1`, version => {
     before(async function () {
       // next builds slower in the CI, match timeout with unit tests
       this.timeout(300 * 1000)
diff --git a/version.js b/version.js
@@ -14,6 +14,5 @@ module.exports = {
   NODE_MAJOR: parseInt(nodeMatches[1]),
   NODE_MINOR: parseInt(nodeMatches[2]),
   NODE_PATCH: parseInt(nodeMatches[3]),
-  NODE_VERSION: nodeMatches[0],
-  IS_NIGHTLY: nodeMatches[0] >= 25
+  NODE_VERSION: nodeMatches[0]
 }
