Merged
Conversation
2952ba0 to
786e0b2
Compare
Also, allow for combined wai-routing + servant metrics.
786e0b2 to
3d024f5
Compare
supersven
reviewed
Oct 18, 2024
supersven
reviewed
Oct 18, 2024
| -- (e.g. removing params from calls) | ||
| waiPrometheusMiddleware :: (Monad m) => Routes a m b -> Wai.Middleware | ||
| waiPrometheusMiddleware routes = | ||
| waiPrometheusMiddleware routes = waiPrometheusMiddlewarePaths $ treeToPaths $ prepare routes |
Contributor
There was a problem hiding this comment.
I'm a bit surprised by our lack of test coverage for proxy 🙄
Wouldn't this ticket have been a chance to make the beast testable and ensure we're not breaking anything? 🤔 (I may miss some details something, though.)
Contributor
Author
There was a problem hiding this comment.
i would argue "out of scope", this is only about internal end-points, and i only changed Run.hs because it seemed the most straight-forward way to do this at the time. it's tricky to test these without api keys for the resp. services. and the public routes really haven't changed in this PR, just wrapped a little.
but i agree to your point. hm, what to do?
supersven
reviewed
Oct 18, 2024
supersven
reviewed
Oct 18, 2024
Co-authored-by: Sven Tennie <sven.tennie@wire.com>
supersven
reviewed
Oct 18, 2024
…-proxy-internal' into WPB-1220-servantify-proxy-internal
supersven
approved these changes
Oct 18, 2024
2 tasks
This was referenced Oct 23, 2024
This file contains hidden or 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
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.
Servantifying the whole of proxy would have been less awkward, but there are some questions as to which services to support, and for each of them servantification is non-trivial.
On the bright side Proxy.Run doesn't need to be touched again for servantivication of the rest.
Checklist
changelog.d