dd-trace 5.35.0 → 5.37.0

package/packages/dd-trace/src/ci-visibility/quarantined-tests/get-quarantined-tests.js

@@ -0,0 +1,62 @@
+const request = require('../../exporters/common/request')
+const id = require('../../id')
+
+function getQuarantinedTests ({
+  url,
+  isEvpProxy,
+  evpProxyPrefix,
+  isGzipCompatible,
+  repositoryUrl
+}, done) {
+  const options = {
+    path: '/api/v2/test/libraries/test-management/tests',
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json'
+    },
+    timeout: 20000,
+    url
+  }
+
+  if (isGzipCompatible) {
+    options.headers['accept-encoding'] = 'gzip'
+  }
+
+  if (isEvpProxy) {
+    options.path = `${evpProxyPrefix}/api/v2/test/libraries/test-management/tests`
+    options.headers['X-Datadog-EVP-Subdomain'] = 'api'
+  } else {
+    const apiKey = process.env.DATADOG_API_KEY || process.env.DD_API_KEY
+    if (!apiKey) {
+      return done(new Error('Quarantined tests were not fetched because Datadog API key is not defined.'))
+    }
+
+    options.headers['dd-api-key'] = apiKey
+  }
+
+  const data = JSON.stringify({
+    data: {
+      id: id().toString(10),
+      type: 'ci_app_libraries_tests_request',
+      attributes: {
+        repository_url: repositoryUrl
+      }
+    }
+  })
+
+  request(data, options, (err, res) => {
+    if (err) {
+      done(err)
+    } else {
+      try {
+        const { data: { attributes: { modules: quarantinedTests } } } = JSON.parse(res)
+
+        done(null, quarantinedTests)
+      } catch (err) {
+        done(err)
+      }
+    }
+  })
+}
+
+module.exports = { getQuarantinedTests }

package/packages/dd-trace/src/ci-visibility/requests/get-library-configuration.js

@@ -94,7 +94,8 @@ function getLibraryConfiguration ({
               early_flake_detection: earlyFlakeDetectionConfig,
               flaky_test_retries_enabled: isFlakyTestRetriesEnabled,
               di_enabled: isDiEnabled,
-              known_tests_enabled: isKnownTestsEnabled
+              known_tests_enabled: isKnownTestsEnabled,
+              test_management: testManagementConfig
             }
           }
         } = JSON.parse(res)
@@ -111,7 +112,9 @@ function getLibraryConfiguration ({
             earlyFlakeDetectionConfig?.faulty_session_threshold ?? DEFAULT_EARLY_FLAKE_DETECTION_ERROR_THRESHOLD,
           isFlakyTestRetriesEnabled,
           isDiEnabled: isDiEnabled && isFlakyTestRetriesEnabled,
-          isKnownTestsEnabled
+          isKnownTestsEnabled,
+          // TODO: should it be test management?
+          isQuarantinedTestsEnabled: (testManagementConfig?.enabled ?? false)
         }
 
         log.debug(() => `Remote settings: ${JSON.stringify(settings)}`)

package/packages/dd-trace/src/ci-visibility/test-api-manual/test-api-manual-plugin.js

@@ -17,13 +17,13 @@ class TestApiManualPlugin extends CiPlugin {
     this.sourceRoot = process.cwd()
 
     this.unconfiguredAddSub('dd-trace:ci:manual:test:start', ({ testName, testSuite }) => {
-      const store = storage.getStore()
+      const store = storage('legacy').getStore()
       const testSuiteRelative = getTestSuitePath(testSuite, this.sourceRoot)
       const testSpan = this.startTestSpan(testName, testSuiteRelative)
       this.enter(testSpan, store)
     })
     this.unconfiguredAddSub('dd-trace:ci:manual:test:finish', ({ status, error }) => {
-      const store = storage.getStore()
+      const store = storage('legacy').getStore()
       const testSpan = store && store.span
       if (testSpan) {
         testSpan.setTag(TEST_STATUS, status)
@@ -35,7 +35,7 @@ class TestApiManualPlugin extends CiPlugin {
       }
     })
     this.unconfiguredAddSub('dd-trace:ci:manual:test:addTags', (tags) => {
-      const store = storage.getStore()
+      const store = storage('legacy').getStore()
       const testSpan = store && store.span
       if (testSpan) {
         testSpan.addTags(tags)

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

@@ -497,6 +497,7 @@ class Config {
     this._setValue(defaults, 'iast.redactionNamePattern', null)
     this._setValue(defaults, 'iast.redactionValuePattern', null)
     this._setValue(defaults, 'iast.requestSampling', 30)
+    this._setValue(defaults, 'iast.securityControlsConfiguration', null)
     this._setValue(defaults, 'iast.telemetryVerbosity', 'INFORMATION')
     this._setValue(defaults, 'iast.stackTrace.enabled', true)
     this._setValue(defaults, 'injectionEnabled', [])
@@ -518,6 +519,9 @@ class Config {
     this._setValue(defaults, 'ciVisAgentlessLogSubmissionEnabled', false)
     this._setValue(defaults, 'legacyBaggageEnabled', true)
     this._setValue(defaults, 'isTestDynamicInstrumentationEnabled', false)
+    this._setValue(defaults, 'isServiceUserProvided', false)
+    this._setValue(defaults, 'testManagementAttemptToFixRetries', 20)
+    this._setValue(defaults, 'isTestManagementEnabled', false)
     this._setValue(defaults, 'logInjection', false)
     this._setValue(defaults, 'lookup', undefined)
     this._setValue(defaults, 'inferredProxyServicesEnabled', false)
@@ -624,6 +628,7 @@ class Config {
       DD_IAST_REDACTION_NAME_PATTERN,
       DD_IAST_REDACTION_VALUE_PATTERN,
       DD_IAST_REQUEST_SAMPLING,
+      DD_IAST_SECURITY_CONTROLS_CONFIGURATION,
       DD_IAST_TELEMETRY_VERBOSITY,
       DD_IAST_STACK_TRACE_ENABLED,
       DD_INJECTION_ENABLED,
@@ -792,6 +797,7 @@ class Config {
       this._setValue(env, 'iast.requestSampling', iastRequestSampling)
     }
     this._envUnprocessed['iast.requestSampling'] = DD_IAST_REQUEST_SAMPLING
+    this._setString(env, 'iast.securityControlsConfiguration', DD_IAST_SECURITY_CONTROLS_CONFIGURATION)
     this._setString(env, 'iast.telemetryVerbosity', DD_IAST_TELEMETRY_VERBOSITY)
     this._setBoolean(env, 'iast.stackTrace.enabled', DD_IAST_STACK_TRACE_ENABLED)
     this._setArray(env, 'injectionEnabled', DD_INJECTION_ENABLED)
@@ -984,14 +990,15 @@ class Config {
       this._setValue(opts, 'iast.requestSampling', iastRequestSampling)
       this._optsUnprocessed['iast.requestSampling'] = options.iast?.requestSampling
     }
-    this._setString(opts, 'iast.telemetryVerbosity', options.iast && options.iast.telemetryVerbosity)
+    this._setValue(opts, 'iast.securityControlsConfiguration', options.iast?.securityControlsConfiguration)
     this._setBoolean(opts, 'iast.stackTrace.enabled', options.iast?.stackTrace?.enabled)
+    this._setString(opts, 'iast.telemetryVerbosity', options.iast && options.iast.telemetryVerbosity)
     this._setBoolean(opts, 'isCiVisibility', options.isCiVisibility)
     this._setBoolean(opts, 'legacyBaggageEnabled', options.legacyBaggageEnabled)
     this._setBoolean(opts, 'llmobs.agentlessEnabled', options.llmobs?.agentlessEnabled)
     this._setString(opts, 'llmobs.mlApp', options.llmobs?.mlApp)
     this._setBoolean(opts, 'logInjection', options.logInjection)
-    this._setString(opts, 'lookup', options.lookup)
+    this._setValue(opts, 'lookup', options.lookup)
     this._setBoolean(opts, 'middlewareTracingEnabled', options.middlewareTracingEnabled)
     this._setBoolean(opts, 'openAiLogsEnabled', options.openAiLogsEnabled)
     this._setValue(opts, 'peerServiceMapping', options.peerServiceMapping)
@@ -1137,7 +1144,9 @@ class Config {
       DD_CIVISIBILITY_FLAKY_RETRY_COUNT,
       DD_TEST_SESSION_NAME,
       DD_AGENTLESS_LOG_SUBMISSION_ENABLED,
-      DD_TEST_DYNAMIC_INSTRUMENTATION_ENABLED
+      DD_TEST_DYNAMIC_INSTRUMENTATION_ENABLED,
+      DD_TEST_MANAGEMENT_ENABLED,
+      DD_TEST_MANAGEMENT_ATTEMPT_TO_FIX_RETRIES
     } = process.env
 
     if (DD_CIVISIBILITY_AGENTLESS_URL) {
@@ -1156,6 +1165,12 @@ class Config {
       this._setString(calc, 'ciVisibilityTestSessionName', DD_TEST_SESSION_NAME)
       this._setBoolean(calc, 'ciVisAgentlessLogSubmissionEnabled', isTrue(DD_AGENTLESS_LOG_SUBMISSION_ENABLED))
       this._setBoolean(calc, 'isTestDynamicInstrumentationEnabled', isTrue(DD_TEST_DYNAMIC_INSTRUMENTATION_ENABLED))
+      this._setBoolean(calc, 'isServiceUserProvided', !!this._env.service)
+      this._setBoolean(calc, 'isTestManagementEnabled', !isFalse(DD_TEST_MANAGEMENT_ENABLED))
+      this._setValue(calc,
+        'testManagementAttemptToFixRetries',
+        coalesce(maybeInt(DD_TEST_MANAGEMENT_ATTEMPT_TO_FIX_RETRIES), 20)
+      )
     }
     this._setString(calc, 'dogstatsd.hostname', this._getHostname())
     this._setBoolean(calc, 'isGitUploadEnabled',

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

@@ -2,14 +2,14 @@ const { storage } = require('../../datadog-core')
 const log = require('./log')
 
 function getDataStreamsContext () {
-  const store = storage.getStore()
+  const store = storage('legacy').getStore()
   return (store && store.dataStreamsContext) || null
 }
 
 function setDataStreamsContext (dataStreamsContext) {
   log.debug(() => `Setting new DSM Context: ${JSON.stringify(dataStreamsContext)}.`)
 
-  if (dataStreamsContext) storage.enterWith({ ...(storage.getStore()), dataStreamsContext })
+  if (dataStreamsContext) storage('legacy').enterWith({ ...(storage('legacy').getStore()), dataStreamsContext })
 }
 
 module.exports = {

package/packages/dd-trace/src/debugger/devtools_client/breakpoints.js

@@ -1,5 +1,6 @@
 'use strict'
 
+const { getGeneratedPosition } = require('./source-maps')
 const session = require('./session')
 const { MAX_SNAPSHOTS_PER_SECOND_PER_PROBE, MAX_NON_SNAPSHOTS_PER_SECOND_PER_PROBE } = require('./defaults')
 const { findScriptFromPartialPath, probes, breakpoints } = require('./state')
@@ -16,10 +17,11 @@ async function addBreakpoint (probe) {
   if (!sessionStarted) await start()
 
   const file = probe.where.sourceFile
-  const line = Number(probe.where.lines[0]) // Tracer doesn't support multiple-line breakpoints
+  let lineNumber = Number(probe.where.lines[0]) // Tracer doesn't support multiple-line breakpoints
+  let columnNumber = 0 // Probes do not contain/support column information
 
   // Optimize for sending data to /debugger/v1/input endpoint
-  probe.location = { file, lines: [String(line)] }
+  probe.location = { file, lines: [String(lineNumber)] }
   delete probe.where
 
   // Optimize for fast calculations when probe is hit
@@ -34,17 +36,22 @@ async function addBreakpoint (probe) {
   // not continue untill all scripts have been parsed?
   const script = findScriptFromPartialPath(file)
   if (!script) throw new Error(`No loaded script found for ${file} (probe: ${probe.id}, version: ${probe.version})`)
-  const [path, scriptId] = script
+  const { url, scriptId, sourceMapURL, source } = script
+
+  if (sourceMapURL) {
+    ({ line: lineNumber, column: columnNumber } = await getGeneratedPosition(url, source, lineNumber, sourceMapURL))
+  }
 
   log.debug(
-    '[debugger:devtools_client] Adding breakpoint at %s:%d (probe: %s, version: %d)',
-    path, line, probe.id, probe.version
+    '[debugger:devtools_client] Adding breakpoint at %s:%d:%d (probe: %s, version: %d)',
+    url, lineNumber, columnNumber, probe.id, probe.version
   )
 
   const { breakpointId } = await session.post('Debugger.setBreakpoint', {
     location: {
       scriptId,
-      lineNumber: line - 1 // Beware! lineNumber is zero-indexed
+      lineNumber: lineNumber - 1, // Beware! lineNumber is zero-indexed
+      columnNumber
     }
   })
 
@@ -66,7 +73,7 @@ async function removeBreakpoint ({ id }) {
   probes.delete(id)
   breakpoints.delete(breakpointId)
 
-  if (breakpoints.size === 0) await stop()
+  if (breakpoints.size === 0) return stop() // return instead of await to reduce number of promises created
 }
 
 async function start () {

package/packages/dd-trace/src/debugger/devtools_client/source-maps.js

@@ -0,0 +1,50 @@
+'use strict'
+
+const { join, dirname } = require('path')
+const { readFileSync } = require('fs')
+const { readFile } = require('fs/promises')
+const { SourceMapConsumer } = require('source-map')
+
+const cache = new Map()
+let cacheTimer = null
+
+const self = module.exports = {
+  async loadSourceMap (dir, url) {
+    if (url.startsWith('data:')) return loadInlineSourceMap(url)
+    const path = join(dir, url)
+    if (cache.has(path)) return cache.get(path)
+    return cacheIt(path, JSON.parse(await readFile(path, 'utf8')))
+  },
+
+  loadSourceMapSync (dir, url) {
+    if (url.startsWith('data:')) return loadInlineSourceMap(url)
+    const path = join(dir, url)
+    if (cache.has(path)) return cache.get(path)
+    return cacheIt(path, JSON.parse(readFileSync(path, 'utf8')))
+  },
+
+  async getGeneratedPosition (url, source, line, sourceMapURL) {
+    const dir = dirname(new URL(url).pathname)
+    return await SourceMapConsumer.with(
+      await self.loadSourceMap(dir, sourceMapURL),
+      null,
+      (consumer) => consumer.generatedPositionFor({ source, line, column: 0 })
+    )
+  }
+}
+
+function cacheIt (key, value) {
+  clearTimeout(cacheTimer)
+  cacheTimer = setTimeout(function () {
+    // Optimize for app boot, where a lot of reads might happen
+    // Clear cache a few seconds after it was last used
+    cache.clear()
+  }, 10_000).unref()
+  cache.set(key, value)
+  return value
+}
+
+function loadInlineSourceMap (data) {
+  data = data.slice(data.indexOf('base64,') + 7)
+  return JSON.parse(Buffer.from(data, 'base64').toString('utf8'))
+}

package/packages/dd-trace/src/debugger/devtools_client/state.js

@@ -1,10 +1,13 @@
 'use strict'
 
+const { join, dirname } = require('path')
+const { loadSourceMapSync } = require('./source-maps')
 const session = require('./session')
+const log = require('../../log')
 
 const WINDOWS_DRIVE_LETTER_REGEX = /[a-zA-Z]/
 
-const scriptIds = []
+const loadedScripts = []
 const scriptUrls = new Map()
 
 module.exports = {
@@ -15,18 +18,17 @@ module.exports = {
    * Find the script to inspect based on a partial or absolute path. Handles both Windows and POSIX paths.
    *
    * @param {string} path - Partial or absolute path to match against loaded scripts
-   * @returns {[string, string, string | undefined] | null} - Array containing [url, scriptId, sourceMapURL]
-   *   or null if no match
+   * @returns {Object | null} - Object containing `url`, `scriptId`, `sourceMapURL`, and `source` - or null if no match
    */
   findScriptFromPartialPath (path) {
     if (!path) return null // This shouldn't happen, but better safe than sorry
 
     path = path.toLowerCase()
 
-    const bestMatch = new Array(3)
+    const bestMatch = { url: null, scriptId: null, sourceMapURL: null, source: null }
     let maxMatchLength = -1
 
-    for (const [url, scriptId, sourceMapURL] of scriptIds) {
+    for (const { url, sourceUrl, scriptId, sourceMapURL, source } of loadedScripts) {
       let i = url.length - 1
       let j = path.length - 1
       let matchLength = 0
@@ -75,12 +77,13 @@ module.exports = {
       // If we found a valid match and it's better than our previous best
       if (atBoundary && (
         lastBoundaryPos > maxMatchLength ||
-        (lastBoundaryPos === maxMatchLength && url.length < bestMatch[0].length) // Prefer shorter paths
+        (lastBoundaryPos === maxMatchLength && url.length < bestMatch.url.length) // Prefer shorter paths
       )) {
         maxMatchLength = lastBoundaryPos
-        bestMatch[0] = url
-        bestMatch[1] = scriptId
-        bestMatch[2] = sourceMapURL
+        bestMatch.url = sourceUrl || url
+        bestMatch.scriptId = scriptId
+        bestMatch.sourceMapURL = sourceMapURL
+        bestMatch.source = source
       }
     }
 
@@ -112,6 +115,31 @@ module.exports = {
 session.on('Debugger.scriptParsed', ({ params }) => {
   scriptUrls.set(params.scriptId, params.url)
   if (params.url.startsWith('file:')) {
-    scriptIds.push([params.url, params.scriptId, params.sourceMapURL])
+    if (params.sourceMapURL) {
+      const dir = dirname(new URL(params.url).pathname)
+      let sources
+      try {
+        sources = loadSourceMapSync(dir, params.sourceMapURL).sources
+      } catch (err) {
+        if (typeof params.sourceMapURL === 'string' && params.sourceMapURL.startsWith('data:')) {
+          log.error('[debugger:devtools_client] could not load inline source map for "%s"', params.url, err)
+        } else {
+          log.error('[debugger:devtools_client] could not load source map "%s" from "%s" for "%s"',
+            params.sourceMapURL, dir, params.url, err)
+        }
+        return
+      }
+      for (const source of sources) {
+        // TODO: Take source map `sourceRoot` into account?
+        loadedScripts.push({
+          ...params,
+          sourceUrl: params.url,
+          url: new URL(join(dir, source), 'file:').href,
+          source
+        })
+      }
+    } else {
+      loadedScripts.push(params)
+    }
   }
 })

package/packages/dd-trace/src/exporters/common/agents.js

@@ -26,7 +26,7 @@ function createAgentClass (BaseAgent) {
     }
 
     _noop (callback) {
-      return storage.run({ noop: true }, callback)
+      return storage('legacy').run({ noop: true }, callback)
     }
   }
 

package/packages/dd-trace/src/exporters/common/request.js

@@ -126,9 +126,9 @@ function request (data, options, callback) {
 
     activeRequests++
 
-    const store = storage.getStore()
+    const store = storage('legacy').getStore()
 
-    storage.enterWith({ noop: true })
+    storage('legacy').enterWith({ noop: true })
 
     const req = client.request(options, onResponse)
 
@@ -146,7 +146,7 @@ function request (data, options, callback) {
       req.end()
     }
 
-    storage.enterWith(store)
+    storage('legacy').enterWith(store)
   }
 
   // TODO: Figure out why setTimeout is needed to avoid losing the async context

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

@@ -1,11 +1,11 @@
 'use strict'
 
-const semver = require('semver')
+const satisfies = require('semifies')
 const logger = require('./log')
 const { addHook } = require('import-in-the-middle')
 const dc = require('dc-polyfill')
 
-if (semver.satisfies(process.versions.node, '>=14.13.1')) {
+if (satisfies(process.versions.node, '>=14.13.1')) {
   const moduleLoadStartChannel = dc.channel('dd-trace:moduleLoadStart')
   addHook((name, namespace) => {
     if (moduleLoadStartChannel.hasSubscribers) {

package/packages/dd-trace/src/llmobs/plugins/bedrockruntime.js

@@ -29,7 +29,7 @@ class BedrockRuntimeLLMObsPlugin extends BaseLLMObsPlugin {
       if (modelName.includes('embed')) {
         return
       }
-      const span = storage.getStore()?.span
+      const span = storage('legacy').getStore()?.span
       this.setLLMObsTags({ request, span, response, modelProvider, modelName })
     })
 

package/packages/dd-trace/src/llmobs/tagger.js

@@ -100,7 +100,12 @@ class LLMObsTagger {
   }
 
   tagMetadata (span, metadata) {
-    this._setTag(span, METADATA, metadata)
+    const existingMetadata = registry.get(span)?.[METADATA]
+    if (existingMetadata) {
+      Object.assign(existingMetadata, metadata)
+    } else {
+      this._setTag(span, METADATA, metadata)
+    }
   }
 
   tagMetrics (span, metrics) {
@@ -128,7 +133,12 @@ class LLMObsTagger {
       }
     }
 
-    this._setTag(span, METRICS, filterdMetrics)
+    const existingMetrics = registry.get(span)?.[METRICS]
+    if (existingMetrics) {
+      Object.assign(existingMetrics, filterdMetrics)
+    } else {
+      this._setTag(span, METRICS, filterdMetrics)
+    }
   }
 
   tagSpanTags (span, tags) {

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

@@ -15,11 +15,11 @@ let logger = defaultLogger
 let logChannel = new LogChannel()
 
 function withNoop (fn) {
-  const store = storage.getStore()
+  const store = storage('legacy').getStore()
 
-  storage.enterWith({ noop: true })
+  storage('legacy').enterWith({ noop: true })
   fn()
-  storage.enterWith(store)
+  storage('legacy').enterWith(store)
 }
 
 function unsubscribeAll () {

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

@@ -6,7 +6,7 @@ const { storage } = require('../../../datadog-core') // TODO: noop storage?
 
 class NoopSpan {
   constructor (tracer, parent) {
-    this._store = storage.getHandle()
+    this._store = storage('legacy').getHandle()
     this._noopTracer = tracer
     this._noopContext = this._createContext(parent)
   }

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

@@ -325,6 +325,7 @@ class TextMapPropagator {
       if (context === null) {
         context = extractedContext
         if (this._config.tracePropagationExtractFirst) {
+          this._extractBaggageItems(carrier, context)
           return context
         }
       } else {
@@ -344,10 +345,7 @@ class TextMapPropagator {
       }
     }
 
-    if (this._hasPropagationStyle('extract', 'baggage') && carrier.baggage) {
-      context = context || new DatadogSpanContext()
-      this._extractBaggageItems(carrier, context)
-    }
+    this._extractBaggageItems(carrier, context)
 
     return context || this._extractSqsdContext(carrier)
   }
@@ -596,6 +594,9 @@ class TextMapPropagator {
   }
 
   _extractBaggageItems (carrier, spanContext) {
+    if (!this._hasPropagationStyle('extract', 'baggage')) return
+    if (!carrier || !carrier.baggage) return
+    if (!spanContext) return
     const baggages = carrier.baggage.split(',')
     for (const keyValue of baggages) {
       if (!keyValue.includes('=')) {

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

@@ -4,7 +4,7 @@
 const { performance } = require('perf_hooks')
 const now = performance.now.bind(performance)
 const dateNow = Date.now
-const semver = require('semver')
+const satisfies = require('semifies')
 const SpanContext = require('./span_context')
 const id = require('../id')
 const tagger = require('../tagger')
@@ -65,7 +65,7 @@ class DatadogSpan {
     this._debug = debug
     this._processor = processor
     this._prioritySampler = prioritySampler
-    this._store = storage.getHandle()
+    this._store = storage('legacy').getHandle()
     this._duration = undefined
 
     this._events = []
@@ -365,7 +365,7 @@ class DatadogSpan {
 }
 
 function createRegistry (type) {
-  if (!semver.satisfies(process.version, '>=14.6')) return
+  if (!satisfies(process.version, '>=14.6')) return
 
   return new global.FinalizationRegistry(name => {
     runtimeMetrics.decrement(`runtime.node.spans.${type}`)

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

@@ -143,6 +143,7 @@ module.exports = class PluginManager {
       ciVisibilityTestSessionName,
       ciVisAgentlessLogSubmissionEnabled,
       isTestDynamicInstrumentationEnabled,
+      isServiceUserProvided,
       middlewareTracingEnabled
     } = this._tracerConfig
 
@@ -155,7 +156,8 @@ module.exports = class PluginManager {
       headers: headerTags || [],
       ciVisibilityTestSessionName,
       ciVisAgentlessLogSubmissionEnabled,
-      isTestDynamicInstrumentationEnabled
+      isTestDynamicInstrumentationEnabled,
+      isServiceUserProvided
     }
 
     if (logInjection !== undefined) {

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

@@ -7,7 +7,7 @@ class ApolloBasePlugin extends TracingPlugin {
   static get kind () { return 'server' }
 
   bindStart (ctx) {
-    const store = storage.getStore()
+    const store = storage('legacy').getStore()
     const childOf = store ? store.span : null
 
     const span = this.startSpan(this.getOperationName(), {