Skip to content

fix: Make sure that InvocationContext.callbackContextData remains the same instance #994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copybara-service merged 1 commit into from
Mar 10, 2026
+8 −2
Merged

fix: Make sure that InvocationContext.callbackContextData remains the same instance #994

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions core/src/main/java/com/google/adk/agents/InvocationContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,10 @@ protected InvocationContext(Builder builder) {
this.eventsCompactionConfig = builder.eventsCompactionConfig;
this.contextCacheConfig = builder.contextCacheConfig;
this.invocationCostManager = builder.invocationCostManager;
this.callbackContextData = new ConcurrentHashMap<>(builder.callbackContextData);
// Don't copy the callback context data. This should be the same instance for the full
// invocation invocation so that Plugins can access the same data it during the invocation
// across all types of callbacks.
this.callbackContextData = builder.callbackContextData;
}

/**
Expand Down Expand Up @@ -345,7 +348,10 @@ private Builder(InvocationContext context) {
this.eventsCompactionConfig = context.eventsCompactionConfig;
this.contextCacheConfig = context.contextCacheConfig;
this.invocationCostManager = context.invocationCostManager;
this.callbackContextData = new ConcurrentHashMap<>(context.callbackContextData);
// Don't copy the callback context data. This should be the same instance for the full
// invocation invocation so that Plugins can access the same data it during the invocation
// across all types of callbacks.
this.callbackContextData = context.callbackContextData;
}

private BaseSessionService sessionService;
Expand Down