neatlogs 1.1.6 → 1.1.8

package/dist/strands.mjs

@@ -1,140 +1,8 @@
 // src/strands.ts
-var PATCH_FLAG = "_neatlogs_patched";
-function strandsHooks(agent) {
-  installEventHookFromAgent(agent);
-  if (agent && typeof agent === "object") {
-    try {
-      Object.defineProperty(agent, PATCH_FLAG, {
-        value: true,
-        enumerable: false,
-        configurable: true
-      });
-    } catch {
-      agent[PATCH_FLAG] = true;
-    }
-  }
-  return agent;
-}
-function installEventHookFromAgent(agent) {
-  const tracer = agent?._tracer;
-  const proto = tracer ? Object.getPrototypeOf(tracer) : void 0;
-  if (!proto || typeof proto._addEvent !== "function") return;
-  if (proto._addEvent[PATCH_FLAG]) return;
-  const orig = proto._addEvent;
-  function patchedAddEvent(span, eventName, eventAttributes) {
-    const result = orig.call(this, span, eventName, eventAttributes);
-    try {
-      enrichSpanFromEvent(span, eventName, eventAttributes || {});
-    } catch {
-    }
-    return result;
-  }
-  patchedAddEvent[PATCH_FLAG] = true;
-  proto._addEvent = patchedAddEvent;
-}
-function enrichSpanFromEvent(span, eventName, attrs) {
-  if (!span || typeof span.setAttribute !== "function") return;
-  if (typeof span.isRecording === "function" && !span.isRecording()) return;
-  const isTool = readSpanOp(span) === "execute_tool";
-  if (eventName.startsWith("gen_ai.") && eventName.endsWith(".message")) {
-    const role = eventName.slice("gen_ai.".length, -".message".length);
-    const content = flattenStrandsContent(attrs.content);
-    if (content) {
-      if (isTool) {
-        span.setAttribute("input.value", content);
-        span.setAttribute("neatlogs.tool.input", content);
-      } else {
-        appendInputMessage(span, role, content);
-      }
-    }
-    return;
-  }
-  if (eventName === "gen_ai.choice") {
-    const out = flattenStrandsContent(attrs.message);
-    if (out) setOutput(span, isTool, out);
-    return;
-  }
-  if (eventName === "gen_ai.client.inference.operation.details") {
-    const out = flattenStrandsContent(attrs["gen_ai.output.messages"]);
-    if (out) setOutput(span, isTool, out);
-  }
-}
-function setOutput(span, isTool, out) {
-  span.setAttribute("output.value", out);
-  if (isTool) {
-    span.setAttribute("neatlogs.tool.output", out);
-  } else {
-    span.setAttribute("neatlogs.llm.output_messages.0.role", "assistant");
-    span.setAttribute("neatlogs.llm.output_messages.0.content", out);
-    span.setAttribute("neatlogs.llm.output", safeStringify({ role: "assistant", content: out }));
-  }
-}
-function appendInputMessage(span, role, content) {
-  const idx = span.__neatlogs_in_idx ?? 0;
-  span.setAttribute(`neatlogs.llm.input_messages.${idx}.role`, role);
-  span.setAttribute(`neatlogs.llm.input_messages.${idx}.content`, content);
-  span.__neatlogs_in_idx = idx + 1;
-  const existing = span.__neatlogs_in_msgs ?? [];
-  existing.push({ role, content });
-  span.__neatlogs_in_msgs = existing;
-  const blob = safeStringify({ messages: existing });
-  span.setAttribute("input.value", blob);
-  span.setAttribute("neatlogs.llm.input", blob);
-}
-function readSpanOp(span) {
-  try {
-    const a = span.attributes;
-    if (!a) return "";
-    const v = typeof a.get === "function" ? a.get("gen_ai.operation.name") : a["gen_ai.operation.name"];
-    return typeof v === "string" ? v.toLowerCase() : "";
-  } catch {
-    return "";
-  }
-}
-function flattenStrandsContent(content) {
-  if (content == null) return "";
-  let val = content;
-  if (typeof val === "string") {
-    const s = val.trim();
-    if (!(s.startsWith("[") || s.startsWith("{"))) return val;
-    try {
-      val = JSON.parse(s);
-    } catch {
-      return val;
-    }
-  }
-  return flattenBlocks(val);
-}
-function flattenBlocks(val) {
-  const items = Array.isArray(val) ? val : [val];
-  const out = [];
-  for (const item of items) {
-    if (typeof item === "string") {
-      out.push(item);
-      continue;
-    }
-    if (!item || typeof item !== "object") {
-      if (item != null) out.push(String(item));
-      continue;
-    }
-    const o = item;
-    if (typeof o.text === "string") out.push(o.text);
-    else if (typeof o.content === "string") out.push(o.content);
-    else if (o.toolUse) out.push(`${o.toolUse.name ?? "tool"}(${safeStringify(o.toolUse.input ?? {})})`);
-    else if (o.toolResult) out.push(flattenBlocks(o.toolResult.content ?? o.toolResult));
-    else if (Array.isArray(o.parts)) out.push(flattenBlocks(o.parts));
-    else if (Array.isArray(o.content)) out.push(flattenBlocks(o.content));
-    else out.push(safeStringify(o));
-  }
-  return out.filter(Boolean).join("\n");
-}
-function safeStringify(value) {
-  if (typeof value === "string") return value;
-  try {
-    return JSON.stringify(value) ?? "";
-  } catch {
-    return "";
-  }
+function strandsHooks(_agent) {
+  throw new Error(
+    "strandsHooks() is not supported because the Strands Agents tracer creates and activates spans on the global OpenTelemetry context (context.active() / context.with()), which cannot be isolated from other tracing SDKs (Datadog, etc.)."
+  );
 }
 export {
   strandsHooks

package/dist/strands.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/strands.ts"],"sourcesContent":["/**\n * Neatlogs Strands Agents integration.\n *\n * Usage:\n *   import { init } from 'neatlogs';\n *   import { strandsHooks } from 'neatlogs/strands';\n *   import { Agent } from '@strands-agents/sdk';\n *\n *   await init({ apiKey, workflowName });\n *   const agent = strandsHooks(new Agent({ model }));\n *\n * Strands self-instruments via native OpenTelemetry (gen_ai.* spans for agent /\n * model / tool calls), which `init()` captures and the attribute mapper classifies\n * (kind, model, token counts).\n *\n * BUT Strands records prompt/response CONTENT as OTel span EVENTS\n * (gen_ai.user.message, gen_ai.system.message, gen_ai.choice, gen_ai.tool.message,\n * gen_ai.client.inference.operation.details) — not as span attributes. neatlogs\n * renders I/O from attributes, so without help those spans show tokens but EMPTY\n * input/output. `strandsHooks()` installs a single class-level hook on Strands'\n * own `Tracer._addEvent` chokepoint: after Strands records a message/choice event,\n * we also copy its content onto the span as input.value / output.value (+ the LLM\n * message attributes). We do NOT create spans — Strands' native tracing stays the\n * source of truth; we only enrich it. Mirrors the Python SDK's strands hook.\n */\n\nconst PATCH_FLAG = '_neatlogs_patched';\n\nexport function strandsHooks<T extends object>(agent: T): T {\n  // Each Strands Agent constructs its OWN private Tracer (`agent._tracer = new\n  // Tracer(...)`), and the Tracer class is NOT publicly exported — so we reach it\n  // through the agent instance and patch its `_addEvent` chokepoint. Patching the\n  // PROTOTYPE (reached via the instance) covers every agent sharing that class and\n  // is idempotent. This is the only access path: the package's exports map blocks\n  // deep imports and the top-level index doesn't export Tracer.\n  installEventHookFromAgent(agent);\n\n  if (agent && typeof agent === 'object') {\n    try {\n      Object.defineProperty(agent, PATCH_FLAG, {\n        value: true,\n        enumerable: false,\n        configurable: true,\n      });\n    } catch {\n      (agent as any)[PATCH_FLAG] = true;\n    }\n  }\n  return agent;\n}\n\nfunction installEventHookFromAgent(agent: any): void {\n  const tracer = agent?._tracer;\n  const proto = tracer ? Object.getPrototypeOf(tracer) : undefined;\n  if (!proto || typeof proto._addEvent !== 'function') return;\n  if (proto._addEvent[PATCH_FLAG]) return;\n\n  const orig = proto._addEvent;\n  function patchedAddEvent(this: any, span: any, eventName: string, eventAttributes?: Record<string, unknown>) {\n    const result = orig.call(this, span, eventName, eventAttributes);\n    try {\n      enrichSpanFromEvent(span, eventName, eventAttributes || {});\n    } catch {\n      // never break the agent run over tracing\n    }\n    return result;\n  }\n  (patchedAddEvent as any)[PATCH_FLAG] = true;\n  proto._addEvent = patchedAddEvent;\n}\n\nfunction enrichSpanFromEvent(\n  span: any,\n  eventName: string,\n  attrs: Record<string, unknown>,\n): void {\n  if (!span || typeof span.setAttribute !== 'function') return;\n  if (typeof span.isRecording === 'function' && !span.isRecording()) return;\n\n  // Classify from the span's own gen_ai.operation.name (set at creation): the same\n  // message/choice events fire on chat (LLM), execute_tool (TOOL) and agent spans.\n  // We don't set neatlogs.span.kind (the mapper does, from the span name); we only\n  // route I/O to the correct namespace so a {span_kind}-templated key isn't needed.\n  const isTool = readSpanOp(span) === 'execute_tool';\n\n  // Input-side messages: gen_ai.{system,user,assistant,tool}.message\n  if (eventName.startsWith('gen_ai.') && eventName.endsWith('.message')) {\n    const role = eventName.slice('gen_ai.'.length, -'.message'.length);\n    const content = flattenStrandsContent(attrs.content);\n    if (content) {\n      if (isTool) {\n        span.setAttribute('input.value', content);\n        span.setAttribute('neatlogs.tool.input', content);\n      } else {\n        appendInputMessage(span, role, content);\n      }\n    }\n    return;\n  }\n\n  // Output: legacy gen_ai.choice or the latest-convention details event.\n  if (eventName === 'gen_ai.choice') {\n    const out = flattenStrandsContent(attrs.message);\n    if (out) setOutput(span, isTool, out);\n    return;\n  }\n  if (eventName === 'gen_ai.client.inference.operation.details') {\n    const out = flattenStrandsContent(attrs['gen_ai.output.messages']);\n    if (out) setOutput(span, isTool, out);\n  }\n}\n\nfunction setOutput(span: any, isTool: boolean, out: string): void {\n  span.setAttribute('output.value', out);\n  if (isTool) {\n    span.setAttribute('neatlogs.tool.output', out);\n  } else {\n    span.setAttribute('neatlogs.llm.output_messages.0.role', 'assistant');\n    span.setAttribute('neatlogs.llm.output_messages.0.content', out);\n    span.setAttribute('neatlogs.llm.output', safeStringify({ role: 'assistant', content: out }));\n  }\n}\n\nfunction appendInputMessage(span: any, role: string, content: string): void {\n  const idx = (span.__neatlogs_in_idx as number) ?? 0;\n  span.setAttribute(`neatlogs.llm.input_messages.${idx}.role`, role);\n  span.setAttribute(`neatlogs.llm.input_messages.${idx}.content`, content);\n  span.__neatlogs_in_idx = idx + 1;\n  const existing: Array<{ role: string; content: string }> = span.__neatlogs_in_msgs ?? [];\n  existing.push({ role, content });\n  span.__neatlogs_in_msgs = existing;\n  const blob = safeStringify({ messages: existing });\n  span.setAttribute('input.value', blob);\n  // Flat LLM input the backend reads directly (no reliance on {span_kind} mapping).\n  span.setAttribute('neatlogs.llm.input', blob);\n}\n\nfunction readSpanOp(span: any): string {\n  // OTel spans don't expose attributes publicly; Strands' span objects carry them\n  // on `.attributes`. Best-effort read of gen_ai.operation.name.\n  try {\n    const a = span.attributes;\n    if (!a) return '';\n    const v = typeof a.get === 'function' ? a.get('gen_ai.operation.name') : a['gen_ai.operation.name'];\n    return typeof v === 'string' ? v.toLowerCase() : '';\n  } catch {\n    return '';\n  }\n}\n\n/**\n * Strands event content arrives as a JSON string of content blocks\n * ([{text}], [{toolUse|toolResult}], or {role,parts,...}) or a plain string.\n */\nfunction flattenStrandsContent(content: unknown): string {\n  if (content == null) return '';\n  let val: unknown = content;\n  if (typeof val === 'string') {\n    const s = val.trim();\n    if (!(s.startsWith('[') || s.startsWith('{'))) return val; // already plain text\n    try {\n      val = JSON.parse(s);\n    } catch {\n      return val as string;\n    }\n  }\n  return flattenBlocks(val);\n}\n\nfunction flattenBlocks(val: unknown): string {\n  const items = Array.isArray(val) ? val : [val];\n  const out: string[] = [];\n  for (const item of items) {\n    if (typeof item === 'string') {\n      out.push(item);\n      continue;\n    }\n    if (!item || typeof item !== 'object') {\n      if (item != null) out.push(String(item));\n      continue;\n    }\n    const o = item as Record<string, any>;\n    if (typeof o.text === 'string') out.push(o.text);\n    else if (typeof o.content === 'string') out.push(o.content);\n    else if (o.toolUse) out.push(`${o.toolUse.name ?? 'tool'}(${safeStringify(o.toolUse.input ?? {})})`);\n    else if (o.toolResult) out.push(flattenBlocks(o.toolResult.content ?? o.toolResult));\n    else if (Array.isArray(o.parts)) out.push(flattenBlocks(o.parts));\n    else if (Array.isArray(o.content)) out.push(flattenBlocks(o.content));\n    else out.push(safeStringify(o));\n  }\n  return out.filter(Boolean).join('\\n');\n}\n\nfunction safeStringify(value: unknown): string {\n  if (typeof value === 'string') return value;\n  try {\n    return JSON.stringify(value) ?? '';\n  } catch {\n    return '';\n  }\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../src/strands.ts"],"sourcesContent":["/**\n * Strands currently creates and activates spans through the process-global\n * OpenTelemetry context. Neatlogs always uses a private provider, so this\n * integration is rejected until Strands can accept an injected private-context\n * runtime or Neatlogs ships an explicit wrapper that owns span creation.\n */\nexport function strandsHooks<T extends object>(_agent: T): T {\n  throw new Error(\n    'strandsHooks() is not supported because the Strands Agents tracer creates ' +\n      'and activates spans on the global OpenTelemetry context ' +\n      '(context.active() / context.with()), which cannot be isolated from other ' +\n      'tracing SDKs (Datadog, etc.).',\n  );\n}\n"],"mappings":";AAMO,SAAS,aAA+B,QAAc;AAC3D,QAAM,IAAI;AAAA,IACR;AAAA,EAIF;AACF;","names":[]}

package/dist/vertex-ai.cjs

@@ -84,9 +84,6 @@ function getLogger() {
 // src/core/mask.ts
 var logger = getLogger();
 
-// src/core/end-user.ts
-var import_api = require("@opentelemetry/api");
-
 // src/core/identity.ts
 var import_node_async_hooks2 = require("async_hooks");
 var _GLOBAL_KEY = /* @__PURE__ */ Symbol.for("neatlogs.identity.storage");
@@ -102,6 +99,47 @@ function currentEndUserMetadata() {
   return _storage.getStore()?.endUserMetadata;
 }
 
+// src/core/provider.ts
+var import_node_async_hooks3 = require("async_hooks");
+var import_api = require("@opentelemetry/api");
+var PRIVATE_SPAN_STORAGE_KEY = /* @__PURE__ */ Symbol.for(
+  "neatlogs.private_span_async_local_storage"
+);
+var PRIVATE_PROVIDER_STATE_KEY = /* @__PURE__ */ Symbol.for(
+  "neatlogs.private_provider_state"
+);
+var neatlogsGlobal = globalThis;
+var privateContextStorage = neatlogsGlobal[PRIVATE_SPAN_STORAGE_KEY] ?? (neatlogsGlobal[PRIVATE_SPAN_STORAGE_KEY] = new import_node_async_hooks3.AsyncLocalStorage());
+var providerState = neatlogsGlobal[PRIVATE_PROVIDER_STATE_KEY] ?? (neatlogsGlobal[PRIVATE_PROVIDER_STATE_KEY] = {
+  provider: null
+});
+var preInitTracer = {
+  startSpan() {
+    return import_api.trace.wrapSpanContext(import_api.INVALID_SPAN_CONTEXT);
+  },
+  startActiveSpan(_name, arg2, arg3, arg4) {
+    const fn = typeof arg2 === "function" ? arg2 : typeof arg3 === "function" ? arg3 : arg4;
+    return fn(import_api.trace.wrapSpanContext(import_api.INVALID_SPAN_CONTEXT));
+  }
+};
+function getNeatlogsTracer(name) {
+  return providerState.provider?.getTracer(name) ?? preInitTracer;
+}
+function getNeatlogsActiveContext() {
+  return privateContextStorage.getStore() ?? import_api.ROOT_CONTEXT;
+}
+function getActiveNeatlogsSpan() {
+  return import_api.trace.getSpan(getNeatlogsActiveContext());
+}
+function getNeatlogsParentContext(baseContext) {
+  return baseContext ?? getNeatlogsActiveContext();
+}
+function withNeatlogsSpan(span, fn, baseContext) {
+  const base = baseContext ?? getNeatlogsActiveContext();
+  const ctx = import_api.trace.setSpan(base, span);
+  return privateContextStorage.run(ctx, fn);
+}
+
 // src/core/end-user.ts
 var logger2 = getLogger();
 var END_USER_ID_KEY = "neatlogs.end_user.id";
@@ -215,11 +253,11 @@ var AutoRootTracer = class {
     const kind = String(
       options?.attributes?.["neatlogs.span.kind"] ?? ""
     ).toLowerCase();
-    const ctx = context ?? import_api4.context.active();
-    const parent = import_api4.trace.getSpan(ctx);
+    const ctx = context ?? getNeatlogsParentContext();
+    const parent = getActiveNeatlogsSpan();
     const needsRoot = autoRootEnabled() && !ROOT_KINDS.has(kind) && !(parent !== void 0 && parent.isRecording());
     if (!needsRoot) {
-      return this._tracer.startSpan(name, options, context);
+      return this._tracer.startSpan(name, options, ctx);
     }
     const root = this._tracer.startSpan(
       resolveRootWorkflowName(),
@@ -238,7 +276,7 @@ var AutoRootTracer = class {
   ));
 };
 function getProviderTracer(name) {
-  return new AutoRootTracer(import_api4.trace.getTracer(name));
+  return new AutoRootTracer(getNeatlogsTracer(name));
 }
 
 // src/vertex-ai.ts
@@ -250,8 +288,8 @@ function wrapVertexAI(client) {
 }
 function traceTool(name, fn) {
   return async function tracedTool(args) {
-    const tracer = getProviderTracer(TRACER_NAME);
-    return tracer.startActiveSpan(
+    const tracer = getNeatlogsTracer(TRACER_NAME);
+    const span = tracer.startSpan(
       `tool.${name}`,
       {
         attributes: {
@@ -260,21 +298,21 @@ function traceTool(name, fn) {
           "input.value": safeStringify(args)
         }
       },
-      import_api5.context.active(),
-      async (span) => {
-        try {
-          const result = await fn(args);
-          span.setAttribute("output.value", safeStringify(result));
-          span.setStatus({ code: import_api5.SpanStatusCode.OK });
-          return result;
-        } catch (err) {
-          recordError(span, err);
-          throw err;
-        } finally {
-          span.end();
-        }
-      }
+      getNeatlogsParentContext()
     );
+    return withNeatlogsSpan(span, async () => {
+      try {
+        const result = await fn(args);
+        span.setAttribute("output.value", safeStringify(result));
+        span.setStatus({ code: import_api5.SpanStatusCode.OK });
+        return result;
+      } catch (err) {
+        recordError(span, err);
+        throw err;
+      } finally {
+        span.end();
+      }
+    });
   };
 }
 function wrapNamespace(target, path) {
@@ -336,15 +374,14 @@ function tracedChatSend(original, chat, params, rest, isStream) {
       "neatlogs.llm.model_name": model,
       "neatlogs.llm.is_streaming": isStream
     }
-  }, import_api5.context.active());
+  }, getNeatlogsParentContext());
   const message = params?.message ?? params;
   span.setAttribute("neatlogs.llm.input_messages.0.role", "user");
   span.setAttribute(
     "neatlogs.llm.input_messages.0.content",
     typeof message === "string" ? message : safeStringify(message)
   );
-  const ctx = import_api5.trace.setSpan(import_api5.context.active(), span);
-  const result = import_api5.context.with(ctx, () => original(params, ...rest));
+  const result = withNeatlogsSpan(span, () => original(params, ...rest));
   return Promise.resolve(result).then(
     (response) => {
       if (isStream) return wrapStream(response, span);
@@ -367,9 +404,8 @@ function tracedEmbedContent(original) {
         "neatlogs.embedding.model_name": opts?.model ?? "",
         "neatlogs.embedding.text": safeStringify(opts?.contents ?? "")
       }
-    }, import_api5.context.active());
-    const ctx = import_api5.trace.setSpan(import_api5.context.active(), span);
-    const result = import_api5.context.with(ctx, () => original(opts, ...rest));
+    }, getNeatlogsParentContext());
+    const result = withNeatlogsSpan(span, () => original(opts, ...rest));
     return Promise.resolve(result).then(
       (response) => {
         const embeddings = response?.embeddings;
@@ -399,9 +435,8 @@ function tracedCountTokens(original) {
         "neatlogs.llm.task": "count_tokens",
         "neatlogs.llm.model_name": opts?.model ?? ""
       }
-    }, import_api5.context.active());
-    const ctx = import_api5.trace.setSpan(import_api5.context.active(), span);
-    const result = import_api5.context.with(ctx, () => original(opts, ...rest));
+    }, getNeatlogsParentContext());
+    const result = withNeatlogsSpan(span, () => original(opts, ...rest));
     return Promise.resolve(result).then(
       (response) => {
         if (response?.totalTokens != null) span.setAttribute("neatlogs.llm.token_count.prompt", response.totalTokens);
@@ -428,10 +463,9 @@ function tracedGenerateContent(original, isStream) {
         "neatlogs.llm.model_name": model,
         "neatlogs.llm.is_streaming": isStream
       }
-    }, import_api5.context.active());
+    }, getNeatlogsParentContext());
     setInputAttributes(span, opts);
-    const ctx = import_api5.trace.setSpan(import_api5.context.active(), span);
-    const result = import_api5.context.with(ctx, () => original(opts, ...rest));
+    const result = withNeatlogsSpan(span, () => original(opts, ...rest));
     return Promise.resolve(result).then(
       (response) => {
         if (isStream) {