dd-trace 5.101.0 → 5.103.0

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

@@ -1,6 +1,6 @@
 'use strict'
 
-const { getValueFromEnvSources } = require('../../config/helper')
+const getConfig = require('../../config')
 const {
   GIT_COMMIT_SHA,
   GIT_BRANCH,
@@ -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) {
@@ -46,20 +46,22 @@ function validateGitCommitSha (gitCommitSha) {
 }
 
 function getUserProviderGitMetadata () {
-  const DD_GIT_COMMIT_SHA = getValueFromEnvSources('DD_GIT_COMMIT_SHA')
-  const DD_GIT_BRANCH = getValueFromEnvSources('DD_GIT_BRANCH')
-  const DD_GIT_REPOSITORY_URL = getValueFromEnvSources('DD_GIT_REPOSITORY_URL')
-  const DD_GIT_TAG = getValueFromEnvSources('DD_GIT_TAG')
-  const DD_GIT_COMMIT_MESSAGE = getValueFromEnvSources('DD_GIT_COMMIT_MESSAGE')
-  const DD_GIT_COMMIT_COMMITTER_NAME = getValueFromEnvSources('DD_GIT_COMMIT_COMMITTER_NAME')
-  const DD_GIT_COMMIT_COMMITTER_EMAIL = getValueFromEnvSources('DD_GIT_COMMIT_COMMITTER_EMAIL')
-  const DD_GIT_COMMIT_COMMITTER_DATE = getValueFromEnvSources('DD_GIT_COMMIT_COMMITTER_DATE')
-  const DD_GIT_COMMIT_AUTHOR_NAME = getValueFromEnvSources('DD_GIT_COMMIT_AUTHOR_NAME')
-  const DD_GIT_COMMIT_AUTHOR_EMAIL = getValueFromEnvSources('DD_GIT_COMMIT_AUTHOR_EMAIL')
-  const DD_GIT_COMMIT_AUTHOR_DATE = getValueFromEnvSources('DD_GIT_COMMIT_AUTHOR_DATE')
-  const DD_GIT_PULL_REQUEST_BASE_BRANCH = getValueFromEnvSources('DD_GIT_PULL_REQUEST_BASE_BRANCH')
-  const DD_GIT_PULL_REQUEST_BASE_BRANCH_SHA = getValueFromEnvSources('DD_GIT_PULL_REQUEST_BASE_BRANCH_SHA')
-  const DD_GIT_COMMIT_HEAD_SHA = getValueFromEnvSources('DD_GIT_COMMIT_HEAD_SHA')
+  const {
+    DD_GIT_COMMIT_SHA,
+    DD_GIT_BRANCH,
+    DD_GIT_REPOSITORY_URL,
+    DD_GIT_TAG,
+    DD_GIT_COMMIT_MESSAGE,
+    DD_GIT_COMMIT_COMMITTER_NAME,
+    DD_GIT_COMMIT_COMMITTER_EMAIL,
+    DD_GIT_COMMIT_COMMITTER_DATE,
+    DD_GIT_COMMIT_AUTHOR_NAME,
+    DD_GIT_COMMIT_AUTHOR_EMAIL,
+    DD_GIT_COMMIT_AUTHOR_DATE,
+    DD_GIT_PULL_REQUEST_BASE_BRANCH,
+    DD_GIT_PULL_REQUEST_BASE_BRANCH_SHA,
+    DD_GIT_COMMIT_HEAD_SHA,
+  } = getConfig()
 
   const branch = normalizeRef(DD_GIT_BRANCH)
   let tag = normalizeRef(DD_GIT_TAG)

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

@@ -110,7 +110,7 @@ class PrioritySampler {
    * Assigns a sampling priority to a span if not already set.
    *
    * @param {DatadogSpan} span
-   * @param {boolean} [auto=true] - Whether to use automatic sampling if no manual tags are present.
+   * @param {boolean} [auto] - Whether to use automatic sampling if no manual tags are present.
    * @returns {void}
    */
   sample (span, auto = true) {

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

@@ -260,7 +260,7 @@ class Profiler extends EventEmitter {
     this.#lastStart = start
     if (!this.#timer || timeout !== this._timeoutInterval) {
       this.#timer = setTimeout(() => this._collect(snapshotKinds.PERIODIC), timeout)
-      this.#timer.unref()
+      this.#timer.unref?.()
     } else {
       this.#timer.refresh()
     }

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

@@ -223,7 +223,7 @@ class NativeWallProfiler {
       asyncContextsLiveGauge.mark(totalAsyncContextCount)
       asyncContextsUsedGauge.mark(usedAsyncContextCount)
     }, this.#telemetryHeartbeatIntervalMillis)
-    this._contextCountGaugeUpdater.unref()
+    this._contextCountGaugeUpdater.unref?.()
   }
 
   #enter () {
@@ -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/profiling/ssi-heuristics.js

@@ -39,7 +39,7 @@ class SSIHeuristics {
     setTimeout(() => {
       this.shortLived = false
       this._maybeTriggered()
-    }, this.longLivedThreshold).unref()
+    }, this.longLivedThreshold).unref?.()
 
     this._onSpanCreated = this._onSpanCreated.bind(this)
     dc.subscribe('dd-trace:span:start', this._onSpanCreated)

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

@@ -5,7 +5,7 @@ const limiter = require('../../../vendor/dist/limiter')
 class RateLimiter {
   /**
    * @param {number} rateLimit - Allowed units per interval. Negative means unlimited, 0 disables.
-   * @param {'second'|'minute'|'hour'|'day'} [interval='second'] - Time window for the limiter.
+   * @param {'second'|'minute'|'hour'|'day'} [interval] - Time window for the limiter.
    */
   constructor (rateLimit, interval = 'second') {
     // TODO: Change rateLimit to integers. Right now these are sometimes strings, sometimes numbers.

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

@@ -17,7 +17,7 @@ class Scheduler {
   runAfterDelay (interval = this._interval) {
     this._timer = setTimeout(this._callback, interval, () => this.runAfterDelay())
 
-    this._timer.unref()
+    this._timer.unref?.()
   }
 
   stop () {

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

@@ -31,6 +31,7 @@ const builtinModules = new Set(Module.builtinModules.map(stripNodePrefix))
 
 function isBuiltinModuleName (name) {
   if (typeof name !== 'string') return false
+  if (name === 'electron') return true
   return builtinModules.has(stripNodePrefix(name))
 }
 
@@ -101,7 +102,7 @@ function Hook (modules, options, onrequire) {
     if (cache[moduleId]) {
       // require.cache was potentially altered externally
       const cacheEntry = require.cache[filename]
-      if (cacheEntry && cacheEntry.exports !== cache[filename].original) {
+      if (cacheEntry && cacheEntry.exports !== cache[moduleId].original) {
         return cacheEntry.exports
       }
 

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

@@ -8,14 +8,9 @@ const process = require('process')
 const { performance, PerformanceObserver, monitorEventLoopDelay } = require('perf_hooks')
 const { DogStatsDClient, MetricsAggregationClient } = require('../dogstatsd')
 const log = require('../log')
-const { getValueFromEnvSources } = require('../config/helper')
 
 const { NODE_MAJOR } = require('../../../../version')
 const processTags = require('../process-tags')
-// TODO: This environment variable may not be changed, since the agent expects a flush every ten seconds.
-// It is only a variable for testing. Think about alternatives.
-const DD_RUNTIME_METRICS_FLUSH_INTERVAL = getValueFromEnvSources('DD_RUNTIME_METRICS_FLUSH_INTERVAL') ?? '10000'
-const INTERVAL = Number.parseInt(DD_RUNTIME_METRICS_FLUSH_INTERVAL, 10)
 
 const eventLoopDelayResolution = 4
 
@@ -40,6 +35,8 @@ module.exports = {
    */
   start (config) {
     this.stop()
+    // The agent expects a flush every ten seconds, so this is for tests only.
+    const flushIntervalMs = config.DD_RUNTIME_METRICS_FLUSH_INTERVAL
     const clientConfig = DogStatsDClient.generateClientConfig(config)
 
     if (config.DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED) {
@@ -81,7 +78,7 @@ module.exports = {
         captureNativeMetrics(trackEventLoop, trackGc)
         captureCommonMetrics(trackEventLoop)
         client.flush()
-      }, INTERVAL)
+      }, flushIntervalMs)
     } else {
       lastCpuUsage = process.cpuUsage()
 
@@ -103,10 +100,10 @@ module.exports = {
           captureEventLoopDelay()
         }
         client.flush()
-      }, INTERVAL)
+      }, flushIntervalMs)
     }
 
-    interval.unref()
+    interval.unref?.()
   },
 
   stop () {

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

@@ -17,18 +17,18 @@ function getIsGCPFunction () {
 /**
  * Enable GCP Pub/Sub PUSH subscription tracing for Cloud Run (K_SERVICE present).
  * PUSH: GCP sends HTTP POST requests to the service with message data in headers.
+ *
+ * Stays on the env helper to avoid closing the
+ * `config -> serverless -> config` import cycle.
  */
 function enableGCPPubSubPushSubscription () {
-  const isGCPPubSubPushSubscriptionEnabled = getValueFromEnvSources('DD_TRACE_GCP_PUBSUB_PUSH_ENABLED')
-  return getEnvironmentVariable('K_SERVICE') !== undefined && !isFalse(isGCPPubSubPushSubscriptionEnabled)
+  return getEnvironmentVariable('K_SERVICE') !== undefined &&
+    !isFalse(getValueFromEnvSources('DD_TRACE_GCP_PUBSUB_PUSH_ENABLED'))
 }
 
 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

@@ -32,6 +32,14 @@ const messaging = {
       serviceName: ({ tracerService }) => `${tracerService}-azure-service-bus`,
       serviceSource: integrationSource('azure-service-bus'),
     },
+    'electron:ipc:main:send': {
+      opName: () => 'electron.main.send',
+      serviceName: identityService,
+    },
+    'electron:ipc:renderer:send': {
+      opName: () => 'electron.renderer.send',
+      serviceName: identityService,
+    },
     'google-cloud-pubsub': {
       opName: () => 'pubsub.request',
       serviceName: ({ tracerService }) => `${tracerService}-pubsub`,
@@ -79,9 +87,27 @@ const messaging = {
       serviceName: amqpServiceName,
       serviceSource: integrationSource('amqp'),
     },
+    'electron:ipc:main:receive': {
+      opName: () => 'electron.main.receive',
+      serviceName: identityService,
+    },
+    'electron:ipc:main:handle': {
+      opName: () => 'electron.main.handle',
+      serviceName: identityService,
+    },
+    'electron:ipc:renderer:receive': {
+      opName: () => 'electron.renderer.receive',
+      serviceName: identityService,
+    },
     '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/v0/web.js

@@ -54,6 +54,10 @@ const web = {
       serviceName: httpPluginClientService,
       serviceSource: optionServiceSource,
     },
+    'electron:net:request': {
+      opName: () => 'http.request',
+      serviceName: httpPluginClientService,
+    },
   },
   server: {
     'apollo.gateway.request': {

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

@@ -24,6 +24,14 @@ const messaging = {
       opName: () => 'azure.eventhubs.send',
       serviceName: identityService,
     },
+    'electron:ipc:main:send': {
+      opName: () => 'electron.main.send',
+      serviceName: identityService,
+    },
+    'electron:ipc:renderer:send': {
+      opName: () => 'electron.renderer.send',
+      serviceName: identityService,
+    },
     'google-cloud-pubsub': {
       opName: () => 'gcp.pubsub.send',
       serviceName: identityService,
@@ -53,10 +61,26 @@ const messaging = {
   consumer: {
     amqplib: amqpInbound,
     amqp10: amqpInbound,
+    'electron:ipc:main:receive': {
+      opName: () => 'electron.main.receive',
+      serviceName: identityService,
+    },
+    'electron:ipc:main:handle': {
+      opName: () => 'electron.main.handle',
+      serviceName: identityService,
+    },
+    'electron:ipc:renderer:receive': {
+      opName: () => 'electron.renderer.receive',
+      serviceName: identityService,
+    },
     'google-cloud-pubsub': {
       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/service-naming/schemas/v1/web.js

@@ -48,6 +48,10 @@ const web = {
       opName: () => 'undici.request',
       serviceName: httpPluginClientService,
     },
+    'electron:net:request': {
+      opName: () => 'http.client.request',
+      serviceName: httpPluginClientService,
+    },
   },
   server: {
     'apollo.gateway.request': {

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

@@ -165,7 +165,7 @@ class SpanStatsProcessor {
 
     if (this.enabled) {
       this.timer = setInterval(this.onInterval.bind(this), interval * 1e3)
-      this.timer.unref()
+      this.timer.unref?.()
     }
   }
 

package/packages/dd-trace/src/telemetry/dependencies.js

@@ -75,7 +75,7 @@ function waitAndSend (config, application, host) {
     if (savedDependenciesToSend.size > 0) {
       waitAndSend(config, application, host)
     }
-  }).unref()
+  }).unref?.()
 }
 
 function loadAllTheLoadedModules () {

package/packages/dd-trace/src/telemetry/endpoints.js

@@ -63,7 +63,7 @@ function scheduleFlush () {
   flushScheduled = true
   // this used to be setImmediate() instead, but it was making the system test flaky
   // don't ask me why
-  setTimeout(flushAndSend).unref()
+  setTimeout(flushAndSend).unref?.()
 }
 
 /**

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

@@ -291,7 +291,7 @@ function heartbeat (config, application) {
 
     const { reqType, payload } = createPayload('app-heartbeat')
     sendData(config, application, host, reqType, payload, updateRetryData)
-  }, config.telemetry.heartbeatInterval).unref()
+  }, config.telemetry.heartbeatInterval).unref?.()
 }
 
 /** @param {import('../config/config-base')} config */
@@ -307,7 +307,7 @@ function extendedHeartbeat (config) {
       heartbeatFailedDependencies = []
     }
     sendData(config, application, host, 'app-extended-heartbeat', appPayload)
-  }, config.telemetry.extendedHeartbeatInterval).unref()
+  }, config.telemetry.extendedHeartbeatInterval).unref?.()
 }
 
 /**

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