Make the scope current when needed for grpc server instrumentation #3806
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
When grpc client uses non-blocking requests, the server calls `interceptor#interceptCall` multiple times first, then proceed to the `listener#on...` methods. It is different from blocking requests that call those methods sequentially per request. The behavior causes multiple scopes to be opened on the same thread in `interceptCall` and wrongly consumes them in `on...` methods. This change compares the current scope held by the `ObservationRegistry` against the withheld `scope`. When they are different, make the withheld scope current; then, the subsequent logic can pick the proper target observation. Closes micrometer-metricsgh-3805
jonatan-ivanov
added
bug
| } | ||
|
|
||
| @Override | ||
| public void onMessage(RespT message) { | ||
| if (this.scope != this.registry.getCurrentObservationScope()) { | ||
| this.scope.makeCurrent(); | ||
| this.registry.setCurrentObservationScope(this.scope); |
There was a problem hiding this comment.
Afair this is redundant cause scope will make itself current.
There was a problem hiding this comment.
Currently, makeCurrent does not update the registry.getCurrentObservationScope().
Created a PR to fix it: #3808
| listenerA.onHalfClose(); | ||
| assertThat(registry.getCurrentObservation()).isSameAs(observationA); | ||
| assertThat(registry.getCurrentObservationScope()).isSameAs(scopeA); | ||
| } |
There was a problem hiding this comment.
Can we add a test to ensure that we're not leaving any unclosed scopes? I understand that after making all calls current scope should be null?
shakuzen
added
module: micrometer-core
|
superseded by #3836 |
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 grpc client uses non-blocking requests, the server calls
interceptor#interceptCallmultiple times first, then proceed to thelistener#on...methods. It is different from blocking requests that call those methods sequentially per request. This behavior causes multiple scopes to be opened on the same thread ininterceptCalland wrongly consumes them inon...methods.This change compares the current scope held by the
ObservationRegistryagainst the withheldscopeby the grpc listener callback. When they are different, make the withheld scope current; then, the subsequent logic can pick up the proper target observation.Closes gh-3805