Inherit local context in observation instrumentation instead of overwriting it #761
Conversation
This file contains 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
spring-projects-issues
added
the
status: waiting-for-triage
|
I just tried a build with these changes in our application and now it works again. |
bclozel
added
type: bug
bclozel
added
the
for: backport-to-1.2.x
bclozel
pushed a commit
that referenced
this pull request
Aug 16, 2023
Prior to this commit, a `DataFetcher` instrumented by the `GraphQlObservationInstrumentation` would incorrectly overwrite the local context when: * the `DataFetcher` returns a value object (i.e. not a `DataFetcherResult`) * the given `DatFetchingEnvironment` has an existing local context with values For this case, the instrumentation would create a new local context but would not inherit from the existing local context. See gh-761
bclozel
added
status: backported
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.
When the datafetcher did not return a
DataFetcherResult, the existing context was discarded and a new context was created.Now when there's no
DataFetcherResultreturned, we first check if there's local context available in the environment, and if so, the key is added to it. Otherwise we still create a new context.Should fix #760