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

Simplify config #329

Merged
merged 4 commits into from
Aug 12, 2020
Merged

Simplify config #329

merged 4 commits into from
Aug 12, 2020

Conversation

kulmann
Copy link
Member

@kulmann kulmann commented Jun 22, 2020

With this PR, the OCIS_TRACING_* config variables become the global config for all services. If you want to set individual tracing config for each service, set OCIS_TRACING_ENABLED=false (which is the default) and configure tracing for all services individually.

Tracing documentation updated as well, to reflect both different usages (global config and per-service config).

Implementation for owncloud/product#92

@kulmann kulmann requested review from butonic and micbar June 22, 2020 14:44
@kulmann kulmann self-assigned this Jun 22, 2020
@kulmann
Copy link
Member Author

kulmann commented Jun 22, 2020

I have this in my oCIS config file:

"Tracing": {
          "Enabled": true,
          "Endpoint": "localhost:6831",
          "Collector": "http://localhost:14268/api/traces"
  },

which works...

@kulmann
Copy link
Member Author

kulmann commented Jun 22, 2020

Accounts service doesn't have a tracing config so far.

@kulmann kulmann requested a review from refs June 30, 2020 13:11
@kulmann
Copy link
Member Author

kulmann commented Jun 30, 2020

@refs would be nice to get your opinion on this...

also: needs a rebase

@kulmann
Copy link
Member Author

kulmann commented Jun 30, 2020

rebased + added jaeger endpoint and collector as default values

@butonic
Copy link
Member

butonic commented Jun 30, 2020

but proxy is still not sending spans, tracked in https://github.com/owncloud/ocis-proxy/issues/61

cfg.Proxy.Tracing.Service = cfg.Tracing.Service
}

if cfg.Reva.Reva.JWTSecret != "" {
Copy link
Member

Choose a reason for hiding this comment

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

We might want to look at this struct. cfg.Reva.Reva seems redundant. Issue for another time :)

@kulmann
Copy link
Member Author

kulmann commented Aug 12, 2020

ocis-store command will be aligned with other commands after #409 is merged. The simplified tracing config for ocis-store has to be done later. Tracked here: #445

@kulmann
Copy link
Member Author

kulmann commented Aug 12, 2020

rebased to current master.

@kulmann kulmann merged commit a26c819 into master Aug 12, 2020
ownclouders pushed a commit that referenced this pull request Aug 12, 2020
Merge: 75e9506 ded9a01
Author: Benedikt Kulmann <benedikt@kulmann.biz>
Date:   Wed Aug 12 10:39:47 2020 +0200

    Merge pull request #329 from owncloud/simplify-config

    Simplify config
@refs refs deleted the simplify-config branch October 26, 2020 19:03
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