Skip to content

Fix span reporting when actor aborts with pending waitUntil tasks #5709

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
mar-cf merged 2 commits into from
Jan 2, 2026
Merged

Fix span reporting when actor aborts with pending waitUntil tasks #5709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5ae093
Fix span reporting when actor aborts with pending waitUntil tasks
mar-cf Dec 16, 2025
95435f2
Log warning periodically
mar-cf Dec 16, 2025
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
6 changes: 4 additions & 2 deletions src/workerd/io/io-context.c++
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,8 +310,6 @@ IoContext::IncomingRequest::~IoContext_IncomingRequest() noexcept(false) {
}
}

context->incomingRequests.remove(*this);

KJ_IF_SOME(a, context->actor) {
a.getMetrics().endRequest();
}
Expand All @@ -338,6 +336,10 @@ IoContext::IncomingRequest::~IoContext_IncomingRequest() noexcept(false) {
context->waitUntilTasks.clear();
}
}

// Remove incoming request after canceling waitUntil tasks, which may have spans attached that
// require accessing a timer from the active request.
context->incomingRequests.remove(*this);
}

InputGate::Lock IoContext::getInputLock() {
Expand Down
4 changes: 2 additions & 2 deletions src/workerd/io/tracer.c++
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,8 +411,8 @@ void BaseTracer::adjustSpanTime(tracing::CompleteSpan& span) {
KJ_FAIL_ASSERT(
"reported span without current request", span.operationName, hasCompleteTime);
} else {
LOG_NOSENTRY(WARNING, "reported span without current request", span.operationName,
hasCompleteTime);
LOG_WARNING_PERIODICALLY(
"reported span without current request", span.operationName, hasCompleteTime);
}
}
});
Expand Down
Loading