neatlogs 1.1.13 → 1.1.15

package/dist/index.d.ts

@@ -388,14 +388,21 @@ declare function identify<T>(opts: IdentifyOptions, fn: () => T): T;
  * callers opt in at the exact cross-process boundary where Neatlogs context
  * should travel.
  */
-type TraceContextCarrier = Record<string, string> | {
-    set(name: string, value: string): unknown;
+type TraceContextCarrier = Record<string, string | undefined> | {
+    get?(name: string): string | null | undefined;
+    set?(name: string, value: string): unknown;
 };
 /**
  * Inject the active private Neatlogs span as W3C `traceparent`/`tracestate`
  * headers. Returns false when no valid Neatlogs span is active.
  */
 declare function injectTraceContext(carrier: TraceContextCarrier): boolean;
+/**
+ * Run a callback under a remote W3C parent in Neatlogs' private context.
+ * Invalid or absent context is ignored, so request handling remains fail-open.
+ * The process-global OpenTelemetry context and propagator are never touched.
+ */
+declare function extractTraceContext<T>(carrier: TraceContextCarrier, fn: () => T): T;
 
 interface ContextSetter {
     set(template: string, variables: Record<string, any>): void;
@@ -656,6 +663,6 @@ declare function registerCrewaiTask(task: {
  * SDK version. Kept in sync with package.json by the `version:sync` script
  * (runs automatically on `prebuild`). Do not edit by hand — bump package.json.
  */
-declare const __version__ = "1.1.13";
+declare const __version__ = "1.1.15";
 
-export { type CachedPrompt, type InitOptions, type MaskFunction, PromptApiError, PromptClient, PromptClientError, PromptHandle, type PromptMessage, PromptNotFoundError, PromptTemplate, Span, type SpanKind, type SpanOptions, type TraceContextCarrier, type TraceOptions, UserPromptTemplate, __version__, bindTemplates, createPrompt, deletePrompt, fetchPrompt, flush, getMastraObservability, getPrompt, getSessionConfig, identify, init, injectTraceContext, isDebugEnabled, listPrompts, log, registerCrewaiTask, removeTag, saveAsVersion, setTraceOutput, shutdown, span, trace, updatePrompt };
+export { type CachedPrompt, type InitOptions, type MaskFunction, PromptApiError, PromptClient, PromptClientError, PromptHandle, type PromptMessage, PromptNotFoundError, PromptTemplate, Span, type SpanKind, type SpanOptions, type TraceContextCarrier, type TraceOptions, UserPromptTemplate, __version__, bindTemplates, createPrompt, deletePrompt, extractTraceContext, fetchPrompt, flush, getMastraObservability, getPrompt, getSessionConfig, identify, init, injectTraceContext, isDebugEnabled, listPrompts, log, registerCrewaiTask, removeTag, saveAsVersion, setTraceOutput, shutdown, span, trace, updatePrompt };

package/dist/index.mjs

@@ -2263,6 +2263,9 @@ function withNeatlogsSpan(span2, fn, baseContext) {
   }
   return privateContextStorage.run(ctx, fn);
 }
+function withNeatlogsRemoteParent(span2, fn) {
+  return privateContextStorage.run(otelTrace.setSpan(ROOT_CONTEXT, span2), fn);
+}
 
 // src/core/end-user.ts
 var logger5 = getLogger();
@@ -2454,6 +2457,7 @@ var UserPromptTemplate = class extends BasePromptTemplate {
 
 // src/core/context.ts
 import {
+  trace as otelTrace2,
   createContextKey as createContextKey2,
   ROOT_CONTEXT as ROOT_CONTEXT3,
   SpanStatusCode as SpanStatusCode2
@@ -2638,7 +2642,9 @@ var KNOWN_OPTION_KEYS = /* @__PURE__ */ new Set([
   "endUserMetadata"
 ]);
 function _setSpanAttributes(span2, kind, attributes) {
-  span2.setAttribute("neatlogs.internal", true);
+  if (kind?.toUpperCase() === "LLM") {
+    span2.setAttribute("neatlogs.internal", true);
+  }
   span2.setAttribute("openinference.span.kind", kind ?? "CHAIN");
   for (const [key, value] of Object.entries(attributes)) {
     span2.setAttribute(key, value);
@@ -2698,8 +2704,12 @@ async function trace(options, fn) {
   } = options;
   const sessionId = sessionIdOption ?? currentSessionId();
   const currentSpan = getActiveNeatlogsSpan();
-  const isInActiveTrace = currentSpan !== void 0 && currentSpan.isRecording();
-  const shouldCreateRootTrace = !!sessionId && !isInActiveTrace;
+  const rootSpan = getNeatlogsRootSpan();
+  const currentSpanIsRecording = currentSpan?.isRecording() === true;
+  const rootSpanIsRecording = rootSpan?.isRecording() === true;
+  const shouldFallbackToRoot = !currentSpanIsRecording && rootSpanIsRecording;
+  const hasInheritedTraceContext = currentSpan !== void 0 || rootSpan !== void 0;
+  const shouldCreateRootTrace = !!sessionId && !hasInheritedTraceContext && !rootSpanIsRecording;
   let templateString;
   let isPromptTemplateObj = false;
   if (promptTemplate !== void 0) {
@@ -2735,6 +2745,9 @@ async function trace(options, fn) {
     }
   }
   let ctx = getNeatlogsActiveContext();
+  if (shouldFallbackToRoot) {
+    ctx = otelTrace2.setSpan(ctx, rootSpan);
+  }
   const variablesJson = promptVariables ? JSON.stringify(promptVariables) : void 0;
   const userVariablesJson = userPromptVariables ? JSON.stringify(userPromptVariables) : void 0;
   if (variablesJson) {
@@ -2763,7 +2776,7 @@ async function trace(options, fn) {
       extraAttributes[key] = value;
     }
   }
-  const isRootTrace = shouldCreateRootTrace || !isInActiveTrace;
+  const isRootTrace = shouldCreateRootTrace || !hasInheritedTraceContext;
   const tracer = getNeatlogsTracer("neatlogs.trace");
   const spanCallback = async (span3) => {
     _setSpanAttributes(span3, kind, extraAttributes);
@@ -5946,7 +5959,7 @@ function _resetMastraCache() {
 }
 
 // src/version.ts
-var __version__ = "1.1.13";
+var __version__ = "1.1.15";
 
 // src/init.ts
 var logger13 = getLogger();
@@ -6363,7 +6376,11 @@ function Span(options) {
 }
 
 // src/core/propagation.ts
-import { TraceFlags as TraceFlags2 } from "@opentelemetry/api";
+import {
+  TraceFlags as TraceFlags2,
+  createTraceState,
+  trace as otelTrace4
+} from "@opentelemetry/api";
 function injectTraceContext(carrier) {
   const spanContext = getActiveNeatlogsSpan()?.spanContext();
   if (!spanContext?.traceId || !spanContext.spanId) {
@@ -6384,6 +6401,41 @@ function injectTraceContext(carrier) {
   }
   return true;
 }
+function extractTraceContext(carrier, fn) {
+  const spanContext = parseTraceParent(
+    getHeader(carrier, "traceparent"),
+    getHeader(carrier, "tracestate")
+  );
+  if (!spanContext) {
+    return fn();
+  }
+  return withNeatlogsRemoteParent(otelTrace4.wrapSpanContext(spanContext), fn);
+}
+function parseTraceParent(traceparent, tracestate) {
+  const match = traceparent?.trim().match(
+    /^00-([0-9a-f]{32})-([0-9a-f]{16})-([0-9a-f]{2})$/
+  );
+  if (!match || match[1] === "00000000000000000000000000000000" || match[2] === "0000000000000000") {
+    return void 0;
+  }
+  const flags = Number.parseInt(match[3], 16);
+  return {
+    traceId: match[1],
+    spanId: match[2],
+    traceFlags: flags & TraceFlags2.SAMPLED ? TraceFlags2.SAMPLED : TraceFlags2.NONE,
+    isRemote: true,
+    ...tracestate?.trim() ? { traceState: createTraceState(tracestate.trim()) } : {}
+  };
+}
+function getHeader(carrier, name) {
+  const getter = carrier.get;
+  if (typeof getter === "function") {
+    const value = getter.call(carrier, name);
+    return typeof value === "string" ? value : void 0;
+  }
+  const record = carrier;
+  return record[name] ?? record[name.toLowerCase()] ?? record[name.toUpperCase()];
+}
 function setHeader(carrier, name, value) {
   if ("set" in carrier && typeof carrier.set === "function") {
     carrier.set(name, value);
@@ -6617,7 +6669,7 @@ import { SpanStatusCode as SpanStatusCode5 } from "@opentelemetry/api";
 
 // src/core/auto-root.ts
 import {
-  trace as otelTrace4
+  trace as otelTrace5
 } from "@opentelemetry/api";
 var ROOT_KINDS = /* @__PURE__ */ new Set(["workflow", "chain", "agent", "mcp_tool"]);
 function autoRootEnabled() {
@@ -6671,7 +6723,7 @@ function maybeOpenAutoRoot(tracer, kind, baseCtx) {
     baseCtx
   );
   stampAutoRootIdentity(root);
-  return { root, ctx: otelTrace4.setSpan(baseCtx, root) };
+  return { root, ctx: otelTrace5.setSpan(baseCtx, root) };
 }
 function endAutoRoot(root) {
   if (!root) return;
@@ -6701,7 +6753,7 @@ var AutoRootTracer = class {
       ctx
     );
     stampAutoRootIdentity(root);
-    const childCtx = otelTrace4.setSpan(ctx, root);
+    const childCtx = otelTrace5.setSpan(ctx, root);
     const child = this._tracer.startSpan(name, options, childCtx);
     return wrapSpanWithRoot(child, root);
   }
@@ -12311,6 +12363,7 @@ export {
   createAITelemetry,
   createPrompt,
   deletePrompt,
+  extractTraceContext,
   fetchPrompt,
   flush,
   getMastraObservability,