Remove support for expvar-backed metrics #5437

joeyyy09 · 2024-05-10T09:45:00Z

Which problem is this PR solving?

Part of [deprecation] Remove support for expvar metrics #4722

Description of the changes

This PR removes deprecated expvar CLI flags for expvar-backed metrics
The internal parameters/settings of some components are still exposed via expvar. The implementation was changed to no longer depend on go-kit, thus reducing the dependencies

How was this change tested?

Tested locally by running the application without the deprecated flags to ensure that it functions correctly.

Checklist

I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
I have signed all commits
I have added unit tests for the new functionality
[] I have run lint and test steps successfully
- for jaeger: make lint test
- for jaeger-ui: yarn lint and yarn test

Signed-off-by: Joeyyy09 <[email protected]>

yurishkuro · 2024-05-10T17:31:03Z

I would start with deleting internal/metrics/expvar and then making sure make build-binaries-(your platform) is ok.

examples/hotrod/cmd/flags.go

examples/hotrod/cmd/root.go

internal/metrics/metricsbuilder/builder.go

Co-authored-by: Yuri Shkuro <[email protected]> Signed-off-by: Harshith Mente <[email protected]>

Signed-off-by: Joeyyy09 <[email protected]>

joeyyy09 · 2024-05-11T07:11:56Z

I would start with deleting internal/metrics/expvar and then making sure make build-binaries-(your platform) is ok.

Yeah, i removed them and made sure the build is okay.

joeyyy09 · 2024-05-11T07:13:02Z

@yurishkuro can you review these changes and let me know if i've got to change any more?

codecov · 2024-05-11T17:20:37Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.20%. Comparing base (695f230) to head (6e06128).

Additional details and impacted files

@@             Coverage Diff             @@
##             main    #5437       +/-   ##
===========================================
+ Coverage   54.23%   96.20%   +41.96%     
===========================================
  Files         160      330      +170     
  Lines        8369    16151     +7782     
===========================================
+ Hits         4539    15538    +10999     
+ Misses       3384      437     -2947     
+ Partials      446      176      -270

Flag	Coverage Δ
badger_v1	`8.05% <ø> (ø)`
badger_v2	`1.93% <ø> (ø)`
cassandra-3.x-v1	`16.43% <ø> (ø)`
cassandra-3.x-v2	`1.85% <ø> (ø)`
cassandra-4.x-v1	`16.43% <ø> (ø)`
cassandra-4.x-v2	`1.85% <ø> (ø)`
elasticsearch-7.x-v1	`18.89% <ø> (+0.01%)`	⬆️
elasticsearch-8.x-v1	`19.08% <ø> (ø)`
elasticsearch-8.x-v2	`19.08% <ø> (+0.01%)`	⬆️
grpc_v1	`9.53% <ø> (+0.01%)`	⬆️
grpc_v2	`7.58% <ø> (ø)`
kafka	`9.78% <ø> (ø)`
opensearch-1.x-v1	`18.92% <ø> (-0.02%)`	⬇️
opensearch-2.x-v1	`18.94% <ø> (+0.01%)`	⬆️
opensearch-2.x-v2	`18.92% <ø> (ø)`
unittests	`93.91% <100.00%> (?)`

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

yurishkuro · 2024-05-11T18:09:16Z

please make sure make lint test are green

Signed-off-by: Joeyyy09 <[email protected]>

joeyyy09 · 2024-05-12T08:09:26Z

please make sure make lint test are green

Yeah, fixed them. Thanks for the help! Is there anything i need to change?

yurishkuro

You need to query Prometheus endpoint on each binary before and after changes to make sure no changes to metrics names happen.

cmd/all-in-one/main.go

cmd/agent/main.go

cmd/collector/main.go

cmd/agent/main.go

go.mod

internal/metrics/metricsbuilder/builder.go

Signed-off-by: Joeyyy09 <[email protected]>

joeyyy09 · 2024-05-13T09:31:43Z

You need to query Prometheus endpoint on each binary before and after changes to make sure no changes to metrics names happen.

Yeah, I'll verify this once.

joeyyy09 · 2024-05-13T10:34:41Z

@yurishkuro I've resolved all the edits, thank you for helping me out. Absolutely sorry for messing up the namespaces. Can you please let me know if there's anything more i need to do? I'm willing to make the entire changes till this issue gets resolved.

yurishkuro · 2024-05-13T15:39:45Z

I still see breaking changes. You need to test that the metrics names are the same, by running each of the main Jaeger components from your branch and from main (e.g. SPAN_STORAGE_TYPE=grpc-plugin go run ./cmd/query) and comparing the output of curl http://localhost:16687/metrics (admin port will be different for different binaries, see logs)

joeyyy09 · 2024-05-14T07:04:45Z

I still see breaking changes. You need to test that the metrics names are the same, by running each of the main Jaeger components from your branch and from main (e.g. SPAN_STORAGE_TYPE=grpc-plugin go run ./cmd/query) and comparing the output of curl http://localhost:16687/metrics (admin port will be different for different binaries, see logs)

Okay, will work on it!

Signed-off-by: Yuri Shkuro <[email protected]>

## Which problem is this PR solving? - Part of jaegertracing#4722 ## Description of the changes - This PR removes deprecated expvar CLI flags for expvar-backed metrics - The internal parameters/settings of some components are still exposed via expvar. The implementation was changed to no longer depend on go-kit, thus reducing the dependencies ## How was this change tested? - Tested locally by running the application without the deprecated flags to ensure that it functions correctly. ## Checklist - [x] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [x] I have signed all commits - [ ] I have added unit tests for the new functionality - [] I have run lint and test steps successfully - for `jaeger`: `make lint test` - for `jaeger-ui`: `yarn lint` and `yarn test` --------- Signed-off-by: Joeyyy09 <[email protected]> Signed-off-by: Harshith Mente <[email protected]> Signed-off-by: Yuri Shkuro <[email protected]> Signed-off-by: Yuri Shkuro <[email protected]> Co-authored-by: Yuri Shkuro <[email protected]> Co-authored-by: Yuri Shkuro <[email protected]> Signed-off-by: Vamshi Maskuri <[email protected]>

joeyyy09 requested a review from a team as a code owner May 10, 2024 09:45

joeyyy09 requested a review from joe-elliott May 10, 2024 09:45

Remove support for expvar metrics

12fea50

Signed-off-by: Joeyyy09 <[email protected]>

yurishkuro reviewed May 10, 2024

View reviewed changes

examples/hotrod/cmd/flags.go Show resolved Hide resolved

examples/hotrod/cmd/flags.go Outdated Show resolved Hide resolved

examples/hotrod/cmd/root.go Outdated Show resolved Hide resolved

internal/metrics/metricsbuilder/builder.go Outdated Show resolved Hide resolved

joeyyy09 and others added 2 commits May 11, 2024 00:26

Update examples/hotrod/cmd/flags.go

fd00e5e

Co-authored-by: Yuri Shkuro <[email protected]> Signed-off-by: Harshith Mente <[email protected]>

Removed internal/metrics/expvar

1715c01

Signed-off-by: Joeyyy09 <[email protected]>

Fix Linting issues

3b21a5d

Signed-off-by: Joeyyy09 <[email protected]>

yurishkuro reviewed May 12, 2024

View reviewed changes

Removed Forks, maintained namespaces

d1c9040

Signed-off-by: Joeyyy09 <[email protected]>

yurishkuro mentioned this pull request May 27, 2024

WIP No expvar #5494

Closed

4 tasks

Merge branch 'main' into dep-cli-flags

73e7fff

Signed-off-by: Yuri Shkuro <[email protected]>

yurishkuro added the changelog:breaking-change Change that is breaking public APIs or established behavior label May 27, 2024

yurishkuro added 5 commits May 27, 2024 18:27

fix

e7180b7

Signed-off-by: Yuri Shkuro <[email protected]>

Restore internal expvar

fb3f730

Signed-off-by: Yuri Shkuro <[email protected]>

remove gokit

fd17b0a

Signed-off-by: Yuri Shkuro <[email protected]>

fix tests

39391b4

Signed-off-by: Yuri Shkuro <[email protected]>

fix

6e06128

Signed-off-by: Yuri Shkuro <[email protected]>

yurishkuro approved these changes May 27, 2024

View reviewed changes

yurishkuro changed the title ~~Remove support for expvar metrics~~ Remove support for expvar-backed metrics May 27, 2024

yurishkuro merged commit a7a7308 into jaegertracing:main May 27, 2024
40 checks passed

yurishkuro mentioned this pull request May 27, 2024

[deprecation] Remove support for expvar metrics #4722

Closed

2 tasks

asatt mentioned this pull request Jul 17, 2024

[Bug]: HotRod run failed if using the old env variable #5759

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove support for expvar-backed metrics #5437

Remove support for expvar-backed metrics #5437

joeyyy09 commented May 10, 2024 •

edited by yurishkuro

Loading

yurishkuro commented May 10, 2024

joeyyy09 commented May 11, 2024

joeyyy09 commented May 11, 2024

codecov bot commented May 11, 2024 •

edited

Loading

yurishkuro commented May 11, 2024

joeyyy09 commented May 12, 2024

yurishkuro left a comment

joeyyy09 commented May 13, 2024

joeyyy09 commented May 13, 2024 •

edited

Loading

yurishkuro commented May 13, 2024

joeyyy09 commented May 14, 2024

Remove support for expvar-backed metrics #5437

Remove support for expvar-backed metrics #5437

Conversation

joeyyy09 commented May 10, 2024 • edited by yurishkuro Loading

Which problem is this PR solving?

Description of the changes

How was this change tested?

Checklist

yurishkuro commented May 10, 2024

joeyyy09 commented May 11, 2024

joeyyy09 commented May 11, 2024

codecov bot commented May 11, 2024 • edited Loading

Codecov Report

yurishkuro commented May 11, 2024

joeyyy09 commented May 12, 2024

yurishkuro left a comment

Choose a reason for hiding this comment

joeyyy09 commented May 13, 2024

joeyyy09 commented May 13, 2024 • edited Loading

yurishkuro commented May 13, 2024

joeyyy09 commented May 14, 2024

joeyyy09 commented May 10, 2024 •

edited by yurishkuro

Loading

codecov bot commented May 11, 2024 •

edited

Loading

joeyyy09 commented May 13, 2024 •

edited

Loading