Consistent tagging and propagate sendAsync throwable #5553
Merged
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 handling the sendAsync call in our instrumentation, we were not propagating the throwable observed to the CompletionFuture returned. This fixes that and adds a test. To keep tagging consistent in the case where response is null or not, this also updates tagging to always include `status` and `outcome`. In case the response is null, they will have value `UNKNOWN` for now. This is a change from before for this case, but the behavior before is problematic for the Prometheus registry that expects a consistent set of tags. The change is adding tags that weren't there before in the case response is null, so it should generally not break users.
shakuzen
commented
Oct 8, 2024
| assertThatThrownBy(response::join).isInstanceOf(CompletionException.class); | ||
| assertThatNoException().isThrownBy(() -> meterRegistry.get("http.client.requests") | ||
| .tag("method", "GET") | ||
| // TODO fix status/uri in exceptional cases where response may be null |
There was a problem hiding this comment.
This is not a TODO we should tackle in this PR. This should probably be fixed on main instead since it results in a change in behavior. Ideally, we should add more to our HttpClientTimingInstrumentationVerificationTests to ensure consistent behavior across instrumentations. The issue, if I remember correctly, is that some HTTP clients cannot instrument the case where the response is null.
shakuzen
commented
Oct 9, 2024
...er-java11/src/main/java/io/micrometer/java11/instrument/binder/jdk/MicrometerHttpClient.java
Show resolved
Hide resolved
jonatan-ivanov
approved these changes
Oct 10, 2024
...er-java11/src/main/java/io/micrometer/java11/instrument/binder/jdk/MicrometerHttpClient.java
Show resolved
Hide resolved
izeye
added a commit
to izeye/micrometer
that referenced
this pull request
Nov 23, 2024
izeye
added a commit
to izeye/micrometer
that referenced
this pull request
Nov 23, 2024
shakuzen
pushed a commit
that referenced
this pull request
Nov 25, 2024
jonatan-ivanov
pushed a commit
that referenced
this pull request
Dec 4, 2024
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 handling the sendAsync call in our instrumentation, we were not propagating the throwable observed to the CompletionFuture returned. This fixes that and adds a test. To keep tagging consistent in the case where response is null or not, this also updates tagging to always include
statusandoutcome. In case the response is null, they will have valueUNKNOWNfor now. This is a change from before for this case, but the behavior before is problematic for the Prometheus registry that expects a consistent set of tags. The change is adding tags that weren't there before in the case response is null, so it should generally not break users.Resolves gh-5136