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

make tracing defaults consistent #1130

Merged
merged 1 commit into from
Dec 17, 2020
Merged

Conversation

wkloucek
Copy link
Contributor

@wkloucek wkloucek commented Dec 17, 2020

ocis and proxy are the only extensions which have a default for tracing endpoints. There shouldn't be a default at all, because there is a comparison if OCIS_TRACING_COLLECTOR is empty:

exporter, err := jaeger.NewExporter(
jaeger.Options{
AgentEndpoint: cfg.Tracing.Endpoint,
CollectorEndpoint: cfg.Tracing.Collector,
Process: jaeger.Process{
ServiceName: cfg.Tracing.Service,
},
},
)

Which calls this: https://github.com/census-ecosystem/opencensus-go-exporter-jaeger/blob/30c8b0fe8ad9d0eac5785893f3941b2e72c5aaaa/jaeger.go#L88-L98

For example if you want to use OCIS_TRACING_ENDPOINT at the moment you have to explicitly override OCIS_TRACING_COLLECTOR with an empty string. The configuration looks like this:

export OCIS_TRACING_COLLECTOR=""
export OCIS_TRACING_ENABLED=true
export OCIS_TRACING_ENDPOINT=127.0.0.1:6831

After the merge this would look like this:

export OCIS_TRACING_ENABLED=true
export OCIS_TRACING_ENDPOINT=127.0.0.1:6831

Loosely related: cs3org/reva#1379

@update-docs
Copy link

update-docs bot commented Dec 17, 2020

Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a changelog item based on your changes.

@wkloucek wkloucek requested review from C0rby and refs December 17, 2020 14:58
@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@phil-davis phil-davis merged commit af34379 into master Dec 17, 2020
@delete-merged-branch delete-merged-branch bot deleted the make_tracing_defaults_consistent branch December 17, 2020 16:13
ownclouders pushed a commit that referenced this pull request Dec 17, 2020
Merge: 53382a8 9c34174
Author: Phil Davis <[email protected]>
Date:   Thu Dec 17 21:58:24 2020 +0545

    Merge pull request #1130 from owncloud/make_tracing_defaults_consistent

    make tracing defaults consistent
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.

4 participants