Uh oh!
There was an error while loading. Please reload this page.
ref(node): Streamline graphql instrumentation - #21556
Merged
logaretm merged 4 commits intoJun 15, 2026
Merged
Conversation
Contributor
size-limit report 📦
|
Migrate the vendored graphql span lifecycle from the OpenTelemetry tracer to the @sentry/core span API (startInactiveSpan + withActiveSpan), bake the auto.graphql.otel.graphql origin into the execute span (previously set via a Sentry responseHook), and drop the OTel recordException calls (no-ops in the Sentry pipeline) in favour of setStatus. Remove the upstream-only config the SDK never exposed through GraphqlOptions (allowValues, depth, mergeItems, flatResolveSpans) along with the now-dead variable-attribute code and the allowValues opt-out (source literals are now always redacted, which is the de-facto default). Drop the blanket eslint-disable in favour of a scoped oxlint exception, and remove @opentelemetry/api from the vendored source (span types now come from @sentry/core).
…redaction Add real Apollo integration coverage for two paths the existing apollo-graphql suite never exercised: - resolve spans: a scenario with `ignoreResolveSpans: false` asserting the parse/validate/resolve span tree (the resolver lifecycle migrated to the @sentry/core span API). - source redaction: an inline string literal must be redacted to `"*"` in `graphql.source`, locking in the now-hardcoded default after dropping the `allowValues` option.
logaretmforce-pushed
the
awad/js-2380-streamline-opentelemetryinstrumentation-graphql
branch
from
June 15, 2026 17:49
6bed8e7 to
6327f24Comparelogaretm
marked this pull request as ready for review
June 15, 2026 18:09
logaretm
requested review from
JPeer264, andreiborza, mydea and nicohrubec
and removed request for
a teamJune 15, 2026 18:09
| /* eslint-disable */ | ||
| export enum AttributeNames { | ||
| SOURCE = 'graphql.source', |
Member
There was a problem hiding this comment.
l/m: This is neither in OTel's nor Sentry's semantic conventions. Maybe we should define it or update it to https://getsentry.github.io/sentry-conventions/attributes/graphql/#graphql-document?
Feel free to disregard for this PR, just maybe good to note as a follow-up?
MemberAuthor
There was a problem hiding this comment.
I think it's an old attribute that predated OTel so they have it for backward compat stuff
I think we can track it as part of the attributes to fix before v11 release, since we have a lot of those semantic attrs missing or need renaming all over. What do you think?
Uh oh!
There was an error while loading. Please reload this page.
Move the Sentry-specific responseHook behavior (error status + root span renaming via useOperationNameForRootSpan) directly into the vendored graphql instrumentation, dropping the generic responseHook config indirection. The behavior is now applied when the execution result is handled. Also remove the graphql unit test, which only asserted default option assignment against a mock. The defaults and the operation-name formatting (including the >5 truncation) are already covered end-to-end by the apollo-graphql integration suite.
There was a problem hiding this comment.
Cursor Bugbot has reviewed your changes and found 2 potential issues.
❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.
Reviewed by Cursor Bugbot for commit 2b354fa. Configure here.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
andreiborza
approved these changes
Jun 15, 2026
Uh oh!
There was an error while loading. Please reload this page.
logaretm
deleted the
awad/js-2380-streamline-opentelemetryinstrumentation-graphql
branch
June 15, 2026 19:50
48 tasks
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 freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Streamlines the GraphQL instrumentation by removing options that cannot be set by the user and they were never typed, so they result in dead code that is unreachable.
This instrumentation also isn't safe to use
startSpan*because of the arbitrary nature of resolver return values.I also added Apollo integration tests for two previously-uncovered paths: the resolve-span tree and inline-literal source redaction.