revert storage, remove tracing.service and bring back common

This commit is contained in:
Willy Kloucek
2022-01-07 16:06:56 +00:00
committed by Jörn Friedrich Dreyer
parent 9422388b74
commit 3c3fc2e098
114 changed files with 824 additions and 875 deletions
+8 -2
View File
@@ -1,13 +1,19 @@
package config
import "context"
import (
"context"
"github.com/owncloud/ocis/ocis-pkg/shared"
)
// Config combines all available configuration parts.
type Config struct {
*shared.Commons
Service Service
Tracing Tracing `ocisConfig:"tracing"`
Log Log `ocisConfig:"log"`
Log *Log `ocisConfig:"log"`
Debug Debug `ocisConfig:"debug"`
HTTP HTTP `ocisConfig:"http"`
+1 -1
View File
@@ -24,10 +24,10 @@ func DefaultConfig() *Config {
Name: "proxy",
},
Tracing: Tracing{
Enabled: false,
Type: "jaeger",
Endpoint: "",
Collector: "",
Service: "proxy",
},
OIDC: OIDC{
Issuer: "https://localhost:9200",
-1
View File
@@ -6,5 +6,4 @@ type Tracing struct {
Type string `ocisConfig:"type" env:"OCIS_TRACING_TYPE;PROXY_TRACING_TYPE"`
Endpoint string `ocisConfig:"endpoint" env:"OCIS_TRACING_ENDPOINT;PROXY_TRACING_ENDPOINT"`
Collector string `ocisConfig:"collector" env:"OCIS_TRACING_COLLECTOR;PROXY_TRACING_COLLECTOR"`
Service string `ocisConfig:"service" env:"PROXY_TRACING_SERVICE"` //TODO: should this be an ID? or the same as Service.Name?
}