feat(span): internal API split for Span

packages/datadog-plugin-child_process/src/index.js

@@ -31,10 +31,6 @@ class ChildProcessPlugin extends TracingPlugin {
   static id = 'child_process'
   static prefix = 'tracing:datadog:child_process:execution'
 
-  get tracer () {
-    return this._tracer
-  }
-
   start (ctx) {
     const { command, shell } = ctx
 

packages/datadog-plugin-child_process/test/index.spec.js

@@ -511,7 +511,7 @@ describe('Child process plugin', () => {
 
           beforeEach((done) => {
             if (hasParentSpan) {
-              parentSpan = tracer.startSpan('parent')
+              parentSpan = tracer.startSpan('parent')._span
               parentSpan.finish()
               tracer.scope().activate(parentSpan, done)
             } else {

packages/datadog-plugin-connect/test/index.spec.js

@@ -172,7 +172,7 @@ describe('Plugin', () => {
           let span
 
           app.use((req, res, next) => {
-            span = tracer.scope().active()
+            span = tracer.scope().active()._span
 
             sinon.spy(span, 'finish')
 

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

@@ -1047,11 +1047,10 @@ class CypressPlugin {
         if (isQuarantinedFromSupport) {
           this.activeTestSpan.setTag(TEST_MANAGEMENT_IS_QUARANTINED, 'true')
         }
-
         const finishedTest = {
           testName,
           testStatus,
-          finishTime: this.activeTestSpan._getTime(), // we store the finish time here
+          finishTime: this.activeTestSpan._span._getTime(), // we store the finish time here
           testSpan: this.activeTestSpan,
           isEfdRetry,
           isAttemptToFix,

packages/datadog-plugin-dd-trace-api/test/index.spec.js

@@ -144,6 +144,7 @@ describe('Plugin', () => {
           ret: dummySpan,
         })
         span = tracer.startSpan.getCall(0).returnValue
+        span = span._span || span
         sinon.spy(span)
       })
 
@@ -207,6 +208,7 @@ describe('Plugin', () => {
             fn: span.setTag,
             self: dummySpan,
             ret: dummySpan,
+            args: ['key', 'value'],
           })
         })
       })
@@ -218,6 +220,7 @@ describe('Plugin', () => {
             fn: span.addTags,
             self: dummySpan,
             ret: dummySpan,
+            args: [{ key: 'value' }],
           })
         })
       })
@@ -228,6 +231,7 @@ describe('Plugin', () => {
             name: 'span:finish',
             fn: span.finish,
             self: dummySpan,
+            args: [123],
           })
         })
       })

packages/datadog-plugin-express/test/index.spec.js

@@ -628,7 +628,7 @@ describe('Plugin', () => {
           let span
 
           app.use((req, res, next) => {
-            span = tracer.scope().active()
+            span = tracer.scope().active()._span
 
             sinon.spy(span, 'finish')
 

packages/datadog-plugin-koa/test/index.spec.js

@@ -192,7 +192,7 @@ describe('Plugin', () => {
           let childSpan
 
           app.use((ctx, next) => {
-            parentSpan = tracer.scope().active()
+            parentSpan = tracer.scope().active()._span
 
             sinon.spy(parentSpan, 'finish')
 
@@ -213,7 +213,7 @@ describe('Plugin', () => {
           })
 
           app.use((ctx, next) => {
-            childSpan = tracer.scope().active()
+            childSpan = tracer.scope().active()._span
 
             sinon.spy(childSpan, 'finish')
 

packages/datadog-plugin-redis/test/client.spec.js

@@ -136,10 +136,10 @@ describe('Plugin', () => {
         )
 
         it('should restore the parent context in the callback', async () => {
-          const span = {}
+          const span = tracer.startSpan('test')
           tracer.scope().activate(span, () => {
             client.get('foo', () => {
-              assert.strictEqual(span.context().active(), span)
+              assert.strictEqual(tracer.scope().active(), span)
             })
           })
         })

packages/datadog-plugin-rhea/test/index.spec.js

@@ -243,7 +243,7 @@ describe('Plugin', () => {
             it('should extract the span context', done => {
               container.once('message', msg => {
                 const span = tracer.scope().active()
-                assert.notStrictEqual(span._spanContext._parentId, null)
+                assert.notStrictEqual(span.context()._parentId, null)
                 done()
               })
               context.sender.send({ body: 'Hello World!' })

packages/dd-trace/src/aiguard/sdk.js

@@ -140,6 +140,7 @@ class AIGuard extends NoopAIGuard {
     }
     const { block = true } = opts ?? {}
     return this.#tracer.trace(AI_GUARD_RESOURCE, {}, async (span) => {
+      span = span?._span || span
       const last = messages[messages.length - 1]
       const target = this.#isToolCall(last) ? 'tool' : 'prompt'
       span.setTag(AI_GUARD_TARGET_TAG_KEY, target)

packages/dd-trace/src/constants.js

@@ -30,6 +30,7 @@ module.exports = {
   ERROR_STACK: 'error.stack',
   IGNORE_OTEL_ERROR: Symbol('ignore.otel.error'),
   COMPONENT: 'component',
+  SVC_SRC_KEY: '_dd.svc_src',
   CLIENT_PORT_KEY: 'network.destination.port',
   PEER_SERVICE_KEY: 'peer.service',
   PEER_SERVICE_SOURCE_KEY: '_dd.peer.service.source',

packages/dd-trace/src/llmobs/sdk.js

@@ -7,6 +7,26 @@ const tracerVersion = require('../../../../package.json').version
 const logger = require('../log')
 const { getValueFromEnvSources } = require('../config/helper')
 const Span = require('../opentracing/span')
+const PublicSpan = require('../opentracing/public/span')
+
+/**
+ * Checks whether a value is a Span or PublicSpan instance.
+ * @param {unknown} value
+ * @returns {boolean}
+ */
+function isSpan (value) {
+  return value instanceof Span || value instanceof PublicSpan
+}
+
+/**
+ * Returns the underlying raw DatadogSpan, unwrapping a PublicSpan if needed.
+ * @param {import('../opentracing/span') | PublicSpan} span
+ * @returns {import('../opentracing/span')}
+ */
+function unwrapSpan (span) {
+  return span instanceof PublicSpan ? span._span : span
+}
+
 const { SPAN_KIND, OUTPUT_VALUE, INPUT_VALUE } = require('./constants/tags')
 const {
   getFunctionArguments,
@@ -209,7 +229,7 @@ class LLMObs extends NoopLLMObs {
       span = this._active()
     }
 
-    if ((span && !options) && !(span instanceof Span)) {
+    if ((span && !options) && !isSpan(span)) {
       options = span
       span = this._active()
     }
@@ -230,7 +250,7 @@ class LLMObs extends NoopLLMObs {
         err = 'invalid_span_type'
         throw new Error('Span must be an LLMObs-generated span')
       }
-      if (span._duration !== undefined) {
+      if (unwrapSpan(span)._duration !== undefined) {
         err = 'invalid_finished_span'
         throw new Error('Cannot annotate a finished span')
       }
@@ -287,7 +307,7 @@ class LLMObs extends NoopLLMObs {
         err = 'no_active_span'
         throw new Error('No span provided and no active LLMObs-generated span found')
       }
-      if (!(span instanceof Span)) {
+      if (!isSpan(span)) {
         err = 'invalid_span'
         throw new TypeError('Span must be a valid Span object.')
       }

packages/dd-trace/src/llmobs/span_processor.js

@@ -9,6 +9,7 @@ const {
   ERROR_TYPE,
   ERROR_STACK,
 } = require('../constants')
+const PublicSpan = require('../opentracing/public/span')
 const {
   SPAN_KIND,
   MODEL_NAME,
@@ -35,6 +36,17 @@ const { UNSERIALIZABLE_VALUE_TEXT } = require('./constants/text')
 const telemetry = require('./telemetry')
 const LLMObsTagger = require('./tagger')
 
+/**
+ * Resolves the tagMap key for a raw span from the finish channel.
+ * Plugin-instrumented spans are registered with raw Span instances,
+ * while SDK spans are registered with PublicSpan wrappers.
+ */
+function resolveTagMapKey (span) {
+  if (LLMObsTagger.tagMap.has(span)) return span
+  const wrapped = new PublicSpan(span)
+  if (LLMObsTagger.tagMap.has(wrapped)) return wrapped
+}
+
 class LLMObservabilitySpan {
   constructor () {
     this.input = []
@@ -73,15 +85,19 @@ class LLMObsSpanProcessor {
   // TODO: instead of relying on the tagger's weakmap registry, can we use some namespaced storage correlation?
   process (span) {
     if (!this.#config.llmobs.enabled) return
+    // The finish channel always publishes raw Span instances, but the tagMap
+    // may be keyed by either a raw Span (plugin-instrumented) or a PublicSpan
+    // wrapper (SDK-instrumented). Resolve to whichever key is present.
+    const tagMapKey = resolveTagMapKey(span)
     // if the span is not in our private tagger map, it is not an llmobs span
-    if (!LLMObsTagger.tagMap.has(span)) return
+    if (!tagMapKey) return
 
     try {
-      const formattedEvent = this.format(span)
-      telemetry.incrementLLMObsSpanFinishedCount(span)
+      const formattedEvent = this.format(span, tagMapKey)
+      telemetry.incrementLLMObsSpanFinishedCount(tagMapKey)
       if (formattedEvent == null) return
 
-      const mlObsTags = LLMObsTagger.tagMap.get(span)
+      const mlObsTags = LLMObsTagger.tagMap.get(tagMapKey)
       const routing = {
         apiKey: mlObsTags[ROUTING_API_KEY],
         site: mlObsTags[ROUTING_SITE],
@@ -99,12 +115,12 @@ class LLMObsSpanProcessor {
     }
   }
 
-  format (span) {
+  format (span, tagMapKey) {
     const llmObsSpan = new LLMObservabilitySpan()
     let inputType, outputType
 
     const spanTags = span.context()._tags
-    const mlObsTags = LLMObsTagger.tagMap.get(span)
+    const mlObsTags = LLMObsTagger.tagMap.get(tagMapKey)
 
     const spanKind = mlObsTags[SPAN_KIND]
 
@@ -156,7 +172,7 @@ class LLMObsSpanProcessor {
 
     const name = mlObsTags[NAME] || span._name
 
-    const tags = this.#getTags(span, mlApp, sessionId, error)
+    const tags = this.#getTags(span, tagMapKey, mlApp, sessionId, error)
     llmObsSpan._tags = tags
 
     const processedSpan = this.#runProcessor(llmObsSpan)
@@ -246,7 +262,7 @@ class LLMObsSpanProcessor {
     add(obj, carrier)
   }
 
-  #getTags (span, mlApp, sessionId, error) {
+  #getTags (span, tagMapKey, mlApp, sessionId, error) {
     let tags = {
       ...this.#config.parsedDdTags,
       version: this.#config.version,
@@ -264,10 +280,10 @@ class LLMObsSpanProcessor {
 
     if (sessionId) tags.session_id = sessionId
 
-    const integration = LLMObsTagger.tagMap.get(span)?.[INTEGRATION]
+    const integration = LLMObsTagger.tagMap.get(tagMapKey)?.[INTEGRATION]
     if (integration) tags.integration = integration
 
-    const existingTags = LLMObsTagger.tagMap.get(span)?.[TAGS] || {}
+    const existingTags = LLMObsTagger.tagMap.get(tagMapKey)?.[TAGS] || {}
     if (existingTags) tags = { ...tags, ...existingTags }
 
     return tags

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

@@ -4,6 +4,8 @@ const NoopAppsecSdk = require('../appsec/sdk/noop')
 const NoopLLMObsSDK = require('../llmobs/noop')
 const NoopFlaggingProvider = require('../openfeature/noop')
 const NoopAIGuardSDK = require('../aiguard/noop')
+const PublicSpan = require('../opentracing/public/span')
+const { SVC_SRC_KEY } = require('../../src/constants')
 const NoopDogStatsDClient = require('./dogstatsd')
 const NoopTracer = require('./tracer')
 
@@ -51,6 +53,12 @@ class NoopProxy {
     if (typeof fn !== 'function') return
 
     options = options || {}
+    if (options.service || options?.tags?.service || options?.tags?.['service.name']) {
+      options.tags = {
+        ...options.tags,
+        [SVC_SRC_KEY]: 'm',
+      }
+    }
 
     return this._tracer.trace(name, options, fn)
   }
@@ -64,7 +72,12 @@ class NoopProxy {
     if (typeof fn !== 'function') return fn
 
     options = options || {}
-
+    if (options.service || options?.tags?.service || options?.tags?.['service.name']) {
+      options.tags = {
+        ...options.tags,
+        [SVC_SRC_KEY]: 'm',
+      }
+    }
     return this._tracer.wrap(name, options, fn)
   }
 
@@ -73,8 +86,14 @@ class NoopProxy {
     return this
   }
 
-  startSpan () {
-    return this._tracer.startSpan.apply(this._tracer, arguments)
+  startSpan (name, options) {
+    if (options?.tags?.service || options?.tags?.['service.name']) {
+      options.tags = {
+        ...options.tags,
+        [SVC_SRC_KEY]: 'm',
+      }
+    }
+    return new PublicSpan(this._tracer.startSpan.apply(this._tracer, arguments))
   }
 
   inject () {

packages/dd-trace/src/opentelemetry/context_manager.js

@@ -16,7 +16,8 @@ class ContextManager {
   active () {
     const store = this._store.getStore()
     const baseContext = store || ROOT_CONTEXT
-    const activeSpan = tracer.scope().active()
+    const publicSpan = tracer.scope().active()
+    const activeSpan = publicSpan?._span || publicSpan
 
     const storedSpan = store ? trace.getSpan(store) : null
 

packages/dd-trace/src/opentracing/public/scope.js

@@ -0,0 +1,24 @@
+'use strict'
+
+const PublicSpan = require('./span')
+
+class Scope {
+  constructor (scope) {
+    this._scope = scope
+  }
+
+  active () {
+    const span = this._scope.active()
+    return span ? new PublicSpan(span) : null
+  }
+
+  activate (span, fn) {
+    return this._scope.activate(span?._span || span, fn)
+  }
+
+  bind (fn, span) {
+    return this._scope.bind(fn, span?._span || span)
+  }
+}
+
+module.exports = Scope