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

Support tracer env based initialization in hotrod #1115

Merged

Conversation

eundoosong
Copy link
Contributor

@eundoosong eundoosong commented Oct 12, 2018

Which problem is this PR solving?

Short description of the changes

  • Remove jAgentHostPort(jaeger-agent.host-port) flag.
  • Replace config.Configuration() by config.FromEnv()
  • Move metricsFactory.Namespace inside Init()

Signed-off-by: Eundoo Song <eundoo.song@gmail.com>
Signed-off-by: Eundoo Song <eundoo.song@gmail.com>
Signed-off-by: Eundoo Song <eundoo.song@gmail.com>
@eundoosong eundoosong force-pushed the remove_jaeger_endpoint_in_hotrod branch 2 times, most recently from 07a2cb0 to 87116e9 Compare October 12, 2018 11:04
@eundoosong
Copy link
Contributor Author

eundoosong commented Oct 12, 2018

Looks like the build error is caused by change in glide.lock
https://travis-ci.org/jaegertracing/jaeger/jobs/440583267
I just did glide update and seems the dependancies related to ingester were updated as well.
glide.lock is generated from glide.yaml. Is there any way to update go-client only?

@pavolloffay pavolloffay changed the title Support env based initialization in hotrod Support tracer env based initialization in hotrod Oct 12, 2018
@@ -233,7 +233,7 @@ imports:
- name: github.com/uber-go/atomic
version: 8474b86a5a6f79c443ce4b2992817ff32cf208b8
- name: github.com/uber/jaeger-client-go
version: b043381d944715b469fd6b37addfd30145ca1758
version: 1a782e2da844727691fef1757c72eb190c2909f0
Copy link
Member

Choose a reason for hiding this comment

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

Can you update the verson in glide.yml?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes I did, but still error from ingester.

This reverts commit 04a4652.

Signed-off-by: Eundoo Song <eundoo.song@gmail.com>
@eundoosong eundoosong force-pushed the remove_jaeger_endpoint_in_hotrod branch from 18bad7a to aa7edfb Compare October 12, 2018 12:10
@pavolloffay
Copy link
Member

readme needs to be updated too

@pavolloffay
Copy link
Member

glide update will probably update other deps too. But you didn't add go client bump in glide.yml

@eundoosong
Copy link
Contributor Author

@pavolloffay
Yes I think readme needs to be updated.
When is example-hotrod docker image tagged? I need to specify the verision(probably 1.8?).

Signed-off-by: Eundoo Song <eundoo.song@gmail.com>
@pavolloffay
Copy link
Member

it's tagged during the release process - tag on github. Not need to tag it/change the version explicitly.

Signed-off-by: Eundoo Song <eundoo.song@gmail.com>
@eundoosong eundoosong force-pushed the remove_jaeger_endpoint_in_hotrod branch from 34c0f68 to 620fd7d Compare October 12, 2018 13:31
@@ -49,10 +49,11 @@ go run ./main.go all
docker run \
--rm \
--link jaeger \
--env JAEGER_AGENT_HOST=jaeger \
--env JAEGER_AGENT_PORT=6831 \
-p8080-8083:8080-8083 \
jaegertracing/example-hotrod:1.6 \
Copy link
Contributor Author

Choose a reason for hiding this comment

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

1.6 version is old, so it needs to be updated to accept JAEGER_AGENT_XXX env.
Should I remove version tag so that latest is pulled?

Copy link
Member

Choose a reason for hiding this comment

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

This has to be updated. latest is fine or 1.8

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Changed to latest

Signed-off-by: Eundoo Song <eundoo.song@gmail.com>
@black-adder
Copy link
Contributor

let's pin sarama and sarama-cluster to 1.16.0 and 2.1.13 respectively, looks like there was a breaking change.

@black-adder
Copy link
Contributor

More specifically https://github.com/bsm/sarama-cluster/blame/f7d869db45fd8d74bf62c02a9d17637f945668d0/partitions.go#L23 was added to the interface in the newest version of sarama-cluster

Signed-off-by: Eundoo Song <eundoo.song@gmail.com>
@codecov
Copy link

codecov bot commented Oct 12, 2018

Codecov Report

Merging #1115 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@          Coverage Diff           @@
##           master   #1115   +/-   ##
======================================
  Coverage     100%    100%           
======================================
  Files         142     142           
  Lines        6743    6743           
======================================
  Hits         6743    6743

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 732ef79...3d3d8cf. Read the comment docs.

@eundoosong
Copy link
Contributor Author

Pin sarama and sarama-cluster to 1.16.0 and 2.1.13 is done.
It's ready for review.

@black-adder black-adder merged commit fb10d4c into jaegertracing:master Oct 12, 2018
@black-adder
Copy link
Contributor

@eundoosong thanks!

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.

3 participants