dd-trace 6.7.0 → 6.9.0

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

@@ -8,13 +8,13 @@ const HTTP2_HEADER_AUTHORITY = ':authority'
 const HTTP2_HEADER_SCHEME = ':scheme'
 const HTTP2_HEADER_PATH = ':path'
 
-const PATH_REGEX = /^(?:[a-z]+:\/\/(?:[^?/]+))?(?<path>\/[^?]*)(?:(\?).*)?$/
+const PATH_REGEX = /^(?:[a-z]+:\/\/[^?/]+)?(?<path>\/[^?]*)(?:(\?).*)?$/
 
 const INT_SEGMENT = /^[1-9][0-9]+$/ // Integer of size at least 2 (>=10)
-const INT_ID_SEGMENT = /^(?=.*[0-9].*)[0-9._-]{3,}$/ // Mixed string with digits and delimiters
-const HEX_SEGMENT = /^(?=.*[0-9].*)[A-Fa-f0-9]{6,}$/ // Hexadecimal digits of size at least 6 with at least one decimal digit
-const HEX_ID_SEGMENT = /^(?=.*[0-9].*)[A-Fa-f0-9._-]{6,}$/ // Mixed string with hex digits and delimiters
-const STRING_SEGMENT = /^.{20,}|.*[%&'()*+,:=@].*$/ // Long string or a string containing special characters
+const INT_ID_SEGMENT = /^(?=.*[0-9])[0-9._-]{3,}$/ // Mixed string with digits and delimiters
+const HEX_SEGMENT = /^(?=.*[0-9])[A-Fa-f0-9]{6,}$/ // Hexadecimal digits of size at least 6 with at least one decimal digit
+const HEX_ID_SEGMENT = /^(?=.*[0-9])[A-Fa-f0-9._-]{6,}$/ // Mixed string with hex digits and delimiters
+const STRING_SEGMENT = /(?:^.{20,}|[%&'()*+,:=@])/ // Long string or a string containing special characters
 
 /**
  * Extract full URL from HTTP request

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.]+):(\/\/)?(.*?)(\/?|#[-\w.]+?)$/.test(repoUrl)
+  return /(?:git|ssh|https?|git@[-\w.]+):(\/\/)?(.*?)(\/?|#[-\w.]+)$/.test(repoUrl)
 }
 
 function validateGitCommitSha (gitCommitSha) {

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

@@ -34,6 +34,7 @@ const HTTP_CLIENT_IP = tags.HTTP_CLIENT_IP
 const MANUAL_DROP = tags.MANUAL_DROP
 
 const contexts = new WeakMap()
+const requests = new WeakMap()
 
 // TODO: change this to no longer rely on creating a dummy plugin to be able to access startSpan
 function createWebPlugin (tracer, config = {}) {
@@ -127,6 +128,7 @@ const web = {
     context.tracer = tracer
     context.span = span
     context.res = res
+    requests.set(span, req)
 
     this.setConfig(req, config)
     addRequestTags(context, this.TYPE)
@@ -219,7 +221,7 @@ const web = {
     const store = legacyStorage.getStore()
     const pubsubSpan = store?.span?._name === 'pubsub.push.receive' ? store.span : null
 
-    let childOf = pubsubSpan || tracer.extract(FORMAT_HTTP_HEADERS, headers)
+    let childOf = pubsubSpan || this.extractIncomingServerContext(tracer, headers)
 
     // we may have headers signaling a router proxy span should be created (such as for AWS API Gateway)
     if (tracer._config?.inferredProxyServicesEnabled) {
@@ -232,6 +234,10 @@ const web = {
     return startSpanHelper(tracer, name, { childOf }, traceCtx, config)
   },
 
+  extractIncomingServerContext (tracer, headers) {
+    return tracer.extract(FORMAT_HTTP_HEADERS, normalizeHeadersCarrier(headers))
+  },
+
   // Validate a request's status code and then add error tags if necessary
   addStatusError (req, statusCode) {
     const context = contexts.get(req)
@@ -307,6 +313,7 @@ const web = {
     web.finishMiddleware(context)
 
     web.finishSpan(context, spanType)
+    requests.delete(context.span)
 
     finishInferredProxySpan(context)
   },
@@ -336,6 +343,9 @@ const web = {
   getContext (req) {
     return contexts.get(req)
   },
+  getRequest (span) {
+    return requests.get(span)
+  },
   setRouteOrEndpointTag (req) {
     const context = contexts.get(req)
 
@@ -345,6 +355,18 @@ const web = {
   },
 }
 
+function normalizeHeadersCarrier (headers) {
+  if (!headers || typeof headers.get !== 'function' || typeof headers[Symbol.iterator] !== 'function') {
+    return headers
+  }
+
+  const carrier = {}
+  for (const [key, value] of headers) {
+    carrier[String(key).toLowerCase()] = value
+  }
+  return carrier
+}
+
 function addAllowHeaders (req, res, headers) {
   const allowHeaders = splitHeader(headers['access-control-allow-headers'])
   const requestHeaders = splitHeader(req.headers['access-control-request-headers'])
@@ -376,7 +398,7 @@ function isOriginAllowed (req, headers) {
 }
 
 function splitHeader (str) {
-  return typeof str === 'string' ? str.split(/\s*,\s*/) : []
+  return typeof str === 'string' ? str.split(',').map((header) => header.trim()) : []
 }
 
 function addRequestTags (context, spanType) {

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

@@ -140,7 +140,7 @@ class PrioritySampler {
       samplers[key] = new Sampler(rates[key])
     }
 
-    samplers[DEFAULT_KEY] = samplers[DEFAULT_KEY] || defaultSampler
+    samplers[DEFAULT_KEY] ||= defaultSampler
 
     this._samplers = samplers
 
@@ -257,8 +257,11 @@ class PrioritySampler {
     context._trace[SAMPLING_RULE_DECISION] = rule.sampleRate
     context._trace.tags[SAMPLING_KNUTH_RATE] = formatKnuthRate(rule.sampleRate)
     context._sampling.mechanism = SAMPLING_MECHANISM_RULE
-    if (rule.provenance === 'customer') context._sampling.mechanism = SAMPLING_MECHANISM_REMOTE_USER
-    if (rule.provenance === 'dynamic') context._sampling.mechanism = SAMPLING_MECHANISM_REMOTE_DYNAMIC
+    if (rule.provenance === 'customer') {
+      context._sampling.mechanism = SAMPLING_MECHANISM_REMOTE_USER
+    } else if (rule.provenance === 'dynamic') {
+      context._sampling.mechanism = SAMPLING_MECHANISM_REMOTE_DYNAMIC
+    }
 
     return rule.sample(context) && this._isSampledByRateLimit(context)
       ? USER_KEEP

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

@@ -20,7 +20,7 @@ module.exports = {
 
   /**
    * Declares the set of custom label keys that will be used with
-   * {@link runWithLabels}.
+   * `runWithLabels`.
    *
    * @param {Iterable<string>} keys - Custom label key names
    */

package/packages/dd-trace/src/profiling/exporters/event_serializer.js

@@ -43,7 +43,7 @@ class EventSerializer {
 
   /**
    * Returns the destination URL for the near-OOM export subprocess, or nothing when this exporter
-   * does not support OOM export. Overridden by {@link AgentExporter} and {@link FileExporter}.
+   * does not support OOM export. Overridden by `AgentExporter` and `FileExporter`.
    *
    * @returns {URL | undefined}
    */

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

@@ -2,7 +2,7 @@
 
 const { performance, constants, PerformanceObserver } = require('perf_hooks')
 const {
-  Function,
+  Function: PprofFunction,
   Label,
   Line,
   Location,
@@ -256,7 +256,7 @@ class EventSerializer {
     // A synthetic single-frame location to serve as the location for timeline
     // samples. We need these as the profiling backend (mimicking official pprof
     // tool's behavior) ignores these.
-    const fn = new Function({ id: this.functions.length + 1, name: this.stringTable.dedup('') })
+    const fn = new PprofFunction({ id: this.functions.length + 1, name: this.stringTable.dedup('') })
     this.functions.push(fn)
     const line = new Line({ functionId: fn.id })
     const location = new Location({ id: this.locations.length + 1, line: [line] })

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

@@ -6,7 +6,7 @@ class PoissonProcessSamplingFilter {
   #samplingInterval
   #resetInterval
   #now
-  #lastNow = Number.NEGATIVE_INFINITY
+  #lastNow = -Infinity
   #samplingInstantCount = 0
 
   constructor ({ samplingInterval, now, resetInterval }) {

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

@@ -17,8 +17,8 @@ function getThreadLabels () {
   const nativeThreadId = pprof.getNativeThreadId()
   return {
     [THREAD_NAME_LABEL]: eventLoopThreadName,
-    [THREAD_ID_LABEL]: `${threadId}`,
-    [OS_THREAD_ID_LABEL]: `${nativeThreadId}`,
+    [THREAD_ID_LABEL]: threadId.toString(),
+    [OS_THREAD_ID_LABEL]: nativeThreadId.toString(),
   }
 }
 

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

@@ -49,6 +49,7 @@ class LazyModule {
 
   /**
    * @param {import('./config/config-base')} config - Tracer configuration
+   * @param {...unknown} args - Extra arguments forwarded to the lazily loaded module
    */
   enable (config, ...args) {
     this.module = this.provider()

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

@@ -7,7 +7,11 @@ const Module = require('module')
 const dc = require('dc-polyfill')
 
 const parse = require('../../../vendor/dist/module-details-from-path')
-const { isRelativeRequire } = require('../../datadog-instrumentations/src/helpers/shared-utils')
+const {
+  isBuiltinModuleName,
+  isRelativeRequire,
+  normalizeModuleName,
+} = require('../../datadog-instrumentations/src/helpers/shared-utils')
 const { getConfiguredEnvName, getEnvironmentVariable } = require('./config/helper')
 
 const origRequire = Module.prototype.require
@@ -22,25 +26,6 @@ let patchedRequire = null
 const moduleLoadStartChannel = dc.channel('dd-trace:moduleLoadStart')
 const moduleLoadEndChannel = dc.channel('dd-trace:moduleLoadEnd')
 
-function stripNodePrefix (name) {
-  if (typeof name !== 'string') return name
-  return name.startsWith('node:') ? name.slice(5) : name
-}
-
-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))
-}
-
-function normalizeModuleName (name) {
-  if (typeof name !== 'string') return name
-  const stripped = stripNodePrefix(name)
-  return builtinModules.has(stripped) ? stripped : name
-}
-
 /**
  * @overload
  * @param {string[]} modules list of modules to hook into
@@ -52,6 +37,11 @@ function normalizeModuleName (name) {
  * @param {string[]} modules list of modules to hook into
  * @param {Function} onrequire callback to be executed upon encountering module
  */
+/**
+ * @param {string[]} modules list of modules to hook into
+ * @param {object | Function} [options] hook options, or the `onrequire` callback
+ * @param {Function} [onrequire] callback to be executed upon encountering module
+ */
 function Hook (modules, options, onrequire) {
   if (!(this instanceof Hook)) return new Hook(modules, options, onrequire)
   if (typeof options === 'function') {

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

@@ -11,11 +11,13 @@ const { NODE_MAJOR, NODE_MINOR } = require('../../../../version')
 const { createMetricsClient } = require('./client')
 
 const eventLoopDelayResolution = 4
-const EVENT_LOOP_SAMPLE_PER_ITERATION_AVAILABLE = NODE_MAJOR > 26 || (NODE_MAJOR === 26 && NODE_MINOR >= 5)
+const EVENT_LOOP_SAMPLE_PER_ITERATION_AVAILABLE = NODE_MAJOR > 26 ||
+  (NODE_MAJOR === 26 && NODE_MINOR >= 5) ||
+  (NODE_MAJOR === 24 && NODE_MINOR >= 19)
 
 // @datadog/native-metrics is only needed on Node versions where
 // monitorEventLoopDelay's samplePerIteration option is unavailable.
-// TODO: remove @datadog/native-metrics and this branch once Node < 26.5 is no longer supported.
+// TODO: remove @datadog/native-metrics and this branch once all supported Node versions provide this option.
 const NATIVE_METRICS_REQUIRED = !EVENT_LOOP_SAMPLE_PER_ITERATION_AVAILABLE
 
 let nativeMetrics = null

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

@@ -180,8 +180,10 @@ class SamplingRule {
     if (resource) {
       this.matchers.push(matcher(resource, resourceLocator))
     }
-    for (const [key, value] of Object.entries(tags || {})) {
-      this.matchers.push(matcher(value, makeTagLocator(key)))
+    if (tags) {
+      for (const [key, value] of Object.entries(tags)) {
+        this.matchers.push(matcher(value, makeTagLocator(key)))
+      }
     }
 
     this._sampler = new Sampler(sampleRate)

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

@@ -150,7 +150,7 @@ const storage = {
       },
     },
     pg: {
-      opName: () => 'pg.query',
+      opName: ({ operation = 'query' }) => `pg.${operation}`,
       serviceName: withSuffixFunction('postgres'),
       serviceSource: ({ tracerService, pluginConfig, connectionName }) => {
         return optionServiceSource({ tracerService, pluginConfig, connectionName, integration: 'pg' })

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

@@ -82,7 +82,7 @@ const storage = {
       serviceSource: optionServiceSource,
     },
     pg: {
-      opName: () => 'postgresql.query',
+      opName: ({ operation = 'query' }) => `postgresql.${operation}`,
       serviceName: withFunction,
       serviceSource: optionServiceSource,
     },

package/packages/dd-trace/src/startup-log.js

@@ -108,6 +108,9 @@ function configInfo () {
     profiling_enabled: profilingEnabled === 'true' || profilingEnabled === 'auto',
     appsec_enabled: config.appsec.enabled,
     data_streams_enabled: !!config.dsmEnabled,
+    otlp_traces_export_enabled: config.OTEL_TRACES_EXPORTER === 'otlp' && !config.isCiVisibility,
+    otlp_metrics_export_enabled: !!config.DD_METRICS_OTEL_ENABLED,
+    otlp_logs_export_enabled: !!config.DD_LOGS_OTEL_ENABLED,
   }
 }
 

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

@@ -13,6 +13,9 @@ let enabled = false
  * Telemetry logs api defines only ERROR, WARN and DEBUG levels:
  * - WARN level is enabled by default
  * - DEBUG level will be possible to activate with an env var or telemetry config property
+ *
+ * @param {string | undefined} level
+ * @returns {boolean}
  */
 function isLevelEnabled (level) {
   return isValidLevel(level)

package/packages/dd-trace/src/telemetry/logs/log-collector.js

@@ -31,7 +31,9 @@ function isValid (logEntry) {
 }
 
 const EOL = '\n'
-const STACK_FRAME_LINE_REGEX = /^\s*at\s/gm
+// `[ \t]*` (horizontal whitespace) cannot span line terminators, so under `m` the `^`-anchored
+// match runs once per line instead of rescanning across lines. Stack frames indent with spaces.
+const STACK_FRAME_LINE_REGEX = /^[ \t]*at\s/gm
 
 function sanitize (logEntry) {
   const stack = logEntry.stack_trace

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

@@ -130,7 +130,7 @@ function updateRetryData (error, retryObj) {
 
 function getIntegrations () {
   const newIntegrations = /** @type {Integration[]} */ ([])
-  for (const pluginName of Object.keys(pluginManager._pluginsByName ?? {})) {
+  for (const pluginName of Object.keys(pluginManager._pluginsByName)) {
     if (!sentIntegrations.has(pluginName)) {
       newIntegrations.push({
         name: pluginName,

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

@@ -102,6 +102,21 @@ function getSegment (string, separator, index, fallback) {
   return end === -1 ? string.slice(start) : string.slice(start, end)
 }
 
+/**
+ * Return the path portion of a request target, dropping any query string and fragment.
+ * The two scans avoid the array and substring a `split(/[?#]/)` allocates per call.
+ *
+ * @param {string} target
+ */
+function stripQueryAndFragment (target) {
+  let cut = target.indexOf('?')
+  const fragment = target.indexOf('#')
+  if (cut === -1 || (fragment !== -1 && fragment < cut)) {
+    cut = fragment
+  }
+  return cut === -1 ? target : target.slice(0, cut)
+}
+
 function calculateDDBasePath (dirname) {
   const dirSteps = dirname.split(path.sep)
   const packagesIndex = dirSteps.lastIndexOf('packages')
@@ -136,6 +151,7 @@ module.exports = {
   isError,
   globMatch,
   getSegment,
+  stripQueryAndFragment,
   ddBasePath: globalThis.__DD_ESBUILD_BASEPATH || calculateDDBasePath(__dirname),
   normalizePluginEnvName,
   formatKnuthRate,