dd-trace 5.100.0 → 5.102.0

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/priority_sampler.js

@@ -148,9 +148,8 @@ class PrioritySampler {
   update (rates) {
     const samplers = {}
 
-    for (const key in rates) {
-      const rate = rates[key]
-      samplers[key] = new Sampler(rate)
+    for (const key of Object.keys(rates)) {
+      samplers[key] = new Sampler(rates[key])
     }
 
     samplers[DEFAULT_KEY] = samplers[DEFAULT_KEY] || defaultSampler
@@ -334,7 +333,10 @@ class PrioritySampler {
       if (!trace.tags[DECISION_MAKER_KEY]) {
         trace.tags[DECISION_MAKER_KEY] = `-${mechanism}`
       }
-    } else {
+    } else if (DECISION_MAKER_KEY in trace.tags) {
+      // Guard the `delete` so the common drop path doesn't pay the V8
+      // dictionary-mode transition unless a prior keep decision actually
+      // set the tag.
       delete trace.tags[DECISION_MAKER_KEY]
     }
   }

package/packages/dd-trace/src/profiling/config.js

@@ -4,6 +4,7 @@ const path = require('path')
 const { pathToFileURL } = require('url')
 
 const satisfies = require('../../../../vendor/dist/semifies')
+const getGitMetadata = require('../git_metadata')
 const { GIT_REPOSITORY_URL, GIT_COMMIT_SHA } = require('../plugins/util/tags')
 const { getIsAzureFunction } = require('../serverless')
 const { getAzureTagsFromMetadata, getAzureAppMetadata, getAzureFunctionMetadata } = require('../azure_metadata')
@@ -38,10 +39,10 @@ class Config {
       ...getAzureTagsFromMetadata(getIsAzureFunction() ? getAzureFunctionMetadata() : getAzureAppMetadata()),
     }
 
-    // Add source code integration tags if available
-    if (options.repositoryUrl && options.commitSHA) {
-      this.tags[GIT_REPOSITORY_URL] = options.repositoryUrl
-      this.tags[GIT_COMMIT_SHA] = options.commitSHA
+    const { commitSHA, repositoryUrl } = getGitMetadata(options)
+    if (repositoryUrl && commitSHA) {
+      this.tags[GIT_REPOSITORY_URL] = repositoryUrl
+      this.tags[GIT_COMMIT_SHA] = commitSHA
     }
 
     // Normalize from seconds to milliseconds. Default must be longer than a minute.

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/remote_config/index.js

@@ -5,6 +5,7 @@ const tracerVersion = require('../../../../package.json').version
 const request = require('../exporters/common/request')
 const log = require('../log')
 const { getExtraServices } = require('../service-naming/extra-services')
+const getGitMetadata = require('../git_metadata')
 const { GIT_REPOSITORY_URL, GIT_COMMIT_SHA } = require('../plugins/util/tags')
 const tagger = require('../tagger')
 const { getAgentUrl } = require('../agent/url')
@@ -37,11 +38,12 @@ class RemoteConfig {
       '_dd.rc.client_id': clientId,
     })
 
-    const tags = config.repositoryUrl
+    const { commitSHA, repositoryUrl } = getGitMetadata(config)
+    const tags = repositoryUrl
       ? {
           ...config.tags,
-          [GIT_REPOSITORY_URL]: config.repositoryUrl,
-          [GIT_COMMIT_SHA]: config.commitSHA,
+          [GIT_REPOSITORY_URL]: repositoryUrl,
+          [GIT_COMMIT_SHA]: commitSHA,
         }
       : config.tags
 

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/span_format.js

@@ -2,6 +2,11 @@
 
 const tags = require('../../../ext/tags')
 const constants = require('./constants')
+const {
+  MAX_META_KEY_LENGTH,
+  MAX_META_VALUE_LENGTH,
+  MAX_METRIC_KEY_LENGTH,
+} = require('./encode/tags-processors')
 const id = require('./id')
 const { isError } = require('./util')
 const { registerExtraService } = require('./service-naming/extra-services')
@@ -33,6 +38,23 @@ const map = {
   'resource.name': 'resource',
 }
 
+/**
+ * @typedef {object} FormattedSpan
+ * @property {import('./id').Identifier} trace_id
+ * @property {import('./id').Identifier} span_id
+ * @property {import('./id').Identifier} parent_id
+ * @property {string} name
+ * @property {string} resource
+ * @property {number} error
+ * @property {Record<string, string>} meta
+ * @property {Record<string, number>} metrics
+ * @property {Record<string, unknown> | undefined} meta_struct
+ * @property {number} start
+ * @property {number} duration
+ * @property {Array} links
+ * @property {Array<{ name: string, time_unix_nano: number, attributes?: Record<string, string> }>} [span_events]
+ */
+
 function format (span, isFirstSpanInChunk = false, tagForFirstSpanInChunk = false) {
   const formatted = formatSpan(span)
 
@@ -71,12 +93,15 @@ function setSingleSpanIngestionTags (span, options) {
   addTag({}, span.metrics, SPAN_SAMPLING_MAX_PER_SECOND, options.maxPerSecond)
 }
 
+/**
+ * @param {FormattedSpan} formattedSpan
+ * @param {import('./opentracing/span')} span
+ */
 function extractSpanLinks (formattedSpan, span) {
   if (!span._links?.length) {
     return
   }
-  const links = span._links.map(link => {
-    const { context, attributes } = link
+  const links = span._links.map(({ context, attributes }) => {
     const formattedLink = {
       trace_id: context.toTraceId(true),
       span_id: context.toSpanId(true),
@@ -90,21 +115,28 @@ function extractSpanLinks (formattedSpan, span) {
 
     return formattedLink
   })
-  formattedSpan.meta['_dd.span_links'] = JSON.stringify(links)
+  let serialized = JSON.stringify(links)
+  if (serialized.length > MAX_META_VALUE_LENGTH) {
+    serialized = `${serialized.slice(0, MAX_META_VALUE_LENGTH)}...`
+  }
+  formattedSpan.meta['_dd.span_links'] = serialized
 }
 
+/**
+ * @param {FormattedSpan} formattedSpan
+ * @param {import('./opentracing/span')} span
+ */
 function extractSpanEvents (formattedSpan, span) {
   if (!span._events?.length) {
     return
   }
-  const events = span._events.map(event => {
+  formattedSpan.span_events = span._events.map(event => {
     return {
       name: event.name,
       time_unix_nano: Math.round(event.startTime * 1e6),
       attributes: event.attributes && Object.keys(event.attributes).length > 0 ? event.attributes : undefined,
     }
   })
-  formattedSpan.span_events = events
 }
 
 function extractTags (formattedSpan, span) {
@@ -225,13 +257,25 @@ function extractError (formattedSpan, error) {
 function addTag (meta, metrics, key, value, nested) {
   switch (typeof value) {
     case 'string':
+      if (key.length > MAX_META_KEY_LENGTH) {
+        key = `${key.slice(0, MAX_META_KEY_LENGTH)}...`
+      }
+      if (value.length > MAX_META_VALUE_LENGTH) {
+        value = `${value.slice(0, MAX_META_VALUE_LENGTH)}...`
+      }
       meta[key] = value
       break
     case 'number':
       if (Number.isNaN(value)) break
+      if (key.length > MAX_METRIC_KEY_LENGTH) {
+        key = `${key.slice(0, MAX_METRIC_KEY_LENGTH)}...`
+      }
       metrics[key] = value
       break
     case 'boolean':
+      if (key.length > MAX_METRIC_KEY_LENGTH) {
+        key = `${key.slice(0, MAX_METRIC_KEY_LENGTH)}...`
+      }
       metrics[key] = value ? 1 : 0
       break
     default:
@@ -240,6 +284,9 @@ function addTag (meta, metrics, key, value, nested) {
       // Special case for Node.js Buffer and URL
       // TODO(BridgeAR)[31.03.2025]: Figure out if all typed arrays should be treated as buffers.
       if (isNodeBuffer(value) || isUrl(value)) {
+        if (key.length > MAX_METRIC_KEY_LENGTH) {
+          key = `${key.slice(0, MAX_METRIC_KEY_LENGTH)}...`
+        }
         metrics[key] = value.toString()
       } else if (!Array.isArray(value) && !nested) {
         for (const [prop, val] of Object.entries(value)) {

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

@@ -158,10 +158,6 @@ class SpanProcessor {
       }
     }
 
-    for (const span of trace.finished) {
-      span.context()._tags = {}
-    }
-
     trace.started = active
     trace.finished = []
   }

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

@@ -85,7 +85,6 @@ module.exports.addSpan = function (span) {
   const expiration = now + LIFETIME
   const wrapped = new WeakRef(span)
   spans.add(wrapped, expiration)
-  // registry.register(span, span._name)
 }
 
 function isEnabled () {

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))
     }
   }
 

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

@@ -2,6 +2,22 @@
 
 const path = require('path')
 
+/**
+ * `for-in` with an early return is the only allocation-free shape for
+ * "does this object have any own enumerable properties". Microbenchmarks
+ * pin it as 1.3-1.4x faster than `Object.keys(obj).length === 0` across
+ * small / medium / large objects -- enough that hot paths in the AWS SDK
+ * and AppSec reporter promote it.
+ *
+ * @param {object | undefined} obj
+ * @returns {boolean}
+ */
+function isEmpty (obj) {
+  // eslint-disable-next-line no-unreachable-loop
+  for (const _ in obj) return false
+  return true
+}
+
 function isTrue (str) {
   str = String(str).toLowerCase()
   return str === 'true' || str === '1'
@@ -76,6 +92,7 @@ function normalizePluginEnvName (envPluginName, makeLowercase = false) {
 }
 
 module.exports = {
+  isEmpty,
   isTrue,
   isFalse,
   isError,