cmd/thanos/bucket: expose metrics #1702
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
Currently, the bucket web command generates and registers metrics but they are never actually exposed. This commit ensures that the metrics are exposed and leverages the recently created server package for consistency. This cleanup also helps prepare for the upcoming changes for thanos-io#1657. Signed-off-by: Lucas Servén Marín <lserven@gmail.com>
squat
force-pushed
the
bucketwebmetrics
branch
from
5018c85
to
df3688b
Compare
metalmatze
reviewed
Oct 31, 2019
| r.Get("/", instrf("root", b.root)) | ||
| r.Get("/static/*filepath", instrf("static", b.serveStaticAsset)) | ||
| s.Handle("/", instrf("root", b.root)) | ||
| s.Handle("/static/*filepath", instrf("static", b.serveStaticAsset)) |
There was a problem hiding this comment.
Why change these specifically?
There was a problem hiding this comment.
:/ because the Server type doesn't have a Get method, only a Handle and to be consistent internally, it simplifies things to re-use the server package.
There was a problem hiding this comment.
Server is just a wrapper around http.Server that why it resonates with its methods. However, since prometheus/common/route.Router implements http.Handler you can pass it down to the Server, if you want to preserve behaviour.
There was a problem hiding this comment.
I guess we could do that but I think it would just add an extra layer of complexity
squat
added a commit
to squat/thanos
that referenced
this pull request
Nov 4, 2019
This commit fixes a regression introduced in thanos-io#1702, where the signature of the bucketui.Register method was changed. The bug was caused because one of the registered paths relied on the HTTP parameter variable support from github.com/julienschmidt/httprouter, which the standard library does not support. The fix is instead to implement the change recommended in thanos-io#1702 (comment). Signed-off-by: Lucas Servén Marín <lserven@gmail.com>
bwplotka
pushed a commit
that referenced
this pull request
Nov 4, 2019
This commit fixes a regression introduced in #1702, where the signature of the bucketui.Register method was changed. The bug was caused because one of the registered paths relied on the HTTP parameter variable support from github.com/julienschmidt/httprouter, which the standard library does not support. The fix is instead to implement the change recommended in #1702 (comment). Signed-off-by: Lucas Servén Marín <lserven@gmail.com>
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.
Currently, the bucket web command generates and registers metrics but
they are never actually exposed. This commit ensures that the metrics
are exposed and leverages the recently created server package for
consistency.
This cleanup also helps prepare for the upcoming changes for
#1657.
Signed-off-by: Lucas Servén Marín lserven@gmail.com
Changelog entry is already covered by #1680
Verification
Launched bucket web component before and after change and ensured that metrics are exposed.