mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-04-30 07:49:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix tracing config

Browse Source
This commit is contained in:
Willy Kloucek
2022-01-12 10:24:59 +01:00
parent 060401a168
commit 182712b223
32 changed files with 177 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graph-explorer/pkg/config/config.go
+3 -3
View File
@@ -12,9 +12,9 @@ type Config struct {
Service Service
Tracing Tracing `ocisConfig:"tracing"`
Log *Log `ocisConfig:"log"`
Debug Debug `ocisConfig:"debug"`
Tracing *Tracing `ocisConfig:"tracing"`
Log *Log `ocisConfig:"log"`
Debug Debug `ocisConfig:"debug"`
HTTP HTTP `ocisConfig:"http"`
graph-explorer/pkg/config/parser/parse.go
+11
View File
@@ -28,6 +28,17 @@ func ParseConfig(cfg *config.Config) error {
} else if cfg.Log == nil && cfg.Commons == nil {
cfg.Log = &config.Log{}
}
// provide with defaults for shared tracing, since we need a valid destination address for BindEnv.
if cfg.Tracing == nil && cfg.Commons != nil && cfg.Commons.Tracing != nil {
cfg.Tracing = &config.Tracing{
Enabled: cfg.Commons.Tracing.Enabled,
Type: cfg.Commons.Tracing.Type,
Endpoint: cfg.Commons.Tracing.Endpoint,
Collector: cfg.Commons.Tracing.Collector,
}
} else if cfg.Tracing == nil && cfg.Commons == nil {
cfg.Tracing = &config.Tracing{}
}
// load all env variables relevant to the config in the current context.
if err := envdecode.Decode(cfg); err != nil {