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.

Sign up for GitHub

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

Jump to bottom

Only add the collector port if it was not explicitly set #2396

Merged
merged 2 commits into from
Aug 16, 2020
Merged

Only add the collector port if it was not explicitly set #2396

merged 2 commits into from
Aug 16, 2020

Conversation

joe-elliott
Copy link
Member

Which problem is this PR solving?

Short description of the changes

  • Only add the collector host port to the agent if the list is empty. This allows for both manual configuration and automatic startup.

@joe-elliott joe-elliott requested a review from a team as a code owner August 15, 2020 12:35
@codecov
Copy link

codecov bot commented Aug 15, 2020 •
edited
Loading

Codecov Report

Merging #2396 into master will increase coverage by 0.00%.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #2396   +/-   ##
=======================================
  Coverage   95.59%   95.60%           
=======================================
  Files         206      206           
  Lines       10549    10549           
=======================================
+ Hits        10084    10085    +1     
+ Misses        397      395    -2     
- Partials       68       69    +1
Impacted Files Coverage Δ
cmd/query/app/server.go 90.90% <0.00%> (-2.28%) ⬇️
plugin/storage/integration/integration.go 80.86% <0.00%> (+0.47%) ⬆️
...lugin/sampling/strategystore/adaptive/processor.go 100.00% <0.00%> (+0.79%) ⬆️

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 5f4fc8d...14bbf0c. Read the comment docs.

yurishkuro
yurishkuro approved these changes Aug 15, 2020
View reviewed changes
Copy link
Member

@yurishkuro yurishkuro left a comment

Choose a reason for hiding this comment

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

Thanks!

@yurishkuro yurishkuro merged commit 569e975 into jaegertracing:master Aug 16, 2020
zhouhao3 pushed a commit to zhouhao3/jaeger that referenced this pull request Aug 20, 2020
@joe-elliott @yurishkuro
Only add the collector port if it was not explicitly set (jaegertraci…
5481ee4 
…ng#2396)

Signed-off-by: Joe Elliott <[email protected]>

Co-authored-by: Yuri Shkuro <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yurishkuro yurishkuro yurishkuro approved these changes

@pavolloffay pavolloffay Awaiting requested review from pavolloffay

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Jaeger Agent adding collector endpoint to user-provided list of collectors
2 participants
@joe-elliott @yurishkuro