braintrust 0.4.1 → 0.4.3

package/dev/dist/index.d.mts

@@ -7454,6 +7454,12 @@ interface Span extends Exportable {
      */
     startSpanWithParents(spanId: string, spanParents: string[], args?: StartSpanArgs): Span;
     state(): BraintrustState;
+    /**
+     * Internal method to get the OTEL parent string for this span.
+     * This is used by OtelContextManager to set the braintrust.parent attribute.
+     * @returns A string like "project_id:X" or "experiment_id:X", or undefined if no parent
+     */
+    _getOtelParent(): string | undefined;
     kind: "span";
 }
 declare abstract class ContextManager {
@@ -7484,6 +7490,7 @@ declare class NoopSpan implements Span {
     setAttributes(_args: Omit<StartSpanArgs, "event">): void;
     startSpanWithParents(_spanId: string, _spanParents: string[], _args?: StartSpanArgs): Span;
     state(): BraintrustState;
+    _getOtelParent(): string | undefined;
     toString(): string;
 }
 declare const NOOP_SPAN: NoopSpan;
@@ -7645,6 +7652,7 @@ declare class Logger<IsAsyncFlush extends boolean> implements Exportable {
     get org_id(): Promise<string>;
     get project(): Promise<ObjectMetadata>;
     get id(): Promise<string>;
+    get loggingState(): BraintrustState;
     private parentObjectType;
     /**
      * Log a single event. The event will be batched and uploaded behind the scenes if `logOptions.asyncFlush` is true.
@@ -7861,6 +7869,13 @@ declare class Experiment extends ObjectFetcher<ExperimentEvent> implements Expor
     kind: "experiment";
     constructor(state: BraintrustState, lazyMetadata: LazyValue<ProjectExperimentMetadata>, dataset?: AnyDataset);
     get id(): Promise<string>;
+    get loggingState(): BraintrustState;
+    /**
+     * Wait for the experiment ID to be resolved. This is useful for ensuring the ID
+     * is available synchronously in child spans (for OTEL parent attributes).
+     * @internal
+     */
+    _waitForId(): Promise<void>;
     get name(): Promise<string>;
     get project(): Promise<ObjectMetadata>;
     private parentObjectType;
@@ -7966,6 +7981,7 @@ declare class Dataset<IsLegacyDataset extends boolean = typeof DEFAULT_IS_LEGACY
     get id(): Promise<string>;
     get name(): Promise<string>;
     get project(): Promise<ObjectMetadata>;
+    get loggingState(): BraintrustState;
     protected getState(): Promise<BraintrustState>;
     private validateEvent;
     private createArgs;

package/dev/dist/index.d.ts

@@ -7454,6 +7454,12 @@ interface Span extends Exportable {
      */
     startSpanWithParents(spanId: string, spanParents: string[], args?: StartSpanArgs): Span;
     state(): BraintrustState;
+    /**
+     * Internal method to get the OTEL parent string for this span.
+     * This is used by OtelContextManager to set the braintrust.parent attribute.
+     * @returns A string like "project_id:X" or "experiment_id:X", or undefined if no parent
+     */
+    _getOtelParent(): string | undefined;
     kind: "span";
 }
 declare abstract class ContextManager {
@@ -7484,6 +7490,7 @@ declare class NoopSpan implements Span {
     setAttributes(_args: Omit<StartSpanArgs, "event">): void;
     startSpanWithParents(_spanId: string, _spanParents: string[], _args?: StartSpanArgs): Span;
     state(): BraintrustState;
+    _getOtelParent(): string | undefined;
     toString(): string;
 }
 declare const NOOP_SPAN: NoopSpan;
@@ -7645,6 +7652,7 @@ declare class Logger<IsAsyncFlush extends boolean> implements Exportable {
     get org_id(): Promise<string>;
     get project(): Promise<ObjectMetadata>;
     get id(): Promise<string>;
+    get loggingState(): BraintrustState;
     private parentObjectType;
     /**
      * Log a single event. The event will be batched and uploaded behind the scenes if `logOptions.asyncFlush` is true.
@@ -7861,6 +7869,13 @@ declare class Experiment extends ObjectFetcher<ExperimentEvent> implements Expor
     kind: "experiment";
     constructor(state: BraintrustState, lazyMetadata: LazyValue<ProjectExperimentMetadata>, dataset?: AnyDataset);
     get id(): Promise<string>;
+    get loggingState(): BraintrustState;
+    /**
+     * Wait for the experiment ID to be resolved. This is useful for ensuring the ID
+     * is available synchronously in child spans (for OTEL parent attributes).
+     * @internal
+     */
+    _waitForId(): Promise<void>;
     get name(): Promise<string>;
     get project(): Promise<ObjectMetadata>;
     private parentObjectType;
@@ -7966,6 +7981,7 @@ declare class Dataset<IsLegacyDataset extends boolean = typeof DEFAULT_IS_LEGACY
     get id(): Promise<string>;
     get name(): Promise<string>;
     get project(): Promise<ObjectMetadata>;
+    get loggingState(): BraintrustState;
     protected getState(): Promise<BraintrustState>;
     private validateEvent;
     private createArgs;

package/dev/dist/index.js

@@ -5141,7 +5141,6 @@ var init_context3 = __esm({
   "src/otel/context.ts"() {
     "use strict";
     init_logger();
-    init_util();
     OTEL_NOT_INSTALLED_MESSAGE = "OpenTelemetry packages are not installed. Install them with: npm install @opentelemetry/api @opentelemetry/sdk-trace-base";
     otelTrace = null;
     otelContext = null;
@@ -5204,6 +5203,10 @@ var init_context3 = __esm({
             const currentContext = otelContext.active();
             let newContext = otelTrace.setSpan(currentContext, wrappedContext);
             newContext = newContext.setValue("braintrust_span", span);
+            const parentValue = span._getOtelParent();
+            if (parentValue) {
+              newContext = newContext.setValue("braintrust.parent", parentValue);
+            }
             return otelContext.with(newContext, callback);
           }
         } catch (error2) {
@@ -5219,34 +5222,6 @@ var init_context3 = __esm({
         }
         return void 0;
       }
-      _getOtelParent(span) {
-        if (!span.parentObjectType || !span.parentObjectId) {
-          return void 0;
-        }
-        try {
-          const parentType = span.parentObjectType;
-          const parentId = span.parentObjectId;
-          if (parentType === 2 /* PROJECT_LOGS */) {
-            const id = typeof parentId === "object" && parentId !== null && "get" in parentId ? (
-              // eslint-disable-next-line @typescript-eslint/consistent-type-assertions -- Type guard ensures object has get method
-              parentId.get()
-            ) : parentId;
-            if (typeof id === "string") {
-              return `project_id:${id}`;
-            }
-          } else if (parentType === 1 /* EXPERIMENT */) {
-            const id = typeof parentId === "object" && parentId !== null && "get" in parentId ? (
-              // eslint-disable-next-line @typescript-eslint/consistent-type-assertions -- Type guard ensures object has get method
-              parentId.get()
-            ) : parentId;
-            if (typeof id === "string") {
-              return `experiment_id:${id}`;
-            }
-          }
-        } catch (e9) {
-        }
-        return void 0;
-      }
     };
   }
 });
@@ -5282,7 +5257,7 @@ function getContextManager() {
     try {
       const { OtelContextManager: OtelContextManager2 } = (init_context3(), __toCommonJS(context_exports));
       return new OtelContextManager2();
-    } catch (e10) {
+    } catch (e9) {
       console.warn(
         "OTEL not available, falling back to Braintrust-only context manager"
       );
@@ -6521,6 +6496,9 @@ var init_logger = __esm({
       state() {
         return _internalGetGlobalState();
       }
+      _getOtelParent() {
+        return void 0;
+      }
       // Custom inspect for Node.js console.log
       [Symbol.for("nodejs.util.inspect.custom")]() {
         return `NoopSpan {
@@ -7248,6 +7226,9 @@ with a Blob/ArrayBuffer, or run the program on Node.js.`
       get id() {
         return (async () => (await this.project).id)();
       }
+      get loggingState() {
+        return this.state;
+      }
       parentObjectType() {
         return 2 /* PROJECT_LOGS */;
       }
@@ -7908,6 +7889,18 @@ Error: ${errorText}`;
           return (await this.lazyMetadata.get()).experiment.id;
         })();
       }
+      get loggingState() {
+        return this.state;
+      }
+      /**
+       * Wait for the experiment ID to be resolved. This is useful for ensuring the ID
+       * is available synchronously in child spans (for OTEL parent attributes).
+       * @internal
+       */
+      async _waitForId() {
+        await this.lazyId.get().catch(() => {
+        });
+      }
       get name() {
         return (async () => {
           return (await this.lazyMetadata.get()).experiment.name;
@@ -8164,6 +8157,9 @@ View complete results in Braintrust or run experiment.summarize() again.`
           return (await this.lazyMetadata.get()).experiment.name;
         })();
       }
+      get loggingState() {
+        return this.state;
+      }
       async getState() {
         await this.lazyMetadata.get();
         return this.state;
@@ -8460,6 +8456,42 @@ View complete results in Braintrust or run experiment.summarize() again.`
       state() {
         return this._state;
       }
+      /**
+       * Internal method to get the OTEL parent string for this span.
+       * This is used by OtelContextManager to set the braintrust.parent attribute.
+       * @returns A string like "project_id:X" or "experiment_id:X", or undefined if no parent
+       */
+      _getOtelParent() {
+        if (!this.parentObjectType) {
+          return void 0;
+        }
+        try {
+          if (this.parentObjectType === 2 /* PROJECT_LOGS */) {
+            const syncResult = this.parentObjectId.getSync();
+            const id = syncResult.value;
+            const args = this.parentComputeObjectMetadataArgs;
+            if (id) {
+              return `project_id:${id}`;
+            }
+            const projectName = _optionalChain([args, 'optionalAccess', _94 => _94.project_name]);
+            if (projectName) {
+              return `project_name:${projectName}`;
+            }
+          } else if (this.parentObjectType === 1 /* EXPERIMENT */) {
+            const syncResult = this.parentObjectId.getSync();
+            const id = syncResult.value;
+            if (!syncResult.resolved) {
+              this.parentObjectId.get().catch(() => {
+              });
+            }
+            if (id) {
+              return `experiment_id:${id}`;
+            }
+          }
+        } catch (e) {
+        }
+        return void 0;
+      }
       // Custom inspect for Node.js console.log
       [Symbol.for("nodejs.util.inspect.custom")]() {
         return `SpanImpl {
@@ -8516,6 +8548,9 @@ View complete results in Braintrust or run experiment.summarize() again.`
           return (await this.lazyMetadata.get()).project;
         })();
       }
+      get loggingState() {
+        return this.state;
+      }
       async getState() {
         await this.lazyMetadata.get();
         return this.state;
@@ -8738,13 +8773,13 @@ View complete results in Braintrust or run experiment.summarize() again.`
         return "slug" in this.metadata ? this.metadata.slug : this.metadata.id;
       }
       get prompt() {
-        return _optionalChain([this, 'access', _94 => _94.getParsedPromptData, 'call', _95 => _95(), 'optionalAccess', _96 => _96.prompt]);
+        return _optionalChain([this, 'access', _95 => _95.getParsedPromptData, 'call', _96 => _96(), 'optionalAccess', _97 => _97.prompt]);
       }
       get version() {
         return this.metadata[TRANSACTION_ID_FIELD];
       }
       get options() {
-        return _optionalChain([this, 'access', _97 => _97.getParsedPromptData, 'call', _98 => _98(), 'optionalAccess', _99 => _99.options]) || {};
+        return _optionalChain([this, 'access', _98 => _98.getParsedPromptData, 'call', _99 => _99(), 'optionalAccess', _100 => _100.options]) || {};
       }
       get promptData() {
         return this.getParsedPromptData();
@@ -8895,7 +8930,7 @@ View complete results in Braintrust or run experiment.summarize() again.`
           return {
             type: "chat",
             messages,
-            ..._optionalChain([prompt, 'access', _100 => _100.tools, 'optionalAccess', _101 => _101.trim, 'call', _102 => _102()]) ? {
+            ..._optionalChain([prompt, 'access', _101 => _101.tools, 'optionalAccess', _102 => _102.trim, 'call', _103 => _103()]) ? {
               tools: render(prompt.tools)
             } : void 0
           };
@@ -8976,7 +9011,7 @@ async function getBaseBranch(remote = void 0) {
     if (git === null) {
       throw new Error("Not in a git repo");
     }
-    const remoteName = await _asyncNullishCoalesce(remote, async () => ( await _asyncOptionalChain([(await git.getRemotes()), 'access', async _103 => _103[0], 'optionalAccess', async _104 => _104.name])));
+    const remoteName = await _asyncNullishCoalesce(remote, async () => ( await _asyncOptionalChain([(await git.getRemotes()), 'access', async _104 => _104[0], 'optionalAccess', async _105 => _105.name])));
     if (!remoteName) {
       throw new Error("No remote found");
     }
@@ -8998,7 +9033,7 @@ async function getBaseBranch(remote = void 0) {
           throw new Error(`Could not find HEAD branch in remote ${remoteName}`);
         }
         branch = match[1];
-      } catch (e11) {
+      } catch (e10) {
         branch = "main";
       }
     }
@@ -9069,7 +9104,7 @@ async function getRepoInfo(settings) {
     return repo;
   }
   let sanitized = {};
-  _optionalChain([settings, 'access', _105 => _105.fields, 'optionalAccess', _106 => _106.forEach, 'call', _107 => _107((field) => {
+  _optionalChain([settings, 'access', _106 => _106.fields, 'optionalAccess', _107 => _107.forEach, 'call', _108 => _108((field) => {
     sanitized = { ...sanitized, [field]: repo[field] };
   })]);
   return sanitized;
@@ -9156,9 +9191,9 @@ function getCallerLocation() {
   const entries = getStackTrace();
   for (const frame of entries) {
     if (thisDir === void 0) {
-      thisDir = _optionalChain([isomorph_default, 'access', _108 => _108.pathDirname, 'optionalCall', _109 => _109(frame.fileName)]);
+      thisDir = _optionalChain([isomorph_default, 'access', _109 => _109.pathDirname, 'optionalCall', _110 => _110(frame.fileName)]);
     }
-    if (_optionalChain([isomorph_default, 'access', _110 => _110.pathDirname, 'optionalCall', _111 => _111(frame.fileName)]) !== thisDir) {
+    if (_optionalChain([isomorph_default, 'access', _111 => _111.pathDirname, 'optionalCall', _112 => _112(frame.fileName)]) !== thisDir) {
       return {
         caller_functionname: frame.functionName,
         caller_filename: frame.fileName,
@@ -10791,6 +10826,9 @@ async function Eval(name, evaluator, reporterOrOpts) {
       repoInfo: evaluator.repoInfo,
       dataset: Dataset2.isDataset(data) ? data : void 0
     });
+    if (experiment && typeof process !== "undefined" && _optionalChain([process, 'access', _113 => _113.env, 'optionalAccess', _114 => _114.BRAINTRUST_OTEL_COMPAT, 'optionalAccess', _115 => _115.toLowerCase, 'call', _116 => _116()]) === "true") {
+      await experiment._waitForId();
+    }
     if (experiment && options.onStart) {
       const summary = await experiment.summarize({ summarizeScores: false });
       options.onStart(summary);
@@ -10973,10 +11011,10 @@ async function runEvaluatorInternal(experiment, evaluator, progressReporter, fil
                 span,
                 parameters: _nullishCoalesce(parameters, () => ( {})),
                 reportProgress: (event) => {
-                  _optionalChain([stream, 'optionalCall', _112 => _112({
+                  _optionalChain([stream, 'optionalCall', _117 => _117({
                     ...event,
                     id: rootSpan.id,
-                    origin: _optionalChain([baseEvent, 'access', _113 => _113.event, 'optionalAccess', _114 => _114.origin]),
+                    origin: _optionalChain([baseEvent, 'access', _118 => _118.event, 'optionalAccess', _119 => _119.origin]),
                     name: evaluator.evalName,
                     object_type: "task"
                   })]);
@@ -11126,7 +11164,7 @@ async function runEvaluatorInternal(experiment, evaluator, progressReporter, fil
             ...scores
           },
           error: error2,
-          origin: _optionalChain([baseEvent, 'access', _115 => _115.event, 'optionalAccess', _116 => _116.origin])
+          origin: _optionalChain([baseEvent, 'access', _120 => _120.event, 'optionalAccess', _121 => _121.origin])
         });
       };
       if (!experiment) {
@@ -11351,12 +11389,12 @@ async function cachedLogin(options) {
 }
 function makeCheckAuthorized(allowedOrgName) {
   return async (req, _res, next) => {
-    if (!_optionalChain([req, 'access', _117 => _117.ctx, 'optionalAccess', _118 => _118.token])) {
+    if (!_optionalChain([req, 'access', _122 => _122.ctx, 'optionalAccess', _123 => _123.token])) {
       return next(_httperrors2.default.call(void 0, 401, "Unauthorized"));
     }
     try {
       const state = await cachedLogin({
-        apiKey: _optionalChain([req, 'access', _119 => _119.ctx, 'optionalAccess', _120 => _120.token]),
+        apiKey: _optionalChain([req, 'access', _124 => _124.ctx, 'optionalAccess', _125 => _125.token]),
         orgName: allowedOrgName
       });
       req.ctx.state = state;
@@ -11567,7 +11605,7 @@ function runDevServer(evaluators, opts) {
         scores,
         stream
       } = evalBodySchema.parse(req.body);
-      if (!_optionalChain([req, 'access', _121 => _121.ctx, 'optionalAccess', _122 => _122.state])) {
+      if (!_optionalChain([req, 'access', _126 => _126.ctx, 'optionalAccess', _127 => _127.state])) {
         res.status(500).json({ error: "Braintrust state not initialized in request" });
         return;
       }
@@ -11624,7 +11662,7 @@ function runDevServer(evaluators, opts) {
             ...evaluator,
             data: evalData.data,
             scores: evaluator.scores.concat(
-              _nullishCoalesce(_optionalChain([scores, 'optionalAccess', _123 => _123.map, 'call', _124 => _124(
+              _nullishCoalesce(_optionalChain([scores, 'optionalAccess', _128 => _128.map, 'call', _129 => _129(
                 (score) => makeScorer(state, score.name, score.function_id)
               )]), () => ( []))
             ),

package/dev/dist/index.mjs

@@ -5141,7 +5141,6 @@ var init_context3 = __esm({
   "src/otel/context.ts"() {
     "use strict";
     init_logger();
-    init_util();
     OTEL_NOT_INSTALLED_MESSAGE = "OpenTelemetry packages are not installed. Install them with: npm install @opentelemetry/api @opentelemetry/sdk-trace-base";
     otelTrace = null;
     otelContext = null;
@@ -5204,6 +5203,10 @@ var init_context3 = __esm({
             const currentContext = otelContext.active();
             let newContext = otelTrace.setSpan(currentContext, wrappedContext);
             newContext = newContext.setValue("braintrust_span", span);
+            const parentValue = span._getOtelParent();
+            if (parentValue) {
+              newContext = newContext.setValue("braintrust.parent", parentValue);
+            }
             return otelContext.with(newContext, callback);
           }
         } catch (error2) {
@@ -5219,34 +5222,6 @@ var init_context3 = __esm({
         }
         return void 0;
       }
-      _getOtelParent(span) {
-        if (!span.parentObjectType || !span.parentObjectId) {
-          return void 0;
-        }
-        try {
-          const parentType = span.parentObjectType;
-          const parentId = span.parentObjectId;
-          if (parentType === 2 /* PROJECT_LOGS */) {
-            const id = typeof parentId === "object" && parentId !== null && "get" in parentId ? (
-              // eslint-disable-next-line @typescript-eslint/consistent-type-assertions -- Type guard ensures object has get method
-              parentId.get()
-            ) : parentId;
-            if (typeof id === "string") {
-              return `project_id:${id}`;
-            }
-          } else if (parentType === 1 /* EXPERIMENT */) {
-            const id = typeof parentId === "object" && parentId !== null && "get" in parentId ? (
-              // eslint-disable-next-line @typescript-eslint/consistent-type-assertions -- Type guard ensures object has get method
-              parentId.get()
-            ) : parentId;
-            if (typeof id === "string") {
-              return `experiment_id:${id}`;
-            }
-          }
-        } catch {
-        }
-        return void 0;
-      }
     };
   }
 });
@@ -6521,6 +6496,9 @@ var init_logger = __esm({
       state() {
         return _internalGetGlobalState();
       }
+      _getOtelParent() {
+        return void 0;
+      }
       // Custom inspect for Node.js console.log
       [Symbol.for("nodejs.util.inspect.custom")]() {
         return `NoopSpan {
@@ -7248,6 +7226,9 @@ with a Blob/ArrayBuffer, or run the program on Node.js.`
       get id() {
         return (async () => (await this.project).id)();
       }
+      get loggingState() {
+        return this.state;
+      }
       parentObjectType() {
         return 2 /* PROJECT_LOGS */;
       }
@@ -7908,6 +7889,18 @@ Error: ${errorText}`;
           return (await this.lazyMetadata.get()).experiment.id;
         })();
       }
+      get loggingState() {
+        return this.state;
+      }
+      /**
+       * Wait for the experiment ID to be resolved. This is useful for ensuring the ID
+       * is available synchronously in child spans (for OTEL parent attributes).
+       * @internal
+       */
+      async _waitForId() {
+        await this.lazyId.get().catch(() => {
+        });
+      }
       get name() {
         return (async () => {
           return (await this.lazyMetadata.get()).experiment.name;
@@ -8164,6 +8157,9 @@ View complete results in Braintrust or run experiment.summarize() again.`
           return (await this.lazyMetadata.get()).experiment.name;
         })();
       }
+      get loggingState() {
+        return this.state;
+      }
       async getState() {
         await this.lazyMetadata.get();
         return this.state;
@@ -8460,6 +8456,42 @@ View complete results in Braintrust or run experiment.summarize() again.`
       state() {
         return this._state;
       }
+      /**
+       * Internal method to get the OTEL parent string for this span.
+       * This is used by OtelContextManager to set the braintrust.parent attribute.
+       * @returns A string like "project_id:X" or "experiment_id:X", or undefined if no parent
+       */
+      _getOtelParent() {
+        if (!this.parentObjectType) {
+          return void 0;
+        }
+        try {
+          if (this.parentObjectType === 2 /* PROJECT_LOGS */) {
+            const syncResult = this.parentObjectId.getSync();
+            const id = syncResult.value;
+            const args = this.parentComputeObjectMetadataArgs;
+            if (id) {
+              return `project_id:${id}`;
+            }
+            const projectName = args?.project_name;
+            if (projectName) {
+              return `project_name:${projectName}`;
+            }
+          } else if (this.parentObjectType === 1 /* EXPERIMENT */) {
+            const syncResult = this.parentObjectId.getSync();
+            const id = syncResult.value;
+            if (!syncResult.resolved) {
+              this.parentObjectId.get().catch(() => {
+              });
+            }
+            if (id) {
+              return `experiment_id:${id}`;
+            }
+          }
+        } catch (e) {
+        }
+        return void 0;
+      }
       // Custom inspect for Node.js console.log
       [Symbol.for("nodejs.util.inspect.custom")]() {
         return `SpanImpl {
@@ -8516,6 +8548,9 @@ View complete results in Braintrust or run experiment.summarize() again.`
           return (await this.lazyMetadata.get()).project;
         })();
       }
+      get loggingState() {
+        return this.state;
+      }
       async getState() {
         await this.lazyMetadata.get();
         return this.state;
@@ -10791,6 +10826,9 @@ async function Eval(name, evaluator, reporterOrOpts) {
       repoInfo: evaluator.repoInfo,
       dataset: Dataset2.isDataset(data) ? data : void 0
     });
+    if (experiment && typeof process !== "undefined" && process.env?.BRAINTRUST_OTEL_COMPAT?.toLowerCase() === "true") {
+      await experiment._waitForId();
+    }
     if (experiment && options.onStart) {
       const summary = await experiment.summarize({ summarizeScores: false });
       options.onStart(summary);