From a3df3f9119cdcf52bfd65ede715bcd8305904d5b Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Wed, 12 Jan 2022 10:56:02 +0100 Subject: [PATCH] remove default tracing config from indiviual packages --- glauth/pkg/config/defaultconfig.go | 6 ------ graph-explorer/pkg/config/defaultconfig.go | 6 ------ graph/pkg/config/defaultconfig.go | 6 ------ idp/pkg/config/defaultconfig.go | 6 ------ ocs/pkg/config/defaultconfig.go | 7 +------ proxy/pkg/config/defaultconfig.go | 6 ------ settings/pkg/config/defaultconfig.go | 6 ------ store/pkg/config/defaultconfig.go | 6 ------ thumbnails/pkg/config/defaultconfig.go | 6 ------ web/pkg/config/defaultconfig.go | 6 ------ webdav/pkg/config/defaultconfig.go | 6 ------ 11 files changed, 1 insertion(+), 66 deletions(-) diff --git a/glauth/pkg/config/defaultconfig.go b/glauth/pkg/config/defaultconfig.go index becff0bb9..503321d8e 100644 --- a/glauth/pkg/config/defaultconfig.go +++ b/glauth/pkg/config/defaultconfig.go @@ -11,12 +11,6 @@ func DefaultConfig() *Config { Debug: Debug{ Addr: "127.0.0.1:9129", }, - Tracing: Tracing{ - Enabled: false, - Type: "jaeger", - Endpoint: "", - Collector: "", - }, Service: Service{ Name: "glauth", }, diff --git a/graph-explorer/pkg/config/defaultconfig.go b/graph-explorer/pkg/config/defaultconfig.go index 7ea490819..454cb239a 100644 --- a/graph-explorer/pkg/config/defaultconfig.go +++ b/graph-explorer/pkg/config/defaultconfig.go @@ -16,12 +16,6 @@ func DefaultConfig() *Config { Service: Service{ Name: "graph-explorer", }, - Tracing: Tracing{ - Enabled: false, - Type: "jaeger", - Endpoint: "", - Collector: "", - }, GraphExplorer: GraphExplorer{ ClientID: "ocis-explorer.js", Issuer: "https://localhost:9200", diff --git a/graph/pkg/config/defaultconfig.go b/graph/pkg/config/defaultconfig.go index 5879b9487..3bb022786 100644 --- a/graph/pkg/config/defaultconfig.go +++ b/graph/pkg/config/defaultconfig.go @@ -14,12 +14,6 @@ func DefaultConfig() *Config { Service: Service{ Name: "graph", }, - Tracing: Tracing{ - Enabled: false, - Type: "jaeger", - Endpoint: "", - Collector: "", - }, Reva: Reva{ Address: "127.0.0.1:9142", }, diff --git a/idp/pkg/config/defaultconfig.go b/idp/pkg/config/defaultconfig.go index 21e59a339..823291596 100644 --- a/idp/pkg/config/defaultconfig.go +++ b/idp/pkg/config/defaultconfig.go @@ -22,12 +22,6 @@ func DefaultConfig() *Config { Service: Service{ Name: "idp", }, - Tracing: Tracing{ - Enabled: false, - Type: "jaeger", - Endpoint: "", - Collector: "", - }, Asset: Asset{}, IDP: Settings{ Iss: "https://localhost:9200", diff --git a/ocs/pkg/config/defaultconfig.go b/ocs/pkg/config/defaultconfig.go index 59cbfb8f1..0ed8378ba 100644 --- a/ocs/pkg/config/defaultconfig.go +++ b/ocs/pkg/config/defaultconfig.go @@ -22,12 +22,7 @@ func DefaultConfig() *Config { Service: Service{ Name: "ocs", }, - Tracing: Tracing{ - Enabled: false, - Type: "jaeger", - Endpoint: "", - Collector: "", - }, + TokenManager: TokenManager{ JWTSecret: "Pive-Fumkiu4", }, diff --git a/proxy/pkg/config/defaultconfig.go b/proxy/pkg/config/defaultconfig.go index 136cf28b9..12bcbe806 100644 --- a/proxy/pkg/config/defaultconfig.go +++ b/proxy/pkg/config/defaultconfig.go @@ -23,12 +23,6 @@ func DefaultConfig() *Config { Service: Service{ Name: "proxy", }, - Tracing: Tracing{ - Enabled: false, - Type: "jaeger", - Endpoint: "", - Collector: "", - }, OIDC: OIDC{ Issuer: "https://localhost:9200", Insecure: true, diff --git a/settings/pkg/config/defaultconfig.go b/settings/pkg/config/defaultconfig.go index a667c0c25..7f72e50a3 100644 --- a/settings/pkg/config/defaultconfig.go +++ b/settings/pkg/config/defaultconfig.go @@ -33,12 +33,6 @@ func DefaultConfig() *Config { Addr: "127.0.0.1:9191", Namespace: "com.owncloud.api", }, - Tracing: Tracing{ - Enabled: false, - Type: "jaeger", - Endpoint: "", - Collector: "", - }, DataPath: path.Join(defaults.BaseDataPath(), "settings"), Asset: Asset{ Path: "", diff --git a/store/pkg/config/defaultconfig.go b/store/pkg/config/defaultconfig.go index 66e44044d..c2d42f430 100644 --- a/store/pkg/config/defaultconfig.go +++ b/store/pkg/config/defaultconfig.go @@ -21,12 +21,6 @@ func DefaultConfig() *Config { Service: Service{ Name: "store", }, - Tracing: Tracing{ - Enabled: false, - Type: "jaeger", - Endpoint: "", - Collector: "", - }, Datapath: path.Join(defaults.BaseDataPath(), "store"), } } diff --git a/thumbnails/pkg/config/defaultconfig.go b/thumbnails/pkg/config/defaultconfig.go index ac2da94d2..8f59db53e 100644 --- a/thumbnails/pkg/config/defaultconfig.go +++ b/thumbnails/pkg/config/defaultconfig.go @@ -21,12 +21,6 @@ func DefaultConfig() *Config { Service: Service{ Name: "thumbnails", }, - Tracing: Tracing{ - Enabled: false, - Type: "jaeger", - Endpoint: "", - Collector: "", - }, Thumbnail: Thumbnail{ Resolutions: []string{"16x16", "32x32", "64x64", "128x128", "1920x1080", "3840x2160", "7680x4320"}, FileSystemStorage: FileSystemStorage{ diff --git a/web/pkg/config/defaultconfig.go b/web/pkg/config/defaultconfig.go index 42f22beda..018cac2d0 100644 --- a/web/pkg/config/defaultconfig.go +++ b/web/pkg/config/defaultconfig.go @@ -17,12 +17,6 @@ func DefaultConfig() *Config { Service: Service{ Name: "web", }, - Tracing: Tracing{ - Enabled: false, - Type: "jaeger", - Endpoint: "", - Collector: "", - }, Asset: Asset{ Path: "", }, diff --git a/webdav/pkg/config/defaultconfig.go b/webdav/pkg/config/defaultconfig.go index dcd3c04f9..3bf74acd2 100644 --- a/webdav/pkg/config/defaultconfig.go +++ b/webdav/pkg/config/defaultconfig.go @@ -22,12 +22,6 @@ func DefaultConfig() *Config { Service: Service{ Name: "webdav", }, - Tracing: Tracing{ - Enabled: false, - Type: "jaeger", - Endpoint: "", - Collector: "", - }, OcisPublicURL: "https://127.0.0.1:9200", WebdavNamespace: "/users/{{.Id.OpaqueId}}", RevaGateway: "127.0.0.1:9142",