feat(google-adk): add ADK instrumentation and e2e coverage by AbhiPrasad · Pull Request #1765 · braintrustdata/braintrust-sdk-javascript

Abhijeet Prasad (AbhiPrasad) · 2026-04-09T03:52:06Z

resolves#1477

Add Braintrust instrumentation for @google/adk with auto-instrumentation support by default when users run with Braintrust's loader hook.

This adds tracing for:

Runner.runAsync
BaseAgent.runAsync and subclasses
FunctionTool.runAsync

It also adds Google ADK e2e coverage for both hook-driven and wrapped execution.

Because ADK uses @google/genai under the hood, underlying LLM spans continue to come from the existing Google GenAI instrumentation.

Recommended usage: auto-instrumentation

The primary way users should adopt this is via Braintrust auto-instrumentation:

node --import braintrust/hook.mjs app.mjs

Then they can use @google/adk normally and Braintrust will trace supported ADK operations automatically.

Example:

import*asadkfrom"@google/adk";import{initLogger}from"braintrust";initLogger({projectName: "my-google-adk-app"});constagent=newadk.LlmAgent({name: "weather_agent",model: "gemini-2.5-flash-lite",instruction: "Answer weather questions",});construnner=newadk.InMemoryRunner({ agent,appName: "weather-app"});awaitrunner.sessionService.createSession({appName: runner.appName,userId: "user-1",sessionId: "session-1",});forawait(consteventofrunner.runAsync({userId: "user-1",sessionId: "session-1",newMessage: {role: "user",parts: [{text: "What's the weather in Paris?"}],},})){console.log(event);}

If needed, it can be disabled with:

BRAINTRUST_DISABLE_INSTRUMENTATION=google-adk node --import braintrust/hook.mjs app.mjs

Manual usage

Manual wrapping is also available for cases where users want explicit control:

import*asadkfrom"@google/adk";import{wrapGoogleADK}from"braintrust";constwrapped=wrapGoogleADK(adk);

Screenshot

Abhijeet Prasad (AbhiPrasad) · 2026-04-09T03:55:48Z

wait this need some more work. I realized the parent child relationships are wrong 😢

Luca Forstner (lforst) · 2026-04-09T10:28:59Z

wait this need some more work. I realized the parent child relationships are wrong 😢

I honestly don't know why this is so painful in this SDK. Tracing channels make it harder because they are event based. It should honestly just be a simple wrapping call imo.

Add manual and load-time instrumentation for `@google/adk` across runner, agent, and tool execution. This introduces the wrapper entrypoint, tracing-channel plugin, vendored SDK types, exports, and loader config needed to emit Braintrust spans for Google ADK workflows. Add a dedicated Google ADK e2e scenario with a committed lockfile and stable snapshots for both wrapped and hook-driven execution. Stabilize the scenario by pre-creating ADK sessions, letting the loader hook respect `BRAINTRUST_DISABLE_INSTRUMENTATION`, and normalizing volatile outputs in the assertions so the coverage stays repeatable.

Abhijeet Prasad (AbhiPrasad) · 2026-04-13T14:11:35Z

Okay fixed the parent-child relationships! This is good to review now.

socket-security · 2026-04-13T14:12:24Z

Review the following changes in direct dependencies. Learn more about Socket for GitHub.

Diff	Package	Supply Chain Security	Vulnerability	Quality	Maintenance
	next@15.5.15 ⏵ 14.2.34	⁺²⁰	^-30	⁺⁴	^-46
	@ai-sdk/openai@3.0.52 ⏵ 1.3.24	^-1		^-3
	@ai-sdk/openai@3.0.52 ⏵ 2.0.53	^-1		^-3
	@opentelemetry/exporter-trace-otlp-http@0.53.0 ⏵ 0.200.0
	@opentelemetry/exporter-trace-otlp-http@0.53.0 ⏵ 0.205.0
	@opentelemetry/context-async-hooks@1.26.0 ⏵ 2.6.1			^-4
	openai@5.23.2
	@vercel/otel@0.1.0
	cohere-ai@7.21.0
	cohere-ai@8.0.0
	@types/react-dom@18.3.7
	@braintrust/otel@0.1.2
	@opentelemetry/sdk-trace-base@1.26.0 ⏵ 2.0.0	⁺¹
	cohere-ai@7.20.0
	@ai-sdk/openai@3.0.52 ⏵ 0.0.62	⁺²⁸		^-5	^-1
	@opentelemetry/otlp-exporter-base@0.53.0 ⏵ 0.205.0	⁺¹		^-1
	react@19.2.5 ⏵ 18.3.1			⁺¹
	@opentelemetry/otlp-exporter-base@0.53.0 ⏵ 0.35.0	⁺¹			^-3
	@ai-sdk/openai@3.0.52 ⏵ 2.0.57	⁺²⁸		^-3
	@ai-sdk/openai@3.0.52 ⏵ 3.0.7	⁺²⁷		^-2
	@opentelemetry/otlp-transformer@0.53.0 ⏵ 0.35.0	⁺¹		^-3	^-3
	@vercel/otel@2.1.0
	@opentelemetry/context-async-hooks@1.26.0 ⏵ 1.9.0	⁺²⁷		⁺¹	^-5
	@opentelemetry/sdk-trace-base@1.26.0 ⏵ 1.9.0	⁺²²			^-5
	zod@4.1.11
	ai@6.0.159 ⏵ 5.0.76	^-10
	typescript@5.4.4
	braintrust@2.2.2 ⏵ 2.2.1-rc.0	⁺¹
	@opentelemetry/exporter-trace-otlp-http@0.53.0 ⏵ 0.35.0	⁺²⁶			^-3
	react-dom@19.2.5 ⏵ 18.3.1	^-7
	ai@6.0.159 ⏵ 6.0.1	^-8
	cohere-ai@7.14.0
See 15 more rows in the dashboard

View full report

Luca Forstner (lforst) · 2026-04-14T09:47:36Z

The wrapper is still not perfect. It's not capturing llm spans. I am still gonna merge because the package has too little downloads to justify putting more work in.

Abhijeet Prasad (AbhiPrasad) · 2026-04-09T03:52:06Z

resolves#1477

Add Braintrust instrumentation for @google/adk with auto-instrumentation support by default when users run with Braintrust's loader hook.

This adds tracing for:

Runner.runAsync
BaseAgent.runAsync and subclasses
FunctionTool.runAsync

It also adds Google ADK e2e coverage for both hook-driven and wrapped execution.

Because ADK uses @google/genai under the hood, underlying LLM spans continue to come from the existing Google GenAI instrumentation.

Recommended usage: auto-instrumentation

The primary way users should adopt this is via Braintrust auto-instrumentation:

node --import braintrust/hook.mjs app.mjs

Then they can use @google/adk normally and Braintrust will trace supported ADK operations automatically.

Example:

import*asadkfrom"@google/adk";import{initLogger}from"braintrust";initLogger({projectName: "my-google-adk-app"});constagent=newadk.LlmAgent({name: "weather_agent",model: "gemini-2.5-flash-lite",instruction: "Answer weather questions",});construnner=newadk.InMemoryRunner({ agent,appName: "weather-app"});awaitrunner.sessionService.createSession({appName: runner.appName,userId: "user-1",sessionId: "session-1",});forawait(consteventofrunner.runAsync({userId: "user-1",sessionId: "session-1",newMessage: {role: "user",parts: [{text: "What's the weather in Paris?"}],},})){console.log(event);}

If needed, it can be disabled with:

BRAINTRUST_DISABLE_INSTRUMENTATION=google-adk node --import braintrust/hook.mjs app.mjs

Manual usage

Manual wrapping is also available for cases where users want explicit control:

import*asadkfrom"@google/adk";import{wrapGoogleADK}from"braintrust";constwrapped=wrapGoogleADK(adk);

Screenshot

Abhijeet Prasad (AbhiPrasad) · 2026-04-09T03:55:48Z

wait this need some more work. I realized the parent child relationships are wrong 😢

Luca Forstner (lforst) · 2026-04-09T10:28:59Z

wait this need some more work. I realized the parent child relationships are wrong 😢

I honestly don't know why this is so painful in this SDK. Tracing channels make it harder because they are event based. It should honestly just be a simple wrapping call imo.

Add manual and load-time instrumentation for `@google/adk` across runner, agent, and tool execution. This introduces the wrapper entrypoint, tracing-channel plugin, vendored SDK types, exports, and loader config needed to emit Braintrust spans for Google ADK workflows. Add a dedicated Google ADK e2e scenario with a committed lockfile and stable snapshots for both wrapped and hook-driven execution. Stabilize the scenario by pre-creating ADK sessions, letting the loader hook respect `BRAINTRUST_DISABLE_INSTRUMENTATION`, and normalizing volatile outputs in the assertions so the coverage stays repeatable.

Abhijeet Prasad (AbhiPrasad) · 2026-04-13T14:11:35Z

Okay fixed the parent-child relationships! This is good to review now.

socket-security · 2026-04-13T14:12:24Z

Review the following changes in direct dependencies. Learn more about Socket for GitHub.

Diff	Package	Supply Chain Security	Vulnerability	Quality	Maintenance
	next@15.5.15 ⏵ 14.2.34	⁺²⁰	^-30	⁺⁴	^-46
	@ai-sdk/openai@3.0.52 ⏵ 1.3.24	^-1		^-3
	@ai-sdk/openai@3.0.52 ⏵ 2.0.53	^-1		^-3
	@opentelemetry/exporter-trace-otlp-http@0.53.0 ⏵ 0.200.0
	@opentelemetry/exporter-trace-otlp-http@0.53.0 ⏵ 0.205.0
	@opentelemetry/context-async-hooks@1.26.0 ⏵ 2.6.1			^-4
	openai@5.23.2
	@vercel/otel@0.1.0
	cohere-ai@7.21.0
	cohere-ai@8.0.0
	@types/react-dom@18.3.7
	@braintrust/otel@0.1.2
	@opentelemetry/sdk-trace-base@1.26.0 ⏵ 2.0.0	⁺¹
	cohere-ai@7.20.0
	@ai-sdk/openai@3.0.52 ⏵ 0.0.62	⁺²⁸		^-5	^-1
	@opentelemetry/otlp-exporter-base@0.53.0 ⏵ 0.205.0	⁺¹		^-1
	react@19.2.5 ⏵ 18.3.1			⁺¹
	@opentelemetry/otlp-exporter-base@0.53.0 ⏵ 0.35.0	⁺¹			^-3
	@ai-sdk/openai@3.0.52 ⏵ 2.0.57	⁺²⁸		^-3
	@ai-sdk/openai@3.0.52 ⏵ 3.0.7	⁺²⁷		^-2
	@opentelemetry/otlp-transformer@0.53.0 ⏵ 0.35.0	⁺¹		^-3	^-3
	@vercel/otel@2.1.0
	@opentelemetry/context-async-hooks@1.26.0 ⏵ 1.9.0	⁺²⁷		⁺¹	^-5
	@opentelemetry/sdk-trace-base@1.26.0 ⏵ 1.9.0	⁺²²			^-5
	zod@4.1.11
	ai@6.0.159 ⏵ 5.0.76	^-10
	typescript@5.4.4
	braintrust@2.2.2 ⏵ 2.2.1-rc.0	⁺¹
	@opentelemetry/exporter-trace-otlp-http@0.53.0 ⏵ 0.35.0	⁺²⁶			^-3
	react-dom@19.2.5 ⏵ 18.3.1	^-7
	ai@6.0.159 ⏵ 6.0.1	^-8
	cohere-ai@7.14.0
See 15 more rows in the dashboard

View full report

Luca Forstner (lforst) · 2026-04-14T09:47:36Z

The wrapper is still not perfect. It's not capturing llm spans. I am still gonna merge because the package has too little downloads to justify putting more work in.

Abhijeet Prasad (AbhiPrasad) · 2026-04-09T03:52:06Z

resolves#1477

Add Braintrust instrumentation for @google/adk with auto-instrumentation support by default when users run with Braintrust's loader hook.

This adds tracing for:

Runner.runAsync
BaseAgent.runAsync and subclasses
FunctionTool.runAsync

It also adds Google ADK e2e coverage for both hook-driven and wrapped execution.

Because ADK uses @google/genai under the hood, underlying LLM spans continue to come from the existing Google GenAI instrumentation.

Recommended usage: auto-instrumentation

The primary way users should adopt this is via Braintrust auto-instrumentation:

node --import braintrust/hook.mjs app.mjs

Then they can use @google/adk normally and Braintrust will trace supported ADK operations automatically.

Example:

import*asadkfrom"@google/adk";import{initLogger}from"braintrust";initLogger({projectName: "my-google-adk-app"});constagent=newadk.LlmAgent({name: "weather_agent",model: "gemini-2.5-flash-lite",instruction: "Answer weather questions",});construnner=newadk.InMemoryRunner({ agent,appName: "weather-app"});awaitrunner.sessionService.createSession({appName: runner.appName,userId: "user-1",sessionId: "session-1",});forawait(consteventofrunner.runAsync({userId: "user-1",sessionId: "session-1",newMessage: {role: "user",parts: [{text: "What's the weather in Paris?"}],},})){console.log(event);}

If needed, it can be disabled with:

BRAINTRUST_DISABLE_INSTRUMENTATION=google-adk node --import braintrust/hook.mjs app.mjs

Manual usage

Manual wrapping is also available for cases where users want explicit control:

import*asadkfrom"@google/adk";import{wrapGoogleADK}from"braintrust";constwrapped=wrapGoogleADK(adk);

Screenshot

Abhijeet Prasad (AbhiPrasad) · 2026-04-09T03:55:48Z

wait this need some more work. I realized the parent child relationships are wrong 😢

Luca Forstner (lforst) · 2026-04-09T10:28:59Z

wait this need some more work. I realized the parent child relationships are wrong 😢

I honestly don't know why this is so painful in this SDK. Tracing channels make it harder because they are event based. It should honestly just be a simple wrapping call imo.

Add manual and load-time instrumentation for `@google/adk` across runner, agent, and tool execution. This introduces the wrapper entrypoint, tracing-channel plugin, vendored SDK types, exports, and loader config needed to emit Braintrust spans for Google ADK workflows. Add a dedicated Google ADK e2e scenario with a committed lockfile and stable snapshots for both wrapped and hook-driven execution. Stabilize the scenario by pre-creating ADK sessions, letting the loader hook respect `BRAINTRUST_DISABLE_INSTRUMENTATION`, and normalizing volatile outputs in the assertions so the coverage stays repeatable.

Abhijeet Prasad (AbhiPrasad) · 2026-04-13T14:11:35Z

Okay fixed the parent-child relationships! This is good to review now.

socket-security · 2026-04-13T14:12:24Z

Review the following changes in direct dependencies. Learn more about Socket for GitHub.

Diff	Package	Supply Chain Security	Vulnerability	Quality	Maintenance
	next@15.5.15 ⏵ 14.2.34	⁺²⁰	^-30	⁺⁴	^-46
	@ai-sdk/openai@3.0.52 ⏵ 1.3.24	^-1		^-3
	@ai-sdk/openai@3.0.52 ⏵ 2.0.53	^-1		^-3
	@opentelemetry/exporter-trace-otlp-http@0.53.0 ⏵ 0.200.0
	@opentelemetry/exporter-trace-otlp-http@0.53.0 ⏵ 0.205.0
	@opentelemetry/context-async-hooks@1.26.0 ⏵ 2.6.1			^-4
	openai@5.23.2
	@vercel/otel@0.1.0
	cohere-ai@7.21.0
	cohere-ai@8.0.0
	@types/react-dom@18.3.7
	@braintrust/otel@0.1.2
	@opentelemetry/sdk-trace-base@1.26.0 ⏵ 2.0.0	⁺¹
	cohere-ai@7.20.0
	@ai-sdk/openai@3.0.52 ⏵ 0.0.62	⁺²⁸		^-5	^-1
	@opentelemetry/otlp-exporter-base@0.53.0 ⏵ 0.205.0	⁺¹		^-1
	react@19.2.5 ⏵ 18.3.1			⁺¹
	@opentelemetry/otlp-exporter-base@0.53.0 ⏵ 0.35.0	⁺¹			^-3
	@ai-sdk/openai@3.0.52 ⏵ 2.0.57	⁺²⁸		^-3
	@ai-sdk/openai@3.0.52 ⏵ 3.0.7	⁺²⁷		^-2
	@opentelemetry/otlp-transformer@0.53.0 ⏵ 0.35.0	⁺¹		^-3	^-3
	@vercel/otel@2.1.0
	@opentelemetry/context-async-hooks@1.26.0 ⏵ 1.9.0	⁺²⁷		⁺¹	^-5
	@opentelemetry/sdk-trace-base@1.26.0 ⏵ 1.9.0	⁺²²			^-5
	zod@4.1.11
	ai@6.0.159 ⏵ 5.0.76	^-10
	typescript@5.4.4
	braintrust@2.2.2 ⏵ 2.2.1-rc.0	⁺¹
	@opentelemetry/exporter-trace-otlp-http@0.53.0 ⏵ 0.35.0	⁺²⁶			^-3
	react-dom@19.2.5 ⏵ 18.3.1	^-7
	ai@6.0.159 ⏵ 6.0.1	^-8
	cohere-ai@7.14.0
See 15 more rows in the dashboard

View full report

Luca Forstner (lforst) · 2026-04-14T09:47:36Z

The wrapper is still not perfect. It's not capturing llm spans. I am still gonna merge because the package has too little downloads to justify putting more work in.

Abhijeet Prasad (AbhiPrasad) · 2026-04-09T03:52:06Z

resolves#1477

Add Braintrust instrumentation for @google/adk with auto-instrumentation support by default when users run with Braintrust's loader hook.

This adds tracing for:

Runner.runAsync
BaseAgent.runAsync and subclasses
FunctionTool.runAsync

It also adds Google ADK e2e coverage for both hook-driven and wrapped execution.

Because ADK uses @google/genai under the hood, underlying LLM spans continue to come from the existing Google GenAI instrumentation.

Recommended usage: auto-instrumentation

The primary way users should adopt this is via Braintrust auto-instrumentation:

node --import braintrust/hook.mjs app.mjs

Then they can use @google/adk normally and Braintrust will trace supported ADK operations automatically.

Example:

import*asadkfrom"@google/adk";import{initLogger}from"braintrust";initLogger({projectName: "my-google-adk-app"});constagent=newadk.LlmAgent({name: "weather_agent",model: "gemini-2.5-flash-lite",instruction: "Answer weather questions",});construnner=newadk.InMemoryRunner({ agent,appName: "weather-app"});awaitrunner.sessionService.createSession({appName: runner.appName,userId: "user-1",sessionId: "session-1",});forawait(consteventofrunner.runAsync({userId: "user-1",sessionId: "session-1",newMessage: {role: "user",parts: [{text: "What's the weather in Paris?"}],},})){console.log(event);}

If needed, it can be disabled with:

BRAINTRUST_DISABLE_INSTRUMENTATION=google-adk node --import braintrust/hook.mjs app.mjs

Manual usage

Manual wrapping is also available for cases where users want explicit control:

import*asadkfrom"@google/adk";import{wrapGoogleADK}from"braintrust";constwrapped=wrapGoogleADK(adk);

Screenshot

Abhijeet Prasad (AbhiPrasad) · 2026-04-09T03:55:48Z

wait this need some more work. I realized the parent child relationships are wrong 😢

Luca Forstner (lforst) · 2026-04-09T10:28:59Z

wait this need some more work. I realized the parent child relationships are wrong 😢

I honestly don't know why this is so painful in this SDK. Tracing channels make it harder because they are event based. It should honestly just be a simple wrapping call imo.

Add manual and load-time instrumentation for `@google/adk` across runner, agent, and tool execution. This introduces the wrapper entrypoint, tracing-channel plugin, vendored SDK types, exports, and loader config needed to emit Braintrust spans for Google ADK workflows. Add a dedicated Google ADK e2e scenario with a committed lockfile and stable snapshots for both wrapped and hook-driven execution. Stabilize the scenario by pre-creating ADK sessions, letting the loader hook respect `BRAINTRUST_DISABLE_INSTRUMENTATION`, and normalizing volatile outputs in the assertions so the coverage stays repeatable.

Abhijeet Prasad (AbhiPrasad) · 2026-04-13T14:11:35Z

Okay fixed the parent-child relationships! This is good to review now.

socket-security · 2026-04-13T14:12:24Z

Review the following changes in direct dependencies. Learn more about Socket for GitHub.

Diff	Package	Supply Chain Security	Vulnerability	Quality	Maintenance
	next@15.5.15 ⏵ 14.2.34	⁺²⁰	^-30	⁺⁴	^-46
	@ai-sdk/openai@3.0.52 ⏵ 1.3.24	^-1		^-3
	@ai-sdk/openai@3.0.52 ⏵ 2.0.53	^-1		^-3
	@opentelemetry/exporter-trace-otlp-http@0.53.0 ⏵ 0.200.0
	@opentelemetry/exporter-trace-otlp-http@0.53.0 ⏵ 0.205.0
	@opentelemetry/context-async-hooks@1.26.0 ⏵ 2.6.1			^-4
	openai@5.23.2
	@vercel/otel@0.1.0
	cohere-ai@7.21.0
	cohere-ai@8.0.0
	@types/react-dom@18.3.7
	@braintrust/otel@0.1.2
	@opentelemetry/sdk-trace-base@1.26.0 ⏵ 2.0.0	⁺¹
	cohere-ai@7.20.0
	@ai-sdk/openai@3.0.52 ⏵ 0.0.62	⁺²⁸		^-5	^-1
	@opentelemetry/otlp-exporter-base@0.53.0 ⏵ 0.205.0	⁺¹		^-1
	react@19.2.5 ⏵ 18.3.1			⁺¹
	@opentelemetry/otlp-exporter-base@0.53.0 ⏵ 0.35.0	⁺¹			^-3
	@ai-sdk/openai@3.0.52 ⏵ 2.0.57	⁺²⁸		^-3
	@ai-sdk/openai@3.0.52 ⏵ 3.0.7	⁺²⁷		^-2
	@opentelemetry/otlp-transformer@0.53.0 ⏵ 0.35.0	⁺¹		^-3	^-3
	@vercel/otel@2.1.0
	@opentelemetry/context-async-hooks@1.26.0 ⏵ 1.9.0	⁺²⁷		⁺¹	^-5
	@opentelemetry/sdk-trace-base@1.26.0 ⏵ 1.9.0	⁺²²			^-5
	zod@4.1.11
	ai@6.0.159 ⏵ 5.0.76	^-10
	typescript@5.4.4
	braintrust@2.2.2 ⏵ 2.2.1-rc.0	⁺¹
	@opentelemetry/exporter-trace-otlp-http@0.53.0 ⏵ 0.35.0	⁺²⁶			^-3
	react-dom@19.2.5 ⏵ 18.3.1	^-7
	ai@6.0.159 ⏵ 6.0.1	^-8
	cohere-ai@7.14.0
See 15 more rows in the dashboard

View full report

Luca Forstner (lforst) · 2026-04-14T09:47:36Z

The wrapper is still not perfect. It's not capturing llm spans. I am still gonna merge because the package has too little downloads to justify putting more work in.

Abhijeet Prasad (AbhiPrasad) · 2026-04-09T03:52:06Z

resolves#1477

Add Braintrust instrumentation for @google/adk with auto-instrumentation support by default when users run with Braintrust's loader hook.

This adds tracing for:

Runner.runAsync
BaseAgent.runAsync and subclasses
FunctionTool.runAsync

It also adds Google ADK e2e coverage for both hook-driven and wrapped execution.

Because ADK uses @google/genai under the hood, underlying LLM spans continue to come from the existing Google GenAI instrumentation.

Recommended usage: auto-instrumentation

The primary way users should adopt this is via Braintrust auto-instrumentation:

node --import braintrust/hook.mjs app.mjs

Then they can use @google/adk normally and Braintrust will trace supported ADK operations automatically.

Example:

import*asadkfrom"@google/adk";import{initLogger}from"braintrust";initLogger({projectName: "my-google-adk-app"});constagent=newadk.LlmAgent({name: "weather_agent",model: "gemini-2.5-flash-lite",instruction: "Answer weather questions",});construnner=newadk.InMemoryRunner({ agent,appName: "weather-app"});awaitrunner.sessionService.createSession({appName: runner.appName,userId: "user-1",sessionId: "session-1",});forawait(consteventofrunner.runAsync({userId: "user-1",sessionId: "session-1",newMessage: {role: "user",parts: [{text: "What's the weather in Paris?"}],},})){console.log(event);}

If needed, it can be disabled with:

BRAINTRUST_DISABLE_INSTRUMENTATION=google-adk node --import braintrust/hook.mjs app.mjs

Manual usage

Manual wrapping is also available for cases where users want explicit control:

import*asadkfrom"@google/adk";import{wrapGoogleADK}from"braintrust";constwrapped=wrapGoogleADK(adk);

Screenshot

Abhijeet Prasad (AbhiPrasad) · 2026-04-09T03:55:48Z

wait this need some more work. I realized the parent child relationships are wrong 😢

Luca Forstner (lforst) · 2026-04-09T10:28:59Z

wait this need some more work. I realized the parent child relationships are wrong 😢

I honestly don't know why this is so painful in this SDK. Tracing channels make it harder because they are event based. It should honestly just be a simple wrapping call imo.

Add manual and load-time instrumentation for `@google/adk` across runner, agent, and tool execution. This introduces the wrapper entrypoint, tracing-channel plugin, vendored SDK types, exports, and loader config needed to emit Braintrust spans for Google ADK workflows. Add a dedicated Google ADK e2e scenario with a committed lockfile and stable snapshots for both wrapped and hook-driven execution. Stabilize the scenario by pre-creating ADK sessions, letting the loader hook respect `BRAINTRUST_DISABLE_INSTRUMENTATION`, and normalizing volatile outputs in the assertions so the coverage stays repeatable.

Abhijeet Prasad (AbhiPrasad) · 2026-04-13T14:11:35Z

Okay fixed the parent-child relationships! This is good to review now.

socket-security · 2026-04-13T14:12:24Z

Review the following changes in direct dependencies. Learn more about Socket for GitHub.

Diff	Package	Supply Chain Security	Vulnerability	Quality	Maintenance
	next@15.5.15 ⏵ 14.2.34	⁺²⁰	^-30	⁺⁴	^-46
	@ai-sdk/openai@3.0.52 ⏵ 1.3.24	^-1		^-3
	@ai-sdk/openai@3.0.52 ⏵ 2.0.53	^-1		^-3
	@opentelemetry/exporter-trace-otlp-http@0.53.0 ⏵ 0.200.0
	@opentelemetry/exporter-trace-otlp-http@0.53.0 ⏵ 0.205.0
	@opentelemetry/context-async-hooks@1.26.0 ⏵ 2.6.1			^-4
	openai@5.23.2
	@vercel/otel@0.1.0
	cohere-ai@7.21.0
	cohere-ai@8.0.0
	@types/react-dom@18.3.7
	@braintrust/otel@0.1.2
	@opentelemetry/sdk-trace-base@1.26.0 ⏵ 2.0.0	⁺¹
	cohere-ai@7.20.0
	@ai-sdk/openai@3.0.52 ⏵ 0.0.62	⁺²⁸		^-5	^-1
	@opentelemetry/otlp-exporter-base@0.53.0 ⏵ 0.205.0	⁺¹		^-1
	react@19.2.5 ⏵ 18.3.1			⁺¹
	@opentelemetry/otlp-exporter-base@0.53.0 ⏵ 0.35.0	⁺¹			^-3
	@ai-sdk/openai@3.0.52 ⏵ 2.0.57	⁺²⁸		^-3
	@ai-sdk/openai@3.0.52 ⏵ 3.0.7	⁺²⁷		^-2
	@opentelemetry/otlp-transformer@0.53.0 ⏵ 0.35.0	⁺¹		^-3	^-3
	@vercel/otel@2.1.0
	@opentelemetry/context-async-hooks@1.26.0 ⏵ 1.9.0	⁺²⁷		⁺¹	^-5
	@opentelemetry/sdk-trace-base@1.26.0 ⏵ 1.9.0	⁺²²			^-5
	zod@4.1.11
	ai@6.0.159 ⏵ 5.0.76	^-10
	typescript@5.4.4
	braintrust@2.2.2 ⏵ 2.2.1-rc.0	⁺¹
	@opentelemetry/exporter-trace-otlp-http@0.53.0 ⏵ 0.35.0	⁺²⁶			^-3
	react-dom@19.2.5 ⏵ 18.3.1	^-7
	ai@6.0.159 ⏵ 6.0.1	^-8
	cohere-ai@7.14.0
See 15 more rows in the dashboard

View full report

Luca Forstner (lforst) · 2026-04-14T09:47:36Z

The wrapper is still not perfect. It's not capturing llm spans. I am still gonna merge because the package has too little downloads to justify putting more work in.

Abhijeet Prasad (AbhiPrasad) · 2026-04-09T03:52:06Z

resolves#1477

Add Braintrust instrumentation for @google/adk with auto-instrumentation support by default when users run with Braintrust's loader hook.

This adds tracing for:

Runner.runAsync
BaseAgent.runAsync and subclasses
FunctionTool.runAsync

It also adds Google ADK e2e coverage for both hook-driven and wrapped execution.

Because ADK uses @google/genai under the hood, underlying LLM spans continue to come from the existing Google GenAI instrumentation.

Recommended usage: auto-instrumentation

The primary way users should adopt this is via Braintrust auto-instrumentation:

node --import braintrust/hook.mjs app.mjs

Then they can use @google/adk normally and Braintrust will trace supported ADK operations automatically.

Example:

import*asadkfrom"@google/adk";import{initLogger}from"braintrust";initLogger({projectName: "my-google-adk-app"});constagent=newadk.LlmAgent({name: "weather_agent",model: "gemini-2.5-flash-lite",instruction: "Answer weather questions",});construnner=newadk.InMemoryRunner({ agent,appName: "weather-app"});awaitrunner.sessionService.createSession({appName: runner.appName,userId: "user-1",sessionId: "session-1",});forawait(consteventofrunner.runAsync({userId: "user-1",sessionId: "session-1",newMessage: {role: "user",parts: [{text: "What's the weather in Paris?"}],},})){console.log(event);}

If needed, it can be disabled with:

BRAINTRUST_DISABLE_INSTRUMENTATION=google-adk node --import braintrust/hook.mjs app.mjs

Manual usage

Manual wrapping is also available for cases where users want explicit control:

import*asadkfrom"@google/adk";import{wrapGoogleADK}from"braintrust";constwrapped=wrapGoogleADK(adk);

Screenshot

Abhijeet Prasad (AbhiPrasad) · 2026-04-09T03:55:48Z

wait this need some more work. I realized the parent child relationships are wrong 😢

Luca Forstner (lforst) · 2026-04-09T10:28:59Z

wait this need some more work. I realized the parent child relationships are wrong 😢

I honestly don't know why this is so painful in this SDK. Tracing channels make it harder because they are event based. It should honestly just be a simple wrapping call imo.

Add manual and load-time instrumentation for `@google/adk` across runner, agent, and tool execution. This introduces the wrapper entrypoint, tracing-channel plugin, vendored SDK types, exports, and loader config needed to emit Braintrust spans for Google ADK workflows. Add a dedicated Google ADK e2e scenario with a committed lockfile and stable snapshots for both wrapped and hook-driven execution. Stabilize the scenario by pre-creating ADK sessions, letting the loader hook respect `BRAINTRUST_DISABLE_INSTRUMENTATION`, and normalizing volatile outputs in the assertions so the coverage stays repeatable.

Abhijeet Prasad (AbhiPrasad) · 2026-04-13T14:11:35Z

Okay fixed the parent-child relationships! This is good to review now.

socket-security · 2026-04-13T14:12:24Z

Review the following changes in direct dependencies. Learn more about Socket for GitHub.

Diff	Package	Supply Chain Security	Vulnerability	Quality	Maintenance
	next@15.5.15 ⏵ 14.2.34	⁺²⁰	^-30	⁺⁴	^-46
	@ai-sdk/openai@3.0.52 ⏵ 1.3.24	^-1		^-3
	@ai-sdk/openai@3.0.52 ⏵ 2.0.53	^-1		^-3
	@opentelemetry/exporter-trace-otlp-http@0.53.0 ⏵ 0.200.0
	@opentelemetry/exporter-trace-otlp-http@0.53.0 ⏵ 0.205.0
	@opentelemetry/context-async-hooks@1.26.0 ⏵ 2.6.1			^-4
	openai@5.23.2
	@vercel/otel@0.1.0
	cohere-ai@7.21.0
	cohere-ai@8.0.0
	@types/react-dom@18.3.7
	@braintrust/otel@0.1.2
	@opentelemetry/sdk-trace-base@1.26.0 ⏵ 2.0.0	⁺¹
	cohere-ai@7.20.0
	@ai-sdk/openai@3.0.52 ⏵ 0.0.62	⁺²⁸		^-5	^-1
	@opentelemetry/otlp-exporter-base@0.53.0 ⏵ 0.205.0	⁺¹		^-1
	react@19.2.5 ⏵ 18.3.1			⁺¹
	@opentelemetry/otlp-exporter-base@0.53.0 ⏵ 0.35.0	⁺¹			^-3
	@ai-sdk/openai@3.0.52 ⏵ 2.0.57	⁺²⁸		^-3
	@ai-sdk/openai@3.0.52 ⏵ 3.0.7	⁺²⁷		^-2
	@opentelemetry/otlp-transformer@0.53.0 ⏵ 0.35.0	⁺¹		^-3	^-3
	@vercel/otel@2.1.0
	@opentelemetry/context-async-hooks@1.26.0 ⏵ 1.9.0	⁺²⁷		⁺¹	^-5
	@opentelemetry/sdk-trace-base@1.26.0 ⏵ 1.9.0	⁺²²			^-5
	zod@4.1.11
	ai@6.0.159 ⏵ 5.0.76	^-10
	typescript@5.4.4
	braintrust@2.2.2 ⏵ 2.2.1-rc.0	⁺¹
	@opentelemetry/exporter-trace-otlp-http@0.53.0 ⏵ 0.35.0	⁺²⁶			^-3
	react-dom@19.2.5 ⏵ 18.3.1	^-7
	ai@6.0.159 ⏵ 6.0.1	^-8
	cohere-ai@7.14.0
See 15 more rows in the dashboard

View full report

Luca Forstner (lforst) · 2026-04-14T09:47:36Z

The wrapper is still not perfect. It's not capturing llm spans. I am still gonna merge because the package has too little downloads to justify putting more work in.

Abhijeet Prasad (AbhiPrasad) · 2026-04-09T03:52:06Z

resolves#1477

Add Braintrust instrumentation for @google/adk with auto-instrumentation support by default when users run with Braintrust's loader hook.

This adds tracing for:

Runner.runAsync
BaseAgent.runAsync and subclasses
FunctionTool.runAsync

It also adds Google ADK e2e coverage for both hook-driven and wrapped execution.

Because ADK uses @google/genai under the hood, underlying LLM spans continue to come from the existing Google GenAI instrumentation.

Recommended usage: auto-instrumentation

The primary way users should adopt this is via Braintrust auto-instrumentation:

node --import braintrust/hook.mjs app.mjs

Then they can use @google/adk normally and Braintrust will trace supported ADK operations automatically.

Example:

import*asadkfrom"@google/adk";import{initLogger}from"braintrust";initLogger({projectName: "my-google-adk-app"});constagent=newadk.LlmAgent({name: "weather_agent",model: "gemini-2.5-flash-lite",instruction: "Answer weather questions",});construnner=newadk.InMemoryRunner({ agent,appName: "weather-app"});awaitrunner.sessionService.createSession({appName: runner.appName,userId: "user-1",sessionId: "session-1",});forawait(consteventofrunner.runAsync({userId: "user-1",sessionId: "session-1",newMessage: {role: "user",parts: [{text: "What's the weather in Paris?"}],},})){console.log(event);}

If needed, it can be disabled with:

BRAINTRUST_DISABLE_INSTRUMENTATION=google-adk node --import braintrust/hook.mjs app.mjs

Manual usage

Manual wrapping is also available for cases where users want explicit control:

import*asadkfrom"@google/adk";import{wrapGoogleADK}from"braintrust";constwrapped=wrapGoogleADK(adk);

Screenshot

Abhijeet Prasad (AbhiPrasad) · 2026-04-09T03:55:48Z

wait this need some more work. I realized the parent child relationships are wrong 😢

Luca Forstner (lforst) · 2026-04-09T10:28:59Z

wait this need some more work. I realized the parent child relationships are wrong 😢

I honestly don't know why this is so painful in this SDK. Tracing channels make it harder because they are event based. It should honestly just be a simple wrapping call imo.

Add manual and load-time instrumentation for `@google/adk` across runner, agent, and tool execution. This introduces the wrapper entrypoint, tracing-channel plugin, vendored SDK types, exports, and loader config needed to emit Braintrust spans for Google ADK workflows. Add a dedicated Google ADK e2e scenario with a committed lockfile and stable snapshots for both wrapped and hook-driven execution. Stabilize the scenario by pre-creating ADK sessions, letting the loader hook respect `BRAINTRUST_DISABLE_INSTRUMENTATION`, and normalizing volatile outputs in the assertions so the coverage stays repeatable.

Abhijeet Prasad (AbhiPrasad) · 2026-04-13T14:11:35Z

Okay fixed the parent-child relationships! This is good to review now.

socket-security · 2026-04-13T14:12:24Z

Review the following changes in direct dependencies. Learn more about Socket for GitHub.

Diff	Package	Supply Chain Security	Vulnerability	Quality	Maintenance
	next@15.5.15 ⏵ 14.2.34	⁺²⁰	^-30	⁺⁴	^-46
	@ai-sdk/openai@3.0.52 ⏵ 1.3.24	^-1		^-3
	@ai-sdk/openai@3.0.52 ⏵ 2.0.53	^-1		^-3
	@opentelemetry/exporter-trace-otlp-http@0.53.0 ⏵ 0.200.0
	@opentelemetry/exporter-trace-otlp-http@0.53.0 ⏵ 0.205.0
	@opentelemetry/context-async-hooks@1.26.0 ⏵ 2.6.1			^-4
	openai@5.23.2
	@vercel/otel@0.1.0
	cohere-ai@7.21.0
	cohere-ai@8.0.0
	@types/react-dom@18.3.7
	@braintrust/otel@0.1.2
	@opentelemetry/sdk-trace-base@1.26.0 ⏵ 2.0.0	⁺¹
	cohere-ai@7.20.0
	@ai-sdk/openai@3.0.52 ⏵ 0.0.62	⁺²⁸		^-5	^-1
	@opentelemetry/otlp-exporter-base@0.53.0 ⏵ 0.205.0	⁺¹		^-1
	react@19.2.5 ⏵ 18.3.1			⁺¹
	@opentelemetry/otlp-exporter-base@0.53.0 ⏵ 0.35.0	⁺¹			^-3
	@ai-sdk/openai@3.0.52 ⏵ 2.0.57	⁺²⁸		^-3
	@ai-sdk/openai@3.0.52 ⏵ 3.0.7	⁺²⁷		^-2
	@opentelemetry/otlp-transformer@0.53.0 ⏵ 0.35.0	⁺¹		^-3	^-3
	@vercel/otel@2.1.0
	@opentelemetry/context-async-hooks@1.26.0 ⏵ 1.9.0	⁺²⁷		⁺¹	^-5
	@opentelemetry/sdk-trace-base@1.26.0 ⏵ 1.9.0	⁺²²			^-5
	zod@4.1.11
	ai@6.0.159 ⏵ 5.0.76	^-10
	typescript@5.4.4
	braintrust@2.2.2 ⏵ 2.2.1-rc.0	⁺¹
	@opentelemetry/exporter-trace-otlp-http@0.53.0 ⏵ 0.35.0	⁺²⁶			^-3
	react-dom@19.2.5 ⏵ 18.3.1	^-7
	ai@6.0.159 ⏵ 6.0.1	^-8
	cohere-ai@7.14.0
See 15 more rows in the dashboard

View full report

Luca Forstner (lforst) · 2026-04-14T09:47:36Z

The wrapper is still not perfect. It's not capturing llm spans. I am still gonna merge because the package has too little downloads to justify putting more work in.

Abhijeet Prasad (AbhiPrasad) · 2026-04-09T03:52:06Z

resolves#1477

Add Braintrust instrumentation for @google/adk with auto-instrumentation support by default when users run with Braintrust's loader hook.

This adds tracing for:

Runner.runAsync
BaseAgent.runAsync and subclasses
FunctionTool.runAsync

It also adds Google ADK e2e coverage for both hook-driven and wrapped execution.

Because ADK uses @google/genai under the hood, underlying LLM spans continue to come from the existing Google GenAI instrumentation.

Recommended usage: auto-instrumentation

The primary way users should adopt this is via Braintrust auto-instrumentation:

node --import braintrust/hook.mjs app.mjs

Then they can use @google/adk normally and Braintrust will trace supported ADK operations automatically.

Example:

import*asadkfrom"@google/adk";import{initLogger}from"braintrust";initLogger({projectName: "my-google-adk-app"});constagent=newadk.LlmAgent({name: "weather_agent",model: "gemini-2.5-flash-lite",instruction: "Answer weather questions",});construnner=newadk.InMemoryRunner({ agent,appName: "weather-app"});awaitrunner.sessionService.createSession({appName: runner.appName,userId: "user-1",sessionId: "session-1",});forawait(consteventofrunner.runAsync({userId: "user-1",sessionId: "session-1",newMessage: {role: "user",parts: [{text: "What's the weather in Paris?"}],},})){console.log(event);}

If needed, it can be disabled with:

BRAINTRUST_DISABLE_INSTRUMENTATION=google-adk node --import braintrust/hook.mjs app.mjs

Manual usage

Manual wrapping is also available for cases where users want explicit control:

import*asadkfrom"@google/adk";import{wrapGoogleADK}from"braintrust";constwrapped=wrapGoogleADK(adk);

Screenshot

Abhijeet Prasad (AbhiPrasad) · 2026-04-09T03:55:48Z

wait this need some more work. I realized the parent child relationships are wrong 😢

Luca Forstner (lforst) · 2026-04-09T10:28:59Z

wait this need some more work. I realized the parent child relationships are wrong 😢

I honestly don't know why this is so painful in this SDK. Tracing channels make it harder because they are event based. It should honestly just be a simple wrapping call imo.

Add manual and load-time instrumentation for `@google/adk` across runner, agent, and tool execution. This introduces the wrapper entrypoint, tracing-channel plugin, vendored SDK types, exports, and loader config needed to emit Braintrust spans for Google ADK workflows. Add a dedicated Google ADK e2e scenario with a committed lockfile and stable snapshots for both wrapped and hook-driven execution. Stabilize the scenario by pre-creating ADK sessions, letting the loader hook respect `BRAINTRUST_DISABLE_INSTRUMENTATION`, and normalizing volatile outputs in the assertions so the coverage stays repeatable.

Abhijeet Prasad (AbhiPrasad) · 2026-04-13T14:11:35Z

Okay fixed the parent-child relationships! This is good to review now.

socket-security · 2026-04-13T14:12:24Z

Review the following changes in direct dependencies. Learn more about Socket for GitHub.

Diff	Package	Supply Chain Security	Vulnerability	Quality	Maintenance
	next@15.5.15 ⏵ 14.2.34	⁺²⁰	^-30	⁺⁴	^-46
	@ai-sdk/openai@3.0.52 ⏵ 1.3.24	^-1		^-3
	@ai-sdk/openai@3.0.52 ⏵ 2.0.53	^-1		^-3
	@opentelemetry/exporter-trace-otlp-http@0.53.0 ⏵ 0.200.0
	@opentelemetry/exporter-trace-otlp-http@0.53.0 ⏵ 0.205.0
	@opentelemetry/context-async-hooks@1.26.0 ⏵ 2.6.1			^-4
	openai@5.23.2
	@vercel/otel@0.1.0
	cohere-ai@7.21.0
	cohere-ai@8.0.0
	@types/react-dom@18.3.7
	@braintrust/otel@0.1.2
	@opentelemetry/sdk-trace-base@1.26.0 ⏵ 2.0.0	⁺¹
	cohere-ai@7.20.0
	@ai-sdk/openai@3.0.52 ⏵ 0.0.62	⁺²⁸		^-5	^-1
	@opentelemetry/otlp-exporter-base@0.53.0 ⏵ 0.205.0	⁺¹		^-1
	react@19.2.5 ⏵ 18.3.1			⁺¹
	@opentelemetry/otlp-exporter-base@0.53.0 ⏵ 0.35.0	⁺¹			^-3
	@ai-sdk/openai@3.0.52 ⏵ 2.0.57	⁺²⁸		^-3
	@ai-sdk/openai@3.0.52 ⏵ 3.0.7	⁺²⁷		^-2
	@opentelemetry/otlp-transformer@0.53.0 ⏵ 0.35.0	⁺¹		^-3	^-3
	@vercel/otel@2.1.0
	@opentelemetry/context-async-hooks@1.26.0 ⏵ 1.9.0	⁺²⁷		⁺¹	^-5
	@opentelemetry/sdk-trace-base@1.26.0 ⏵ 1.9.0	⁺²²			^-5
	zod@4.1.11
	ai@6.0.159 ⏵ 5.0.76	^-10
	typescript@5.4.4
	braintrust@2.2.2 ⏵ 2.2.1-rc.0	⁺¹
	@opentelemetry/exporter-trace-otlp-http@0.53.0 ⏵ 0.35.0	⁺²⁶			^-3
	react-dom@19.2.5 ⏵ 18.3.1	^-7
	ai@6.0.159 ⏵ 6.0.1	^-8
	cohere-ai@7.14.0
See 15 more rows in the dashboard

View full report

Luca Forstner (lforst) · 2026-04-14T09:47:36Z

The wrapper is still not perfect. It's not capturing llm spans. I am still gonna merge because the package has too little downloads to justify putting more work in.

Abhijeet Prasad (AbhiPrasad) requested a review from Luca Forstner (lforst)April 9, 2026 03:52

Abhijeet Prasad (AbhiPrasad) self-assigned this Apr 9, 2026

Abhijeet Prasad (AbhiPrasad) marked this pull request as draft April 9, 2026 03:55

Abhijeet Prasad (AbhiPrasad) mentioned this pull request Apr 9, 2026
fix(auto-instrumentation): Upgrade @apm-js-collab/code-transformer to v0.12.0 #1708
Merged
4 tasks

Luca Forstner (lforst) reviewed Apr 9, 2026
View reviewed changes

Comment threadjs/src/auto-instrumentations/configs/google-adk.test.ts Outdated
Comment threade2e/scenarios/google-adk-instrumentation/assertions.ts

Abhijeet Prasad (AbhiPrasad)force-pushed the feat/google-adk-instrumentation branch 2 times, most recently from 45ea59e to 19c40c1Compare April 13, 2026 14:11

Abhijeet Prasad (AbhiPrasad)force-pushed the feat/google-adk-instrumentation branch from 19c40c1 to d4ef367Compare April 13, 2026 14:11

Abhijeet Prasad (AbhiPrasad) marked this pull request as ready for review April 13, 2026 14:11

Abhijeet Prasad (AbhiPrasad)force-pushed the feat/google-adk-instrumentation branch from d4ef367 to 4739528Compare April 13, 2026 16:07

clean up trace
3ae014b

Luca Forstner (lforst)force-pushed the feat/google-adk-instrumentation branch from 4739528 to 3ae014bCompare April 13, 2026 19:39

Luca Forstner (lforst) added 4 commits April 13, 2026 21:41

Merge origin/main into feat/google-adk-instrumentation
2cd1483

regen pnpm lock
59265a2

fix tests
34ce701

fix race
4e07b2e

Luca Forstner (lforst) approved these changes Apr 14, 2026
View reviewed changes

Luca Forstner (lforst) merged commit df3434d into mainApr 14, 2026
45 of 49 checks passed

Luca Forstner (lforst) deleted the feat/google-adk-instrumentation branch April 14, 2026 09:47