@microsoft/opentelemetry 0.1.0-alpha.6 → 1.0.0

package/dist/commonjs/genai/instrumentations/langchain/tracer.js

@@ -58,22 +58,20 @@ const Utils = __importStar(require("./utils.js"));
  * - Skips LangChain-internal runs (tagged `langsmith:hidden`, `Branch*`, or
  *   unmapped run types) to avoid noisy traces.
  * - Guards against unbounded memory with a hard cap of {@link MAX_RUNS}.
- * - Content-sensitive attributes (messages, tool args, system instructions)
- *   are only recorded when `isContentRecordingEnabled` is true.
+ * - Content attributes (messages, tool args) are always recorded
+ *   (aligned with Python/.NET SDKs).
  */
 class LangChainTracer extends base_1.BaseTracer {
     /** Hard cap on concurrent tracked runs to prevent memory leaks. */
     static MAX_RUNS = 10_000;
     tracer;
-    isContentRecordingEnabled;
     /** Active runs keyed by LangChain run ID. */
     runs = new Map();
     /** Maps each run ID → its parent run ID for parent-span-context lookup. */
     parentByRunId = new Map();
-    constructor(tracer, options) {
+    constructor(tracer) {
         super();
         this.tracer = tracer;
-        this.isContentRecordingEnabled = options?.isContentRecordingEnabled ?? false;
     }
     name = "OpenTelemetryLangChainTracer";
     persistRun(_run) {
@@ -113,14 +111,18 @@ class LangChainTracer extends base_1.BaseTracer {
             : api_1.context.active();
         // Build span name: "<operation> <name|model>"
         let spanName = run.name;
+        let kind = api_1.SpanKind.INTERNAL;
         if (operation === "invoke_agent") {
             spanName = `${operation} ${run.name}`;
+            kind = api_1.SpanKind.SERVER;
         }
         else if (operation === "execute_tool") {
             spanName = `${operation} ${run.name}`;
+            kind = api_1.SpanKind.CLIENT;
         }
         else if (operation === "chat") {
             spanName = `${operation} ${Utils.getModel(run) || run.name}`.trim();
+            kind = api_1.SpanKind.CLIENT;
         }
         if (this.runs.size >= LangChainTracer.MAX_RUNS) {
             api_2.diag.warn(`[LangChainTracer] Max runs (${LangChainTracer.MAX_RUNS}) reached, skipping span`);
@@ -129,7 +131,7 @@ class LangChainTracer extends base_1.BaseTracer {
         }
         const startTime = run.start_time ?? Date.now();
         const span = this.tracer.startSpan(spanName, {
-            kind: api_1.SpanKind.INTERNAL,
+            kind,
             startTime,
             attributes: { [index_js_1.ATTR_GEN_AI_PROVIDER_NAME]: "langchain" },
         }, activeContext);
@@ -137,8 +139,7 @@ class LangChainTracer extends base_1.BaseTracer {
     }
     /**
      * Called by LangChain when a run finishes. Sets status, enriches the span
-     * with GenAI attributes, and ends it. If content recording is enabled,
-     * message bodies, tool arguments, and system instructions are also attached.
+     * with GenAI attributes, and ends it.
      */
     async _endTrace(run) {
         if ((0, core_1.isTracingSuppressed)(api_1.context.active())) {
@@ -168,6 +169,11 @@ class LangChainTracer extends base_1.BaseTracer {
             if (run.error) {
                 span.setStatus({ code: api_1.SpanStatusCode.ERROR });
                 span.setAttribute(index_js_1.ATTR_ERROR_MESSAGE, String(run.error));
+                const errorType = run.error?.name ??
+                    run.error?.constructor?.name;
+                if (typeof errorType === "string" && errorType.length > 0) {
+                    span.setAttribute(index_js_1.ATTR_ERROR_TYPE, errorType);
+                }
             }
             else {
                 span.setStatus({ code: api_1.SpanStatusCode.OK });
@@ -175,17 +181,21 @@ class LangChainTracer extends base_1.BaseTracer {
             // Always-on attributes: operation type, agent info, model, provider, session, tokens
             Utils.setOperationTypeAttribute(operation, span);
             Utils.setAgentAttributes(run, span);
+            if (operation === "invoke_agent") {
+                const callerName = this.findCallerAgentName(run);
+                if (callerName) {
+                    span.setAttribute(index_js_1.ATTR_GEN_AI_CALLER_AGENT_NAME, callerName);
+                }
+            }
             Utils.setModelAttribute(run, span);
             Utils.setProviderNameAttribute(run, span);
             Utils.setSessionIdAttribute(run, span);
             Utils.setTokenAttributes(run, span);
-            // Opt-in content attributes (may contain PII / large payloads)
-            if (this.isContentRecordingEnabled) {
-                Utils.setToolAttributes(run, span);
-                Utils.setInputMessagesAttribute(run, span);
-                Utils.setOutputMessagesAttribute(run, span);
-                Utils.setSystemInstructionsAttribute(run, span);
-            }
+            // Content attributes — always recorded (aligned with Python/.NET SDKs)
+            Utils.setToolAttributes(run, span);
+            Utils.setInputMessagesAttribute(run, span);
+            Utils.setOutputMessagesAttribute(run, span);
+            Utils.setSystemInstructionsAttribute(run, span);
         }
         catch (error) {
             api_2.diag.error(`[LangChainTracer] Error setting span attributes for run ${run.name}: ${error instanceof Error ? error.message : String(error)}`);
@@ -213,6 +223,21 @@ class LangChainTracer extends base_1.BaseTracer {
         }
         return undefined;
     }
+    /**
+     * Walk up the parent run chain to find the nearest ancestor that is an
+     * invoke_agent run, returning its name as the caller agent name.
+     */
+    findCallerAgentName(run) {
+        let pid = run.parent_run_id;
+        while (pid) {
+            const entry = this.runs.get(pid);
+            if (entry && Utils.getOperationType(entry.run) === "invoke_agent") {
+                return entry.run.name;
+            }
+            pid = this.parentByRunId.get(pid);
+        }
+        return undefined;
+    }
 }
 exports.LangChainTracer = LangChainTracer;
 //# sourceMappingURL=tracer.js.map

package/dist/commonjs/genai/instrumentations/langchain/tracer.js.map

@@ -1 +1 @@
-{"version":3,"file":"tracer.js","sourceRoot":"","sources":["../../../../../src/genai/instrumentations/langchain/tracer.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;AAClC,kGAAkG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAElG,4CAA4F;AAC5F,uDAA+D;AAC/D,8CAA0D;AAC1D,4CAA0C;AAC1C,6CAA+E;AAC/E,kDAAoC;AAIpC;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAa,eAAgB,SAAQ,iBAAU;IAC7C,mEAAmE;IAC3D,MAAM,CAAU,QAAQ,GAAG,MAAM,CAAC;IAClC,MAAM,CAAS;IACf,yBAAyB,CAAU;IAC3C,6CAA6C;IACrC,IAAI,GAAG,IAAI,GAAG,EAAuB,CAAC;IAC9C,2EAA2E;IACnE,aAAa,GAAG,IAAI,GAAG,EAA8B,CAAC;IAE9D,YAAY,MAAc,EAAE,OAAiD;QAC3E,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,yBAAyB,GAAG,OAAO,EAAE,yBAAyB,IAAI,KAAK,CAAC;IAC/E,CAAC;IAED,IAAI,GAAG,8BAA8B,CAAC;IAE5B,UAAU,CAAC,IAAS;QAC5B,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,WAAW,CAAC,GAAQ;QACxB,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,CAAC,aAAa,CAAC,CAAC;QAClD,IAAI,KAAK,CAAC,WAAW;YAAE,MAAM,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QACpD,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IACzB,CAAC;IAED;;;;OAIG;IACO,YAAY,CAAC,GAAQ;QAC7B,IAAI,IAAA,0BAAmB,EAAC,aAAO,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC;YAC1C,OAAO;QACT,CAAC;QAED,MAAM,SAAS,GAAG,KAAK,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;QAE9C,0EAA0E;QAC1E,IACE,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,kBAAkB,CAAC;YACtC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,QAAQ,CAAC;YAC9B,SAAS,KAAK,SAAS,EACvB,CAAC;YACD,UAAI,CAAC,KAAK,CACR,4CAA4C,GAAG,CAAC,IAAI,aAAa,GAAG,CAAC,aAAa,GAAG,CACtF,CAAC;YACF,OAAO;QACT,CAAC;QAED,2DAA2D;QAC3D,MAAM,SAAS,GAAG,IAAI,CAAC,2BAA2B,CAAC,GAAG,CAAC,CAAC;QACxD,MAAM,aAAa,GAAG,SAAS;YAC7B,CAAC,CAAC,WAAK,CAAC,cAAc,CAAC,aAAO,CAAC,MAAM,EAAE,EAAE,SAAS,CAAC;YACnD,CAAC,CAAC,aAAO,CAAC,MAAM,EAAE,CAAC;QAErB,8CAA8C;QAC9C,IAAI,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC;QACxB,IAAI,SAAS,KAAK,cAAc,EAAE,CAAC;YACjC,QAAQ,GAAG,GAAG,SAAS,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC;QACxC,CAAC;aAAM,IAAI,SAAS,KAAK,cAAc,EAAE,CAAC;YACxC,QAAQ,GAAG,GAAG,SAAS,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC;QACxC,CAAC;aAAM,IAAI,SAAS,KAAK,MAAM,EAAE,CAAC;YAChC,QAAQ,GAAG,GAAG,SAAS,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC;QACtE,CAAC;QAED,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,eAAe,CAAC,QAAQ,EAAE,CAAC;YAC/C,UAAI,CAAC,IAAI,CAAC,+BAA+B,eAAe,CAAC,QAAQ,0BAA0B,CAAC,CAAC;YAC7F,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAClC,OAAO;QACT,CAAC;QAED,MAAM,SAAS,GAAG,GAAG,CAAC,UAAU,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;QAC/C,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAChC,QAAQ,EACR;YACE,IAAI,EAAE,cAAQ,CAAC,QAAQ;YACvB,SAAS;YACT,UAAU,EAAE,EAAE,CAAC,oCAAyB,CAAC,EAAE,WAAW,EAAE;SACzD,EACD,aAAa,CACd,CAAC;QAEF,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,cAAc,EAAE,SAAS,EAAE,CAAC,CAAC;IAC7E,CAAC;IAED;;;;OAIG;IACO,KAAK,CAAC,SAAS,CAAC,GAAQ;QAChC,IAAI,IAAA,0BAAmB,EAAC,aAAO,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC;YAC1C,mEAAmE;YACnE,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAC9C,IAAI,eAAe,EAAE,CAAC;gBACpB,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,IAAI,SAAS,CAAC,CAAC;YACtD,CAAC;YACD,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAClC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACzB,OAAO;QACT,CAAC;QAED,MAAM,SAAS,GAAG,KAAK,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;QAC9C,IACE,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,kBAAkB,CAAC;YACtC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,QAAQ,CAAC;YAC9B,SAAS,KAAK,SAAS,EACvB,CAAC;YACD,UAAI,CAAC,KAAK,CACR,4CAA4C,GAAG,CAAC,IAAI,aAAa,GAAG,CAAC,aAAa,GAAG,CACtF,CAAC;YACF,OAAO;QACT,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACpC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO;QACT,CAAC;QAED,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;QACvB,IAAI,CAAC;YACH,KAAK,CAAC,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAElC,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;gBACd,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,oBAAc,CAAC,KAAK,EAAE,CAAC,CAAC;gBAC/C,IAAI,CAAC,YAAY,CAAC,6BAAkB,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;YAC3D,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,oBAAc,CAAC,EAAE,EAAE,CAAC,CAAC;YAC9C,CAAC;YAED,qFAAqF;YACrF,KAAK,CAAC,yBAAyB,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;YACjD,KAAK,CAAC,kBAAkB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YACpC,KAAK,CAAC,iBAAiB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YACnC,KAAK,CAAC,wBAAwB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YAC1C,KAAK,CAAC,qBAAqB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YACvC,KAAK,CAAC,kBAAkB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YAEpC,+DAA+D;YAC/D,IAAI,IAAI,CAAC,yBAAyB,EAAE,CAAC;gBACnC,KAAK,CAAC,iBAAiB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;gBACnC,KAAK,CAAC,yBAAyB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;gBAC3C,KAAK,CAAC,0BAA0B,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;gBAC5C,KAAK,CAAC,8BAA8B,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YAClD,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,UAAI,CAAC,KAAK,CACR,2DAA2D,GAAG,CAAC,IAAI,KAAK,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CACjI,CAAC;YACF,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,oBAAc,CAAC,KAAK,EAAE,CAAC,CAAC;QACjD,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,IAAI,SAAS,CAAC,CAAC;YACpC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACzB,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAClC,MAAM,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC;IAED;;;;OAIG;IACK,2BAA2B,CAAC,GAAQ;QAC1C,IAAI,GAAG,GAAG,GAAG,CAAC,aAAa,CAAC;QAE5B,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACjC,IAAI,KAAK;gBAAE,OAAO,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YAC3C,GAAG,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACpC,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;;AAnLH,0CAoLC"}
+{"version":3,"file":"tracer.js","sourceRoot":"","sources":["../../../../../src/genai/instrumentations/langchain/tracer.ts"],"names":[],"mappings":"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"}

package/dist/commonjs/genai/instrumentations/langchain/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/genai/instrumentations/langchain/utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,GAAG,EAAE,MAAM,8BAA8B,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAuB1C,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAExD;AAGD,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,CAWjD;AAGD,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,QAEtE;AAGD,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,QAOtD;AAGD,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,QAyBrD;AAED,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,QAwB7D;AA+ED,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,QAgE9D;AAGD,wBAAgB,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,GAAG,SAAS,CASrD;AAGD,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,QAGrD;AAGD,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,QAG5D;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,GAAG,IAAI,CAShE;AAGD,wBAAgB,8BAA8B,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,oBAuBlE;AAGD,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,QA2BtD"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/genai/instrumentations/langchain/utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,GAAG,EAAE,MAAM,8BAA8B,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAiC1C,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAExD;AAGD,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,CAWjD;AAGD,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,QAEtE;AAGD,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,QAOtD;AAGD,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,QA4CrD;AAED,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,QAgC7D;AAmOD,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,QA6D9D;AAGD,wBAAgB,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,GAAG,SAAS,CAarD;AAGD,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,QAGrD;AAGD,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,QAG5D;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,GAAG,IAAI,CAahE;AAGD,wBAAgB,8BAA8B,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,oBA+BlE;AAGD,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,QAoCtD"}

package/dist/commonjs/genai/instrumentations/langchain/utils.js

@@ -17,6 +17,8 @@ exports.setSessionIdAttribute = setSessionIdAttribute;
 exports.setSystemInstructionsAttribute = setSystemInstructionsAttribute;
 exports.setTokenAttributes = setTokenAttributes;
 const index_js_1 = require("../../index.js");
+const message_utils_js_1 = require("../../../a365/message-utils.js");
+const contracts_js_1 = require("../../../a365/contracts.js");
 // Type guards
 function isString(value) {
     return typeof value === "string";
@@ -59,49 +61,78 @@ function setToolAttributes(run, span) {
     if (isString(run.name)) {
         span.setAttribute(index_js_1.ATTR_GEN_AI_TOOL_NAME, run.name);
     }
-    if (run.inputs)
-        span.setAttribute(index_js_1.ATTR_GEN_AI_TOOL_CALL_ARGUMENTS, JSON.stringify(run.inputs?.input ?? run.inputs));
-    if (run.outputs?.output?.kwargs?.content)
-        span.setAttribute(index_js_1.ATTR_GEN_AI_TOOL_CALL_RESULT, JSON.stringify(run.outputs?.output?.kwargs?.content));
+    if (run.inputs) {
+        const argsValue = run.inputs?.input ?? run.inputs;
+        span.setAttribute(index_js_1.ATTR_GEN_AI_TOOL_CALL_ARGUMENTS, (0, message_utils_js_1.safeSerializeToJson)(typeof argsValue === "object" ? argsValue : String(argsValue), "arguments"));
+    }
+    // Tool result: v0 uses output.kwargs.content, v1 returns output as a plain string or has content directly
+    const toolResult = run.outputs?.output?.kwargs?.content ??
+        (isString(run.outputs?.output) ? run.outputs.output : null) ??
+        run.outputs?.output?.content;
+    if (toolResult != null) {
+        span.setAttribute(index_js_1.ATTR_GEN_AI_TOOL_CALL_RESULT, (0, message_utils_js_1.safeSerializeToJson)(typeof toolResult === "object"
+            ? toolResult
+            : String(toolResult), "result"));
+    }
     span.setAttribute(index_js_1.ATTR_GEN_AI_TOOL_TYPE, "extension");
-    if (run.outputs?.output?.tool_call_id)
-        span.setAttribute(index_js_1.ATTR_GEN_AI_TOOL_CALL_ID, run.outputs?.output?.tool_call_id);
+    // Tool call ID: v0 uses output.tool_call_id, v1 may have it on inputs
+    const toolCallId = run.outputs?.output?.tool_call_id ?? run.inputs?.tool_call_id;
+    if (toolCallId)
+        span.setAttribute(index_js_1.ATTR_GEN_AI_TOOL_CALL_ID, toolCallId);
 }
 function setInputMessagesAttribute(run, span) {
     const messages = run.inputs?.messages;
     if (!Array.isArray(messages)) {
         return;
     }
-    const preprocess = getScopeType(run) === "inference" && messages.length > 0 ? messages[0] : messages;
-    const processed = preprocess
-        ?.map((msg) => {
-        const content = extractMessageContent(msg);
-        if (!content)
-            return null;
-        const msgType = getMessageType(msg);
-        if (shouldIncludeInputMessage(msgType)) {
-            return content;
-        }
-        return null;
-    })
-        .filter(Boolean);
-    if (processed.length > 0) {
-        span.setAttribute(index_js_1.ATTR_GEN_AI_INPUT_MESSAGES, JSON.stringify(processed));
+    // LangChain may provide messages as a direct array or as a single nested array.
+    // Normalize both shapes so agent/inference inputs are consistently processed.
+    const preprocess = getScopeType(run) !== "unknown" && messages.length > 0 && Array.isArray(messages[0])
+        ? messages[0]
+        : messages;
+    const chatMessages = [];
+    for (const msg of preprocess) {
+        if (!msg || typeof msg !== "object")
+            continue;
+        const msgObj = msg;
+        const parts = buildPartsFromMessage(msgObj);
+        if (parts.length === 0)
+            continue;
+        const msgType = getMessageType(msgObj);
+        const role = mapLangChainRole(msgType);
+        chatMessages.push({ role, parts });
+    }
+    if (chatMessages.length > 0) {
+        const wrapper = {
+            version: contracts_js_1.A365_MESSAGE_SCHEMA_VERSION,
+            messages: chatMessages,
+        };
+        span.setAttribute(index_js_1.ATTR_GEN_AI_INPUT_MESSAGES, (0, message_utils_js_1.serializeMessages)(wrapper));
     }
 }
-// Helper: Extract message content from various formats
-function extractMessageContent(msg) {
-    // Simple format: {role: "user", content}
-    if (isString(msg.content)) {
-        return msg.content;
+// Helper: Extract string content from a message (used for fallback text extraction and system instructions)
+function extractStringContent(msg) {
+    const raw = extractRawContent(msg);
+    return isString(raw) ? raw : null;
+}
+// Helper: Extract raw content (string or content block array) from various message formats
+function extractRawContent(msg) {
+    // Simple format: {role: "user", content: string | array}
+    if (msg.content !== undefined && msg.content !== null) {
+        if (isString(msg.content))
+            return msg.content;
+        if (Array.isArray(msg.content))
+            return msg.content;
     }
     // LangChain format: {lc_type: "human", lc_kwargs: {content}}
     if (msg.lc_kwargs && typeof msg.lc_kwargs === "object" && !Array.isArray(msg.lc_kwargs)) {
         const kwargs = msg.lc_kwargs;
         if (isString(kwargs.content))
             return kwargs.content;
+        if (Array.isArray(kwargs.content))
+            return kwargs.content;
     }
-    // New LangChain format: {lc: 1, type: "constructor", kwargs: {content}}
+    // LangChain v1 serialized class instance format: { lc: 1, type: "constructor", kwargs: {...} }
     if (msg.lc === 1 &&
         msg.type === "constructor" &&
         msg.kwargs &&
@@ -110,9 +141,140 @@ function extractMessageContent(msg) {
         const kwargs = msg.kwargs;
         if (isString(kwargs.content))
             return kwargs.content;
+        if (Array.isArray(kwargs.content))
+            return kwargs.content;
     }
     return null;
 }
+// Helper: Map LangChain message type to MessageRole
+function mapLangChainRole(msgType) {
+    switch (msgType) {
+        case "user":
+        case "human":
+            return contracts_js_1.MessageRole.USER;
+        case "assistant":
+        case "ai":
+            return contracts_js_1.MessageRole.ASSISTANT;
+        case "system":
+            return contracts_js_1.MessageRole.SYSTEM;
+        case "tool":
+            return contracts_js_1.MessageRole.TOOL;
+        default:
+            return msgType;
+    }
+}
+// Helper: Build MessagePart[] from a LangChain message
+function buildPartsFromMessage(msg) {
+    const parts = [];
+    const rawContent = extractRawContent(msg);
+    const addUnknownBlockPart = (blockType, block) => {
+        try {
+            parts.push({ type: blockType, content: JSON.stringify(block) });
+        }
+        catch {
+            parts.push({ type: blockType, content: "[unserializable]" });
+        }
+    };
+    const addPartFromContentBlock = (block) => {
+        if (!block || typeof block !== "object")
+            return;
+        const contentBlock = block;
+        const blockType = contentBlock.type;
+        if (!blockType)
+            return;
+        if (blockType === "text" && isString(contentBlock.text)) {
+            parts.push({ type: "text", content: contentBlock.text });
+            return;
+        }
+        if (blockType === "reasoning" && isString(contentBlock.reasoning)) {
+            parts.push({ type: "reasoning", content: contentBlock.reasoning });
+            return;
+        }
+        if (blockType === "tool_call") {
+            parts.push({
+                type: "tool_call",
+                name: String(contentBlock.name ?? ""),
+                id: contentBlock.id != null ? String(contentBlock.id) : undefined,
+                arguments: contentBlock.args && typeof contentBlock.args === "object"
+                    ? contentBlock.args
+                    : undefined,
+            });
+            return;
+        }
+        addUnknownBlockPart(blockType, contentBlock);
+    };
+    if (isString(rawContent)) {
+        parts.push({ type: "text", content: rawContent });
+    }
+    else if (Array.isArray(rawContent)) {
+        for (const block of rawContent) {
+            addPartFromContentBlock(block);
+        }
+    }
+    // Extract tool_calls from the message (AI messages may have a separate tool_calls array)
+    // Deduplicate by ID to avoid duplicates when tool_calls appear in both content blocks and tool_calls array
+    const seenToolCallIds = new Set();
+    for (const part of parts) {
+        if (part.type !== "tool_call")
+            continue;
+        const partId = part.id;
+        if (isString(partId)) {
+            seenToolCallIds.add(partId);
+        }
+    }
+    for (const toolCall of extractToolCalls(msg)) {
+        const toolCallId = toolCall.id;
+        if (isString(toolCallId) && seenToolCallIds.has(toolCallId)) {
+            continue;
+        }
+        if (isString(toolCallId)) {
+            seenToolCallIds.add(toolCallId);
+        }
+        parts.push(toolCall);
+    }
+    // Fallback: if no parts were built, use text extraction
+    if (parts.length === 0) {
+        const textContent = extractStringContent(msg);
+        if (textContent) {
+            parts.push({ type: "text", content: textContent });
+        }
+    }
+    return parts;
+}
+// Helper: Extract tool_calls from a LangChain message
+function extractToolCalls(msg) {
+    const parts = [];
+    // Standard format: message.tool_calls[] — check direct, lc_kwargs, and kwargs paths
+    const directToolCalls = getNestedValue(msg, "tool_calls") ??
+        getNestedValue(msg, "lc_kwargs", "tool_calls") ??
+        getNestedValue(msg, "kwargs", "tool_calls");
+    if (Array.isArray(directToolCalls)) {
+        for (const tc of directToolCalls) {
+            if (!tc || typeof tc !== "object")
+                continue;
+            const call = tc;
+            parts.push({
+                type: "tool_call",
+                name: String(call.name ?? ""),
+                id: call.id != null ? String(call.id) : undefined,
+                arguments: call.args && typeof call.args === "object"
+                    ? call.args
+                    : undefined,
+            });
+        }
+    }
+    return parts;
+}
+// Helper: Safely get a nested value from a message object
+function getNestedValue(obj, ...keys) {
+    let current = obj;
+    for (const key of keys) {
+        if (!current || typeof current !== "object" || Array.isArray(current))
+            return undefined;
+        current = current[key];
+    }
+    return current;
+}
 // Helper: Determine message type
 function getMessageType(msg) {
     // Simple format
@@ -121,9 +283,10 @@ function getMessageType(msg) {
     // LangChain old format
     if (isString(msg.lc_type))
         return msg.lc_type;
-    if (isString(msg.type))
+    // Skip v1 constructor type marker — fall through to id array check
+    if (isString(msg.type) && msg.type !== "constructor")
         return msg.type;
-    // LangChain new format - check id array for message type
+    // LangChain v1 format - check id array for message type (e.g., ["langchain_core", "messages", "HumanMessage"])
     if (Array.isArray(msg.id)) {
         const lastId = msg.id[msg.id.length - 1];
         if (isString(lastId)) {
@@ -133,6 +296,8 @@ function getMessageType(msg) {
                 return "ai";
             if (lastId.includes("System"))
                 return "system";
+            if (lastId.includes("Tool"))
+                return "tool";
         }
     }
     return "unknown";
@@ -150,11 +315,6 @@ function getScopeType(run) {
     }
     return "unknown";
 }
-// Helper: Check if input message should be included based on scope and message type
-function shouldIncludeInputMessage(msgType) {
-    // For input messages: all scopes want user/human messages only
-    return msgType === "user" || msgType === "human";
-}
 // Helper: Check if output message should be included based on scope and message type
 function shouldIncludeOutputMessage(scopeType, msgType) {
     if (scopeType === "agent" || scopeType === "inference") {
@@ -174,18 +334,23 @@ function setOutputMessagesAttribute(run, span) {
         return;
     }
     const scopeType = getScopeType(run);
-    const messages = [];
+    const outputMessages = [];
+    // Helper: process a single message object into an OutputMessage
+    const processMessage = (msg) => {
+        const msgType = getMessageType(msg);
+        if (!shouldIncludeOutputMessage(scopeType, msgType))
+            return;
+        const parts = buildPartsFromMessage(msg);
+        if (parts.length === 0)
+            return;
+        const role = mapLangChainRole(msgType);
+        outputMessages.push({ role, parts });
+    };
     // Direct messages array (used in agent/chain outputs)
     if (Array.isArray(outputs.messages)) {
-        outputs.messages.forEach((msg) => {
-            const content = extractMessageContent(msg);
-            if (!content)
-                return;
-            const msgType = getMessageType(msg);
-            if (shouldIncludeOutputMessage(scopeType, msgType)) {
-                messages.push(content);
-            }
-        });
+        for (const msg of outputs.messages) {
+            processMessage(msg);
+        }
     }
     // LangChain generations format (used in LLM/inference outputs)
     if (Array.isArray(outputs.generations)) {
@@ -194,19 +359,14 @@ function setOutputMessagesAttribute(run, span) {
                 gen.forEach((item) => {
                     // Try message property
                     if (item.message && typeof item.message === "object" && !Array.isArray(item.message)) {
-                        const msg = item.message;
-                        const content = extractMessageContent(msg);
-                        if (!content) {
-                            return;
-                        }
-                        const msgType = getMessageType(msg);
-                        if (shouldIncludeOutputMessage(scopeType, msgType)) {
-                            messages.push(content);
-                        }
+                        processMessage(item.message);
                     }
                     // Try direct text property (for generation items)
                     else if (isString(item.text) && scopeType === "inference") {
-                        messages.push(item.text);
+                        outputMessages.push({
+                            role: contracts_js_1.MessageRole.ASSISTANT,
+                            parts: [{ type: "text", content: item.text }],
+                        });
                     }
                 });
             }
@@ -214,23 +374,24 @@ function setOutputMessagesAttribute(run, span) {
     }
     // Check for direct message object (some models return this)
     if (outputs.message && typeof outputs.message === "object" && !Array.isArray(outputs.message)) {
-        const msg = outputs.message;
-        const content = extractMessageContent(msg);
-        if (content) {
-            const msgType = getMessageType(msg);
-            if (shouldIncludeOutputMessage(scopeType, msgType)) {
-                messages.push(content);
-            }
-        }
+        processMessage(outputs.message);
     }
-    if (messages.length > 0) {
-        span.setAttribute(index_js_1.ATTR_GEN_AI_OUTPUT_MESSAGES, JSON.stringify(messages));
+    if (outputMessages.length > 0) {
+        const wrapper = {
+            version: contracts_js_1.A365_MESSAGE_SCHEMA_VERSION,
+            messages: outputMessages,
+        };
+        span.setAttribute(index_js_1.ATTR_GEN_AI_OUTPUT_MESSAGES, (0, message_utils_js_1.serializeMessages)(wrapper));
     }
 }
 // Model - Helper to extract model name from run
 function getModel(run) {
     return [
+        // v1: response_metadata directly on message
+        run.outputs?.generations?.[0]?.[0]?.message?.response_metadata?.model_name,
+        // v0: response_metadata nested under kwargs
         run.outputs?.generations?.[0]?.[0]?.message?.kwargs?.response_metadata?.model_name,
+        // Metadata paths (both v0 and v1)
         run.extra?.metadata?.ls_model_name,
         run.extra?.invocation_params?.model,
         run.extra?.invocation_params?.model_name,
@@ -254,10 +415,14 @@ function setSessionIdAttribute(run, span) {
     const metadata = run.extra?.metadata;
     if (!metadata)
         return;
-    const sessionId = metadata.session_id ?? metadata.conversation_id ?? metadata.thread_id;
-    if (typeof sessionId === "string" && sessionId.length > 0) {
+    const sessionId = metadata.session_id ?? metadata.thread_id;
+    if (isString(sessionId) && sessionId.length > 0) {
         span.setAttribute(index_js_1.ATTR_MICROSOFT_SESSION_ID, sessionId);
     }
+    const conversationId = metadata.conversation_id;
+    if (isString(conversationId) && conversationId.length > 0) {
+        span.setAttribute(index_js_1.ATTR_GEN_AI_CONVERSATION_ID, conversationId);
+    }
 }
 // System instructions
 function setSystemInstructionsAttribute(run, span) {
@@ -273,10 +438,20 @@ function setSystemInstructionsAttribute(run, span) {
         : "";
     if (prompts)
         return span.setAttribute(index_js_1.ATTR_GEN_AI_SYSTEM_INSTRUCTIONS, prompts);
-    const messages = Array.isArray(inputs.messages) ? inputs.messages : [];
-    const systemText = messages
-        .filter((m) => m.lc_type === "system")
-        .map((m) => String(m.lc_kwargs?.content ?? "").trim())
+    // Check both flat and nested message arrays
+    const rawMessages = Array.isArray(inputs.messages) ? inputs.messages : [];
+    const flatMessages = rawMessages.length > 0 && Array.isArray(rawMessages[0])
+        ? rawMessages[0]
+        : rawMessages;
+    const systemText = flatMessages
+        .filter((m) => {
+        if (!m || typeof m !== "object")
+            return false;
+        const msgType = getMessageType(m);
+        return msgType === "system";
+    })
+        .map((m) => extractStringContent(m) ?? "")
+        .map((s) => s.trim())
         .filter(Boolean)
         .join("\n");
     if (systemText)
@@ -285,10 +460,15 @@ function setSystemInstructionsAttribute(run, span) {
 // Tokens (input and output)
 function setTokenAttributes(run, span) {
     // Try multiple paths to find usage metadata (LLM direct/kwargs/response_metadata, agent calls, and chain/model_request outputs)
+    // v1: usage_metadata is often on the last AI message in outputs.messages
+    const lastMsg = Array.isArray(run.outputs?.messages)
+        ? run.outputs.messages[run.outputs.messages.length - 1]
+        : undefined;
     const usage = run.outputs?.generations?.[0]?.[0]?.message?.usage_metadata ||
         run.outputs?.generations?.[0]?.[0]?.message?.kwargs?.usage_metadata ||
+        run.outputs?.generations?.[0]?.[0]?.message?.response_metadata?.tokenUsage ||
         run.outputs?.generations?.[0]?.[0]?.message?.kwargs?.response_metadata?.tokenUsage ||
-        run.outputs?.messages?.[1]?.usage_metadata ||
+        lastMsg?.usage_metadata ||
         run.outputs?.message?.response_metadata?.usage ||
         run.outputs?.message?.response_metadata?.tokenUsage ||
         run.outputs?.messages
@@ -298,11 +478,15 @@ function setTokenAttributes(run, span) {
         return;
     }
     const usageObj = usage;
-    if (typeof usageObj.input_tokens === "number") {
-        span.setAttribute(index_js_1.ATTR_GEN_AI_USAGE_INPUT_TOKENS, usageObj.input_tokens);
+    // Support both usage_metadata shape (input_tokens/output_tokens) and
+    // tokenUsage shape (promptTokens/completionTokens) from LangChain OpenAI provider
+    const inputTokens = usageObj.input_tokens ?? usageObj.promptTokens;
+    const outputTokens = usageObj.output_tokens ?? usageObj.completionTokens;
+    if (typeof inputTokens === "number") {
+        span.setAttribute(index_js_1.ATTR_GEN_AI_USAGE_INPUT_TOKENS, inputTokens);
     }
-    if (typeof usageObj.output_tokens === "number") {
-        span.setAttribute(index_js_1.ATTR_GEN_AI_USAGE_OUTPUT_TOKENS, usageObj.output_tokens);
+    if (typeof outputTokens === "number") {
+        span.setAttribute(index_js_1.ATTR_GEN_AI_USAGE_OUTPUT_TOKENS, outputTokens);
     }
 }
 // LangGraph agent check