Fix request context propagation for async executor tasks - #305
Open
Mishenevd wants to merge 1 commit into
Open
Conversation
Codecov Report✅ All modified and coverable lines are covered by tests. 📢 Thoughts on this report? Let us know! |
Mishenevd
force-pushed
the
fix/executor-context-propagation
branch
from
August 4, 2026 22:58
a10d35e to
9a4eaf7
Compare
Summary by Aikido
🚀 New Features
⚡ Enhancements
|
Mishenevd
force-pushed
the
fix/executor-context-propagation
branch
from
August 4, 2026 23:01
9a4eaf7 to
7bbd84e
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Contextlives in aThreadLocal, so it's only visible on the request-handling thread. When request-controlled input reaches a sink from a worker thread (ExecutorService,@Async,CompletableFuture,ForkJoinPool, a one-shot scheduled task),Context.get()returnsnulland scanning is silently skipped. This captures the context at task-submit time and restores it while the task runs on the worker.Why this is a prerequisite
This unblocks two things:
java.util.concurrentexecutor. The concrete case is OkHttp'senqueue(): itsDispatcheris aThreadPoolExecutor, so the call's DNS resolve + connect run on a worker thread. More generally, any outbound call made from a@Async/CompletableFuture/ executor worker. Without propagation these seeContext.get() == nulland their SSRF / outbound-domain checks silently miss.What changed
ContextPropagation+ContextPropagatingRunnable/Callable: capture the activeContextObjectat submit, set it around the task, restore the worker's previous context afterwards. Idempotent; no-op when there's no context.ExecutorService.submit,ThreadPoolExecutor.execute,ForkJoinPool,ScheduledThreadPoolExecutor.schedule, and theExecutors$Delegated*wrappers. PeriodicscheduleAtFixedRate/WithFixedDelayare intentionally not wrapped — a request context must not persist across periods.ExecutorContextPropagation: cached reflection bridge from the bootstrap-woven advice toagent_api. A not-yet-set jar path during early startup is retried rather than permanently disabling propagation.Testing
ContextPropagationTest: capture / restore / idempotency / exception paths.ExecutorWrapperTest(runs under the agent): realThreadPoolExecutor,ForkJoinPool,ScheduledThreadPoolExecutor.schedule, andExecutors.newSingleThreadExecutor()propagate context to their worker threads.spring_boot_postgres: async SQLi acrossCompletableFuture,ExecutorService,ThreadPoolExecutor,ForkJoinPool,ScheduledThreadPoolExecutor, and Spring@Async.Not covered
Reactor/WebFlux context (separate), raw
new Thread(...), periodic scheduled tasks, Kotlin coroutines, custom executors outside the covered JDK/Spring paths.