dd-trace 6.16.0 → 6.17.0

package/packages/dd-trace/src/opentelemetry/otlp/otlp_http_exporter_base.js

@@ -42,15 +42,9 @@ class OtlpHttpExporterBase {
 
     const isJson = protocol === 'http/json'
 
-    const parsedUrl = new URL(url)
-    this.#transport = parsedUrl.protocol === 'http:' ? http : https
     this.options = {
       method: 'POST',
       timeout,
-      hostname: parsedUrl.hostname,
-      port: parsedUrl.port,
-      path: parsedUrl.pathname + parsedUrl.search,
-      agent: parsedUrl.protocol === 'https:' ? getHttpsProxyAgent(parsedUrl) : undefined,
       headers: {
         'Content-Type': isJson ? 'application/json' : 'application/x-protobuf',
         'User-Agent': `dd-trace-js/${tracerVersion}`,
@@ -59,9 +53,10 @@ class OtlpHttpExporterBase {
     }
 
     this.telemetryTags = [
-      `protocol:${this.#transport === https ? 'https' : 'http'}`,
+      '',
       `encoding:${isJson ? 'json' : 'protobuf'}`,
     ]
+    this.#applyUrl(url)
   }
 
   /**
@@ -164,22 +159,44 @@ class OtlpHttpExporterBase {
   }
 
   /**
-   * Re-targets the exporter to a different URL, updating transport, hostname, port, and path.
    * @param {string} url
    */
-  setUrl (url) {
+  #applyUrl (url) {
     const parsedUrl = new URL(url)
-    this.#transport = parsedUrl.protocol === 'http:' ? http : https
+    if (parsedUrl.protocol !== 'http:' && parsedUrl.protocol !== 'https:') {
+      throw new TypeError(`Unsupported OTLP endpoint protocol: ${parsedUrl.protocol}`)
+    }
+
+    const transport = parsedUrl.protocol === 'http:' ? http : https
+    const agent = transport === https ? getHttpsProxyAgent(parsedUrl) : undefined
+
+    this.#transport = transport
     this.options.hostname = parsedUrl.hostname
     this.options.port = parsedUrl.port
     this.options.path = parsedUrl.pathname + parsedUrl.search
-    this.options.agent = parsedUrl.protocol === 'https:' ? getHttpsProxyAgent(parsedUrl) : undefined
-    this.telemetryTags[0] = `protocol:${this.#transport === https ? 'https' : 'http'}`
+    this.options.agent = agent
+    this.telemetryTags[0] = `protocol:${transport === https ? 'https' : 'http'}`
+  }
+
+  /**
+   * Re-targets the exporter to a different URL, updating transport, hostname, port, and path.
+   * @param {string} url
+   */
+  setUrl (url) {
+    try {
+      this.#applyUrl(url)
+    } catch (error) {
+      log.error(
+        'Invalid OTLP %s URL: %s. Using previous URL. Error: %s',
+        this.signalType,
+        url,
+        error.message
+      )
+    }
   }
 
   /**
    * @param {() => void} [done]
-   * @returns {void}
    */
   shutdown (done) {
     done?.()

package/packages/dd-trace/src/opentelemetry/otlp/otlp_transformer_base.js

@@ -171,7 +171,6 @@ class OtlpTransformerBase {
  * Supports string keys with primitive values or arrays of primitives.
  *
  * @param {Attributes} attributes - Attributes object to stringify
- * @returns {string} Stable string representation
  */
 function stableStringify (attributes) {
   if (attributes == null) {

package/packages/dd-trace/src/opentelemetry/span-helpers.js

@@ -261,7 +261,6 @@ function recordException (ddSpan, exception, timeInput, otelTraceSemanticsEnable
  * @param {number} currentCode 0 = UNSET, 1 = OK, 2 = ERROR.
  * @param {{ code?: number, message?: string }} [status]
  * @param {boolean} [otelTraceSemanticsEnabled]
- * @returns {number} The new status code to track on the caller.
  */
 function applyOtelStatus (ddSpan, currentCode, status, otelTraceSemanticsEnabled) {
   if (!isWritable(ddSpan)) return currentCode

package/packages/dd-trace/src/opentelemetry/trace/otlp_http_trace_exporter.js

@@ -57,7 +57,6 @@ class OtlpHttpTraceExporter extends OtlpHttpExporterBase {
    * Exports DD-formatted spans via OTLP over HTTP.
    *
    * @param {import('./otlp_transformer').DDFormattedSpan[]} spans - Array of DD-formatted spans to export
-   * @returns {void}
    */
   export (spans) {
     if (spans.length === 0) {

package/packages/dd-trace/src/opentelemetry/trace/otlp_transformer.js

@@ -248,7 +248,6 @@ class OtlpTraceTransformer extends OtlpTransformerBase {
    * Maps a DD span.kind string to an OTLP SpanKind enum value.
    *
    * @param {string | undefined} kind - DD span kind string
-   * @returns {number} OTLP SpanKind enum value
    */
   #mapSpanKind (kind) {
     if (!kind) return SPAN_KIND_UNSPECIFIED
@@ -340,7 +339,6 @@ class OtlpTraceTransformer extends OtlpTransformerBase {
    *
    * @param {Identifier} identifier - DD Identifier
    * @param {number} targetLength - Target byte length (16 for trace ID, 8 for span ID)
-   * @returns {string} Hex-encoded string of the specified length
    */
   #idToBytes (identifier, targetLength) {
     const buffer = identifier.toBuffer()
@@ -363,7 +361,6 @@ class OtlpTraceTransformer extends OtlpTransformerBase {
    *
    * @param {string | undefined} hexString - Hex string to normalize
    * @param {number} targetLength - Target byte length
-   * @returns {string} Hex-encoded string of the specified length
    */
   #hexToBytes (hexString, targetLength) {
     if (!hexString) return '0'.repeat(targetLength * 2)

package/packages/dd-trace/src/opentracing/propagation/text_map.js

@@ -88,7 +88,6 @@ const percentByte = /%([0-9A-Fa-f]{2})/g
 /**
  * @param {Array<string | undefined>} traceTagReplacements
  * @param {string} key
- * @returns {boolean}
  */
 function hasTraceTagReplacement (traceTagReplacements, key) {
   for (let index = 0; index < traceTagReplacements.length; index += 2) {
@@ -117,7 +116,6 @@ function extractGenericContext (traceId, spanId, radix) {
 /**
  * @param {string} traceId
  * @param {DatadogSpanContext} spanContext
- * @returns {void}
  */
 function extract128BitTraceId (traceId, spanContext) {
   const buffer = spanContext._traceId.toBuffer()
@@ -485,7 +483,6 @@ class TextMapPropagator {
    * @param {Record<string, string>} traceTags
    * @param {Array<string | undefined>} [traceTagReplacements]
    * @param {number} optionalTraceTagCount
-   * @returns {void}
    */
   #injectTags (carrier, traceTags, traceTagReplacements, optionalTraceTagCount) {
     if (this.#config.DD_TRACE_X_DATADOG_TAGS_MAX_LENGTH === 0) {
@@ -688,7 +685,6 @@ class TextMapPropagator {
   /**
    * @param {'inject' | 'extract'} mode
    * @param {string} name
-   * @returns {boolean}
    */
   #hasPropagationStyle (mode, name) {
     return this.#config.tracePropagationStyle[mode].includes(name)
@@ -974,7 +970,6 @@ class TextMapPropagator {
   /**
    * @param {Record<string, unknown>} carrier
    * @param {DatadogSpanContext} spanContext
-   * @returns {void}
    */
   #extractLegacyBaggageItems (carrier, spanContext) {
     if (!this.#config.legacyBaggageEnabled) return
@@ -985,7 +980,6 @@ class TextMapPropagator {
    * @param {Record<string, unknown> | undefined} carrier
    * @param {DatadogSpanContext | undefined} spanContext
    * @param {boolean} extractBaggage
-   * @returns {void}
    */
   #extractBaggageItems (carrier, spanContext, extractBaggage) {
     removeAllBaggageItems()

package/packages/dd-trace/src/opentracing/span_context.js

@@ -108,7 +108,6 @@ class DatadogSpanContext {
   /**
    * Check if a tag exists.
    * @param {string} key - Tag key
-   * @returns {boolean}
    */
   hasTag (key) { return Object.hasOwn(this._tags, key) }
 

package/packages/dd-trace/src/otel-thread-ctx.js

@@ -25,6 +25,7 @@
 
 const { isMainThread, threadId } = require('worker_threads')
 
+const { AUTO_KEEP } = require('../../../ext/priority')
 const { isACFActive } = require('../../datadog-core/src/storage')
 const log = require('./log')
 const {
@@ -94,6 +95,20 @@ const ATTRIBUTE_KEYS = [
 const THREAD_NAME = (isMainThread ? 'Main' : `Worker #${threadId}`) + ' Event Loop'
 const THREAD_ID = String(threadId)
 
+// W3C trace-flags byte for a record, derived the same way DatadogSpanContext
+// #toTraceparent derives the flags it puts on the wire — sampled iff the
+// priority is AUTO_KEEP or above.
+//
+// Unlike toTraceparent, this does NOT materialize a not-yet-taken decision
+// (_ensureSamplingPriority): that would move every trace's sampling decision
+// forward to the first activation of its first span, on the tracer's hot path,
+// as a side effect of profiling being enabled. An undefined priority therefore
+// reads as not sampled, which is also what OTEP-4947 prescribes when the flags
+// are not known yet. See the note on setTraceFlags in getOrBuildContext.
+function traceFlagsOf (spanContext) {
+  return spanContext._sampling?.priority >= AUTO_KEEP ? 1 : 0
+}
+
 // Cache slot on span objects. One ThreadContext is built per span on first
 // activation and re-installed across every async-context frame that
 // re-enters the span — V8's AsyncContextFrame inherits the JS
@@ -140,7 +155,13 @@ function getOrBuildContext (span) {
     cached = {}
     span[CachedSym] = cached
   }
-  cached.context = new ThreadContext(traceId, spanId, attrs)
+  // The flags are the one part of the record that can still change after
+  // publication: a decision taken later, or overridden, is pushed into the live
+  // record with setTraceFlags rather than by rebuilding the context, which would
+  // strand every async-context frame already holding this one. Nothing calls it
+  // yet — the tracer publishes no event for a sampling decision — so a record
+  // built before the decision keeps reading as not sampled.
+  cached.context = new ThreadContext(traceId, spanId, traceFlagsOf(spanContext), attrs)
   cached.webTags = webTags
   if (endpoint === undefined) awaitEndpoint(webTags, cached)
   return cached.context
@@ -279,7 +300,7 @@ function missingApiMember (ns) {
   for (const name of ['ThreadContext', 'getContext', 'clearContext', 'getProcessContextAttributes']) {
     if (typeof ns[name] !== 'function') return name
   }
-  for (const name of ['appendAttributes', 'enter', 'invalidate']) {
+  for (const name of ['appendAttributes', 'enter', 'invalidate', 'setTraceFlags']) {
     if (typeof ns.ThreadContext.prototype[name] !== 'function') return `ThreadContext.prototype.${name}`
   }
 }
@@ -287,15 +308,21 @@ function missingApiMember (ns) {
 // Install and detach one throwaway context, to establish that this process can
 // actually do it before any span depends on it.
 //
-// @datadog/pprof decides whether AsyncContextFrame is available by inspecting
-// `process.execArgv`, and throws from enter() when it concludes it isn't. That
-// disagrees with the feature detection behind `isACFActive` whenever the flag
-// reached Node by another route: `NODE_OPTIONS=--experimental-async-context-frame`
-// is accepted on Node 22 and 23 and leaves `execArgv` empty, and a worker thread
-// created with an explicit `execArgv` loses it too. Since our subscribers run
-// inline with `storage.enterWith`, letting that throw would put the exception in
-// application code on the first span activation, so find out here instead, where
-// declining to start is still an option.
+// @datadog/pprof throws from enter() when it concludes AsyncContextFrame is not
+// active. It reaches that conclusion by its own feature detection, asking the
+// addon what is in the CPED slot during a `run()` — direct evidence about the
+// exact slot the out-of-process reader walks. `isACFActive` above tests the same
+// property through a weaker proxy: whether `run()` delegates to `enterWith()`,
+// which holds today but relies on unspecified dispatch that anything patching
+// `AsyncLocalStorage` can break. So the two can disagree, and pprof's answer is
+// the one that governs whether a record ever gets written. Its enter() can also
+// fail for reasons `isACFActive` says nothing about, such as an addon that
+// loaded but whose TLS block is unusable.
+//
+// Since our subscribers run inline with `storage.enterWith`, letting enter()
+// throw would put the exception in application code on the first span
+// activation, so find out here instead, where declining to start is still an
+// option.
 function canInstallContext (ns) {
   try {
     // Zero-filled ids: the record is only readable while it is installed, which

package/packages/dd-trace/src/payload-tagging/tagging.js

@@ -1,18 +1,29 @@
 'use strict'
 
 const { PAYLOAD_TAGGING_MAX_TAGS } = require('../constants')
+const { truncateString } = require('../util')
 
 const redactedKeys = new Set([
   'authorization', 'x-authorization', 'password', 'token',
 ])
 const truncated = 'truncated'
 const redacted = 'redacted'
+const maxValueLength = 5000
+const maxRetainedValueLength = maxValueLength * 2
+
+/**
+ * @param {string} value
+ */
+function truncateValue (value) {
+  return value.length > maxRetainedValueLength
+    ? truncateString(value, maxValueLength)
+    : value.slice(0, maxValueLength)
+}
 
 /**
  * Escapes dots in keys to preserve hierarchy in flattened tag names.
  *
  * @param {string} key
- * @returns {string}
  */
 function escapeKey (key) {
   return key.replaceAll('.', String.raw`\.`)
@@ -67,13 +78,14 @@ function tagsFromObject (object, opts) {
 
     if (['number', 'boolean'].includes(typeof object) || Buffer.isBuffer(object)) {
       tagCount += 1
-      result[prefix] = object.toString().slice(0, 5000)
+      const value = object.toString()
+      result[prefix] = value.length > maxValueLength ? truncateValue(value) : value
       return
     }
 
     if (typeof object === 'string') {
       tagCount += 1
-      result[prefix] = object.slice(0, 5000)
+      result[prefix] = object.length > maxValueLength ? truncateValue(object) : object
     }
 
     if (typeof object === 'object') {

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

@@ -593,7 +593,6 @@ module.exports = class CiPlugin extends Plugin {
    * @param {string|undefined} repositoryRoot - Repository root discovered by the coordinator process.
    * @param {Array<{ pattern: string, owners: string[] }>|null|undefined} codeOwnersEntries
    * Parsed CODEOWNERS entries discovered by the coordinator process.
-   * @returns {void}
    */
   _setRepositoryRoot (repositoryRoot, codeOwnersEntries) {
     if (codeOwnersEntries !== undefined) {

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

@@ -3,6 +3,7 @@
 const { LRUCache } = require('../../../../vendor/dist/lru-cache')
 const { PEER_SERVICE_KEY, PEER_SERVICE_SOURCE_KEY } = require('../constants')
 const propagationHash = require('../propagation-hash')
+const { truncateString } = require('../util')
 const StoragePlugin = require('./storage')
 
 // Unreserved RFC 3986 set that `encodeURIComponent` leaves untouched (a conservative subset:
@@ -46,7 +47,6 @@ class DatabasePlugin extends StoragePlugin {
    * @param {string} serviceName
    * @param {import('../../../..').Span} span
    * @param {object} peerData
-   * @returns {string}
    */
   #createDBMPropagationCommentService (serviceName, span, peerData) {
     const spanTags = span.context().getTags()
@@ -70,7 +70,6 @@ class DatabasePlugin extends StoragePlugin {
   /**
    * @param {string} tracerService
    * @param {object} peerData
-   * @returns {string}
    */
   #getDbmServiceName (tracerService, peerData) {
     if (this._tracerConfig.spanComputePeerService) {
@@ -123,7 +122,6 @@ class DatabasePlugin extends StoragePlugin {
    * @param {string} query
    * @param {string} serviceName
    * @param {boolean} disableFullMode
-   * @returns {string}
    */
   injectDbmQuery (span, query, serviceName, disableFullMode = false) {
     const dbmTraceComment = this.createDbmComment(span, serviceName, disableFullMode)
@@ -139,7 +137,6 @@ class DatabasePlugin extends StoragePlugin {
 
   /**
    * @param {string} query
-   * @returns {string}
    */
   maybeTruncate (query) {
     const maxLength = typeof this.config.truncate === 'number'
@@ -147,7 +144,7 @@ class DatabasePlugin extends StoragePlugin {
       : 5000 // same as what the agent does
 
     if (this.config.truncate && query && query.length > maxLength) {
-      query = `${query.slice(0, maxLength - 3)}...`
+      query = truncateString(query, maxLength, '...')
     }
 
     return query
@@ -156,7 +153,6 @@ class DatabasePlugin extends StoragePlugin {
 
 /**
  * @param {string | number | undefined | null} value
- * @returns {string}
  */
 function encode (value) {
   if (!value) return ''

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

@@ -10,6 +10,12 @@ const plugins = {
   get '@azure/functions' () { return require('../../../datadog-plugin-azure-functions/src') },
   get '@modelcontextprotocol/sdk' () { return require('../../../datadog-plugin-modelcontextprotocol-sdk/src') },
   get '@aws/durable-execution-sdk-js' () { return require('../../../datadog-plugin-aws-durable-execution-sdk-js/src') },
+  get '@supabase/auth-js' () { return require('../../../datadog-plugin-supabase/src') },
+  get '@supabase/functions-js' () { return require('../../../datadog-plugin-supabase/src') },
+  get '@supabase/postgrest-js' () { return require('../../../datadog-plugin-supabase/src') },
+  get '@supabase/realtime-js' () { return require('../../../datadog-plugin-supabase/src') },
+  get '@supabase/storage-js' () { return require('../../../datadog-plugin-supabase/src') },
+  get '@supabase/supabase-js' () { return require('../../../datadog-plugin-supabase/src') },
   get 'durable-functions' () { return require('../../../datadog-plugin-azure-durable-functions/src') },
   get '@azure/service-bus' () { return require('../../../datadog-plugin-azure-service-bus/src') },
   get '@cucumber/cucumber' () { return require('../../../datadog-plugin-cucumber/src') },
@@ -121,6 +127,7 @@ const plugins = {
   get pino () { return require('../../../datadog-plugin-pino/src') },
   get 'pino-pretty' () { return require('../../../datadog-plugin-pino/src') },
   get playwright () { return require('../../../datadog-plugin-playwright/src') },
+  get postgres () { return require('../../../datadog-plugin-postgres/src') },
   get protobufjs () { return require('../../../datadog-plugin-protobufjs/src') },
   get redis () { return require('../../../datadog-plugin-redis/src') },
   get restify () { return require('../../../datadog-plugin-restify/src') },

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

@@ -100,7 +100,6 @@ module.exports = class Plugin {
    *
    * @param {object} span The span to bind as current.
    * @param {object=} store Optional existing store to extend; if omitted, uses current store.
-   * @returns {void}
    */
   enter (span, store) {
     store ||= legacyStorage.getStore()
@@ -112,7 +111,6 @@ module.exports = class Plugin {
    *
    * @param {string} channelName Diagnostic channel name.
    * @param {(message: unknown, name: string) => unknown} handler Handler invoked on messages.
-   * @returns {void}
    */
   addSub (channelName, handler) {
     const wrappedHandler = (message, name) => {
@@ -132,7 +130,6 @@ module.exports = class Plugin {
    *
    * @param {string} channelName Diagnostic channel name.
    * @param {(data: unknown) => object} transform Transform to compute the bound store.
-   * @returns {void}
    */
   addBind (channelName, transform) {
     this._bindings.push(new StoreBinding(channelName, transform))
@@ -142,7 +139,6 @@ module.exports = class Plugin {
    * Attach an error to the current active span (if any).
    *
    * @param {unknown} error Error object or sentinel value.
-   * @returns {void}
    */
   addError (error) {
     const store = legacyStorage.getStore()

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

@@ -29,6 +29,7 @@ class TracingPlugin extends Plugin {
    * @param {string} [opts.type]
    * @param {string} [opts.id]
    * @param {string} [opts.kind]
+   * @param {object} [opts.pluginConfig]
    * @returns {{ name: string, source: string | undefined }}
    */
   serviceName (opts = {}) {
@@ -46,7 +47,6 @@ class TracingPlugin extends Plugin {
    * @param {string} [opts.type]
    * @param {string} [opts.id]
    * @param {string} [opts.kind]
-   * @returns {string}
    */
   operationName (opts = {}) {
     const {

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

@@ -95,10 +95,8 @@ function isDirectory (path) {
 }
 
 function isGitAvailable () {
-  const isWindows = os.platform() === 'win32'
-  const command = isWindows ? 'where' : 'which'
   try {
-    cachedExec(command, ['git'])
+    cachedExec('git', ['--version'])
     return true
   } catch {
     incrementCountMetric(TELEMETRY_GIT_COMMAND_ERRORS, { command: 'check_git', exitCode: 'missing' })

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

@@ -104,7 +104,6 @@ function toHttpScheme (scheme) {
  * `REDACTED@host`. Returns the URL unchanged when no userinfo is present.
  *
  * @param {string} url
- * @returns {string}
  */
 function redactUrlCredentials (url) {
   const schemeEnd = url.indexOf('://')

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

@@ -29,7 +29,6 @@ function normalize (text, limit = 128) {
  *
  * @param {Sampler} sampler
  * @param {import('../../../../..').Span|import('../../../../..').SpanContext} span
- * @returns {boolean} `true` if the prompt completion should be sampled, otherwise `false`.
  */
 function isPromptCompletionSampled (sampler, span) {
   return sampler.isSampled(span)
@@ -52,7 +51,6 @@ module.exports = function makeUtilities (integrationName, tracerConfig) {
      * Determines whether a prompt completion should be sampled based on the configured sampling rate.
      *
      * @param {import('../../../../..').Span|import('../../../../..').SpanContext} span
-     * @returns {boolean} `true` if the prompt completion should be sampled, otherwise `false`.
      */
     isPromptCompletionSampled: (span) => isPromptCompletionSampled(sampler, span),
   }

package/packages/dd-trace/src/plugins/util/status-validator.js

@@ -83,7 +83,6 @@ function getStatusValidator (config, optionName, defaultRanges, defaultValidator
 
   /**
    * @param {number} code
-   * @returns {boolean}
    */
   function isValidStatusCode (code) {
     return errorStatusCodes[code] !== 1