dd-trace 5.108.0 → 5.110.0

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

@@ -137,14 +137,17 @@ function normalizeLinkContext (context) {
  * Mirrors `http.response.status_code` onto `http.status_code` (DD's special tag used by APM
  * trace metrics and client-side stats); both names end up on the span.
  *
+ * When OTel trace semantics are enabled, the behavior is disabled.
+ *
  * @param {import('../opentracing/span')} ddSpan
  * @param {string} key
  * @param {unknown} value
+ * @param {boolean} [otelTraceSemanticsEnabled]
  */
-function setOtelAttribute (ddSpan, key, value) {
+function setOtelAttribute (ddSpan, key, value, otelTraceSemanticsEnabled) {
   if (!isWritable(ddSpan)) return
 
-  if (key === 'http.response.status_code') {
+  if (!otelTraceSemanticsEnabled && key === 'http.response.status_code') {
     ddSpan.setTag('http.status_code', String(value))
   }
 
@@ -155,14 +158,17 @@ function setOtelAttribute (ddSpan, key, value) {
  * Same `http.status_code` mirror as `setOtelAttribute`; does not mutate the caller's
  * `attributes` object.
  *
+ * When OTel trace semantics are enabled, the behavior is disabled.
+ *
  * @param {import('../opentracing/span')} ddSpan
  * @param {Record<string, unknown>} attributes
+ * @param {boolean} [otelTraceSemanticsEnabled]
  */
-function setOtelAttributes (ddSpan, attributes) {
+function setOtelAttributes (ddSpan, attributes, otelTraceSemanticsEnabled) {
   if (!isWritable(ddSpan)) return
 
   ddSpan.addTags(attributes)
-  if ('http.response.status_code' in attributes) {
+  if (!otelTraceSemanticsEnabled && 'http.response.status_code' in attributes) {
     ddSpan.setTag('http.status_code', String(attributes['http.response.status_code']))
   }
 }
@@ -223,16 +229,19 @@ function addOtelEvent (ddSpan, name, attributesOrStartTime, startTime) {
  * @param {import('../opentracing/span')} ddSpan
  * @param {ExceptionLike} exception
  * @param {TimeInput} [timeInput]
+ * @param {boolean} [otelTraceSemanticsEnabled]
  */
-function recordException (ddSpan, exception, timeInput) {
+function recordException (ddSpan, exception, timeInput, otelTraceSemanticsEnabled) {
   if (!isWritable(ddSpan)) return
 
-  ddSpan.addTags({
-    [ERROR_TYPE]: exception.name,
-    [ERROR_MESSAGE]: exception.message,
-    [ERROR_STACK]: exception.stack,
-    [IGNORE_OTEL_ERROR]: ddSpan.context().getTag(IGNORE_OTEL_ERROR) ?? true,
-  })
+  if (!otelTraceSemanticsEnabled) {
+    ddSpan.addTags({
+      [ERROR_TYPE]: exception.name,
+      [ERROR_MESSAGE]: exception.message,
+      [ERROR_STACK]: exception.stack,
+      [IGNORE_OTEL_ERROR]: ddSpan.context().getTag(IGNORE_OTEL_ERROR) ?? true,
+    })
+  }
 
   const attributes = {}
   if (exception.message) attributes['exception.message'] = exception.message
@@ -251,13 +260,20 @@ function recordException (ddSpan, exception, timeInput) {
  * @param {import('../opentracing/span')} ddSpan
  * @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) {
+function applyOtelStatus (ddSpan, currentCode, status, otelTraceSemanticsEnabled) {
   if (!isWritable(ddSpan)) return currentCode
 
   const code = status?.code
-  if (!code || currentCode === 1) return currentCode
+  if (!code || currentCode === 1) {
+    if (otelTraceSemanticsEnabled) {
+      ddSpan.context().deleteTag(ERROR_MESSAGE)
+      ddSpan.context().deleteTag(IGNORE_OTEL_ERROR)
+    }
+    return currentCode
+  }
 
   if (code === 2) {
     ddSpan.addTags({

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

@@ -15,7 +15,7 @@ const kinds = require('../../../../ext/kinds')
 const id = require('../id')
 const BridgeSpanBase = require('./bridge-span-base')
 const SpanContext = require('./span_context')
-const { setOtelOperationName } = require('./span-helpers')
+const { setOtelOperationName, setOtelResource } = require('./span-helpers')
 
 const spanKindNames = {
   [api.SpanKind.INTERNAL]: kinds.INTERNAL,
@@ -118,6 +118,8 @@ function spanNameMapper (spanName, kind, attributes) {
  * surface; the underlying DD span carries the lifecycle.
  */
 class Span extends BridgeSpanBase {
+  #otelName
+
   /**
    * @param {import('./tracer')} parentTracer
    * @param {import('@opentelemetry/api').Context} context
@@ -159,12 +161,15 @@ class Span extends BridgeSpanBase {
 
     super(ddSpan)
 
+    this._otelTraceSemanticsEnabled = _tracer._config.DD_TRACE_OTEL_SEMANTICS_ENABLED
+
     if (attributes) {
       this.setAttributes(attributes)
     }
 
     this._parentTracer = parentTracer
     this._context = context
+    this.#otelName = spanName || this._ddSpan.context()._name
 
     // NOTE: Need to grab the value before setting it on the span because the
     // math for computing opentracing timestamps is apparently lossy...
@@ -192,7 +197,7 @@ class Span extends BridgeSpanBase {
   }
 
   get name () {
-    return this._ddSpan.context()._name
+    return this.#otelName
   }
 
   spanContext () {
@@ -223,7 +228,13 @@ class Span extends BridgeSpanBase {
    * @param {string} name
    */
   updateName (name) {
-    setOtelOperationName(this._ddSpan, name)
+    if (this.ended) return this
+    this.#otelName = name
+    if (this._otelTraceSemanticsEnabled) {
+      setOtelResource(this._ddSpan, name)
+    } else {
+      setOtelOperationName(this._ddSpan, name)
+    }
     return this
   }
 

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

@@ -32,6 +32,7 @@ class SpanContext {
   }
 
   get traceFlags () {
+    this._ddContext._ensureSamplingPriority()
     return this._ddContext._sampling.priority >= AUTO_KEEP ? 1 : 0
   }
 

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

@@ -59,7 +59,8 @@ function createOtlpTraceExporter (config) {
     config.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT,
     config.OTEL_EXPORTER_OTLP_TRACES_HEADERS,
     config.OTEL_EXPORTER_OTLP_TRACES_TIMEOUT,
-    buildResourceAttributes(config)
+    buildResourceAttributes(config),
+    config.DD_TRACE_OTEL_SEMANTICS_ENABLED
   )
 }
 

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

@@ -36,10 +36,11 @@ class OtlpHttpTraceExporter extends OtlpHttpExporterBase {
    *   corresponding `OTEL_EXPORTER_OTLP_*_HEADERS` env by the MAP parser.
    * @param {number} timeout - Request timeout in milliseconds
    * @param {import('@opentelemetry/api').Attributes} resourceAttributes - Resource attributes
+   * @param {boolean} otelTraceSemanticsEnabled - When true, do not emit Datadog-only attributes as span attributes
    */
-  constructor (url, headers, timeout, resourceAttributes) {
+  constructor (url, headers, timeout, resourceAttributes, otelTraceSemanticsEnabled) {
     super(url, headers, timeout, 'http/json', 'traces')
-    this.#transformer = new OtlpTraceTransformer(resourceAttributes)
+    this.#transformer = new OtlpTraceTransformer(resourceAttributes, otelTraceSemanticsEnabled)
   }
 
   /**

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

@@ -74,6 +74,9 @@ const EXCLUDED_META_KEYS = new Set([
   TRACE_ID_128,
 ])
 
+// DD-only error tags that should not appear as attributes when OTel trace semantics are enabled.
+const DD_ERROR_META_KEYS = new Set(['error.message'])
+
 /**
  * OtlpTraceTransformer transforms DD-formatted spans to OTLP trace JSON format.
  *
@@ -87,13 +90,17 @@ const EXCLUDED_META_KEYS = new Set([
  * @augments OtlpTransformerBase
  */
 class OtlpTraceTransformer extends OtlpTransformerBase {
+  #otelTraceSemanticsEnabled
+
   /**
    * Creates a new OtlpTraceTransformer instance.
    *
    * @param {import('@opentelemetry/api').Attributes} resourceAttributes - Resource attributes
+   * @param {boolean} [otelTraceSemanticsEnabled] - When true, do not emit Datadog-only attributes as span attributes
    */
-  constructor (resourceAttributes) {
+  constructor (resourceAttributes, otelTraceSemanticsEnabled) {
     super(resourceAttributes, 'http/json', 'traces')
+    this.#otelTraceSemanticsEnabled = otelTraceSemanticsEnabled
   }
 
   /**
@@ -184,24 +191,30 @@ class OtlpTraceTransformer extends OtlpTransformerBase {
   #buildAttributes (span) {
     const attributes = []
 
-    // Add top-level DD span fields as OTLP attributes
-    if (span.service) {
-      attributes.push({ key: 'service.name', value: { stringValue: span.service } })
-    }
-    if (span.name) {
-      attributes.push({ key: 'operation.name', value: { stringValue: span.name } })
-    }
-    if (span.resource) {
-      attributes.push({ key: 'resource.name', value: { stringValue: span.resource } })
-    }
-    if (span.type) {
-      attributes.push({ key: 'span.type', value: { stringValue: span.type } })
+    // Add top-level DD span fields as OTLP attributes.
+    // When OTel trace semantics are enabled, these Datadog-only concepts
+    // are not added to the span attributes so the output conforms to pure
+    // OpenTelemetry semantics.
+    if (!this.#otelTraceSemanticsEnabled) {
+      if (span.service) {
+        attributes.push({ key: 'service.name', value: { stringValue: span.service } })
+      }
+      if (span.name) {
+        attributes.push({ key: 'operation.name', value: { stringValue: span.name } })
+      }
+      if (span.resource) {
+        attributes.push({ key: 'resource.name', value: { stringValue: span.resource } })
+      }
+      if (span.type) {
+        attributes.push({ key: 'span.type', value: { stringValue: span.type } })
+      }
     }
 
     // Add meta string tags, skipping keys that map to dedicated OTLP fields
     if (span.meta) {
       for (const [key, value] of Object.entries(span.meta)) {
         if (EXCLUDED_META_KEYS.has(key)) continue
+        if (this.#otelTraceSemanticsEnabled && DD_ERROR_META_KEYS.has(key)) continue
         attributes.push({ key, value: { stringValue: value } })
       }
     }

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

@@ -371,8 +371,8 @@ class TextMapPropagator {
 
   _hasTraceIdConflict (w3cSpanContext, firstSpanContext) {
     return w3cSpanContext !== undefined &&
-           firstSpanContext.toTraceId(true) === w3cSpanContext.toTraceId(true) &&
-           firstSpanContext.toSpanId() !== w3cSpanContext.toSpanId()
+          firstSpanContext.toTraceId(true) === w3cSpanContext.toTraceId(true) &&
+          firstSpanContext.toSpanId() !== w3cSpanContext.toSpanId()
   }
 
   _hasParentIdInTags (spanContext) {
@@ -875,7 +875,7 @@ class TextMapPropagator {
           (!tracestateSamplingPriority || tracestateSamplingPriority >= 0)) {
         samplingPriority = AUTO_REJECT
       } else if (traceparentSampled === 1 &&
-                 (!tracestateSamplingPriority || tracestateSamplingPriority < 0)) {
+                (!tracestateSamplingPriority || tracestateSamplingPriority < 0)) {
         samplingPriority = AUTO_KEEP
       }
     }

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

@@ -63,6 +63,7 @@ class DatadogSpanContext {
   }
 
   toTraceparent () {
+    this._ensureSamplingPriority()
     const flags = this._sampling.priority >= AUTO_KEEP ? '01' : '00'
     const traceId = this.toTraceId(true)
     const spanId = this.toSpanId(true)
@@ -70,6 +71,22 @@ class DatadogSpanContext {
     return `${version}-${traceId}-${spanId}-${flags}`
   }
 
+  /**
+   * Materialize the lazy priority-sampling decision for this trace, the same
+   * way {@link DatadogTracer#inject} does before propagation. The auto priority
+   * is otherwise computed at flush time, so the W3C sampled flag reads "drop"
+   * for a freshly started, not-yet-flushed span — see
+   * https://github.com/DataDog/dd-trace-js/issues/2547.
+   *
+   * The root span is only used to reach the priority sampler; `this` is passed
+   * to `sample()` so a manual sampling tag set directly on this context is
+   * honored, matching what `inject(this)` would decide.
+   */
+  _ensureSamplingPriority () {
+    if (this._sampling.priority !== undefined) return
+    this._trace.started[0]?._prioritySampler?.sample(this)
+  }
+
   /**
    * Set a tag value.
    * @param {string} key - Tag key

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

@@ -60,7 +60,11 @@ function maybeEnable (Plugin) {
 
 function getEnabled (Plugin) {
   const envName = `DD_TRACE_${Plugin.id.toUpperCase()}_ENABLED`
-  return getValueFromEnvSources(normalizePluginEnvName(envName))
+  // skipDefault: only an explicitly configured value should drive enablement here. A registered
+  // default of `false` (e.g. an experimental plugin like `nats`) must not be read as an explicit
+  // "disabled via configuration option" — that path both logs a misleading line and nulls the
+  // plugin class, bypassing the experimental opt-in handled by `loadPlugin`.
+  return getValueFromEnvSources(normalizePluginEnvName(envName), true)
 }
 
 // TODO this must always be a singleton.
@@ -164,6 +168,7 @@ module.exports = class PluginManager {
       clientIpEnabled,
       clientIpHeader,
       DD_TRACE_MEMCACHED_COMMAND_ENABLED,
+      DD_TRACE_OTEL_SEMANTICS_ENABLED,
       DD_TEST_SESSION_NAME,
       DD_AGENTLESS_LOG_SUBMISSION_ENABLED,
       isTestDynamicInstrumentationEnabled,
@@ -181,6 +186,7 @@ module.exports = class PluginManager {
       dbmPropagationMode,
       dsmEnabled,
       DD_TRACE_MEMCACHED_COMMAND_ENABLED,
+      DD_TRACE_OTEL_SEMANTICS_ENABLED,
       site,
       url,
       headers: headerTags || [],

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

@@ -31,6 +31,7 @@ const Plugin = require('./plugin')
 const { getRepositoryRoot } = require('./util/git')
 const {
   getTestEnvironmentMetadata,
+  getTestLevelsMetadataTags,
   getTestSessionName,
   getCodeOwnersFileEntries,
   getTestParentSpan,
@@ -44,6 +45,7 @@ const {
   TEST_MODULE_ID,
   TEST_SESSION_ID,
   TEST_COMMAND,
+  TEST_LEVELS_METADATA,
   TEST_MODULE,
   TEST_SESSION_NAME,
   getTestSuiteCommonTags,
@@ -219,7 +221,13 @@ module.exports = class CiPlugin extends Plugin {
         this.testEnvironmentMetadata
       )
 
-      const metadataTags = { '*': { [TEST_COMMAND]: command, [TEST_SESSION_NAME]: testSessionName } }
+      const metadataTags = {
+        [TEST_LEVELS_METADATA]: {
+          [TEST_COMMAND]: command,
+          [TEST_SESSION_NAME]: testSessionName,
+          ...getTestLevelsMetadataTags(this.testEnvironmentMetadata),
+        },
+      }
       // tracer might not be initialized correctly
       if (this.tracer._exporter.addMetadataTags) {
         this.tracer._exporter.addMetadataTags(metadataTags)
@@ -442,6 +450,28 @@ module.exports = class CiPlugin extends Plugin {
     }
   }
 
+  /**
+   * Updates repository-root-dependent state when a worker receives the root from
+   * the coordinator process after plugin configuration.
+   *
+   * @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) {
+      this.codeOwnersEntries = codeOwnersEntries
+    }
+
+    if (!repositoryRoot || repositoryRoot === this.repositoryRoot) return
+
+    this.repositoryRoot = repositoryRoot
+    if (codeOwnersEntries === undefined) {
+      this.codeOwnersEntries = getCodeOwnersFileEntries(this.repositoryRoot)
+    }
+  }
+
   /**
    * Returns request error tags from the test session span for propagation to module, suite and test spans.
    * @returns {Record<string, string>}
@@ -610,6 +640,8 @@ module.exports = class CiPlugin extends Plugin {
     const workerTestFramework = WORKER_EXPORTER_TO_TEST_FRAMEWORK[exporter]
     this.shouldSkipGitMetadataExtraction = workerTestFramework &&
       TEST_FRAMEWORKS_TO_SKIP_GIT_METADATA_EXTRACTION.has(workerTestFramework)
+    const shouldDeferCodeOwnersEntries = workerTestFramework === 'vitest'
+    const shouldDeferRepositoryRoot = workerTestFramework === 'vitest'
 
     this.testEnvironmentMetadata = getTestEnvironmentMetadata(
       this.constructor.id,
@@ -635,9 +667,10 @@ module.exports = class CiPlugin extends Plugin {
       [GIT_COMMIT_HEAD_MESSAGE]: commitHeadMessage,
     } = this.testEnvironmentMetadata
 
-    this.repositoryRoot = repositoryRoot || getRepositoryRoot() || process.cwd()
+    this.repositoryRoot = repositoryRoot ||
+      (shouldDeferRepositoryRoot ? process.cwd() : getRepositoryRoot() || process.cwd())
 
-    this.codeOwnersEntries = getCodeOwnersFileEntries(this.repositoryRoot)
+    this.codeOwnersEntries = shouldDeferCodeOwnersEntries ? null : getCodeOwnersFileEntries(this.repositoryRoot)
 
     this.ciProviderName = ciProviderName
 

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

@@ -8,6 +8,7 @@ const plugins = {
   get '@azure/event-hubs' () { return require('../../../datadog-plugin-azure-event-hubs/src') },
   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 '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') },
@@ -55,6 +56,7 @@ const plugins = {
   get express () { return require('../../../datadog-plugin-express/src') },
   get fastify () { return require('../../../datadog-plugin-fastify/src') },
   get 'find-my-way' () { return require('../../../datadog-plugin-find-my-way/src') },
+  get fs () { return require('../../../datadog-plugin-fs/src') },
   get 'global:fetch' () { return require('../../../datadog-plugin-fetch/src') },
   get graphql () { return require('../../../datadog-plugin-graphql/src') },
   get grpc () { return require('../../../datadog-plugin-grpc/src') },
@@ -97,6 +99,7 @@ const plugins = {
   get net () { return require('../../../datadog-plugin-net/src') },
   get next () { return require('../../../datadog-plugin-next/src') },
   get 'node:dns' () { return require('../../../datadog-plugin-dns/src') },
+  get 'node:fs' () { return require('../../../datadog-plugin-fs/src') },
   get 'node:http' () { return require('../../../datadog-plugin-http/src') },
   get 'node:http2' () { return require('../../../datadog-plugin-http2/src') },
   get 'node:https' () { return require('../../../datadog-plugin-http/src') },