@bitfab/sdk 0.57.8 → 0.58.0

package/dist/index.d.cts

@@ -441,7 +441,6 @@ declare class HttpClient {
     private closed;
     private closing;
     externalSpanTransform: ((payload: Record<string, unknown>, submit: SimulationPlanSubmit, drop: () => void) => void) | undefined;
-    frameworkSpanStart: ((traceId: string, spanId: string, parentSpanId: string | null) => void) | undefined;
     externalTraceTransform: ((payload: Record<string, unknown>, submit: SimulationPlanSubmit) => void) | undefined;
     releaseHeldExternalSpans: ((timeoutMs: number) => Promise<boolean> | Promise<void>) | undefined;
     stopSimulationPlan: (() => void) | undefined;
@@ -571,7 +570,6 @@ declare class HttpClient {
      * the OTLP carrier has no path to carry it.
      */
     sendInternalTrace(functionId: string, payload: Record<string, unknown>): void;
-    reserveFrameworkSpan(traceId: string, spanId: string, parentSpanId: string | null | undefined): void;
     sendExternalSpan(payload: Record<string, unknown>): void;
     submitExternalSpan(payload: Record<string, unknown>): void;
     /**
@@ -2887,7 +2885,6 @@ interface TraceOptions {
     mockOnReplayDefault?: boolean;
     /** Maximum number of recorded descendant levels. Defaults to 30. */
     maxDepth?: number;
-    maxSpans?: number;
     maxCapturedSubtreeSpans?: number;
     /** Qualified or simple function names to leave out of the subtree. */
     exclude?: readonly string[] | ReadonlySet<string>;
@@ -3625,7 +3622,7 @@ interface CommitRef {
 /**
  * SDK version from package.json (injected at build time)
  */
-declare const __version__ = "0.57.8";
+declare const __version__ = "0.58.0";
 
 /**
  * Constants for the Bitfab SDK.

package/dist/index.d.ts

@@ -441,7 +441,6 @@ declare class HttpClient {
     private closed;
     private closing;
     externalSpanTransform: ((payload: Record<string, unknown>, submit: SimulationPlanSubmit, drop: () => void) => void) | undefined;
-    frameworkSpanStart: ((traceId: string, spanId: string, parentSpanId: string | null) => void) | undefined;
     externalTraceTransform: ((payload: Record<string, unknown>, submit: SimulationPlanSubmit) => void) | undefined;
     releaseHeldExternalSpans: ((timeoutMs: number) => Promise<boolean> | Promise<void>) | undefined;
     stopSimulationPlan: (() => void) | undefined;
@@ -571,7 +570,6 @@ declare class HttpClient {
      * the OTLP carrier has no path to carry it.
      */
     sendInternalTrace(functionId: string, payload: Record<string, unknown>): void;
-    reserveFrameworkSpan(traceId: string, spanId: string, parentSpanId: string | null | undefined): void;
     sendExternalSpan(payload: Record<string, unknown>): void;
     submitExternalSpan(payload: Record<string, unknown>): void;
     /**
@@ -2887,7 +2885,6 @@ interface TraceOptions {
     mockOnReplayDefault?: boolean;
     /** Maximum number of recorded descendant levels. Defaults to 30. */
     maxDepth?: number;
-    maxSpans?: number;
     maxCapturedSubtreeSpans?: number;
     /** Qualified or simple function names to leave out of the subtree. */
     exclude?: readonly string[] | ReadonlySet<string>;
@@ -3625,7 +3622,7 @@ interface CommitRef {
 /**
  * SDK version from package.json (injected at build time)
  */
-declare const __version__ = "0.57.8";
+declare const __version__ = "0.58.0";
 
 /**
  * Constants for the Bitfab SDK.

package/dist/index.js

@@ -21,7 +21,7 @@ import {
   getCurrentTrace,
   reseedFromRegistry,
   seedFromRegistry
-} from "./chunk-7OU35MBA.js";
+} from "./chunk-EFD52WEX.js";
 import "./chunk-RCHSYWKI.js";
 import {
   BITFAB_PROGRESS_PREFIX,
@@ -30,7 +30,7 @@ import {
   ReplayError,
   reportReplayProgress,
   serializeReplayResult
-} from "./chunk-SSUEN63V.js";
+} from "./chunk-DF4VZUTC.js";
 import {
   BitfabError,
   DEFAULT_SERVICE_URL,
@@ -38,7 +38,7 @@ import {
   MixedTracingError,
   __version__,
   flushTraces
-} from "./chunk-PU6RWSKB.js";
+} from "./chunk-K44ARSH6.js";
 import "./chunk-VCRFFCLY.js";
 export {
   AssertionCategoriesClient,

package/dist/node.cjs

@@ -88,7 +88,7 @@ var __version__, __packageName__;
 var init_version_generated = __esm({
   "src/version.generated.ts"() {
     "use strict";
-    __version__ = "0.57.8";
+    __version__ = "0.58.0";
     __packageName__ = "@bitfab/sdk";
   }
 });
@@ -1046,7 +1046,14 @@ function isTraceRootSpan(payload) {
   const parentId = rawSpanOf(payload)?.parent_id;
   return parentId === void 0 || parentId === null;
 }
-var SIMULATION_PLAN_REFRESH_MS, SIMULATION_PLAN_RETRY_MS, SIMULATION_PLAN_READ_TIMEOUT_MS, SIMULATION_PLAN_MAX_HELD, DISABLE_SIMULATION_PLAN_ENV, ROOT_TRACE_FUNCTION_KEY_FIELD, CONTENT_OFF_KEY, CONTENT_KEYS, SimulationPlan;
+function declaredInCode(payload) {
+  return payload[DECLARED_NODE_FIELD] === true;
+}
+function recordedError(payload) {
+  const error = spanDataOf(payload)?.error;
+  return error !== void 0 && error !== null;
+}
+var SIMULATION_PLAN_REFRESH_MS, SIMULATION_PLAN_RETRY_MS, SIMULATION_PLAN_READ_TIMEOUT_MS, SIMULATION_PLAN_MAX_HELD, DISABLE_SIMULATION_PLAN_ENV, ROOT_TRACE_FUNCTION_KEY_FIELD, DECLARED_NODE_FIELD, CONTENT_OFF_KEY, CONTENT_KEYS, SimulationPlan;
 var init_simulationPlan = __esm({
   "src/simulationPlan.ts"() {
     "use strict";
@@ -1061,6 +1068,7 @@ var init_simulationPlan = __esm({
     SIMULATION_PLAN_MAX_HELD = 1e3;
     DISABLE_SIMULATION_PLAN_ENV = "BITFAB_DISABLE_SIM_PLAN";
     ROOT_TRACE_FUNCTION_KEY_FIELD = "rootTraceFunctionKey";
+    DECLARED_NODE_FIELD = "declaredNode";
     CONTENT_OFF_KEY = "content_off_by_simulation_plan";
     CONTENT_KEYS = [
       "input",
@@ -1232,7 +1240,7 @@ var init_simulationPlan = __esm({
         }
       }
       payloadToSend(entry) {
-        if (entry.traceFunctionKey === void 0) {
+        if (entry.traceFunctionKey === void 0 || declaredInCode(entry.payload)) {
           return entry.payload;
         }
         if (this.contentOffByKey !== void 0) {
@@ -1244,6 +1252,10 @@ var init_simulationPlan = __esm({
         return stripContent(entry.payload);
       }
       submitEntry(entry) {
+        if (entry.traceFunctionKey !== void 0 && this.skipsSpan(entry.payload, entry.traceFunctionKey)) {
+          entry.drop?.();
+          return;
+        }
         try {
           entry.submit(this.payloadToSend(entry));
         } catch (error) {
@@ -1306,8 +1318,12 @@ var init_simulationPlan = __esm({
       contentOffNow(traceFunctionKey, spanName) {
         return !this.stopped && !this.disabled() && this.contentOff(traceFunctionKey, spanName);
       }
+      skipsSpan(payload, traceFunctionKey) {
+        const name = spanNameOf(payload);
+        return name !== void 0 && this.contentOff(traceFunctionKey, name) && !isTraceRootSpan(payload) && !declaredInCode(payload) && spanInstrumentationOf(payload) !== void 0 && !recordedByFramework(payload) && !recordedError(payload);
+      }
       apply(payload, traceFunctionKey) {
-        if (recordedByFramework(payload)) {
+        if (recordedByFramework(payload) || declaredInCode(payload)) {
           return payload;
         }
         const name = spanNameOf(payload);
@@ -2586,7 +2602,6 @@ var init_http = __esm({
           this.closed = true;
           this.externalSpanTransform = void 0;
           this.externalTraceTransform = void 0;
-          this.frameworkSpanStart = void 0;
           this.releaseHeldExternalSpans = void 0;
           this.stopSimulationPlan = void 0;
           const transport = this.traceTransport;
@@ -2769,16 +2784,6 @@ var init_http = __esm({
           carrierMeta("internal_trace", body, void 0)
         );
       }
-      reserveFrameworkSpan(traceId, spanId, parentSpanId) {
-        try {
-          this.frameworkSpanStart?.(traceId, spanId, parentSpanId ?? null);
-        } catch (error) {
-          warnOnce(
-            "framework-span-reservation-failed",
-            `a framework span could not be counted toward its trace's span limit: ${describeError(error)}`
-          );
-        }
-      }
       sendExternalSpan(payload) {
         const ref2 = carrierRef(payload);
         if (ref2?.spanId !== void 0) {
@@ -2807,6 +2812,7 @@ var init_http = __esm({
           sdkVersion: __version__
         };
         delete body[ROOT_TRACE_FUNCTION_KEY_FIELD];
+        delete body[DECLARED_NODE_FIELD];
         this.getTraceTransport()?.submit(
           "external_span",
           body,
@@ -4690,11 +4696,6 @@ var BitfabClaudeAgentHandler = class {
     }
     this.runToSpan.set(spanId, spanInfo);
     this.httpClient.traceCompletion.start(spanInfo.traceId, spanInfo.spanId);
-    this.httpClient.reserveFrameworkSpan(
-      spanInfo.traceId,
-      spanInfo.spanId,
-      spanInfo.parentId
-    );
     return spanInfo;
   }
   completeSpan(spanId, output, error, extraContexts) {
@@ -4974,11 +4975,6 @@ var BitfabClaudeAgentHandler = class {
       this.conversationHistory.push(...this.pendingMessages);
       this.pendingMessages = [];
       this.currentLlmSpanId = randomUuid();
-      this.httpClient.reserveFrameworkSpan(
-        this.ensureTrace(),
-        this.currentLlmSpanId,
-        this.getParentId()
-      );
       this.currentLlmMessageId = messageId ?? null;
       this.currentLlmContent = [];
       this.currentLlmModel = inner.model ?? null;
@@ -6389,11 +6385,6 @@ var BitfabLangGraphCallbackHandler = class {
     this.runToSpan.set(runId, spanInfo);
     if (spanInfo.hidden !== true) {
       this.httpClient.traceCompletion.start(spanInfo.traceId, spanInfo.spanId);
-      this.httpClient.reserveFrameworkSpan(
-        spanInfo.traceId,
-        spanInfo.spanId,
-        spanInfo.parentId
-      );
     }
     if (isRootInvocation) {
       this.sendTraceStart(spanInfo);
@@ -7942,11 +7933,6 @@ var BitfabOpenAITracingProcessor = class {
       const mapping = this.activeSpanMappings[span.traceId];
       const traceId = mapping?.traceId ?? span.traceId;
       this.httpClient.traceCompletion.start(traceId, span.spanId);
-      this.httpClient.reserveFrameworkSpan(
-        traceId,
-        span.spanId,
-        span.parentId ?? mapping?.spanId
-      );
     }
   }
   /**
@@ -8335,56 +8321,9 @@ var BitfabVercelAiHandler = class {
 init_warnOnce();
 var TRUNCATION_LIMIT_ORDER = [
   "max_depth",
-  "max_spans",
   "max_captured_subtree_spans"
 ];
 var activeTraceStates = /* @__PURE__ */ new Map();
-var REFUSED_FRAMEWORK_SPAN_TRACES_RETAINED = 1024;
-var refusedFrameworkSpans = /* @__PURE__ */ new Map();
-function frameworkSpanRefused(traceId, spanId) {
-  return refusedFrameworkSpans.get(traceId)?.has(spanId) === true;
-}
-function refuseFrameworkSpan(traceId, spanId) {
-  const refused = refusedFrameworkSpans.get(traceId);
-  if (refused !== void 0) {
-    refused.add(spanId);
-    return;
-  }
-  refusedFrameworkSpans.set(traceId, /* @__PURE__ */ new Set([spanId]));
-  while (refusedFrameworkSpans.size > REFUSED_FRAMEWORK_SPAN_TRACES_RETAINED) {
-    const oldest = refusedFrameworkSpans.keys().next();
-    if (oldest.done) {
-      return;
-    }
-    refusedFrameworkSpans.delete(oldest.value);
-  }
-}
-function reserveFrameworkSpan(traceId, spanId, parentSpanId) {
-  const spanBudget = activeTraceStates.get(traceId)?.spanBudget;
-  const parentRefused = parentSpanId !== null && frameworkSpanRefused(traceId, parentSpanId);
-  if (!parentRefused && (spanBudget === void 0 || spanBudget.spansUsed < spanBudget.maxSpans)) {
-    if (spanBudget !== void 0) {
-      spanBudget.spansUsed += 1;
-    }
-    return;
-  }
-  refuseFrameworkSpan(traceId, spanId);
-  spanBudget?.truncate("max_spans");
-}
-function isRefusedFrameworkSpan(payload) {
-  if (!recordedByFramework(payload)) {
-    return false;
-  }
-  const rawSpan = payload.rawSpan;
-  const spanId = rawSpan?.id;
-  if (typeof spanId !== "string") {
-    return false;
-  }
-  const traceIds = [payload.sourceTraceId, traceIdOf(payload)];
-  return traceIds.some(
-    (traceId) => typeof traceId === "string" && frameworkSpanRefused(traceId, spanId)
-  );
-}
 function truncationMetadata(truncation) {
   if (truncation === void 0 || truncation.limits.size === 0) {
     return void 0;
@@ -8774,7 +8713,6 @@ function readBooleanEnv(name) {
   return void 0;
 }
 var DEFAULT_AUTO_TRACE_MAX_DEPTH = 30;
-var DEFAULT_AUTO_TRACE_MAX_SPANS = 1e4;
 var DEFAULT_AUTO_TRACE_MAX_CAPTURED_SUBTREE_SPANS = 500;
 function spanOwnerName(receiver) {
   if (typeof receiver === "function") {
@@ -8842,7 +8780,6 @@ var Bitfab = class {
       config.simulationPlan ?? true
     );
     this.httpClient.externalSpanTransform = (payload, submit, drop) => this.applySimulationPlan(payload, submit, drop);
-    this.httpClient.frameworkSpanStart = reserveFrameworkSpan;
     this.httpClient.externalTraceTransform = (payload, submit) => this.simulationPlan.sendTrace(payload, submit);
     this.httpClient.releaseHeldExternalSpans = (timeoutMs) => this.simulationPlan.release(timeoutMs);
     this.httpClient.stopSimulationPlan = () => this.simulationPlan.stop();
@@ -9005,21 +8942,9 @@ var Bitfab = class {
       options.maxDepth,
       DEFAULT_AUTO_TRACE_MAX_DEPTH
     );
-    if (options.maxSpans !== void 0 && options.maxSpans < 1) {
-      throw new BitfabError(
-        `maxSpans must be at least 1 because the root span counts toward it (got ${options.maxSpans})`
-      );
-    }
-    const maxSpans = autoTraceLimit(
-      options.maxSpans,
-      DEFAULT_AUTO_TRACE_MAX_SPANS
-    );
-    const maxCapturedSubtreeSpans = Math.min(
-      autoTraceLimit(
-        options.maxCapturedSubtreeSpans,
-        DEFAULT_AUTO_TRACE_MAX_CAPTURED_SUBTREE_SPANS
-      ),
-      maxSpans
+    const maxCapturedSubtreeSpans = autoTraceLimit(
+      options.maxCapturedSubtreeSpans,
+      DEFAULT_AUTO_TRACE_MAX_CAPTURED_SUBTREE_SPANS
     );
     const rootIsAsync = fn.constructor.name === "AsyncFunction";
     const excluded = new Set(options.exclude ?? []);
@@ -9050,19 +8975,11 @@ var Bitfab = class {
           truncation.droppedSpans += 1;
           warnOnce(
             `auto-trace-truncated:${traceFunctionKey}`,
-            `"${traceFunctionKey}" hit an automatic subtree capture limit (maxDepth=${maxDepth}, maxCapturedSubtreeSpans=${maxCapturedSubtreeSpans}, maxSpans=${maxSpans}); its trace is incomplete. Raise the limits, declare the calls you need with node(), or narrow the subtree with exclude.`
+            `"${traceFunctionKey}" hit an automatic subtree capture limit (maxDepth=${maxDepth}, maxCapturedSubtreeSpans=${maxCapturedSubtreeSpans}); its trace is incomplete. Raise the limits, declare the calls you need with node(), or narrow the subtree with exclude.`
           );
         };
-        const spanBudget = {
-          spansUsed: 1,
-          maxSpans,
-          truncate
-        };
         if (rootTraceState !== void 0) {
           rootTraceState.truncation = truncation;
-          if (rootTraceState.spanBudget === void 0) {
-            rootTraceState.spanBudget = spanBudget;
-          }
         }
         const spanStackOf = (entry) => entry.spanStack;
         const openChild = (entry, childOptions, inputs, isAsync, invokeFn) => {
@@ -9098,16 +9015,16 @@ var Bitfab = class {
           return innermost === void 0 ? traceFunctionKey : rootTraceFunctionKeyOfTrace(innermost.traceId, traceFunctionKey);
         };
         const recordsSpan = (entry, spanName, declared) => {
-          const countsTowardCapturedSubtree = !declared && !self.simulationPlan.contentOffNow(
+          const contentOff = !declared && self.simulationPlan.contentOffNow(
             rootTraceFunctionKeyOfEntry(entry),
             spanName
           );
-          const refusedBy = entry.depth >= maxDepth ? "max_depth" : spanBudget.spansUsed >= maxSpans ? "max_spans" : countsTowardCapturedSubtree && capturedSubtreeCount >= maxCapturedSubtreeSpans ? "max_captured_subtree_spans" : void 0;
+          const countsTowardCapturedSubtree = !declared && !contentOff;
+          const refusedBy = entry.depth >= maxDepth ? "max_depth" : countsTowardCapturedSubtree && capturedSubtreeCount >= maxCapturedSubtreeSpans ? "max_captured_subtree_spans" : void 0;
           if (refusedBy !== void 0) {
             truncate(refusedBy);
             return false;
           }
-          spanBudget.spansUsed += 1;
           if (countsTowardCapturedSubtree) {
             capturedSubtreeCount += 1;
           }
@@ -9126,7 +9043,8 @@ var Bitfab = class {
               return clearAutoTraceNodeConfiguration(invokeFn);
             }
             const spanName = nodeConfiguration?.name ?? definition.name;
-            if (!recordsSpan(entry, spanName, nodeConfiguration !== void 0)) {
+            const declaredNode = nodeConfiguration !== void 0;
+            if (!recordsSpan(entry, spanName, declaredNode)) {
               return invokeWithoutNode();
             }
             const mockOnReplay = nodeConfiguration?.mockOnReplay ?? options.mockOnReplayDefault;
@@ -9139,6 +9057,7 @@ var Bitfab = class {
               functionId: definition.id,
               captureContent: true,
               autoTraceDefinition: definition,
+              ...declaredNode && { declaredNode },
               ...nodeConfiguration?.testRunId !== void 0 && {
                 testRunId: nodeConfiguration.testRunId
               },
@@ -9168,6 +9087,7 @@ var Bitfab = class {
               surface: "opt-out",
               instrumentation: "trace",
               captureContent: true,
+              declaredNode: true,
               ...link !== void 0 && { nestedTrace: link }
             };
             return openChild(entry, childOptions, inputs, false, invokeFn);
@@ -9239,10 +9159,6 @@ var Bitfab = class {
     return autoTraceRoot;
   }
   applySimulationPlan(payload, submit, drop) {
-    if (isRefusedFrameworkSpan(payload)) {
-      drop();
-      return;
-    }
     this.simulationPlan.send(
       payload,
       rootTraceFunctionKeyOf(payload),
@@ -9917,9 +9833,6 @@ var Bitfab = class {
           registeredTraceId = traceId;
         }
         self.httpClient.traceCompletion.start(traceId, spanId);
-        if (isFrameworkInstrumentation(options.instrumentation)) {
-          reserveFrameworkSpan(traceId, spanId, parentSpanId);
-        }
         startedSpan = { traceId, spanId };
         const functionName = fn.name !== "" ? fn.name : void 0;
         const rootTraceFunctionKey = rootTraceFunctionKeyOfTrace(
@@ -9941,6 +9854,7 @@ var Bitfab = class {
           functionId: options.functionId,
           captureContent: options.captureContent ?? true,
           autoTraceDefinition: options.autoTraceDefinition,
+          declaredNode: options.declaredNode === true,
           nestedTrace: options.nestedTrace,
           enclosingTrace: options.enclosingTrace
         };
@@ -10466,7 +10380,7 @@ var Bitfab = class {
    * Queued on the client's span transport; delivery is the transport's job.
    */
   sendWrapperSpan(params) {
-    const contentOff = this.contentOffBySimulationPlan(params);
+    const contentOff = params.declaredNode !== true && this.contentOffBySimulationPlan(params);
     const buildsContent = params.captureContent && !contentOff;
     const serializedInputs = buildsContent ? serializeValue(params.inputs) : void 0;
     const serializedResult = buildsContent ? serializeValue(params.result) : void 0;
@@ -10540,6 +10454,7 @@ var Bitfab = class {
       ...params.rootTraceFunctionKey !== void 0 && {
         [ROOT_TRACE_FUNCTION_KEY_FIELD]: params.rootTraceFunctionKey
       },
+      ...params.declaredNode === true && { [DECLARED_NODE_FIELD]: true },
       rawSpan: externalSpan,
       ...params.testRunId && { testRunId: params.testRunId },
       ...params.mocked && { mocked: true },