query/receive: Unify HTTP server instrumentation #1458
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
Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>
Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>
Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>
Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>
9233a14 to
850c716
Compare
c2551ab to
e34285f
Compare
Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>
e34285f to
7222659
Compare
brancz
approved these changes
Aug 26, 2019
| ins := extpromhttp.NewNopInstrumentationMiddleware() | ||
| if o.Registry != nil { | ||
| ins = extpromhttp.NewInstrumentationMiddleware(o.Registry) | ||
| o.Registry.MustRegister(h.forwardRequestsTotal) |
There was a problem hiding this comment.
Did we always forget to register this or am I missing why this line is here?
There was a problem hiding this comment.
If I understood you correctly, It was registered before. I just removed the ones which come from InstrumentationMiddleware.
Lines 112 to 119 in 8feb079
|
Sorry misclicked. Didn’t mean to approve, just comment. |
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.
This PR attempts to unify HTTP server instrumentation behavior across components and removes unnecessary metrics. Thanos Query and Receive now use common instrumentation middleware.
PTAL #1420 for previous discussions.
Changes
thanos_query_api_instant_query_duration_seconds,thanos_query_api_range_query_duration_secondmetrics.thanos_http_request_duration_seconds,thanos_http_requests_total,thanos_http_response_size_bytes.Verification
Local
make testand run.