dd-trace 5.82.0 → 5.84.0

package/packages/datadog-plugin-cucumber/src/index.js

@@ -2,51 +2,51 @@
 
 const CiPlugin = require('../../dd-trace/src/plugins/ci_plugin')
 const { storage } = require('../../datadog-core')
-const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
+const { getEnvironmentVariable, getValueFromEnvSources } = require('../../dd-trace/src/config/helper')
 
 const {
-  TEST_SKIP_REASON,
-  TEST_STATUS,
-  TEST_SOURCE_START,
+  addIntelligentTestRunnerSpanTags,
   finishAllTraceSpans,
-  getTestSuitePath,
+  getTestEndLine,
   getTestSuiteCommonTags,
-  addIntelligentTestRunnerSpanTags,
-  TEST_ITR_UNSKIPPABLE,
-  TEST_ITR_FORCED_RUN,
-  TEST_CODE_OWNERS,
+  getTestSuitePath,
+  isModifiedTest,
+  CUCUMBER_IS_PARALLEL,
   ITR_CORRELATION_ID,
-  TEST_SOURCE_FILE,
-  TEST_EARLY_FLAKE_ENABLED,
+  TEST_BROWSER_DRIVER,
+  TEST_CODE_OWNERS,
   TEST_EARLY_FLAKE_ABORT_REASON,
+  TEST_EARLY_FLAKE_ENABLED,
+  TEST_HAS_FAILED_ALL_RETRIES,
+  TEST_IS_MODIFIED,
   TEST_IS_NEW,
   TEST_IS_RETRY,
-  CUCUMBER_IS_PARALLEL,
-  TEST_RETRY_REASON,
+  TEST_IS_RUM_ACTIVE,
+  TEST_ITR_FORCED_RUN,
+  TEST_ITR_UNSKIPPABLE,
+  TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED,
   TEST_MANAGEMENT_ENABLED,
-  TEST_MANAGEMENT_IS_QUARANTINED,
-  TEST_MANAGEMENT_IS_DISABLED,
   TEST_MANAGEMENT_IS_ATTEMPT_TO_FIX,
-  TEST_HAS_FAILED_ALL_RETRIES,
-  TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED,
+  TEST_MANAGEMENT_IS_DISABLED,
+  TEST_MANAGEMENT_IS_QUARANTINED,
   TEST_RETRY_REASON_TYPES,
-  TEST_IS_MODIFIED,
-  isModifiedTest,
-  getTestEndLine
+  TEST_RETRY_REASON,
+  TEST_SKIP_REASON,
+  TEST_SOURCE_FILE,
+  TEST_SOURCE_START,
+  TEST_STATUS,
 } = require('../../dd-trace/src/plugins/util/test')
 const { RESOURCE_NAME } = require('../../../ext/tags')
 const { COMPONENT, ERROR_MESSAGE } = require('../../dd-trace/src/constants')
 const {
+  TELEMETRY_CODE_COVERAGE_EMPTY,
+  TELEMETRY_CODE_COVERAGE_FINISHED,
+  TELEMETRY_CODE_COVERAGE_NUM_FILES,
+  TELEMETRY_CODE_COVERAGE_STARTED,
   TELEMETRY_EVENT_CREATED,
   TELEMETRY_EVENT_FINISHED,
-  TELEMETRY_CODE_COVERAGE_STARTED,
-  TELEMETRY_CODE_COVERAGE_FINISHED,
   TELEMETRY_ITR_FORCED_TO_RUN,
-  TELEMETRY_CODE_COVERAGE_EMPTY,
   TELEMETRY_ITR_UNSKIPPABLE,
-  TELEMETRY_CODE_COVERAGE_NUM_FILES,
-  TEST_IS_RUM_ACTIVE,
-  TEST_BROWSER_DRIVER,
   TELEMETRY_TEST_SESSION
 } = require('../../dd-trace/src/ci-visibility/telemetry')
 
@@ -112,7 +112,7 @@ class CucumberPlugin extends CiPlugin {
       finishAllTraceSpans(this.testSessionSpan)
       this.telemetry.count(TELEMETRY_TEST_SESSION, {
         provider: this.ciProviderName,
-        autoInjected: !!getEnvironmentVariable('DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER')
+        autoInjected: !!getValueFromEnvSources('DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER')
       })
 
       this.libraryConfig = null
@@ -362,18 +362,19 @@ class CucumberPlugin extends CiPlugin {
         }
       }
 
+      const spanTags = span.context()._tags
+      const telemetryTags = {
+        hasCodeOwners: !!spanTags[TEST_CODE_OWNERS],
+        isNew,
+        isRum: spanTags[TEST_IS_RUM_ACTIVE] === 'true',
+        browserDriver: spanTags[TEST_BROWSER_DRIVER]
+      }
       span.finish()
       if (!isStep) {
-        const spanTags = span.context()._tags
         this.telemetry.ciVisEvent(
           TELEMETRY_EVENT_FINISHED,
           'test',
-          {
-            hasCodeOwners: !!spanTags[TEST_CODE_OWNERS],
-            isNew,
-            isRum: spanTags[TEST_IS_RUM_ACTIVE] === 'true',
-            browserDriver: spanTags[TEST_BROWSER_DRIVER]
-          }
+          telemetryTags
         )
         finishAllTraceSpans(span)
         // If it's a worker, flushing is cheap, as it's just sending data to the main process

package/packages/datadog-plugin-cypress/src/cypress-plugin.js

@@ -51,7 +51,7 @@ const {
 } = require('../../dd-trace/src/plugins/util/test')
 const { isMarkedAsUnskippable } = require('../../datadog-plugin-jest/src/util')
 const { ORIGIN_KEY, COMPONENT } = require('../../dd-trace/src/constants')
-const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
+const { getValueFromEnvSources } = require('../../dd-trace/src/config/helper')
 const { appClosing: appClosingTelemetry } = require('../../dd-trace/src/telemetry')
 const log = require('../../dd-trace/src/log')
 
@@ -644,7 +644,7 @@ class CypressPlugin {
       this.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'session')
       incrementCountMetric(TELEMETRY_TEST_SESSION, {
         provider: this.ciProviderName,
-        autoInjected: !!getEnvironmentVariable('DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER')
+        autoInjected: !!getValueFromEnvSources('DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER')
       })
 
       finishAllTraceSpans(this.testSessionSpan)

package/packages/datadog-plugin-dd-trace-api/src/index.js

@@ -3,13 +3,13 @@
 const Plugin = require('../../dd-trace/src/plugins/plugin')
 const telemetryMetrics = require('../../dd-trace/src/telemetry/metrics')
 const apiMetrics = telemetryMetrics.manager.namespace('tracers')
-const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
+const { getValueFromEnvSources } = require('../../dd-trace/src/config/helper')
 
 // api ==> here
 const objectMap = new WeakMap()
 
 const injectionEnabledTag =
-  `injection_enabled:${getEnvironmentVariable('DD_INJECTION_ENABLED') ? 'yes' : 'no'}`
+  `injection_enabled:${getValueFromEnvSources('DD_INJECTION_ENABLED') ? 'yes' : 'no'}`
 
 module.exports = class DdTraceApiPlugin extends Plugin {
   static id = 'dd-trace-api'

package/packages/datadog-plugin-express/src/code_origin.js

@@ -1,5 +1,7 @@
 'use strict'
 
+const dc = require('dc-polyfill')
+
 const { entryTags } = require('../../datadog-code-origin')
 const Plugin = require('../../dd-trace/src/plugins/plugin')
 const web = require('../../dd-trace/src/plugins/util/web')
@@ -12,29 +14,33 @@ class ExpressCodeOriginForSpansPlugin extends Plugin {
 
     const layerTags = new WeakMap()
 
-    this.addSub('apm:express:middleware:enter', ({ req, layer }) => {
+    // Middleware/request handling: apply pre-computed tags to spans
+    const handleMiddlewareEnter = ({ req, layer }) => {
       const tags = layerTags.get(layer)
       if (!tags) return
       web.getContext(req)?.span?.addTags(tags)
-    })
-
-    this.addSub('apm:express:route:added', ({ topOfStackFunc, layer }) => {
-      if (!layer) return
-      if (layerTags.has(layer)) return
-      layerTags.set(layer, entryTags(topOfStackFunc))
-    })
+    }
 
-    this.addSub('apm:router:middleware:enter', ({ req, layer }) => {
-      const tags = layerTags.get(layer)
-      if (!tags) return
-      web.getContext(req)?.span?.addTags(tags)
-    })
+    this.addSub('apm:express:middleware:enter', handleMiddlewareEnter)
+    this.addSub('apm:router:middleware:enter', handleMiddlewareEnter)
 
-    this.addSub('apm:router:route:added', ({ topOfStackFunc, layer }) => {
+    // Route added handling: compute and cache tags
+    const handleRouteAdded = ({ topOfStackFunc, layer }) => {
       if (!layer) return
       if (layerTags.has(layer)) return
       layerTags.set(layer, entryTags(topOfStackFunc))
-    })
+    }
+
+    if (this._tracerConfig.remoteConfig?.enabled) {
+      // When RC is enabled, use manual subscriptions (always pre-compute)
+      // This allows tags to be computed even when CO is disabled, so runtime enabling works
+      dc.channel('apm:express:route:added').subscribe(handleRouteAdded)
+      dc.channel('apm:router:route:added').subscribe(handleRouteAdded)
+    } else {
+      // When RC is disabled, use addSub (only computes when CO is enabled)
+      this.addSub('apm:express:route:added', handleRouteAdded)
+      this.addSub('apm:router:route:added', handleRouteAdded)
+    }
   }
 }
 

package/packages/datadog-plugin-fastify/src/code_origin.js

@@ -1,5 +1,7 @@
 'use strict'
 
+const dc = require('dc-polyfill')
+
 const { entryTags } = require('../../datadog-code-origin')
 const Plugin = require('../../dd-trace/src/plugins/plugin')
 const web = require('../../dd-trace/src/plugins/util/web')
@@ -18,11 +20,22 @@ class FastifyCodeOriginForSpansPlugin extends Plugin {
       web.getContext(req)?.span?.addTags(tags)
     })
 
-    this.addSub('apm:fastify:route:added', ({ routeOptions, onRoute }) => {
-      if (!routeOptions.config) routeOptions.config = {}
-      routeOptions.config[kCodeOriginForSpansTagsSym] = entryTags(onRoute)
-    })
+    if (this._tracerConfig.remoteConfig?.enabled) {
+      // When RC is enabled, use manual subscription (always pre-computes)
+      // This allows tags to be computed even when CO is disabled, so runtime enabling works
+      dc.channel('apm:fastify:route:added').subscribe(handleRouteAdded)
+    } else {
+      // When RC is disabled, use addSub (only computes when CO is enabled)
+      this.addSub('apm:fastify:route:added', handleRouteAdded)
+    }
   }
 }
 
 module.exports = FastifyCodeOriginForSpansPlugin
+
+// Route added handling: compute and cache tags
+function handleRouteAdded ({ routeOptions, onRoute }) {
+  if (!routeOptions.config) routeOptions.config = {}
+  if (routeOptions.config[kCodeOriginForSpansTagsSym]) return
+  routeOptions.config[kCodeOriginForSpansTagsSym] = entryTags(onRoute)
+}

package/packages/datadog-plugin-jest/src/index.js

@@ -2,7 +2,7 @@
 
 const CiPlugin = require('../../dd-trace/src/plugins/ci_plugin')
 const { storage } = require('../../datadog-core')
-const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
+const { getEnvironmentVariable, getValueFromEnvSources } = require('../../dd-trace/src/config/helper')
 
 const {
   TEST_STATUS,
@@ -161,7 +161,7 @@ class JestPlugin extends CiPlugin {
 
       this.telemetry.count(TELEMETRY_TEST_SESSION, {
         provider: this.ciProviderName,
-        autoInjected: !!getEnvironmentVariable('DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER')
+        autoInjected: !!getValueFromEnvSources('DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER')
       })
 
       this.tracer._exporter.flush(() => {

package/packages/datadog-plugin-mocha/src/index.js

@@ -2,7 +2,7 @@
 
 const CiPlugin = require('../../dd-trace/src/plugins/ci_plugin')
 const { storage } = require('../../datadog-core')
-const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
+const { getValueFromEnvSources } = require('../../dd-trace/src/config/helper')
 
 const {
   TEST_STATUS,
@@ -406,7 +406,7 @@ class MochaPlugin extends CiPlugin {
         finishAllTraceSpans(this.testSessionSpan)
         this.telemetry.count(TELEMETRY_TEST_SESSION, {
           provider: this.ciProviderName,
-          autoInjected: !!getEnvironmentVariable('DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER')
+          autoInjected: !!getValueFromEnvSources('DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER')
         })
       }
       this.libraryConfig = null

package/packages/datadog-plugin-mongodb-core/src/index.js

@@ -2,7 +2,7 @@
 
 const { isTrue } = require('../../dd-trace/src/util')
 const DatabasePlugin = require('../../dd-trace/src/plugins/database')
-const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
+const { getValueFromEnvSources } = require('../../dd-trace/src/config/helper')
 
 class MongodbCorePlugin extends DatabasePlugin {
   static id = 'mongodb-core'
@@ -20,7 +20,7 @@ class MongodbCorePlugin extends DatabasePlugin {
   configure (config) {
     super.configure(config)
 
-    const heartbeatFromEnv = getEnvironmentVariable('DD_TRACE_MONGODB_HEARTBEAT_ENABLED')
+    const heartbeatFromEnv = getValueFromEnvSources('DD_TRACE_MONGODB_HEARTBEAT_ENABLED')
 
     this.config.heartbeatEnabled = config.heartbeatEnabled ??
       (heartbeatFromEnv && isTrue(heartbeatFromEnv)) ??

package/packages/datadog-plugin-playwright/src/index.js

@@ -3,48 +3,48 @@
 const { storage } = require('../../datadog-core')
 const id = require('../../dd-trace/src/id')
 const CiPlugin = require('../../dd-trace/src/plugins/ci_plugin')
-const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
+const { getValueFromEnvSources } = require('../../dd-trace/src/config/helper')
 
 const {
-  TEST_STATUS,
   finishAllTraceSpans,
-  getTestSuitePath,
   getTestSuiteCommonTags,
-  TEST_SOURCE_START,
+  getTestSuitePath,
+  isModifiedTest,
+  TEST_BROWSER_NAME,
+  TEST_BROWSER_VERSION,
   TEST_CODE_OWNERS,
-  TEST_SOURCE_FILE,
-  TEST_PARAMETERS,
+  TEST_COMMAND,
+  TEST_EARLY_FLAKE_ABORT_REASON,
+  TEST_EARLY_FLAKE_ENABLED,
+  TEST_HAS_FAILED_ALL_RETRIES,
+  TEST_IS_MODIFIED,
   TEST_IS_NEW,
   TEST_IS_RETRY,
-  TEST_EARLY_FLAKE_ENABLED,
-  TEST_EARLY_FLAKE_ABORT_REASON,
-  TELEMETRY_TEST_SESSION,
-  TEST_RETRY_REASON,
-  TEST_MANAGEMENT_IS_QUARANTINED,
+  TEST_IS_RUM_ACTIVE,
+  TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED,
   TEST_MANAGEMENT_ENABLED,
-  TEST_BROWSER_NAME,
-  TEST_MANAGEMENT_IS_DISABLED,
   TEST_MANAGEMENT_IS_ATTEMPT_TO_FIX,
-  TEST_HAS_FAILED_ALL_RETRIES,
-  TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED,
-  TEST_SESSION_ID,
+  TEST_MANAGEMENT_IS_DISABLED,
+  TEST_MANAGEMENT_IS_QUARANTINED,
   TEST_MODULE_ID,
-  TEST_COMMAND,
   TEST_MODULE,
-  TEST_SUITE,
-  TEST_SUITE_ID,
   TEST_NAME,
-  TEST_IS_RUM_ACTIVE,
-  TEST_BROWSER_VERSION,
+  TEST_PARAMETERS,
   TEST_RETRY_REASON_TYPES,
-  TEST_IS_MODIFIED,
-  isModifiedTest
+  TEST_RETRY_REASON,
+  TEST_SESSION_ID,
+  TEST_SOURCE_FILE,
+  TEST_SOURCE_START,
+  TEST_STATUS,
+  TEST_SUITE_ID,
+  TEST_SUITE,
 } = require('../../dd-trace/src/plugins/util/test')
 const { RESOURCE_NAME } = require('../../../ext/tags')
 const { COMPONENT } = require('../../dd-trace/src/constants')
 const {
   TELEMETRY_EVENT_CREATED,
-  TELEMETRY_EVENT_FINISHED
+  TELEMETRY_EVENT_FINISHED,
+  TELEMETRY_TEST_SESSION,
 } = require('../../dd-trace/src/ci-visibility/telemetry')
 const { appClosing: appClosingTelemetry } = require('../../dd-trace/src/telemetry')
 const log = require('../../dd-trace/src/log')
@@ -106,7 +106,7 @@ class PlaywrightPlugin extends CiPlugin {
       finishAllTraceSpans(this.testSessionSpan)
       this.telemetry.count(TELEMETRY_TEST_SESSION, {
         provider: this.ciProviderName,
-        autoInjected: !!getEnvironmentVariable('DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER')
+        autoInjected: !!getValueFromEnvSources('DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER')
       })
       appClosingTelemetry()
       this.tracer._exporter.flush(onDone)
@@ -393,7 +393,7 @@ class PlaywrightPlugin extends CiPlugin {
       span.finish()
 
       finishAllTraceSpans(span)
-      if (getEnvironmentVariable('DD_PLAYWRIGHT_WORKER')) {
+      if (getValueFromEnvSources('DD_PLAYWRIGHT_WORKER')) {
         this.tracer._exporter.flush(onDone)
       }
     })