dd-trace 5.97.0 → 5.99.0

package/packages/datadog-plugin-azure-event-hubs/src/producer.js

@@ -1,6 +1,5 @@
 'use strict'
 
-const { getValueFromEnvSources } = require('../../dd-trace/src/config/helper')
 const ProducerPlugin = require('../../dd-trace/src/plugins/producer')
 
 const spanContexts = new WeakMap()
@@ -11,8 +10,9 @@ class AzureEventHubsProducerPlugin extends ProducerPlugin {
   static get prefix () { return 'tracing:apm:azure-event-hubs:send' }
 
   bindStart (ctx) {
+    const batchLinksEnabled = this._tracerConfig.DD_TRACE_AZURE_EVENTHUBS_BATCH_LINKS_ENABLED
     // we do not want to make these spans when batch linking is disabled.
-    if (!batchLinksAreEnabled() && ctx.functionName === 'tryAdd') {
+    if (!batchLinksEnabled && ctx.functionName === 'tryAdd') {
       return ctx.currentStore
     }
 
@@ -37,7 +37,7 @@ class AzureEventHubsProducerPlugin extends ProducerPlugin {
         span.setTag('message.id', ctx.eventData.messageID)
       }
 
-      if (batchLinksAreEnabled()) {
+      if (batchLinksEnabled) {
         const spanContext = spanContexts.get(ctx.batch)
         if (spanContext) {
           spanContext.push(span.context())
@@ -58,13 +58,11 @@ class AzureEventHubsProducerPlugin extends ProducerPlugin {
         for (const event of eventData) {
           injectTraceContext(this.tracer, span, event)
         }
-      } else {
-        if (batchLinksAreEnabled()) {
-          const contexts = spanContexts.get(eventData)
-          if (contexts) {
-            for (const spanContext of contexts) {
-              span.addLink(spanContext)
-            }
+      } else if (batchLinksEnabled) {
+        const contexts = spanContexts.get(eventData)
+        if (contexts) {
+          for (const spanContext of contexts) {
+            span.addLink(spanContext)
           }
         }
       }
@@ -88,9 +86,4 @@ function injectTraceContext (tracer, span, event) {
   tracer.inject(span, 'text_map', event.properties)
 }
 
-function batchLinksAreEnabled () {
-  const eh = getValueFromEnvSources('DD_TRACE_AZURE_EVENTHUBS_BATCH_LINKS_ENABLED')
-  return eh !== 'false'
-}
-
 module.exports = AzureEventHubsProducerPlugin

package/packages/datadog-plugin-azure-service-bus/src/producer.js

@@ -1,6 +1,5 @@
 'use strict'
 
-const { getValueFromEnvSources } = require('../../dd-trace/src/config/helper')
 const ProducerPlugin = require('../../dd-trace/src/plugins/producer')
 const spanContexts = new WeakMap()
 
@@ -10,8 +9,9 @@ class AzureServiceBusProducerPlugin extends ProducerPlugin {
   static get prefix () { return 'tracing:apm:azure-service-bus:send' }
 
   bindStart (ctx) {
+    const batchLinksEnabled = this._tracerConfig.DD_TRACE_AZURE_SERVICEBUS_BATCH_LINKS_ENABLED
     // we do not want to make these spans when batch linking is disabled.
-    if (!batchLinksAreEnabled() && ctx.functionName === 'tryAddMessage') {
+    if (!batchLinksEnabled && ctx.functionName === 'tryAddMessage') {
       return ctx.currentStore
     }
 
@@ -36,7 +36,7 @@ class AzureServiceBusProducerPlugin extends ProducerPlugin {
         span.setTag('message.id', ctx.msg)
       }
 
-      if (batchLinksAreEnabled()) {
+      if (batchLinksEnabled) {
         const spanContext = spanContexts.get(ctx.batch)
         if (spanContext) {
           spanContext.push(span.context())
@@ -52,7 +52,7 @@ class AzureServiceBusProducerPlugin extends ProducerPlugin {
       const isBatch = messages.constructor?.name === 'ServiceBusMessageBatchImpl'
       if (isBatch) {
         span.setTag('messaging.batch.message_count', messages.count)
-        if (batchLinksAreEnabled()) {
+        if (batchLinksEnabled) {
           const contexts = spanContexts.get(messages)
           if (contexts) {
             for (const spanContext of contexts) {
@@ -89,9 +89,4 @@ function injectTraceContext (tracer, span, msg) {
   tracer.inject(span, 'text_map', msg.applicationProperties)
 }
 
-function batchLinksAreEnabled () {
-  const sb = getValueFromEnvSources('DD_TRACE_AZURE_SERVICEBUS_BATCH_LINKS_ENABLED')
-  return sb !== 'false'
-}
-
 module.exports = AzureServiceBusProducerPlugin

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

@@ -6,7 +6,7 @@ const realSetTimeout = setTimeout
 
 const CiPlugin = require('../../dd-trace/src/plugins/ci_plugin')
 const { storage } = require('../../datadog-core')
-const { getEnvironmentVariable, getValueFromEnvSources } = require('../../dd-trace/src/config/helper')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config/helper')
 
 const {
   addIntelligentTestRunnerSpanTags,
@@ -37,6 +37,7 @@ const {
   TEST_SOURCE_FILE,
   TEST_SOURCE_START,
   TEST_STATUS,
+  TEST_FINAL_STATUS,
 } = require('../../dd-trace/src/plugins/util/test')
 const { RESOURCE_NAME } = require('../../../ext/tags')
 const { COMPONENT, ERROR_MESSAGE } = require('../../dd-trace/src/constants')
@@ -116,7 +117,7 @@ class CucumberPlugin extends CiPlugin {
       finishAllTraceSpans(this.testSessionSpan)
       this.telemetry.count(TELEMETRY_TEST_SESSION, {
         provider: this.ciProviderName,
-        autoInjected: !!getValueFromEnvSources('DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER'),
+        autoInjected: !!this._tracerConfig.DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER,
       })
 
       this.libraryConfig = null
@@ -307,11 +308,16 @@ class CucumberPlugin extends CiPlugin {
       isDisabled,
       isQuarantined,
       isModified,
+      finalStatus,
     }) => {
       const statusTag = isStep ? 'step.status' : TEST_STATUS
 
       span.setTag(statusTag, status)
 
+      if (finalStatus) {
+        span.setTag(TEST_FINAL_STATUS, finalStatus)
+      }
+
       if (isNew) {
         span.setTag(TEST_IS_NEW, 'true')
         if (isEfdRetry) {

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

@@ -1,5 +1,9 @@
 'use strict'
 
+// Capture real timers at module load, before any test can install fake timers.
+const { performance } = require('perf_hooks')
+const dateNow = Date.now
+
 const {
   TEST_STATUS,
   TEST_IS_RUM_ACTIVE,
@@ -53,6 +57,7 @@ const {
   DYNAMIC_NAME_RE,
   logDynamicNamesWarning,
   getPullRequestBaseBranch,
+  TEST_FINAL_STATUS,
 } = require('../../dd-trace/src/plugins/util/test')
 const { isMarkedAsUnskippable } = require('../../datadog-plugin-jest/src/util')
 const { ORIGIN_KEY, COMPONENT } = require('../../dd-trace/src/constants')
@@ -95,7 +100,7 @@ const {
 } = require('../../dd-trace/src/plugins/util/env')
 const { DD_MAJOR } = require('../../../version')
 const {
-  resolveOriginalSourcePosition,
+  resolveOriginalSourceFile,
   resolveSourceLineForTest,
   shouldTrustInvocationDetailsLine,
 } = require('./source-map-utils')
@@ -240,6 +245,58 @@ function getSuiteStatus (suiteStats) {
   return 'pass'
 }
 
+const FINAL_STATUS_RETRY_KIND = {
+  none: 'none',
+  atr: 'atr',
+  efd: 'efd',
+  atf: 'atf',
+}
+
+function getFinalStatusRetryKind ({ finishedTest, finishedTestAttempts, flakyTestRetriesCount }) {
+  // Infer retry kind from the executions we actually saw so ATR enabled with
+  // a retry count of 0 is still treated as a single final execution.
+  if (finishedTest.isAttemptToFix) {
+    return FINAL_STATUS_RETRY_KIND.atf
+  }
+
+  if (finishedTestAttempts.some(testAttempt => testAttempt.isEfdRetry)) {
+    return FINAL_STATUS_RETRY_KIND.efd
+  }
+
+  if (finishedTestAttempts.length > 1 && flakyTestRetriesCount > 0) {
+    return FINAL_STATUS_RETRY_KIND.atr
+  }
+
+  return FINAL_STATUS_RETRY_KIND.none
+}
+
+function getFinalStatus ({
+  status,
+  retryKind,
+  hasFailedAllRetries,
+  hasPassedAllAtfRetries,
+  isQuarantined,
+  isDisabled,
+}) {
+  // If the test is quarantined or disabled, regardless of its actual execution result or active retry features,
+  // the final status of its last execution should be reported as 'skip'.
+  if (isQuarantined || isDisabled || status === 'skip') {
+    return 'skip'
+  }
+
+  switch (retryKind) {
+    case FINAL_STATUS_RETRY_KIND.atr:
+    case FINAL_STATUS_RETRY_KIND.efd:
+      // These modes report the aggregate result across attempts.
+      return hasFailedAllRetries ? 'fail' : 'pass'
+    case FINAL_STATUS_RETRY_KIND.atf:
+      // Attempt-to-fix only passes if every execution passed.
+      return hasPassedAllAtfRetries ? 'pass' : 'fail'
+    default:
+      return status
+  }
+}
+
 class CypressPlugin {
   _isInit = false
   testEnvironmentMetadata = getTestEnvironmentMetadata(TEST_FRAMEWORK_NAME)
@@ -349,6 +406,19 @@ class CypressPlugin {
     this.rumFlushWaitMillis = undefined
     this._pendingRequestErrorTags = []
     this.libraryConfigurationPromise = undefined
+    this._timeOrigin = 0
+    this._perfOrigin = 0
+  }
+
+  /**
+   * Returns the current time in the same coordinate system used by span
+   * start/finish. Captured at session span creation so it shares the same
+   * epoch as the trace without reaching into span internals.
+   *
+   * @returns {number}
+   */
+  _now () {
+    return this._timeOrigin + performance.now() - this._perfOrigin
   }
 
   // Init function returns a promise that resolves with the Cypress configuration
@@ -448,8 +518,7 @@ class CypressPlugin {
     this.ciVisEvent(TELEMETRY_EVENT_CREATED, 'suite')
 
     if (testSuiteAbsolutePath) {
-      const resolvedSuitePosition = resolveOriginalSourcePosition(testSuiteAbsolutePath, 1)
-      const resolvedSuiteAbsolutePath = resolvedSuitePosition ? resolvedSuitePosition.sourceFile : testSuiteAbsolutePath
+      const resolvedSuiteAbsolutePath = resolveOriginalSourceFile(testSuiteAbsolutePath) || testSuiteAbsolutePath
       const testSourceFile = getTestSuitePath(resolvedSuiteAbsolutePath, this.repositoryRoot)
       testSuiteSpanMetadata[TEST_SOURCE_FILE] = testSourceFile
       testSuiteSpanMetadata[TEST_SOURCE_START] = 1
@@ -665,6 +734,13 @@ class CypressPlugin {
       this.tracer._tracer._exporter.addMetadataTags(metadataTags)
     }
 
+    // Capture time references that match what startSpan records internally
+    // (trace.startTime = Date.now(), trace.ticks = performance.now()).
+    // This lets _now() produce values in the same coordinate system as
+    // span._startTime without accessing span internals.
+    this._timeOrigin = dateNow()
+    this._perfOrigin = performance.now()
+
     this.testSessionSpan = this.tracer.startSpan(`${TEST_FRAMEWORK_NAME}.test_session`, {
       childOf,
       tags: {
@@ -797,6 +873,7 @@ class CypressPlugin {
         : spec.relative
 
       const skippedTestSpan = this.getTestSpan({ testName: cypressTestName, testSuite: spec.relative, testSourceFile })
+      skippedTestSpan.setTag(TEST_FINAL_STATUS, 'skip')
 
       skippedTestSpan.setTag(TEST_STATUS, 'skip')
       if (isSkippedByItr) {
@@ -872,8 +949,9 @@ class CypressPlugin {
         if (this.itrCorrelationId) {
           finishedTest.testSpan.setTag(ITR_CORRELATION_ID, this.itrCorrelationId)
         }
-        const resolvedSpecPosition = spec.absolute ? resolveOriginalSourcePosition(spec.absolute, 1) : null
-        const resolvedSpecAbsolutePath = resolvedSpecPosition ? resolvedSpecPosition.sourceFile : spec.absolute
+        const resolvedSpecAbsolutePath = spec.absolute
+          ? resolveOriginalSourceFile(spec.absolute) || spec.absolute
+          : spec.absolute
         const testSourceFile = resolvedSpecAbsolutePath && this.repositoryRoot
           ? getTestSuitePath(resolvedSpecAbsolutePath, this.repositoryRoot)
           : spec.relative
@@ -886,6 +964,36 @@ class CypressPlugin {
           finishedTest.testSpan.setTag(TEST_CODE_OWNERS, codeOwners)
         }
 
+        // We can check if this is the last attempt regardless of the retry mechanism
+        const isLastAttempt = attemptIndex === finishedTestAttempts.length - 1
+        if (isLastAttempt) {
+          const testSpanTags = finishedTest.testSpan.context()._tags
+          const retryKind = getFinalStatusRetryKind({
+            finishedTest,
+            finishedTestAttempts,
+            flakyTestRetriesCount: this.flakyTestRetriesCount,
+          })
+
+          const hasFailedAllRetries = testSpanTags[TEST_HAS_FAILED_ALL_RETRIES] === 'true'
+          const hasPassedAllAtfRetries =
+            testSpanTags[TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED] === 'true'
+          const isQuarantined = testSpanTags[TEST_MANAGEMENT_IS_QUARANTINED] === 'true'
+          const isDisabled = testSpanTags[TEST_MANAGEMENT_IS_DISABLED] === 'true'
+
+          const finalStatus = getFinalStatus({
+            status: cypressTestStatus,
+            retryKind,
+            hasFailedAllRetries,
+            hasPassedAllAtfRetries,
+            isQuarantined,
+            isDisabled,
+          })
+
+          if (finalStatus) {
+            finishedTest.testSpan.setTag(TEST_FINAL_STATUS, finalStatus)
+          }
+        }
+
         finishedTest.testSpan.finish(finishedTest.finishTime)
       }
     }
@@ -1103,7 +1211,7 @@ class CypressPlugin {
         const finishedTest = {
           testName,
           testStatus,
-          finishTime: this.activeTestSpan._getTime(), // we store the finish time here
+          finishTime: this._now(),
           testSpan: this.activeTestSpan,
           isEfdRetry,
           isAttemptToFix,

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

@@ -1,11 +1,68 @@
 'use strict'
 
+const NoopTracer = require('../../dd-trace/src/noop/tracer')
 const Plugin = require('../../dd-trace/src/plugins/plugin')
 
-// Cypress plugin does not patch any library. This is just a placeholder to
-// follow the structure of the plugins
+/**
+ * Cypress plugin handles setup-node-events from the instrumentation layer
+ * via a diagnostic channel, keeping the instrumentation free of tracer references.
+ */
 class CypressPlugin extends Plugin {
   static id = 'cypress'
+
+  constructor (...args) {
+    super(...args)
+
+    this.addSub('ci:cypress:setup-node-events', (payload) => {
+      // Bail out if the tracer failed to init (e.g. invalid DD_SITE).
+      // Mirrors the guard in the manual plugin entrypoint (plugin.js).
+      if (this._tracer._tracer instanceof NoopTracer) return
+
+      const { on, config, userAfterSpecHandlers, userAfterRunHandlers, cleanupWrapper } = payload
+
+      const registerAfterRunWithCleanup = (afterRunHandler) => {
+        on('after:run', (results) => {
+          const chain = userAfterRunHandlers.reduce(
+            (p, h) => p.then(() => h(results)),
+            Promise.resolve()
+          )
+          if (afterRunHandler) {
+            return chain.then(() => afterRunHandler(results)).finally(cleanupWrapper)
+          }
+          return chain.finally(cleanupWrapper)
+        })
+      }
+
+      const cypressPlugin = require('./cypress-plugin')
+
+      if (cypressPlugin._isInit) {
+        // Already initialized by manual plugin call — just chain user handlers
+        for (const h of userAfterSpecHandlers) on('after:spec', h)
+        registerAfterRunWithCleanup()
+        payload.registered = true
+        return
+      }
+
+      on('before:run', cypressPlugin.beforeRun.bind(cypressPlugin))
+
+      on('after:spec', (spec, results) => {
+        const chain = userAfterSpecHandlers.reduce(
+          (p, h) => p.then(() => h(spec, results)),
+          Promise.resolve()
+        )
+        return chain.then(() => cypressPlugin.afterSpec(spec, results))
+      })
+
+      registerAfterRunWithCleanup((results) => cypressPlugin.afterRun(results))
+
+      on('task', cypressPlugin.getTasks())
+
+      payload.registered = true
+      // cypressPlugin.init expects the proxy tracer (with ._tracer._exporter),
+      // not the unwrapped internal tracer that this.tracer returns.
+      payload.configPromise = Promise.resolve(cypressPlugin.init(this._tracer, config)).then(() => config)
+    })
+  }
 }
 
 module.exports = CypressPlugin

package/packages/datadog-plugin-cypress/src/source-map-utils.js

@@ -165,6 +165,48 @@ function resolveOriginalSourcePosition (absoluteFilePath, generatedLine) {
   return null
 }
 
+/**
+ * Given a generated file's absolute path, returns the first original source file
+ * referenced by its source map. This is useful for file-level metadata when the
+ * first generated line has no source mapping, such as TypeScript-emitted prologue
+ * statements.
+ * @param {string} absoluteFilePath - Absolute path to the generated file
+ * @returns {string | null}
+ */
+function resolveOriginalSourceFile (absoluteFilePath) {
+  const sourceMap = getCachedSourceMap(absoluteFilePath)
+  if (!sourceMap) return null
+  const { mappings, sources, sourceRoot } = sourceMap
+  if (!mappings || !sources?.length) return null
+
+  const mapDir = path.dirname(absoluteFilePath)
+  const cursor = { pos: 0 }
+  let srcFile = 0
+
+  const lines = mappings.split(';')
+  for (const line of lines) {
+    if (!line) continue
+    cursor.pos = 0
+    while (cursor.pos < line.length) {
+      decodeVLQ(line, cursor) // genCol - not needed
+      if (cursor.pos < line.length && line[cursor.pos] !== ',') {
+        srcFile += decodeVLQ(line, cursor)
+        decodeVLQ(line, cursor) // srcLine - not needed
+        decodeVLQ(line, cursor) // srcCol - not needed
+        if (cursor.pos < line.length && line[cursor.pos] !== ',') {
+          decodeVLQ(line, cursor) // namesIndex - not needed
+        }
+
+        const sourcePath = sources[srcFile]
+        if (!sourcePath) return null
+        return resolveSourcePath(mapDir, sourceRoot, sourcePath)
+      }
+      if (cursor.pos < line.length && line[cursor.pos] === ',') cursor.pos++
+    }
+  }
+  return null
+}
+
 /**
  * Convert a template literal body (the text between backticks, with `${…}` interpolations)
  * into a regex that matches the runtime-evaluated string. Each `${…}` expression is replaced
@@ -294,4 +336,9 @@ function resolveSourceLineForTest (absoluteFilePath, testName, invocationStack)
   return null
 }
 
-module.exports = { resolveOriginalSourcePosition, resolveSourceLineForTest, shouldTrustInvocationDetailsLine }
+module.exports = {
+  resolveOriginalSourceFile,
+  resolveOriginalSourcePosition,
+  resolveSourceLineForTest,
+  shouldTrustInvocationDetailsLine,
+}

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

@@ -11,7 +11,7 @@ class FsPlugin extends TracingPlugin {
   }
 
   bindStart (ctx) {
-    if (!this.activeSpan) return this.skip()
+    if (!this.activeSpan) return { noop: true }
 
     const { operation, ...params } = ctx
     const lowerOp = operation.toLowerCase()

package/packages/datadog-plugin-google-cloud-pubsub/src/consumer.js

@@ -123,7 +123,8 @@ class GoogleCloudPubsubConsumerPlugin extends ConsumerPlugin {
     const topicName = topic?.slice(topic.lastIndexOf('/') + 1) ??
       subscription.name.slice(subscription.name.lastIndexOf('/') + 1)
     const baseService = this.tracer._service || 'unknown'
-    const serviceName = this.config.service || `${baseService}-pubsub`
+    const serviceName = this.config.service || { name: `${baseService}-pubsub`, source: baseService }
+
     const meta = {
       'gcloud.project_id': subscription.pubsub.projectId,
       'pubsub.topic': topic,

package/packages/datadog-plugin-google-cloud-pubsub/src/pubsub-push-subscription.js

@@ -145,17 +145,12 @@ class GoogleCloudPubsubPushSubscriptionPlugin extends TracingPlugin {
     const subscriptionName = subscription?.slice(subscription.lastIndexOf('/') + 1) ?? subscription
     const publishStartTime = attrs['x-dd-publish-start-time']
     const startTime = publishStartTime ? Number.parseInt(publishStartTime, 10) : undefined
-
-    // Get the base service name and construct the pubsub service override
-    const baseService = this.tracer._service
-    const serviceOverride = this.config.service ?? `${baseService}-pubsub`
-
     // Use this.startSpan() which automatically activates the span
     const span = this.startSpan('pubsub.push.receive', {
       childOf: parentContext,
       startTime,
       kind: 'consumer',
-      service: serviceOverride,
+      service: this.config.service || { name: `${this.tracer._service}-pubsub`, source: this.tracer._service },
       meta: {
         component: 'google-cloud-pubsub',
         'pubsub.method': 'receive',
@@ -163,7 +158,7 @@ class GoogleCloudPubsubPushSubscriptionPlugin extends TracingPlugin {
         'pubsub.message_id': message.messageId,
         'pubsub.subscription_type': 'push',
         'pubsub.topic': topicName,
-        '_dd.base_service': baseService,
+        '_dd.base_service': this.tracer._service,
         '_dd.serviceoverride.type': 'integration',
         'resource.name': `Push Subscription ${subscriptionName}`,
       },

package/packages/datadog-plugin-http/src/client.js

@@ -40,10 +40,10 @@ class HttpClientPlugin extends ClientPlugin {
     const span = this.startSpan(this.operationName(), {
       childOf,
       integrationName: this.constructor.id,
+      service: this.serviceName({ pluginConfig: this.config, sessionDetails: extractSessionDetails(options) }),
       meta: {
         [COMPONENT]: this.constructor.id,
         'span.kind': 'client',
-        'service.name': this.serviceName({ pluginConfig: this.config, sessionDetails: extractSessionDetails(options) }),
         'resource.name': method,
         'span.type': 'http',
         'http.method': method,

package/packages/datadog-plugin-http/src/server.js

@@ -2,9 +2,12 @@
 
 const ServerPlugin = require('../../dd-trace/src/plugins/server')
 const { storage } = require('../../datadog-core')
+const { withRequest } = require('../../dd-trace/src/appsec/store')
 const web = require('../../dd-trace/src/plugins/util/web')
 const { incomingHttpRequestStart, incomingHttpRequestEnd } = require('../../dd-trace/src/appsec/channels')
-const { COMPONENT } = require('../../dd-trace/src/constants')
+const { COMPONENT, SVC_SRC_KEY } = require('../../dd-trace/src/constants')
+
+const legacyStorage = storage('legacy')
 
 class HttpServerPlugin extends ServerPlugin {
   static id = 'http'
@@ -17,31 +20,36 @@ class HttpServerPlugin extends ServerPlugin {
   }
 
   start ({ req, res, abortController }) {
-    let store = storage('legacy').getStore()
+    let store = legacyStorage.getStore()
+    const { name: schemaServiceName, source: schemaServiceSource } = this.serviceName()
+    const service = this.config.service || schemaServiceName
+    const serviceSource = (this.config.service && service !== this.tracer._service)
+      ? 'opt.plugin'
+      : (service === this.tracer._service ? undefined : schemaServiceSource)
     const span = web.startSpan(
       this.tracer,
       {
         ...this.config,
-        service: this.config.service || this.serviceName(),
+        service,
       },
       req,
       res,
       this.operationName()
     )
+    if (serviceSource !== undefined) {
+      span.setTag(SVC_SRC_KEY, serviceSource)
+    }
     span.setTag(COMPONENT, this.constructor.id)
     span._integrationName = this.constructor.id
 
     const context = web.getContext(req)
+    context.parentStore = store
 
-    if (context) {
-      context.parentStore = store
-    }
-
-    // Only AppSec needs the request scope to be active for any async work that
-    // may be scheduled after the synchronous `request` event returns (e.g.
-    // Fastify).
-    if (incomingHttpRequestStart.hasSubscribers) {
-      store = { ...store, req, res }
+    const appsecActive = incomingHttpRequestStart.hasSubscribers
+    if (appsecActive) {
+      // AppSec, IAST, and AI Guard need req on the store so downstream
+      // subscribers can access them from the async context.
+      store = withRequest(store, req)
     }
 
     this.enter(span, store)
@@ -51,7 +59,7 @@ class HttpServerPlugin extends ServerPlugin {
       context.instrumented = true
     }
 
-    if (incomingHttpRequestStart.hasSubscribers) {
+    if (appsecActive) {
       incomingHttpRequestStart.publish({ req, res, abortController }) // TODO: no need to make a new object here
     }
   }

package/packages/datadog-plugin-http2/src/client.js

@@ -41,10 +41,10 @@ class Http2ClientPlugin extends ClientPlugin {
     const span = this.startSpan(this.operationName(), {
       childOf,
       integrationName: this.constructor.id,
+      service: this.serviceName({ pluginConfig: this.config, sessionDetails }),
       meta: {
         [COMPONENT]: this.constructor.id,
         [SPAN_KIND]: CLIENT,
-        'service.name': this.serviceName({ pluginConfig: this.config, sessionDetails }),
         'resource.name': method,
         'span.type': 'http',
         'http.method': method,

package/packages/datadog-plugin-http2/src/server.js

@@ -4,7 +4,7 @@
 
 const ServerPlugin = require('../../dd-trace/src/plugins/server')
 const web = require('../../dd-trace/src/plugins/util/web')
-const { COMPONENT } = require('../../dd-trace/src/constants')
+const { COMPONENT, SVC_SRC_KEY } = require('../../dd-trace/src/constants')
 
 class Http2ServerPlugin extends ServerPlugin {
   constructor (tracer, config) {
@@ -19,17 +19,25 @@ class Http2ServerPlugin extends ServerPlugin {
   bindStart (ctx) {
     const { req, res } = ctx
 
+    const { name: schemaServiceName, source: schemaServiceSource } = this.serviceName()
+    const service = this.config.service || schemaServiceName
+    const serviceSource = (this.config.service && service !== this.tracer._service)
+      ? 'opt.plugin'
+      : (service === this.tracer._service ? undefined : schemaServiceSource)
     const span = web.startSpan(
       this.tracer,
       {
         ...this.config,
-        service: this.config.service || this.serviceName(),
+        service,
       },
       req,
       res,
       this.operationName(),
       ctx
     )
+    if (serviceSource !== undefined) {
+      span.setTag(SVC_SRC_KEY, serviceSource)
+    }
 
     span.setTag(COMPONENT, this.constructor.id)
     span._integrationName = this.constructor.id

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

@@ -5,7 +5,7 @@ const realSetTimeout = setTimeout
 
 const CiPlugin = require('../../dd-trace/src/plugins/ci_plugin')
 const { storage } = require('../../datadog-core')
-const { getEnvironmentVariable, getValueFromEnvSources } = require('../../dd-trace/src/config/helper')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config/helper')
 const { appClosing: appClosingTelemetry } = require('../../dd-trace/src/telemetry')
 
 const {
@@ -166,7 +166,7 @@ class JestPlugin extends CiPlugin {
 
       this.telemetry.count(TELEMETRY_TEST_SESSION, {
         provider: this.ciProviderName,
-        autoInjected: !!getValueFromEnvSources('DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER'),
+        autoInjected: !!this._tracerConfig.DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER,
       })
 
       appClosingTelemetry()