Apache HTTP client instrumentation with Observation #3312
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
shakuzen
added
enhancement
![sonatype-lift[bot]](https://avatars.githubusercontent.com/in/9843?s=60&v=4){kind=small}
.../java/io/micrometer/core/instrument/binder/httpcomponents/MicrometerHttpRequestExecutor.java
Outdated
Show resolved
Hide resolved
...eter/core/instrument/binder/httpcomponents/DefaultApacheHttpClientObservationConvention.java
Outdated
Show resolved
Hide resolved
.../java/io/micrometer/core/instrument/binder/httpcomponents/MicrometerHttpRequestExecutor.java
Outdated
Show resolved
Hide resolved
shakuzen
commented
Jul 25, 2022
.../java/io/micrometer/core/instrument/binder/httpcomponents/MicrometerHttpRequestExecutor.java
Outdated
Show resolved
Hide resolved
...eter/core/instrument/binder/httpcomponents/DefaultApacheHttpClientObservationConvention.java
Show resolved
Hide resolved
.../java/io/micrometer/core/instrument/binder/httpcomponents/MicrometerHttpRequestExecutor.java
Outdated
Show resolved
Hide resolved
.../java/io/micrometer/core/instrument/binder/httpcomponents/MicrometerHttpRequestExecutor.java
Outdated
Show resolved
Hide resolved
shakuzen
force-pushed
the
apache-http-client-to-obs-api
branch
2 times, most recently
from
b8fa4ca
to
de6229f
Compare
shakuzen
force-pushed
the
apache-http-client-to-obs-api
branch
from
6b068fd
to
c6011b5
Compare
micrometer-core/src/main/java/io/micrometer/core/instrument/observation/ObservationOrTimer.java
Outdated
Show resolved
Hide resolved
Work-in-progress on adding Observation-based instrumentation to Apache HTTP client while being backwards compatible.
Adapts to breaking changes made in main, and updates the code to work with global conventions and allows custom conventions to be configured locally. Previously the default convention relied on accepting config that would not be available to third-part implementations. This has been moved to the context instead.
shakuzen
force-pushed
the
apache-http-client-to-obs-api
branch
from
c6011b5
to
93166ee
Compare
shakuzen
force-pushed
the
apache-http-client-to-obs-api
branch
from
4fcade7
to
3bf0bff
Compare
shakuzen
changed the title
marcingrzejszczak
approved these changes
Aug 22, 2022
...c/main/java/io/micrometer/core/instrument/binder/httpcomponents/ApacheHttpClientContext.java
Outdated
Show resolved
Hide resolved
|
|
||
| @Override | ||
| public String getContextualName(ApacheHttpClientContext context) { | ||
| return "HTTP " + getMethodString(context.getCarrier()); |
There was a problem hiding this comment.
I've seen this hard coded quite a few times - I wonder if we can extract this somehow, somewhere? 🤷
There was a problem hiding this comment.
Since how to get the method will be different for each implementation I'm not sure we really can. This is exactly what we were trying to do with the HTTP abstractions for request/response, but we ended up going a different direction.
shakuzen
commented
Aug 22, 2022
|
|
||
| } | ||
|
|
||
| // TODO add test for status = IO_ERROR case. |
There was a problem hiding this comment.
I wanted to add a test for this, but I wasn't sure how. If someone knows how to test this scenario with the Apache HTTP client, let me know. The scenarios are when the response returned from execute is null and when calling execute results in an IOException
izeye
added a commit
to izeye/micrometer
that referenced
this pull request
Sep 18, 2022
jonatan-ivanov
pushed a commit
that referenced
this pull request
Sep 19, 2022
izeye
added a commit
to izeye/micrometer
that referenced
this pull request
Sep 20, 2022
shakuzen
pushed a commit
that referenced
this pull request
Sep 20, 2022
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.
Adds Observation-based instrumentation for the Apache HTTP client while being backwards compatible. Configuring an ObservationRegistry (that is not a no-op) causes the
Observationinstrumentation to be used instead of instrumentation directly withTimer.