Skip to content

fix(anthropic): End and mark messages.stream() span as cancelled on abort - #26236

Merged
RulaKhaled merged 4 commits into
developfrom
fix/anthropic-message-stream-abort-span
Nov 11, 2026
Merged

RulaKhaled merged 4 commits into
developfrom
fix/anthropic-message-stream-abort-span

Conversation

@sentry-junior

@sentry-junior sentry-junior Bot commented Nov 10, 2026 •

Copy link
Copy Markdown
Contributor

Why: When a messages.stream() call is aborted, the Anthropic SDK's MessageStream emits only abort and then end. It never emits message or error. We only ended the span on message or error, so an aborted stream's span never ended and was never sent. The SDK always emits end last, so we now end the span there too. endStreamSpan does nothing if the span already ended. The span keeps whatever usage and response data streamed in before the abort.

Inside end, an aborted stream (stream.aborted) is now marked cancelled, the same as Google GenAI when the caller's abortSignal fires. Only the caller's stream.abort() or request signal sets aborted. The SDK's request timeouts are only active until the response headers arrive, and they surface as APIConnectionTimeoutError on error, so they still record internal_error.

We deliberately don't listen for abort. The SDK raises an unhandled rejection for an abort only when nothing listens for it, so an abort listener would silence that rejection for apps that abort a stream and never await it. stream.aborted exists in every supported SDK version (>=0.19.2).

How to review: The end listener in instrumentMessageStream is the whole change. I also checked it by hand against the real @anthropic-ai/sdk MessageStream, aborting it mid-stream against a local SSE server without awaiting it. Uninstrumented and with this change, the app gets the same single unhandled rejection. With this change, the span also ends cancelled with the partial usage attached.

Note: Under span streaming (the default), getSimpleStatus sends cancelled as ok and drops the status message, as it does for every cancelled span in the SDK. Static mode shows cancelled. An aborted span still differs from a completed one: it has no finish reason, and if it was aborted before the response, it has no response ID or usage.

via Rola Abuhasna.

--

View Session [Sentry]

An aborted MessageStream emits only abort and end, never message or
error, so the span was never ended and never sent. End it on end too.

Co-Authored-By: Rola Abuhasna <rola.abuhasna@sentry.io>
@github-actions

github-actions Bot commented Nov 10, 2026 •

Copy link
Copy Markdown
Contributor

size-limit report 📦

Compared: a929000 (PR test merge using develop at 2f3c8a9)

Against: 2f3c8a9 (develop) · base run #65503

✅ Baseline matches: this diff contains only this PR's changes.

Path Size % Change Change
@sentry/browser 29.92 kB - -
@sentry/browser - with treeshaking flags 28.08 kB - -
@sentry/browser - with treeshaking flags tracing without tracing 27.97 kB - -
@sentry/browser (incl. Tracing) 52.29 kB - -
@sentry/browser (incl. Tracing + Span Streaming) 52.3 kB - -
@sentry/browser (incl. Tracing, Profiling) 55.27 kB - -
@sentry/browser (incl. Tracing, Replay) 92.61 kB - -
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags 81.29 kB - -
@sentry/browser (incl. Tracing, Replay with Canvas) 97.34 kB - -
@sentry/browser (incl. Tracing, Replay, Feedback) 110.34 kB - -
@sentry/browser (incl. Feedback) 47.52 kB - -
@sentry/browser (incl. sendFeedback) 35.02 kB - -
@sentry/browser (incl. FeedbackAsync) 40.13 kB - -
@sentry/browser (incl. Metrics) 31.48 kB - -
@sentry/browser (incl. Logs) 31.77 kB - -
@sentry/browser (incl. Metrics & Logs) 32.45 kB - -
@sentry/react 31.78 kB - -
@sentry/react (incl. Tracing) 54.76 kB - -
@sentry/vue 38.33 kB - -
@sentry/vue (incl. Tracing) 55.33 kB - -
@sentry/svelte 29.95 kB - -
@sentry/remix (Remix 3 client bundle) 57.92 kB - -
CDN Bundle 31.72 kB - -
CDN Bundle (incl. Tracing) 52.89 kB - -
CDN Bundle (incl. Logs, Metrics) 34.52 kB - -
CDN Bundle (incl. Tracing, Logs, Metrics) 55.39 kB - -
CDN Bundle (incl. Replay, Logs, Metrics) 75.9 kB - -
CDN Bundle (incl. Tracing, Replay) 91.06 kB - -
CDN Bundle (incl. Tracing, Replay, Logs, Metrics) 93.62 kB - -
CDN Bundle (incl. Tracing, Replay, Feedback) 97.19 kB - -
CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics) 99.8 kB - -
CDN Bundle - uncompressed 92.76 kB - -
CDN Bundle (incl. Tracing) - uncompressed 156.02 kB - -
CDN Bundle (incl. Logs, Metrics) - uncompressed 101.29 kB - -
CDN Bundle (incl. Tracing, Logs, Metrics) - uncompressed 163.79 kB - -
CDN Bundle (incl. Replay, Logs, Metrics) - uncompressed 232.85 kB - -
CDN Bundle (incl. Tracing, Replay) - uncompressed 277.71 kB - -
CDN Bundle (incl. Tracing, Replay, Logs, Metrics) - uncompressed 285.47 kB - -
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed 291.41 kB - -
CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics) - uncompressed 299.17 kB - -
@sentry/nextjs (client) 57.73 kB - -
@sentry/sveltekit (client) 52.82 kB - -
@sentry/core/server 44.29 kB - -
@sentry/core/browser 14.02 kB - -
@sentry/node 157.15 kB +0.03% +38 B 🔺
@sentry/node/import (ESM hook with diagnostics-channel injection) 82.28 kB - -
@sentry/node - without tracing 96.91 kB +0.03% +21 B 🔺
@sentry/node - without channel injection 137.43 kB +0.03% +40 B 🔺
@sentry/aws-serverless 105.58 kB +0.02% +21 B 🔺
@sentry/cloudflare (withSentry) - minified 203.34 kB - -
@sentry/cloudflare (withSentry) 505.12 kB - -
@sentry/nextjs/cloudflare (withSentry) - minified 225.19 kB - -

View base workflow run

@RulaKhaled RulaKhaled self-assigned this Nov 10, 2026
Matches Google GenAI, which sets cancelled when the caller's signal
fires. The SDK only emits abort for a caller-initiated abort; its
timeouts surface as error.

Co-Authored-By: Rola Abuhasna <rola.abuhasna@sentry.io>
@sentry-junior sentry-junior Bot changed the title fix(anthropic): End messages.stream() span when the stream is aborted fix(anthropic): End and mark messages.stream() span as cancelled on abort Nov 10, 2026
@github-actions

github-actions Bot commented Nov 10, 2026 •

Copy link
Copy Markdown
Contributor

Optional E2E tests

Some optional checks were not successful. They do not block the merge. 9 not successful, 48 successful. See the run.

Check Status
❌ CI: Optional E2E Tests / E2E node-eve (latest) Test (optional) Failing after 51s Details
❌ CI: Optional E2E Tests / E2E node-pi-durable (latest) Test (optional) Failing after 24s Details
❌ CI: Optional E2E Tests / E2E cloudflare-pi-durable (latest) Test (optional) Failing after 28s Details
❌ CI: Optional E2E Tests / E2E node-eve (orchestrion) Test (optional) Failing after 2m Details
❌ CI: Optional E2E Tests / E2E nextjs-16-cacheComponents (cloudflare) Test (optional) Failing after 10m Details
❌ CI: Optional E2E Tests / E2E solidstart-2 Test (optional) Failing after 51s Details
❌ CI: Optional E2E Tests / E2E node-flue (latest) Test (optional) Failing after 29s Details
❌ CI: Optional E2E Tests / E2E react-send-to-sentry Test (optional) Failing after 5m Details
❌ CI: Optional E2E Tests / E2E node-eve Test (optional) Failing after 2m Details
Successful checks
Check Status
✅ CI: Optional E2E Tests / E2E nextjs-16 (vinext) Test (optional) Successful in 2m Details
✅ CI: Optional E2E Tests / E2E nuxt-5-cloudflare Test (optional) Successful in 37s Details
✅ CI: Optional E2E Tests / E2E nextjs-14 (latest) Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E tanstackstart-react-cloudflare Test (optional) Successful in 35s Details
✅ CI: Optional E2E Tests / E2E nextjs-16 (vinext, bun) Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E astro-7 Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E node-express-send-to-sentry Test (optional) Successful in 3m Details
✅ CI: Optional E2E Tests / E2E node-express-send-to-sentry-static Test (optional) Successful in 2m Details
✅ CI: Optional E2E Tests / E2E cloudflare-think (ai v6) Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E node-mastra Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E nextjs-orpc Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E nextjs-16 (cloudflare, latest) Test (optional) Successful in 2m Details
✅ CI: Optional E2E Tests / E2E nextjs-16-tunnel (cloudflare) Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E node-pi-durable Test (optional) Successful in 34s Details
✅ CI: Optional E2E Tests / E2E gen-ai-libraries (latest) Test (optional) Successful in 52s Details
✅ CI: Optional E2E Tests / E2E nuxt-5 (tunnel-dev) Test (optional) Successful in 51s Details
✅ CI: Optional E2E Tests / E2E node-openai-decisions Test (optional) Successful in 32s Details
✅ CI: Optional E2E Tests / E2E cloudflare-agent Test (optional) Successful in 45s Details
✅ CI: Optional E2E Tests / E2E nuxt-5-sourcemaps (static / nuxt generate) Test (optional) Successful in 39s Details
✅ CI: Optional E2E Tests / E2E node-express-mcp-v2 Test (optional) Successful in 30s Details
✅ CI: Optional E2E Tests / E2E cloudflare-flue-send-to-sentry Test (optional) Successful in 3m Details
✅ CI: Optional E2E Tests / E2E debug-id-sourcemaps Test (optional) Successful in 40s Details
✅ CI: Optional E2E Tests / E2E cloudflare-mastra Test (optional) Successful in 50s Details
✅ CI: Optional E2E Tests / E2E tanstackstart-react (latest) Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E nuxt-5-sourcemaps Test (optional) Successful in 40s Details
✅ CI: Optional E2E Tests / E2E nextjs-15 (latest) Test (optional) Successful in 3m Details
✅ CI: Optional E2E Tests / E2E node-mastra (latest) Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E nextjs-16 (deno) Test (optional) Successful in 2m Details
✅ CI: Optional E2E Tests / E2E deno (latest) Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E cloudflare-think Test (optional) Successful in 59s Details
✅ CI: Optional E2E Tests / E2E astro-7-static Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E cloudflare-pi-durable Test (optional) Successful in 41s Details
✅ CI: Optional E2E Tests / E2E nestjs-12 (latest) Test (optional) Successful in 56s Details
✅ CI: Optional E2E Tests / E2E node-fastify-6 Test (optional) Successful in 39s Details
✅ CI: Optional E2E Tests / E2E node-fastify-6 (tracer provider) Test (optional) Successful in 34s Details
✅ CI: Optional E2E Tests / E2E react-router-7-framework-instrumentation Test (optional) Successful in 2m Details
✅ CI: Optional E2E Tests / E2E gen-ai-libraries Test (optional) Successful in 46s Details
✅ CI: Optional E2E Tests / E2E node-flue Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E gen-ai-libraries (cloudflare) Test (optional) Successful in 43s Details
✅ CI: Optional E2E Tests / E2E nuxt-5 Test (optional) Successful in 2m Details
✅ CI: Optional E2E Tests / E2E supabase-nextjs Test (optional) Successful in 2m Details
✅ CI: Optional E2E Tests / E2E node-openai-decisions (latest) Test (optional) Successful in 34s Details
✅ CI: Optional E2E Tests / E2E cloudflare-workers-send-to-sentry Test (optional) Successful in 3m Details
✅ CI: Optional E2E Tests / E2E nuxt-5-sourcemaps (client source maps kept) Test (optional) Successful in 41s Details
✅ CI: Optional E2E Tests / E2E node-express-mcp-v1 Test (optional) Successful in 37s Details
✅ CI: Optional E2E Tests / E2E nextjs-15 (turbo) Test (optional) Successful in 2m Details
✅ CI: Optional E2E Tests / E2E vue-3 (no Options API) Test (optional) Successful in 1m Details
✅ CI: Optional E2E Tests / E2E tanstackstart-react-sourcemaps Test (optional) Successful in 32s Details

@RulaKhaled
RulaKhaled marked this pull request as ready for review November 10, 2026 11:51
@RulaKhaled
RulaKhaled requested a review from a team as a code owner November 10, 2026 11:51
@RulaKhaled
RulaKhaled requested review from isaacs and removed request for a team November 10, 2026 11:51
sentry-junior Bot and others added 2 commits November 10, 2026 11:56
…bort

Attaching an abort listener stopped the SDK from raising an unhandled
rejection when a caller aborts a stream and never awaits it. Read
stream.aborted in the end listener instead, which every supported SDK
version (>=0.19.2) exposes.

Co-Authored-By: Rola Abuhasna <rola.abuhasna@sentry.io>
Add integration cases against the real SDK for a stream aborted before
the response and one aborted mid-stream; both spans were missing from
the envelope before the fix. Add a unit case that a normal completion
keeps the status unset and ends the span once, and type the generic
with aborted instead of casting.

Co-Authored-By: Rola Abuhasna <rola.abuhasna@sentry.io>

@JPeer264 JPeer264 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@RulaKhaled
RulaKhaled merged commit 638bf22 into develop Nov 11, 2026
428 of 437 checks passed
@RulaKhaled
RulaKhaled deleted the fix/anthropic-message-stream-abort-span branch November 11, 2026 10:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants