dd-trace 5.77.0 → 5.79.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "5.77.0",
+  "version": "5.79.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -46,6 +46,8 @@
     "test:llmobs:sdk:ci": "nyc --no-clean --include \"packages/dd-trace/src/llmobs/**/*.js\" -- npm run test:llmobs:sdk",
     "test:llmobs:plugins": "mocha -r \"packages/dd-trace/test/setup/mocha.js\" \"packages/dd-trace/test/llmobs/plugins/@($(echo $PLUGINS))/*.spec.js\"",
     "test:llmobs:plugins:ci": "yarn services && nyc --no-clean --include \"packages/dd-trace/src/llmobs/**/*.js\" -- npm run test:llmobs:plugins",
+    "test:openfeature": "mocha -r \"packages/dd-trace/test/setup/mocha.js\" \"packages/dd-trace/test/openfeature/*.spec.js\"",
+    "test:openfeature:ci": "nyc --no-clean --include \"packages/dd-trace/src/openfeature/**/*.js\" -- npm run test:openfeature",
     "test:plugins": "mocha -r \"packages/dd-trace/test/setup/mocha.js\" \"packages/datadog-plugin-@($(echo $PLUGINS))/test/**/@($(echo ${SPEC:-'*'})).spec.js\"",
     "test:plugins:ci": "yarn services && nyc --no-clean --include \"packages/datadog-plugin-@($(echo $PLUGINS))/src/**/*.js\" -- npm run test:plugins",
     "test:plugins:ci:flaky": "yarn services && nyc --no-clean --include \"packages/datadog-plugin-@($(echo $PLUGINS))/src/**/*.js\" -- npm run test:plugins -- --bail --retries 2",
@@ -125,7 +127,7 @@
     "@datadog/native-appsec": "10.3.0",
     "@datadog/native-iast-taint-tracking": "4.0.0",
     "@datadog/native-metrics": "3.1.1",
-    "@datadog/openfeature-node-server": "0.1.0-preview.15",
+    "@datadog/openfeature-node-server": "^0.2.0",
     "@datadog/pprof": "5.12.0",
     "@datadog/sketches-js": "2.1.1",
     "@datadog/wasm-js-rewriter": "5.0.1",
@@ -165,7 +167,7 @@
     "@eslint/js": "^9.39.0",
     "@msgpack/msgpack": "^3.1.2",
     "@openfeature/core": "^1.9.0",
-    "@openfeature/server-sdk": "^1.20.0",
+    "@openfeature/server-sdk": "~1.20.0",
     "@stylistic/eslint-plugin": "^5.5.0",
     "@types/chai": "^4.3.16",
     "@types/mocha": "^10.0.10",

package/packages/datadog-instrumentations/src/jest.js

@@ -1345,9 +1345,6 @@ addHook({
         }
       }
       return returnedValue
-    } catch (error) {
-      testSuiteErrorCh.publish({ error, testSuiteAbsolutePath: this._testPath })
-      throw error
     } finally {
       // Restore original prepareStackTrace
       Error.prepareStackTrace = originalPrepareStackTrace

package/packages/datadog-plugin-jest/src/index.js

@@ -282,11 +282,7 @@ class JestPlugin extends CiPlugin {
         log.warn('"ci:jest:test-suite:finish": no span found for test suite absolute path %s', testSuiteAbsolutePath)
         return
       }
-      const hasStatus = testSuiteSpan.context()._tags[TEST_STATUS]
-      if (!hasStatus) {
-        // The status may have been set in 'ci:jest:test-suite:error'
-        testSuiteSpan.setTag(TEST_STATUS, status)
-      }
+      testSuiteSpan.setTag(TEST_STATUS, status)
       if (error) {
         testSuiteSpan.setTag('error', error)
         testSuiteSpan.setTag(TEST_STATUS, 'fail')
@@ -323,7 +319,6 @@ class JestPlugin extends CiPlugin {
       } else if (errorMessage) {
         runningTestSuiteSpan.setTag('error', new Error(errorMessage))
       }
-      runningTestSuiteSpan.setTag(TEST_STATUS, 'fail')
     })
 
     /**

package/packages/datadog-plugin-jest/src/util.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const { readFileSync } = require('fs')
-const { parse, extract } = require('jest-docblock')
+const { parse } = require('jest-docblock')
 
 const { getTestSuitePath } = require('../../dd-trace/src/plugins/util/test')
 const log = require('../../dd-trace/src/log')
@@ -61,29 +61,59 @@ function getJestTestName (test, shouldStripSeed = false) {
   return testName
 }
 
+const globalDocblockRegExp = /^\s*(\/\*\*?(.|\r?\n)*?\*\/)/
+
 function isMarkedAsUnskippable (test) {
-  let docblocks
+  let testSource
 
   try {
-    const testSource = readFileSync(test.path, 'utf8')
-    docblocks = parse(extract(testSource))
+    testSource = readFileSync(test.path, 'utf8')
   } catch {
-    // If we have issues parsing the file, we'll assume no unskippable was passed
     return false
   }
 
-  // docblocks were correctly parsed but it does not include a @datadog block
-  if (!docblocks?.datadog) {
-    return false
-  }
+  const re = globalDocblockRegExp
+  re.lastIndex = 0
+  let commentsChecked = 0
+
+  while (testSource.length) {
+    const match = re.exec(testSource)
+    if (!match) break
+    const comment = match[1]
+
+    let docblocks
+    try {
+      docblocks = parse(comment)
+    } catch {
+      // Skip unparsable comment and continue scanning
+      if (commentsChecked++ >= 10) {
+        return false
+      }
+      continue
+    }
 
-  try {
-    return JSON.parse(docblocks.datadog).unskippable
-  } catch {
-    // If the @datadog block comment is present but malformed, we'll run the suite
-    log.warn('@datadog block comment is malformed.')
-    return true
+    if (docblocks?.datadog) {
+      try {
+        // @ts-expect-error The datadog type is defined by us and may only be a string.
+        return JSON.parse(docblocks.datadog).unskippable
+      } catch {
+        // If the @datadog block comment is present but malformed, we'll run the suite
+        log.warn('@datadog block comment is malformed.')
+        return true
+      }
+    }
+
+    if (commentsChecked++ >= 10) {
+      return false
+    }
+
+    // To stop as soon as no doc blocks are found, slice the source. That way the
+    // regexp works by using the `^` anchor. Without it, it would continue
+    // scanning the rest of the file.
+    testSource = testSource.slice(match[0].length)
   }
+
+  return false
 }
 
 function getJestSuitesToRun (skippableSuites, originalTests, rootDir) {

package/packages/dd-trace/src/appsec/iast/path-line.js

@@ -2,6 +2,7 @@
 
 const path = require('path')
 const process = require('process')
+const { fileURLToPath } = require('url')
 const { ddBasePath } = require('../../util')
 const { getOriginalPathAndLineFromSourceMap } = require('./taint-tracking/rewriter')
 const pathLine = {
@@ -31,11 +32,11 @@ function getNonDDCallSiteFrames (callSiteFrames, externallyExcludedPaths) {
   const result = []
 
   for (const callsite of callSiteFrames) {
-    let filepath = callsite.file
+    let filepath = callsite.file?.startsWith('file://') ? fileURLToPath(callsite.file) : callsite.file
 
     if (globalThis.__DD_ESBUILD_IAST_WITH_SM) {
       const callsiteLocation = {
-        path: getRelativePath(filepath),
+        path: filepath,
         line: callsite.line,
         column: callsite.column
       }

package/packages/dd-trace/src/appsec/telemetry/index.js

@@ -16,47 +16,17 @@ const {
   incrementWafConfigErrors,
   incrementWafRequests
 } = require('./waf')
-const telemetryMetrics = require('../../telemetry/metrics')
 
 const metricsStoreMap = new WeakMap()
 
-const appsecMetrics = telemetryMetrics.manager.namespace('appsec')
-
 let enabled = false
-let interval
-const SUPPORTED_ORIGINS = new Set(['env_var', 'code', 'remote_config', 'unknown'])
 
 function enable (config) {
-  const telemetryConfig = config.telemetry
-  enabled = telemetryConfig?.enabled && telemetryConfig.metrics
-
-  if (enabled) {
-    let origin = 'remote_config'
-
-    if (config.appsec.enabled) {
-      origin = config.getOrigin('appsec.enabled')
-
-      if (!SUPPORTED_ORIGINS.has(origin)) {
-        origin = 'unknown'
-      }
-    }
-
-    const gauge = appsecMetrics.gauge('enabled', { origin })
-    gauge.track()
-
-    interval = setInterval(() => {
-      gauge.track()
-    }, telemetryConfig.heartbeatInterval)
-    interval.unref?.()
-  }
+  enabled = config.telemetry?.enabled && config.telemetry?.metrics
 }
 
 function disable () {
   enabled = false
-  if (interval) {
-    clearInterval(interval)
-    interval = undefined
-  }
 }
 
 function newStore () {

package/packages/dd-trace/src/debugger/devtools_client/session.js

@@ -2,6 +2,16 @@
 
 const inspector = require('./inspector_promises_polyfill')
 
-const session = module.exports = new inspector.Session()
+/**
+ * @typedef {import('node:events').EventEmitter & {
+ *   connect: () => void,
+ *   connectToMainThread: () => void
+ *   disconnect: () => void,
+ *   post: (method: string, params?: object) => Promise<any>,
+ * }} CDPSession
+ */
+const session = /** @type {CDPSession} */ (new inspector.Session())
 
 session.connectToMainThread()
+
+module.exports = session

package/packages/dd-trace/src/remote_config/index.js

@@ -6,6 +6,7 @@ const RemoteConfigManager = require('./manager')
 const RemoteConfigCapabilities = require('./capabilities')
 const { setCollectionMode } = require('../appsec/user_tracking')
 const log = require('../log')
+const { updateConfig } = require('../telemetry')
 
 let rc
 
@@ -62,7 +63,8 @@ function enable (config, appsec) {
 
 function enableOrDisableAppsec (action, rcConfig, config, appsec) {
   if (typeof rcConfig.asm?.enabled === 'boolean') {
-    const shouldEnable = action === 'apply' || action === 'modify'
+    const isRemoteConfigControlling = action === 'apply' || action === 'modify'
+    const shouldEnable = isRemoteConfigControlling
       ? rcConfig.asm.enabled // take control
       : config.appsec.enabled // give back control to local config
 
@@ -71,6 +73,14 @@ function enableOrDisableAppsec (action, rcConfig, config, appsec) {
     } else {
       appsec.disable()
     }
+
+    updateConfig([
+      {
+        name: 'appsec.enabled',
+        origin: isRemoteConfigControlling ? 'remote_config' : config.getOrigin('appsec.enabled'),
+        value: shouldEnable
+      }
+    ], config)
   }
 }