dd-trace 6.17.0 → 6.18.0

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

@@ -2,6 +2,8 @@
 
 const {
   EVP_EVENT_PLATFORM_SUBDOMAIN,
+  EVP_ORIGIN_HEADER_NAME,
+  EVP_ORIGIN_VERSION_HEADER_NAME,
   EVP_PROXY_PATH_V2,
   EVP_PROXY_PATH_V4,
   EVP_SUBDOMAIN_HEADER_NAME,
@@ -10,6 +12,10 @@ const { createDirectEVPRoute } = require('../../evp_proxy/direct')
 const { discoverEVPProxy } = require('../../evp_proxy/discovery')
 const logger = require('../../log')
 
+const ROUTE_DISCOVERY_COOLDOWN_MS = 60_000
+const REQUIRED_LOCAL_HEADERS = [EVP_ORIGIN_HEADER_NAME, EVP_ORIGIN_VERSION_HEADER_NAME]
+const STOP_NOOP = () => {}
+
 let missingRouteWarningLogged = false
 
 /**
@@ -26,7 +32,7 @@ function warnExposureDeliveryUnavailable () {
 }
 
 /**
- * Preserves Agent exposure delivery for the Remote Configuration source.
+ * Preserves the one-time EVP v2 capability check for the Remote Configuration source.
  *
  * @param {import('../../config')} config - Tracer configuration object
  * @param {Function} setWriterEnabledValue - Callback to set the writer enabled state
@@ -49,6 +55,7 @@ function setAgentStrategy (config, setWriterEnabledValue) {
       setWriterEnabledValue(false)
     }
   })
+  return STOP_NOOP
 }
 
 /**
@@ -62,54 +69,118 @@ function setAgentStrategy (config, setWriterEnabledValue) {
  */
 function setAgentlessStrategy (config, setWriterEnabledValue) {
   const directRoute = createDirectEVPRoute(config, EVP_EVENT_PLATFORM_SUBDOMAIN)
+  let discovering = false
+  let recoveryTimer
+  let state = 'unknown'
+  let stopped = false
 
-  discoverEVPProxy(config.url, {
-    supportedPaths: [EVP_PROXY_PATH_V4, EVP_PROXY_PATH_V2],
-  }, (error, localRoute) => {
-    if (localRoute) {
-      const route = {
-        ...localRoute,
-        headers: {
-          [EVP_SUBDOMAIN_HEADER_NAME]: EVP_EVENT_PLATFORM_SUBDOMAIN,
-        },
-      }
-      if (directRoute) route.fallback = directRoute
-      logger.debug('FFE Writer enabled with local EVP route %s', route.basePath)
-      setWriterEnabledValue(true, route)
-      return
+  const stop = () => {
+    stopped = true
+    clearTimeout(recoveryTimer)
+    recoveryTimer = undefined
+  }
+
+  const scheduleRecovery = () => {
+    if (stopped || state !== 'unavailable' || recoveryTimer !== undefined) return
+
+    recoveryTimer = setTimeout(discover, ROUTE_DISCOVERY_COOLDOWN_MS)
+    recoveryTimer.unref?.()
+  }
+
+  const markUnavailable = () => {
+    if (stopped || state === 'direct') return
+    if (state !== 'unavailable') {
+      state = 'unavailable'
+      setWriterEnabledValue(false)
     }
+    scheduleRecovery()
+  }
 
+  const activateDirect = () => {
+    if (stopped || state === 'direct' || directRoute === undefined) return
+    state = 'direct'
+    clearTimeout(recoveryTimer)
+    recoveryTimer = undefined
+    setWriterEnabledValue(true, directRoute)
+  }
+
+  /**
+   * @param {{url: URL, basePath: string}} localRoute - Discovered local route
+   */
+  const activateLocal = localRoute => {
+    state = 'local'
+    const route = {
+      ...localRoute,
+      headers: {
+        [EVP_SUBDOMAIN_HEADER_NAME]: EVP_EVENT_PLATFORM_SUBDOMAIN,
+      },
+    }
     if (directRoute) {
+      route.fallback = directRoute
+      route.onFallback = activateDirect
+    } else {
+      route.onUnavailable = markUnavailable
+    }
+    logger.debug('FFE Writer enabled with local EVP route %s', route.basePath)
+    setWriterEnabledValue(true, route)
+  }
+
+  function discover () {
+    recoveryTimer = undefined
+    if (stopped || state === 'direct' || discovering) return
+    discovering = true
+
+    discoverEVPProxy(config.url, {
+      requiredHeaders: REQUIRED_LOCAL_HEADERS,
+      supportedPaths: [EVP_PROXY_PATH_V4, EVP_PROXY_PATH_V2],
+      // Agentless owns fallback and unavailable-state recovery; do not delay them with HTTP retries.
+      retry: false,
+    }, (error, localRoute) => {
+      discovering = false
+      if (stopped || state === 'direct') return
+
+      if (localRoute) {
+        activateLocal(localRoute)
+        return
+      }
+
+      if (directRoute) {
+        if (error) {
+          logger.debug('FFE Writer using direct EVP intake after local discovery failed: %s', error.message)
+        } else {
+          logger.debug('FFE Writer using direct EVP intake because no compatible local route was advertised')
+        }
+        activateDirect()
+        return
+      }
+
       if (error) {
-        logger.debug('FFE Writer using direct EVP intake after local discovery failed: %s', error.message)
-      } else {
-        logger.debug('FFE Writer using direct EVP intake because no compatible local route was advertised')
+        logger.debug('FFE Writer disabled - error getting local receiver info: %s', error.message)
       }
-      setWriterEnabledValue(true, directRoute)
-      return
-    }
+      warnExposureDeliveryUnavailable()
+      markUnavailable()
+    })
+  }
 
-    if (error) {
-      logger.debug('FFE Writer disabled - error getting local receiver info: %s', error.message)
-    }
-    warnExposureDeliveryUnavailable()
-    setWriterEnabledValue(false)
-  })
+  discover()
+  return stop
 }
 
 /**
- * Applies the exposure-delivery strategy for the configured Feature Flags source.
+ * Applies one event-delivery strategy that can be shared by all Feature Flags writers.
  *
  * @param {import('../../config')} config - Tracer configuration object
  * @param {Function} setWriterEnabledValue - Callback to set the writer enabled state
  */
-function setExposureDeliveryStrategy (config, setWriterEnabledValue) {
+function setEventDeliveryStrategy (config, setWriterEnabledValue) {
   if (config.featureFlags?.DD_FEATURE_FLAGS_CONFIGURATION_SOURCE === 'agentless') {
-    setAgentlessStrategy(config, setWriterEnabledValue)
-    return
+    return setAgentlessStrategy(config, setWriterEnabledValue)
   }
 
-  setAgentStrategy(config, setWriterEnabledValue)
+  return setAgentStrategy(config, setWriterEnabledValue)
 }
 
-module.exports = { setExposureDeliveryStrategy }
+module.exports = {
+  setEventDeliveryStrategy,
+  setExposureDeliveryStrategy: setEventDeliveryStrategy,
+}

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

@@ -40,11 +40,11 @@ class DatadogTracer {
     // spans must reach the Electron SDK's IPC bridge, not an OTLP endpoint,
     // even when OTEL_* vars are set for unrelated telemetry.
     if (config.OTEL_TRACES_EXPORTER === 'otlp' && !config.isCiVisibility &&
-      config.experimental.exporter !== 'electron') {
+      config.tracing.DD_TRACE_EXPERIMENTAL_EXPORTER !== 'electron') {
       const { createOtlpTraceExporter } = require('../opentelemetry/trace')
       this._exporter = createOtlpTraceExporter(config)
     } else {
-      const Exporter = getExporter(config.experimental.exporter)
+      const Exporter = getExporter(config.tracing.DD_TRACE_EXPERIMENTAL_EXPORTER)
       this._exporter = new Exporter(config, this._prioritySampler)
     }
 
@@ -55,7 +55,7 @@ class DatadogTracer {
     }
     this._processor = new SpanProcessor(this._exporter, this._prioritySampler, config, otlpStatsExporter)
     this._url = this._exporter._url
-    this._enableGetRumData = config.experimental.enableGetRumData
+    this._enableGetRumData = config.rum.DD_TRACE_EXPERIMENTAL_GET_RUM_DATA_ENABLED
     this._traceId128BitGenerationEnabled = config.traceId128BitGenerationEnabled
     this._propagators = {
       [formats.TEXT_MAP]: new TextMapPropagator(config),

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

@@ -36,7 +36,11 @@ const pluginClasses = {}
 // during instrumentation initialization (e.g. re-requires in bundler contexts)
 // are captured and populate pluginClasses correctly.
 loadChannel.subscribe(({ name }) => {
-  maybeEnable(plugins[name])
+  try {
+    maybeEnable(plugins[name])
+  } catch (error) {
+    log.error('Error activating plugin %s', name, error)
+  }
 })
 
 // instrument everything that needs Plugin System V2 instrumentation
@@ -81,11 +85,15 @@ module.exports = class PluginManager {
     this._configsByName = {}
 
     this._loadedSubscriber = ({ name }) => {
-      const Plugin = plugins[name]
+      try {
+        const Plugin = plugins[name]
 
-      if (!Plugin || typeof Plugin !== 'function') return
+        if (!Plugin || typeof Plugin !== 'function') return
 
-      this.loadPlugin(Plugin.id)
+        this.loadPlugin(Plugin.id)
+      } catch (error) {
+        log.error('Error activating plugin %s', name, error)
+      }
     }
 
     loadChannel.subscribe(this._loadedSubscriber)
@@ -112,10 +120,21 @@ module.exports = class PluginManager {
     }
 
     // extracts predetermined configuration from tracer and combines it with plugin-specific config
-    this._pluginsByName[name].configure({
+    const config = {
       ...this.#getSharedConfig(name),
       ...pluginConfig,
-    })
+    }
+    const plugin = this._pluginsByName[name]
+    try {
+      plugin.configure(config)
+    } catch (error) {
+      try {
+        plugin.configure({ enabled: false })
+      } catch (disableError) {
+        log.error('Error disabling plugin %s after failed activation', name, disableError)
+      }
+      throw error
+    }
   }
 
   // TODO: merge config instead of replacing
@@ -189,7 +208,7 @@ module.exports = class PluginManager {
       traceWebsocketMessagesEnabled,
       traceWebsocketMessagesInheritSampling,
       traceWebsocketMessagesSeparateTraces,
-      experimental,
+      tracing,
       DD_TRACE_RESOURCE_RENAMING_ENABLED,
     } = /** @type {import('./config/config-base')} */ (this._tracerConfig)
 
@@ -212,7 +231,7 @@ module.exports = class PluginManager {
       traceWebsocketMessagesEnabled,
       traceWebsocketMessagesInheritSampling,
       traceWebsocketMessagesSeparateTraces,
-      experimental,
+      tracing,
       resourceRenamingEnabled: DD_TRACE_RESOURCE_RENAMING_ENABLED,
     }
 

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

@@ -788,7 +788,7 @@ module.exports = class CiPlugin extends Plugin {
       return
     }
 
-    const exporter = this.config.experimental?.exporter
+    const exporter = this.config.tracing.DD_TRACE_EXPERIMENTAL_EXPORTER
     const workerTestFramework = WORKER_EXPORTER_TO_TEST_FRAMEWORK[exporter]
     this.shouldSkipGitMetadataExtraction = workerTestFramework &&
       TEST_FRAMEWORKS_TO_SKIP_GIT_METADATA_EXTRACTION.has(workerTestFramework)

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

@@ -881,14 +881,19 @@ function setRumTestTags (testSpan, isRumActive, browserVersion) {
 }
 
 /**
- * Marks a successful test session that intentionally executed no tests.
+ * Marks a successful test session that did not execute any tests.
  *
  * @param {import('../../opentracing/span')} testSessionSpan
  * @param {import('../../opentracing/span')|undefined} testModuleSpan
- * @param {string} skipReason
- * @param {string} emptyReason
+ * @param {'zero_tests'|'all_tests_skipped'|'zero_test_shard'|'test_discovery'} emptyReason
  */
-function setExpectedEmptyTestSessionTags (testSessionSpan, testModuleSpan, skipReason, emptyReason) {
+function setExpectedEmptyTestSessionTags (testSessionSpan, testModuleSpan, emptyReason) {
+  const skipReason = emptyReason === 'test_discovery'
+    ? 'Test discovery only (--list)'
+    : emptyReason === 'zero_test_shard'
+      ? 'No tests were assigned to this shard'
+      : emptyReason === 'all_tests_skipped' ? 'All tests were skipped' : 'No tests were detected'
+
   for (const span of [testSessionSpan, testModuleSpan]) {
     if (!span) continue
 

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

@@ -246,7 +246,7 @@ class Tracer extends NoopProxy {
           appsecRemoteConfig.enable(rc, config, this._modules.appsec)
         }
 
-        if (config.dynamicInstrumentation.enabled) {
+        if (config.dynamicInstrumentation.DD_DYNAMIC_INSTRUMENTATION_ENABLED) {
           getDynamicInstrumentation().start(config, rc)
         }
 
@@ -463,7 +463,7 @@ class Tracer extends NoopProxy {
    * @param {object} rc - The RemoteConfig instance
    */
   #updateDebugger (config, rc) {
-    const shouldBeEnabled = config.dynamicInstrumentation.enabled
+    const shouldBeEnabled = config.dynamicInstrumentation.DD_DYNAMIC_INSTRUMENTATION_ENABLED
     if (!shouldBeEnabled && dynamicInstrumentation === undefined) return
 
     const DynamicInstrumentation = getDynamicInstrumentation()

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

@@ -137,7 +137,8 @@ function sendData (config, application, host, reqType, payload = {}, cb = () =>
   let url = config.url
 
   const isCiVisibilityAgentlessMode = isCiVisibility && testOptimization.DD_CIVISIBILITY_AGENTLESS_ENABLED
-  const isApmTracingAgentlessMode = config.experimental?.exporter === 'agentless'
+  const isApmTracingAgentlessMode =
+    config.tracing.DD_TRACE_EXPERIMENTAL_EXPORTER === 'agentless'
   const isAgentlessMode = isCiVisibilityAgentlessMode || isApmTracingAgentlessMode
 
   if (isCiVisibility && getTestOptimizationAgent === undefined) {

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

@@ -157,7 +157,7 @@ function getProducts (config) {
       enabled: profilingEnabledToBoolean(config.profiling.DD_PROFILING_ENABLED),
     },
     dynamic_instrumentation: {
-      enabled: config.dynamicInstrumentation.enabled,
+      enabled: config.dynamicInstrumentation.DD_DYNAMIC_INSTRUMENTATION_ENABLED,
     },
   }
 }

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

@@ -7,6 +7,7 @@ const {
   flushFrameworkWarnings,
   flushLoadOrderWarnings,
 } = require('../../datadog-instrumentations/src/helpers/check-require-cache')
+const shimmer = require('../../datadog-shimmer')
 const Tracer = require('./opentracing/tracer')
 const Scope = require('./scope')
 const { isError } = require('./util')
@@ -119,7 +120,7 @@ class DatadogTracer extends Tracer {
   wrap (name, options, fn) {
     const tracer = this
 
-    return function (...args) {
+    return shimmer.wrapFunction(fn, original => function (...args) {
       let optionsObj = options
       if (typeof optionsObj === 'function' && typeof fn === 'function') {
         optionsObj = optionsObj.apply(this, args)
@@ -136,11 +137,11 @@ class DatadogTracer extends Tracer {
             return scopeBoundCb.apply(this, arguments)
           }
 
-          return fn.apply(this, args)
+          return original.apply(this, args)
         })
       }
-      return tracer.trace(name, optionsObj, () => fn.apply(this, args))
-    }
+      return tracer.trace(name, optionsObj, () => original.apply(this, args))
+    })
   }
 
   setUrl (url) {

package/packages/datadog-instrumentations/src/azure-cosmos.js

@@ -1,7 +0,0 @@
-'use strict'
-
-const { addHook, getHooks } = require('./helpers/instrument')
-
-for (const hook of getHooks('@azure/cosmos').values()) {
-  addHook(hook, exports => exports)
-}

package/packages/datadog-instrumentations/src/bullmq.js

@@ -1,11 +0,0 @@
-// AUTO-GENERATED by dd-compile
-// Orchestrion rewriter handles the actual instrumentation via JSON config.
-// This file registers the module hooks for the rewriter to process.
-
-'use strict'
-
-const { addHook, getHooks } = require('./helpers/instrument')
-
-for (const hook of getHooks('bullmq').values()) {
-  addHook(hook, exports => exports)
-}

package/packages/datadog-instrumentations/src/langchain.js

@@ -1,7 +0,0 @@
-'use strict'
-
-const { addHook, getHooks } = require('./helpers/instrument')
-
-for (const hook of getHooks('@langchain/core').values()) {
-  addHook(hook, exports => exports)
-}

package/packages/datadog-instrumentations/src/langgraph.js

@@ -1,7 +0,0 @@
-'use strict'
-
-const { addHook, getHooks } = require('./helpers/instrument')
-
-for (const hook of getHooks('@langchain/langgraph').values()) {
-  addHook(hook, exports => exports)
-}

package/packages/datadog-instrumentations/src/mercurius.js

@@ -1,11 +0,0 @@
-// AUTO-GENERATED by dd-compile
-// Orchestrion rewriter handles the actual instrumentation via JSON config.
-// This file registers the module hooks for the rewriter to process.
-
-'use strict'
-
-const { addHook, getHooks } = require('./helpers/instrument')
-
-for (const hook of getHooks('mercurius').values()) {
-  addHook(hook, exports => exports)
-}