dd-trace 6.8.0 → 6.10.0

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

@@ -36,6 +36,7 @@ const plugins = {
   get '@smithy/core' () { return require('../../../datadog-plugin-aws-sdk/src') },
   get '@smithy/smithy-client' () { return require('../../../datadog-plugin-aws-sdk/src') },
   get '@vitest/runner' () { return require('../../../datadog-plugin-vitest/src') },
+  get '@wdio/jasmine-framework' () { return require('../../../datadog-plugin-mocha/src') },
   get '@wdio/local-runner' () { return require('../../../datadog-plugin-mocha/src') },
   get '@langchain/langgraph' () { return require('../../../datadog-plugin-langgraph/src') },
   get '@openai/agents' () { return require('../../../datadog-plugin-openai-agents/src') },

package/packages/dd-trace/src/plugins/util/ci.js

@@ -114,6 +114,9 @@ const uniq = (items) => [...new Set(items)]
  *
  * This is much more robust than relying on hardcoded paths, especially on self-hosted runners
  * and GHES environments where the runner may be installed under arbitrary directories/users.
+ *
+ * @param {string | undefined} runnerTemp value of the `RUNNER_TEMP` environment variable
+ * @returns {string[]}
  */
 function getGithubDiagnosticDirsFromEnv (runnerTemp) {
   const dirs = []
@@ -182,6 +185,9 @@ function expandGlobPattern (pattern) {
 /**
  * Expands a mixed list of literal directories and glob patterns into concrete
  * directories. Literals pass through unchanged (existence is checked later).
+ *
+ * @param {string[]} candidates
+ * @returns {string[]}
  */
 function expandDiagnosticDirCandidates (candidates) {
   const expanded = []

package/packages/dd-trace/src/plugins/util/git.js

@@ -38,6 +38,8 @@ const {
 const { filterSensitiveInfoFromRepository } = require('./url')
 const { cachedExec } = require('./git-cache')
 
+/** @typedef {NonNullable<ReturnType<string['match']>>} RegExpMatch */
+
 const legacyStorage = storage('legacy')
 
 const GIT_REV_LIST_MAX_BUFFER = 12 * 1024 * 1024 // 12MB
@@ -116,12 +118,12 @@ function isShallowRepository () {
 
 function getGitVersion () {
   const gitVersionString = sanitizedExec('git', ['version'])
-  const gitVersionMatches = /** @type {RegExpMatchArray} */ (gitVersionString.match(/git version (\d+)\.(\d+)\.(\d+)/))
+  const gitVersionMatches = /** @type {RegExpMatch} */ (gitVersionString.match(/git version (\d+)\.(\d+)\.(\d+)/))
   try {
     return {
-      major: Number.parseInt(gitVersionMatches[1]),
-      minor: Number.parseInt(gitVersionMatches[2]),
-      patch: Number.parseInt(gitVersionMatches[3]),
+      major: Number.parseInt(gitVersionMatches[1], 10),
+      minor: Number.parseInt(gitVersionMatches[2], 10),
+      patch: Number.parseInt(gitVersionMatches[3], 10),
     }
   } catch {
     return null

package/packages/dd-trace/src/plugins/util/http-otel-semantics.js

@@ -71,7 +71,7 @@ function decomposeServerUrl (rawUrl, obfuscatedUrl) {
       address = stripIpv6Brackets(hostname)
     }
     if (parsed.port) {
-      const parsedPort = Number.parseInt(parsed.port)
+      const parsedPort = Number.parseInt(parsed.port, 10)
       if (parsedPort > 0) port = parsedPort
     }
     path = parsed.pathname || '/'
@@ -210,7 +210,7 @@ function applyHttpOtelSemantics (formattedSpan) {
     // metric (the OTLP exporter serializes meta as stringValue but metrics as
     // intValue) — mirroring how server.port is handled below. Guard against a
     // non-numeric status, which would otherwise write a NaN metric.
-    statusCode = Number.parseInt(status)
+    statusCode = Number.parseInt(status, 10)
     if (Number.isFinite(statusCode)) newMetrics[HTTP_RESPONSE_STATUS_CODE] = statusCode
   }
 

package/packages/dd-trace/src/plugins/util/ip_extractor.js

@@ -36,7 +36,7 @@ const privateIPMatcher = new net.BlockList()
 for (const cidr of privateCIDRs) {
   const [address, prefix] = cidr.split('/')
 
-  privateIPMatcher.addSubnet(address, Number.parseInt(prefix), net.isIPv6(address) ? 'ipv6' : 'ipv4')
+  privateIPMatcher.addSubnet(address, Number.parseInt(prefix, 10), net.isIPv6(address) ? 'ipv6' : 'ipv4')
 }
 
 function extractIp (config, req) {

package/packages/{datadog-plugin-jest/src/util.js → dd-trace/src/plugins/util/jest.js}

@@ -1,10 +1,6 @@
 'use strict'
 
-const { readFileSync } = require('fs')
-const { parse } = require('../../../vendor/dist/jest-docblock')
-
-const { getTestSuitePath } = require('../../dd-trace/src/plugins/util/test')
-const log = require('../../dd-trace/src/log')
+const { getTestSuitePath, isMarkedAsUnskippable } = require('./test')
 
 /**
  * There are two ways to call `test.each` in `jest`:
@@ -15,6 +11,8 @@ const log = require('../../dd-trace/src/log')
  * [[1, 2, 3], [2, 3, 5]]
  * 2. An array of objects, e.g.
  * [{ a: 1, b: 2, expected: 3 }, { a: 2, b: 3, expected: 5}]
+ *
+ * @param {unknown[]} testParameters `test.each` arguments
  */
 function getFormattedJestTestParameters (testParameters) {
   if (!testParameters || !testParameters.length) {
@@ -67,62 +65,6 @@ function getJestTestName (test) {
   return removeSeedSuffixFromTestName(getRawJestTestName(test))
 }
 
-const globalDocblockRegExp = /^\s*(\/\*\*?(.|\r?\n)*?\*\/)/
-const MAX_COMMENTS_CHECKED = 10
-
-function isMarkedAsUnskippable (test) {
-  let testSource
-
-  try {
-    testSource = readFileSync(test.path, 'utf8')
-  } catch {
-    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++ >= MAX_COMMENTS_CHECKED) {
-        return false
-      }
-      continue
-    }
-
-    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++ >= MAX_COMMENTS_CHECKED) {
-      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, fallbackRootDir) {
   const unskippableSuites = {}
   const forcedToRunSuites = {}
@@ -193,6 +135,5 @@ module.exports = {
   getJestTestName,
   getRawJestTestName,
   getJestSuitesToRun,
-  isMarkedAsUnskippable,
   removeSeedSuffixFromTestName,
 }

package/packages/dd-trace/src/plugins/util/stacktrace.js

@@ -184,6 +184,9 @@ function isDDInstrumentationFile (fileName) {
  * This function extracts the `myscript.js:10:3` part, passes it, returns the file name, line number, and column
  * number and sets the `index` to the start of the whole location string.
  *
+ * @param {string} stack the stack trace, or the nested location string when recursing
+ * @param {number} start index of the first character of the frame in `stack`
+ * @param {number} index index to start parsing backwards from
  * @returns {[string, string, string, number]|undefined}
  */
 function parseLocation (stack, start, index) {