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

Update to jaeger-lib 2 and latest sha for jaeger-client-go, to pick u… #1282

Merged
merged 4 commits into from
Jan 17, 2019

Conversation

objectiser
Copy link
Contributor

…p refactored metric names

Signed-off-by: Gary Brown gary@brownuk.com

Which problem is this PR solving?

Updating to latest jaeger-lib (version 2) and jaeger-client-go (sha currently as not yet released). This is to pick up changes to the metric names.

Short description of the changes

Updated versions - as the metrics factory approach changed in jaeger-lib 2 this required updates throughout the code.

NOTE: Will need to change the namespace used with the go client, to use the base metrics factory, to avoid jaeger_client_jaeger_tracer.... prefix and instead just have jaeger_tracer..... Should this be added to this PR or be done separately?

…p refactored metric names

Signed-off-by: Gary Brown <gary@brownuk.com>
@codecov
Copy link

codecov bot commented Jan 15, 2019

Codecov Report

Merging #1282 into master will not change coverage.
The diff coverage is 100%.

Impacted file tree graph

@@          Coverage Diff           @@
##           master   #1282   +/-   ##
======================================
  Coverage     100%    100%           
======================================
  Files         161     161           
  Lines        7185    7193    +8     
======================================
+ Hits         7185    7193    +8
Impacted Files Coverage Δ
cmd/ingester/app/consumer/offset/manager.go 100% <100%> (ø) ⬆️
cmd/agent/app/testutils/fixture.go 100% <100%> (ø) ⬆️
storage/spanstore/metrics/write_metrics.go 100% <100%> (ø) ⬆️
cmd/ingester/app/consumer/deadlock_detector.go 100% <100%> (ø) ⬆️
cmd/ingester/app/processor/decorator/retry.go 100% <100%> (ø) ⬆️
cmd/agent/app/reporter/tchannel/collector_proxy.go 100% <100%> (ø) ⬆️
plugin/storage/cassandra/spanstore/reader.go 100% <100%> (ø) ⬆️
storage/spanstore/metrics/decorator.go 100% <100%> (ø) ⬆️
plugin/storage/cassandra/spanstore/writer.go 100% <100%> (ø) ⬆️
cmd/collector/app/builder/span_handler_builder.go 100% <100%> (ø) ⬆️
... and 11 more

Continue to review full report at Codecov.

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

Copy link
Member

@pavolloffay pavolloffay left a comment

Choose a reason for hiding this comment

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

Just one question related to jaeger client, LGTM otherwise

Gopkg.toml Outdated
@@ -81,11 +81,11 @@ required = [

[[constraint]]
name = "github.com/uber/jaeger-client-go"
version = "^2.15.0"
revision = "cd507787f07ecb833e0f2df888e074f45a0dca74"
Copy link
Member

Choose a reason for hiding this comment

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

has the client been updated to use lib v2? If no is it a problem?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Copy link
Member

Choose a reason for hiding this comment

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

Then could we pin this to a version rather than a commit?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Copy link
Member

Choose a reason for hiding this comment

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

thanks for the pointer. It's all good

@pavolloffay
Copy link
Member

Does this PR introduce any breaking changes? Even in produced matrics?

@objectiser
Copy link
Contributor Author

@pavolloffay Yes metric names will be changed - so a note will need to be added to the change log.

I could do it with this PR - but one thing that needs to be decided is whether to also make the jaeger_client_jaeger_tracer -> jaeger_tracer namespace change in this PR or a separate PR?

@pavolloffay
Copy link
Member

I could do it with this PR - but one thing that needs to be decided is whether to also make the jaeger_client_jaeger_tracer -> jaeger_tracer namespace change in this PR or a separate PR?

As you prefer. Could you please also add a changelog (separater PR is fine)?

… than 'jaeger_client_jaeger_tracer'

Signed-off-by: Gary Brown <gary@brownuk.com>
Signed-off-by: Gary Brown <gary@brownuk.com>
@objectiser
Copy link
Contributor Author

@pavolloffay Just checked the expvar output, and the jaeger_tracer metrics are inconsistent, as they use a _ - whereas all other components use jaeger.<component> - so think it would be better if I update the jaeger go client first and then update the sha in this PR. Is that ok with you?

@objectiser
Copy link
Contributor Author

objectiser commented Jan 16, 2019

@pavolloffay Have created jaegertracing/jaeger-client-go#364 to fix the namespace separator issue - if you think the change is ok, can you merge that PR and I will update the sha in this PR.

…mespace separator

Signed-off-by: Gary Brown <gary@brownuk.com>
@objectiser
Copy link
Contributor Author

@pavolloffay All the metrics are now consistent - and the changelog has been updated.

@pavolloffay pavolloffay merged commit 7cbb25d into jaegertracing:master Jan 17, 2019
@ghost ghost removed the review label Jan 17, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants