This repository has been archived by the owner on May 23, 2024. It is now read-only.
Support more environment variables in configuration #323
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
golangci
reviewed
Jul 12, 2018
config/config.go
Outdated
| @@ -369,5 +382,13 @@ func (rc *ReporterConfig) NewReporter( | |||
| } | |||
|
|
|||
| func (rc *ReporterConfig) newTransport() (jaeger.Transport, error) { | |||
| var opts transport.HTTPOption | |||
| if rc.User != "" && rc.Password != "" { | |||
| opts = transport.HTTPBasicAuth(rc.User, rc.Password) | |||
Codecov Report
@@ Coverage Diff @@
## master #323 +/- ##
==========================================
- Coverage 87.15% 87.14% -0.01%
==========================================
Files 54 54
Lines 2965 2988 +23
==========================================
+ Hits 2584 2604 +20
- Misses 269 272 +3
Partials 112 112
Continue to review full report at Codecov.
|
Previously, the client could only send spans via UDP to the agent. This PR adds support for sending spans using HTTP to the collector by setting the JAEGER_ENDPOINT env var. Additionally, the HTTP transport can be secured through basic auth by setting the JAEGER_USER and JAEGER_PASSWORD env vars. Fixes: jaegertracing/jaeger#920 Signed-off-by: Daneyon Hansen <danehans@cisco.com>
yurishkuro
changed the title
yurishkuro
approved these changes
Jul 13, 2018
black-adder
reviewed
Jul 13, 2018
config/config_env.go
Outdated
| @@ -157,11 +161,17 @@ func reporterConfigFromEnv() (*ReporterConfig, error) { | |||
|
|
|||
| host := jaeger.DefaultUDPSpanServerHost | |||
| if e := os.Getenv(envAgentHost); e != "" { | |||
| if ep := os.Getenv(envEndpoint); ep != "" { | |||
There was a problem hiding this comment.
how about we read the envEndpoint once and use ep in all the checks?
config/config_env.go
Outdated
| rc.CollectorEndpoint = fmt.Sprintf("%s", u) | ||
| } | ||
|
|
||
| if e := os.Getenv(envUser); e != "" { |
There was a problem hiding this comment.
can we use xor here instead and combine everything into 1 check? Albeit, it might not be a worthwhile optimization given this only happens during initialization but it's always fun to use xor every now and again.
Signed-off-by: Daneyon Hansen <danehans@cisco.com>
golangci
reviewed
Jul 13, 2018
config/config_env.go
Outdated
| pswd := os.Getenv(envPassword) | ||
| if user != "" && pswd == "" || user == "" && pswd != "" { | ||
| return nil, errors.Errorf("you must set %s and %s env vars together", envUser, envPassword) | ||
| } else { |
There was a problem hiding this comment.
if block ends with a return statement, so drop this else and outdent its block
config/config_env.go
Outdated
|
|
||
| user := os.Getenv(envUser) | ||
| pswd := os.Getenv(envPassword) | ||
| if user != "" && pswd == "" || user == "" && pswd != "" { |
Signed-off-by: Daneyon Hansen <danehans@cisco.com>
|
@danehans thanks! |
2 tasks
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Which problem is this PR solving?
Short description of the changes
This PR adds support for sending spans using HTTP to the collector
by setting the JAEGER_ENDPOINT env var. Additionally, the HTTP
transport can be secured through basic auth by setting the
JAEGER_USER and JAEGER_PASSWORD env vars.
Signed-off-by: Daneyon Hansen danehans@cisco.com