dd-trace 5.101.0 → 5.102.0

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

@@ -318,6 +318,7 @@ module.exports = {
   parseAnnotations,
   getIsFaultyEarlyFlakeDetection,
   getEfdRetryCount,
+  getMaxEfdRetryCount,
   TEST_BROWSER_DRIVER,
   TEST_BROWSER_DRIVER_VERSION,
   TEST_BROWSER_NAME,
@@ -922,9 +923,7 @@ function getCoveredFilenamesFromCoverage (coverage) {
     .filter(filename => {
       const fileCoverage = coverageMap.fileCoverageFor(filename)
       const lineCoverage = fileCoverage.getLineCoverage()
-      const isAnyLineExecuted = Object.entries(lineCoverage).some(([, numExecutions]) => !!numExecutions)
-
-      return isAnyLineExecuted
+      return Object.entries(lineCoverage).some(([, numExecutions]) => !!numExecutions)
     })
 }
 
@@ -1045,6 +1044,22 @@ function getEfdRetryCount (durationMs, slowTestRetries) {
   return 0 // ≥ 5 min — abort
 }
 
+/**
+ * Returns the maximum retry count configured by the backend for EFD.
+ *
+ * @param {Record<string, number>} slowTestRetries e.g. { '5s': 10, '10s': 5, '30s': 3, '5m': 2 }
+ * @returns {number}
+ */
+function getMaxEfdRetryCount (slowTestRetries) {
+  let maxRetries = 0
+  for (const retryCount of Object.values(slowTestRetries || {})) {
+    if (retryCount > maxRetries) {
+      maxRetries = retryCount
+    }
+  }
+  return maxRetries
+}
+
 function getIsFaultyEarlyFlakeDetection (projectSuites, testsBySuiteName, faultyThresholdPercentage) {
   let newSuites = 0
   for (const suite of projectSuites) {
@@ -1276,10 +1291,7 @@ function getPullRequestBaseBranch (pullRequestBaseBranch) {
   let bestScore = Infinity
   for (const branch of Object.keys(metrics)) {
     const score = metrics[branch].ahead
-    if (score < bestScore) {
-      bestScore = score
-      bestBranch = branch
-    } else if (score === bestScore && isDefaultBranch(branch)) {
+    if (score < bestScore || score === bestScore && isDefaultBranch(branch)) {
       bestScore = score
       bestBranch = branch
     }

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

@@ -108,11 +108,9 @@ function calculateHttpEndpoint (url) {
     return element
   })
 
-  const endpoint = normalizedElements.length > 0
+  return normalizedElements.length > 0
     ? '/' + normalizedElements.join('/')
     : '/'
-
-  return endpoint
 }
 
 function filterSensitiveInfoFromRepository (repositoryUrl) {

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

@@ -36,7 +36,7 @@ function removeEmptyValues (tagsAndValues) {
 // https://github.com/jonschlinkert/is-git-url/blob/396965ffabf2f46656c8af4c47bef1d69f09292e/index.js#L9C15-L9C87
 // The `.git` suffix is optional in this version
 function validateGitRepositoryUrl (repoUrl) {
-  return /(?:git|ssh|https?|git@[-\w.]+):(\/\/)?(.*?)(\/?|#[-\d\w._]+?)$/.test(repoUrl)
+  return /(?:git|ssh|https?|git@[-\w.]+):(\/\/)?(.*?)(\/?|#[-\w.]+?)$/.test(repoUrl)
 }
 
 function validateGitCommitSha (gitCommitSha) {

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

@@ -217,9 +217,7 @@ const web = {
       }
     }
 
-    const span = startSpanHelper(tracer, name, { childOf }, traceCtx, config)
-
-    return span
+    return startSpanHelper(tracer, name, { childOf }, traceCtx, config)
   },
 
   // Validate a request's status code and then add error tags if necessary
@@ -309,10 +307,10 @@ const web = {
     return contexts.get(req)
   },
   wrapRes (context, req, res, end) {
-    return function () {
+    return function (...args) {
       web.finishAll(context)
 
-      return end.apply(res, arguments)
+      return end.apply(res, args)
     }
   },
   wrapEnd (context) {
@@ -330,8 +328,8 @@ const web = {
         return ends.get(this)
       },
       set (value) {
-        ends.set(this, function () {
-          return storage('legacy').run(context.store, value, ...arguments)
+        ends.set(this, function (...args) {
+          return storage('legacy').run(context.store, value, ...args)
         })
       },
     })

package/packages/dd-trace/src/profiling/profilers/events.js

@@ -174,7 +174,7 @@ class NetDecorator {
   }
 }
 
-class FilesystemDecorator {
+class KeyValueDecorator {
   constructor (stringTable) {
     this.stringTable = stringTable
   }
@@ -205,31 +205,11 @@ class ZlibDecorator {
   }
 }
 
-class CryptoDecorator {
-  constructor (stringTable) {
-    this.stringTable = stringTable
-  }
-
-  decorateSample (sampleInput, item) {
-    const labels = sampleInput.label
-    const stringTable = this.stringTable
-    for (const [key, value] of Object.entries(item.detail)) {
-      switch (typeof value) {
-        case 'string':
-          labels.push(labelFromStrStr(stringTable, key, value))
-          break
-        case 'number':
-          labels.push(new Label({ key: stringTable.dedup(key), num: value }))
-      }
-    }
-  }
-}
-
 // Keys correspond to PerformanceEntry.entryType, values are constructor
 // functions for type-specific decorators.
 const decoratorTypes = {
-  crypto: CryptoDecorator,
-  fs: FilesystemDecorator,
+  crypto: KeyValueDecorator,
+  fs: KeyValueDecorator,
   dns: DNSDecorator,
   gc: GCDecorator,
   net: NetDecorator,

package/packages/dd-trace/src/profiling/profilers/wall.js

@@ -317,11 +317,10 @@ class NativeWallProfiler {
   }
 
   #setNewContext () {
-    this.#pprof.time.setContext(
-      this._currentContext = {
-        ref: {},
-      }
-    )
+    this._currentContext = {
+      ref: {},
+    }
+    this.#pprof.time.setContext(this._currentContext)
   }
 
   #spanFinished (span) {

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

@@ -29,8 +29,8 @@ module.exports = {
 
   stop () {
     runtimeMetrics.stop()
-
-    Object.setPrototypeOf(module.exports, runtimeMetrics = noop)
+    runtimeMetrics = noop
+    Object.setPrototypeOf(module.exports, noop)
   },
 }
 

package/packages/dd-trace/src/scope.js

@@ -3,14 +3,11 @@
 const { storage } = require('../../datadog-core')
 
 // TODO: refactor bind to use shimmer once the new internal tracer lands
-
-const originals = new WeakMap()
-
 class Scope {
   active () {
     const store = storage('legacy').getStore()
 
-    return (store && store.span) || null
+    return store?.span ?? null
   }
 
   activate (span, callback) {
@@ -40,15 +37,11 @@ class Scope {
     const scope = this
     const spanOrActive = this._spanOrActive(span)
 
-    const bound = function () {
+    return function (...args) {
       return scope.activate(spanOrActive, () => {
-        return fn.apply(this, arguments)
+        return fn.apply(this, args)
       })
     }
-
-    originals.set(bound, fn)
-
-    return bound
   }
 
   _spanOrActive (span) {

package/packages/dd-trace/src/serverless.js

@@ -24,11 +24,8 @@ function enableGCPPubSubPushSubscription () {
 }
 
 function getIsAzureFunction () {
-  const isAzureFunction =
-    getEnvironmentVariable('FUNCTIONS_EXTENSION_VERSION') !== undefined &&
+  return getEnvironmentVariable('FUNCTIONS_EXTENSION_VERSION') !== undefined &&
     getEnvironmentVariable('FUNCTIONS_WORKER_RUNTIME') !== undefined
-
-  return isAzureFunction
 }
 
 function getIsFlexConsumptionAzureFunction () {

package/packages/dd-trace/src/service-naming/schemas/v0/messaging.js

@@ -81,7 +81,13 @@ const messaging = {
     },
     'google-cloud-pubsub': {
       opName: () => 'pubsub.receive',
-      serviceName: identityService,
+      serviceName: ({ tracerService }) => `${tracerService}-pubsub`,
+      serviceSource: integrationSource('google-cloud-pubsub'),
+    },
+    'google-cloud-pubsub-push-subscription': {
+      opName: () => 'pubsub.receive',
+      serviceName: ({ tracerService }) => `${tracerService}-pubsub`,
+      serviceSource: integrationSource('google-cloud-pubsub'),
     },
     kafkajs: {
       opName: () => 'kafka.consume',

package/packages/dd-trace/src/service-naming/schemas/v1/messaging.js

@@ -57,6 +57,10 @@ const messaging = {
       opName: () => 'gcp.pubsub.process',
       serviceName: identityService,
     },
+    'google-cloud-pubsub-push-subscription': {
+      opName: () => 'gcp.pubsub.process',
+      serviceName: identityService,
+    },
     kafkajs: {
       opName: () => 'kafka.process',
       serviceName: identityService,

package/packages/dd-trace/src/tracer.js

@@ -100,27 +100,27 @@ class DatadogTracer extends Tracer {
   wrap (name, options, fn) {
     const tracer = this
 
-    return function () {
+    return function (...args) {
       let optionsObj = options
       if (typeof optionsObj === 'function' && typeof fn === 'function') {
-        optionsObj = optionsObj.apply(this, arguments)
+        optionsObj = optionsObj.apply(this, args)
       }
 
-      const lastArgId = arguments.length - 1
-      const cb = arguments[lastArgId]
+      const lastArgId = args.length - 1
+      const cb = args[lastArgId]
 
       if (typeof cb === 'function') {
         const scopeBoundCb = tracer.scope().bind(cb)
         return tracer.trace(name, optionsObj, (span, done) => {
-          arguments[lastArgId] = function (err) {
+          args[lastArgId] = function (err) {
             done(err)
             return scopeBoundCb.apply(this, arguments)
           }
 
-          return fn.apply(this, arguments)
+          return fn.apply(this, args)
         })
       }
-      return tracer.trace(name, optionsObj, () => fn.apply(this, arguments))
+      return tracer.trace(name, optionsObj, () => fn.apply(this, args))
     }
   }