Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

proxy: support configurable metrics #3027

Merged
merged 1 commit into from
Apr 22, 2024
Merged

Conversation

AlexanderYastrebov
Copy link
Member

Use configed metrics and fallback to global for backwards compatibility.

Updates #3026

Use configed metrics and fallback to global for backwards compatibility.

Updates #3026

Signed-off-by: Alexander Yastrebov <alexander.yastrebov@zalando.de>
@AlexanderYastrebov AlexanderYastrebov added the major moderate risk, for example new API, small filter changes that have no risk like refactoring or logs label Apr 19, 2024
@@ -1309,9 +1309,8 @@ func listenAndServeQuit(
}

if o.EnableConnMetricsServer {
m := metrics.Default
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor: why were metrics.Default and mtr were mixed in this function at all?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤷

@RomanZavodskikh
Copy link
Member

👍

1 similar comment
@AlexanderYastrebov
Copy link
Member Author

👍

@AlexanderYastrebov AlexanderYastrebov merged commit 5dc8098 into master Apr 22, 2024
14 checks passed
@AlexanderYastrebov AlexanderYastrebov deleted the proxy/params-metrics branch April 22, 2024 08:20
AlexanderYastrebov added a commit to zalando-incubator/kubernetes-on-aws that referenced this pull request Apr 22, 2024
[Changes](zalando/skipper@v0.21.54...v0.21.61)

* [build(deps): bump amazonlinux from `ef9435f` to `5478f82` in /fuzz](zalando/skipper#3031)
* [build(deps): bump actions/upload-artifact from 4.3.1 to 4.3.2](zalando/skipper#3033)
* [build(deps): bump actions/checkout from 4.1.2 to 4.1.3](zalando/skipper#3032)
* [build(deps): bump github.com/miekg/dns from 1.1.58 to 1.1.59](zalando/skipper#3030)
* [proxy: support configurable metrics](zalando/skipper#3027)
* [filters/auth: add login redirect stub support](zalando/skipper#3028)
* [filters: move annotate into own package](zalando/skipper#3023)
* [filters/auth: add jwtMetrics](zalando/skipper#3020)
* [filters/builtin: add annotate filter](zalando/skipper#3022)

Signed-off-by: Alexander Yastrebov <alexander.yastrebov@zalando.de>
AlexanderYastrebov added a commit to zalando-incubator/kubernetes-on-aws that referenced this pull request Apr 22, 2024
[Changes](zalando/skipper@v0.21.54...v0.21.61)

* `build(deps): bump amazonlinux from `ef9435f` to `5478f82` in /fuzz` zalando/skipper#3031
* `build(deps): bump actions/upload-artifact from 4.3.1 to 4.3.2` zalando/skipper#3033
* `build(deps): bump actions/checkout from 4.1.2 to 4.1.3` zalando/skipper#3032
* `build(deps): bump github.com/miekg/dns from 1.1.58 to 1.1.59` zalando/skipper#3030
* `proxy: support configurable metrics` zalando/skipper#3027
* `filters/auth: add login redirect stub support` zalando/skipper#3028
* `filters: move annotate into own package` zalando/skipper#3023
* `filters/auth: add jwtMetrics` zalando/skipper#3020
* `filters/builtin: add annotate filter` zalando/skipper#3022

Signed-off-by: Alexander Yastrebov <alexander.yastrebov@zalando.de>
AlexanderYastrebov added a commit to zalando-incubator/kubernetes-on-aws that referenced this pull request Apr 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
major moderate risk, for example new API, small filter changes that have no risk like refactoring or logs
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants