Switch from grpc-ecosystem/go-grpc-prometheus to grpc-ecosystem/go-grpc-middleware/providers/prometheus

[dims]

Reviving previous effort from: #17974

xref: kubernetes/kubernetes#128583

Added a new test to make sure we are not missing any expected metrics.

Please read https://github.com/etcd-io/etcd/blob/main/CONTRIBUTING.md#contribution-flow.

[k8s-ci-robot]

Hi @dims. Thanks for your PR.

I'm waiting for a etcd-io member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

[ivanvc]

/ok-to-test

[dims]

thanks @ivanvc

[codecov]

Codecov Report

Attention: Patch coverage is 88.37209% with 5 lines in your changes missing coverage. Please review.

Project coverage is 68.88%. Comparing base (5d47d7f) to head (742ce69).
Report is 9 commits behind head on main.

Files with missing lines	Patch %	Lines
server/etcdmain/grpc_proxy.go	0.00%	4 Missing ⚠️
server/etcdserver/api/v3rpc/metrics.go	96.55%	1 Missing ⚠️

Additional details and impacted files

Files with missing lines	Coverage Δ
server/config/config.go	80.23% <ø> (ø)
server/embed/etcd.go	76.16% <100.00%> (+0.30%)	⬆️
server/etcdserver/api/v3rpc/grpc.go	100.00% <100.00%> (ø)
server/etcdserver/api/v3rpc/metrics.go	97.05% <96.55%> (-2.95%)	⬇️
server/etcdmain/grpc_proxy.go	14.44% <0.00%> (-0.08%)	⬇️

... and 27 files with indirect coverage changes

@@            Coverage Diff             @@
##             main   #19195      +/-   ##
==========================================
+ Coverage   68.76%   68.88%   +0.12%     
==========================================
  Files         420      420              
  Lines       35650    35686      +36     
==========================================
+ Hits        24514    24584      +70     
+ Misses       9714     9684      -30     
+ Partials     1422     1418       -4     

---

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5d47d7f...742ce69. Read the comment docs.

[dims]

/test pull-etcd-integration-2-cpu-amd64

[dims]

/assign @ahrtr @serathius

[ahrtr]

Thanks @dims for the PR.

I did some sanity test on this PR, and compared it with the existing main branch.

• Confirmed that this PR can generate the same gRPC counter metrics as the existing main branch, including
  • grpc_server_handled_total
  • grpc_server_msg_received_total
  • grpc_server_msg_sent_total
  • grpc_server_started_total
• It couldn't generate the histograms metrics, but the existing main branch can.
  • grpc_server_handling_seconds_bucket
  • grpc_server_handling_seconds_count
  • grpc_server_handling_seconds_sum

Also references:

• https://github.com/grpc-ecosystem/go-grpc-prometheus
• https://github.com/grpc-ecosystem/go-grpc-middleware/blob/main/examples/server/main.go

[serathius]

Do we need a test to confirm that no metric was removed?

[dims]

It couldn't generate the histograms metrics, but the existing main branch can.
grpc_server_handling_seconds_bucket
grpc_server_handling_seconds_count
grpc_server_handling_seconds_sum

@ahrtr did you run with --metrics 'extensive' option? or let it default to 'basic'?

[dims]

Do we need a test to confirm that no metric was removed?

i think so for future-proofing!

[ahrtr]

@ahrtr did you run with --metrics 'extensive' option?

YES, I executed the same command on this PR and the main branch. The main branch was working as expected, but this PR did not generate the histograms metrics.

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: dims
Once this PR has been reviewed and has the lgtm label, please ask for approval from ahrtr. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

• OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[dims]

@ahrtr found the issue and hopefully fixed it. Added a test as well. However, please check if i broke anything in the process of threading the option through to both the test suite and the main binary.

[dims]

/test pull-etcd-integration-2-cpu-amd64

[dims]

/test pull-etcd-robustness-arm64

[dims]

Do we need a test to confirm that no metric was removed?

@serathius Done! see new test case. If there are other metrics we can trigger them and then add to the list.

[serathius]

The test is large already, can you move the test to separate PR?