Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion e2e/helpers/prod-forwarding.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ export async function initializeProdForwarding(): Promise<void> {
const logger = initLogger({
apiKey,
appUrl: process.env.BRAINTRUST_APP_URL,
asyncFlush: false,
forceLogin: true,
projectName,
});
Expand Down
15 changes: 5 additions & 10 deletions integrations/langchain-js/src/BraintrustCallbackHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,18 @@ import {
type LangChainCallbackHandlerOptions,
} from "braintrust";

type BraintrustCallbackHandlerOptions<IsAsyncFlush extends boolean> =
LangChainCallbackHandlerOptions<IsAsyncFlush>;
type BraintrustCallbackHandlerOptions = LangChainCallbackHandlerOptions;

/**
* A Braintrust tracer for LangChain.js that logs LLM calls, chains, and tools.
*/
export class BraintrustCallbackHandler<
IsAsyncFlush extends boolean,
> extends BaseCallbackHandler {
export class BraintrustCallbackHandler extends BaseCallbackHandler {
name = "BraintrustCallbackHandler";
private inner: BraintrustLangChainCallbackHandler<IsAsyncFlush>;
private inner: BraintrustLangChainCallbackHandler;

constructor(
options?: Partial<BraintrustCallbackHandlerOptions<IsAsyncFlush>>,
) {
constructor(options?: Partial<BraintrustCallbackHandlerOptions>) {
super();
this.inner = new BraintrustLangChainCallbackHandler<IsAsyncFlush>(options);
this.inner = new BraintrustLangChainCallbackHandler(options);
}

handleLLMStart(
Expand Down
2 changes: 1 addition & 1 deletion integrations/openai-agents-js/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ function getTimeElapsed(end?: string, start?: string): number | undefined {
export class OpenAIAgentsTraceProcessor {
private static readonly DEFAULT_MAX_TRACES = 10000;

private logger?: Logger<any>;
private logger?: Logger;
private maxTraces: number;
private traceSpans = new Map<
string,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ describe(
TEST_SUITE_OPTIONS,
() => {
let backgroundLogger: TestBackgroundLogger;
let _logger: Logger<false>;
let _logger: Logger;
let Agent: any;
let run: any;
let tool: any;
Expand Down
2 changes: 1 addition & 1 deletion integrations/openai-agents-js/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export type TraceMetadata = {
};

export interface OpenAIAgentsTraceProcessorOptions {
logger?: Logger<any>;
logger?: Logger;
maxTraces?: number;
}

Expand Down
3 changes: 0 additions & 3 deletions js/src/exports.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,11 @@ export type {
InitLoggerOptions,
InitOptions,
LoadPromptOptions,
LogOptions,
LoginOptions,
Logs3OverflowInputRow,
Logs3OverflowUpload,
MetricSummary,
ObjectMetadata,
PromiseUnless,
PropagationContext,
PromptRowWithId,
ScoreSummary,
Expand Down Expand Up @@ -125,7 +123,6 @@ export {
withCurrent,
withDataset,
withExperiment,
withLogger,
withParent,
wrapTraced,
registerOtelFlush,
Expand Down
4 changes: 2 additions & 2 deletions js/src/instrumentation/providers/eve-instrumentation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ class EveBridge {
turn: TurnState,
event: { input?: unknown; output?: unknown },
): void {
currentLogger<true>()?.updateSpan({
currentLogger()?.updateSpan({
id: turn.rowId,
root_span_id: turn.rootSpanId,
span_id: turn.spanId,
Expand Down Expand Up @@ -637,7 +637,7 @@ class EveBridge {
if (Object.keys(totals).length === 0) {
return;
}
currentLogger<true>()?.updateSpan({
currentLogger()?.updateSpan({
id: turn.rowId,
metrics: totals,
root_span_id: turn.rootSpanId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ type TraceMetadata = {
};

export interface OpenAIAgentsTraceProcessorOptions {
logger?: Logger<any>;
logger?: Logger;
maxTraces?: number;
}

Expand Down Expand Up @@ -180,7 +180,7 @@ function parseUsageMetrics(usage: unknown): Record<string, number> {
export class OpenAIAgentsTraceProcessor {
private static readonly DEFAULT_MAX_TRACES = 10000;

private logger?: Logger<any>;
private logger?: Logger;
private maxTraces: number;
private traceSpans = new Map<
string,
Expand Down
70 changes: 69 additions & 1 deletion js/src/logger.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
/* eslint-disable @typescript-eslint/consistent-type-assertions */

import { vi, expect, test, describe, beforeEach, afterEach } from "vitest";
import {
vi,
expect,
expectTypeOf,
test,
describe,
beforeEach,
afterEach,
} from "vitest";
import {
_exportsForTestingOnly,
init,
Expand All @@ -11,6 +19,7 @@ import {
loadPrompt,
loadParameters,
wrapTraced,
traced,
currentSpan,
withParent,
startSpan,
Expand All @@ -19,6 +28,8 @@ import {
deepCopyEvent,
ReadonlyExperiment,
renderMessageImpl,
flush,
type InitLoggerOptions,
} from "./logger";

import { configureNode } from "./node/config";
Expand All @@ -31,6 +42,12 @@ import { SpanCache } from "./span-cache";

configureNode();

type InitLoggerHasAsyncFlush = "asyncFlush" extends keyof InitLoggerOptions
? true
: false;

expectTypeOf<InitLoggerHasAsyncFlush>().toEqualTypeOf<false>();

test("renderMessage with file content parts", () => {
const message = {
role: "user" as const,
Expand Down Expand Up @@ -426,6 +443,57 @@ test("verify MemoryBackgroundLogger intercepts logs", async () => {
_exportsForTestingOnly.clearTestBackgroundLogger(); // can go back to normal
});

test("logger and tracing APIs preserve return shapes without implicit flushing", async () => {
await _exportsForTestingOnly.simulateLoginForTests();
const backgroundLogger = _exportsForTestingOnly.useTestBackgroundLogger();
const flushSpy = vi.spyOn(backgroundLogger, "flush");

try {
const logger = initLogger({
projectName: "test",
projectId: "test-project-id",
});

const id = logger.log({ input: "input" });
expectTypeOf(id).toEqualTypeOf<string>();

const loggerSyncResult = logger.traced(() => 42 as const);
expectTypeOf(loggerSyncResult).toEqualTypeOf<42>();
expect(loggerSyncResult).toBe(42);

const loggerAsyncResult = logger.traced(async () => 43);
expectTypeOf(loggerAsyncResult).toEqualTypeOf<Promise<number>>();
await expect(loggerAsyncResult).resolves.toBe(43);

const tracedSyncResult = traced(() => "sync" as const);
expectTypeOf(tracedSyncResult).toEqualTypeOf<"sync">();
expect(tracedSyncResult).toBe("sync");

const syncFunction = (value: number) => value + 1;
const wrappedSyncFunction = wrapTraced(syncFunction);
expectTypeOf(wrappedSyncFunction).toEqualTypeOf<typeof syncFunction>();
expect(wrappedSyncFunction(1)).toBe(2);

const asyncFunction = async (value: number) => value + 1;
const wrappedAsyncFunction = wrapTraced(asyncFunction);
expectTypeOf(wrappedAsyncFunction).toEqualTypeOf<typeof asyncFunction>();
await expect(wrappedAsyncFunction(2)).resolves.toBe(3);

expect(flushSpy).not.toHaveBeenCalled();

await logger.flush();
const span = logger.startSpan({ name: "explicit-flush" });
span.end();
await span.flush();
await flush();

expect(flushSpy).toHaveBeenCalledTimes(3);
} finally {
_exportsForTestingOnly.clearTestBackgroundLogger();
_exportsForTestingOnly.simulateLogoutForTests();
}
});

test("init validation", () => {
expect(() => init({})).toThrow(
"Must specify at least one of project or projectId",
Expand Down
Loading
Loading