fix(llmobs): additional options like for manual span instrumentation are properly recognized (#5424)

* fix approach to passing additional llm observability span options to the tagger

Author: sabrenner

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

@@ -105,12 +105,12 @@ class LLMObs extends NoopLLMObs {
 
     if (fn.length > 1) {
       return this._tracer.trace(name, spanOptions, (span, cb) =>
-        this._activate(span, { kind, options: llmobsOptions }, () => fn(span, cb))
+        this._activate(span, { kind, ...llmobsOptions }, () => fn(span, cb))
       )
     }
 
     return this._tracer.trace(name, spanOptions, span =>
-      this._activate(span, { kind, options: llmobsOptions }, () => fn(span))
+      this._activate(span, { kind, ...llmobsOptions }, () => fn(span))
     )
   }
 
@@ -166,7 +166,7 @@ class LLMObs extends NoopLLMObs {
       }
 
       try {
-        const result = llmobs._activate(span, { kind, options: llmobsOptions }, () => fn.apply(this, fnArgs))
+        const result = llmobs._activate(span, { kind, ...llmobsOptions }, () => fn.apply(this, fnArgs))
 
         if (result && typeof result.then === 'function') {
           return result.then(

packages/dd-trace/test/llmobs/sdk/index.spec.js

@@ -327,6 +327,29 @@ describe('sdk', () => {
           })
         })
       })
+
+      it('passes the options to the tagger correctly', () => {
+        let span
+        llmobs.trace({
+          kind: 'workflow',
+          name: 'test',
+          mlApp: 'override',
+          sessionId: 'sessionId',
+          modelName: 'modelName',
+          modelProvider: 'modelProvider'
+        }, (_span) => {
+          span = _span
+        })
+
+        expect(LLMObsTagger.tagMap.get(span)).to.deep.equal({
+          '_ml_obs.meta.span.kind': 'workflow',
+          '_ml_obs.meta.ml_app': 'override',
+          '_ml_obs.meta.model_name': 'modelName',
+          '_ml_obs.meta.model_provider': 'modelProvider',
+          '_ml_obs.session_id': 'sessionId',
+          '_ml_obs.llmobs_parent_id': 'undefined'
+        })
+      })
     })
 
     describe('wrap', () => {
@@ -745,6 +768,32 @@ describe('sdk', () => {
           wrappedOuter()
         })
       })
+
+      it('passes the options to the tagger correctly', () => {
+        let span
+
+        const fn = llmobs.wrap({
+          kind: 'workflow',
+          name: 'test',
+          mlApp: 'override',
+          sessionId: 'sessionId',
+          modelName: 'modelName',
+          modelProvider: 'modelProvider'
+        }, () => {
+          span = llmobs._active()
+        })
+
+        fn()
+
+        expect(LLMObsTagger.tagMap.get(span)).to.deep.equal({
+          '_ml_obs.meta.span.kind': 'workflow',
+          '_ml_obs.meta.ml_app': 'override',
+          '_ml_obs.meta.model_name': 'modelName',
+          '_ml_obs.meta.model_provider': 'modelProvider',
+          '_ml_obs.session_id': 'sessionId',
+          '_ml_obs.llmobs_parent_id': 'undefined'
+        })
+      })
     })
   })