Repository navigation
Conversation
Apollo 3, 4, and 5 HTTP interceptors reported coroutine cancellation as INTERNAL_ERROR. Cancellation is expected control flow, so map it to CANCELLED. The original exception is still attached to the span and rethrown unchanged. Fixes #6193
📲 Install BuildsAndroid
|
This branch has not been deployed
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.
📜 Description
The Apollo 3, 4, and 5 HTTP interceptors now set the span status to
CANCELLEDwhen request execution throws aCancellationException, instead ofINTERNAL_ERROR.The exception is still attached to the span and rethrown unchanged, so coroutine cancellation semantics are unaffected.
ApolloHttpExceptionand other failures keep their existing status mapping.Notes for reviewers:
TimeoutCancellationException(fromwithTimeout) is aCancellationExceptionsubclass and therefore also maps toCANCELLED. No other HTTP integration in the SDK distinguishes timeouts; OkHttp, Ktor, and OpenFeign all reportINTERNAL_ERRORfor failures, andDEADLINE_EXCEEDEDis only used for SDK-owned deadlines.Span.finishonly links the throwable to the span context; it does not create an event.IOException("Canceled")wrapped inApolloNetworkException) still maps toINTERNAL_ERROR. This PR only coversCancellationException.💡 Motivation and Context
Cancellation is expected control flow, not an internal error.
Follow-up from #6074 (comment)
💚 How did you test it?
CancellationExceptionand asserts that the same instance is rethrown and the span status isCANCELLED. The tests failed before the fix withINTERNAL_ERROR../gradlew :sentry-apollo-3:check :sentry-apollo-4:check :sentry-apollo-5:checkAdded
google-truthas a test dependency tosentry-apollo-3andsentry-apollo-4for the new tests.📝 Checklist
sendDefaultPIIis enabled.🔮 Next steps