From 50381b2225241aa35fa082ce321e27c166797cc3 Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Tue, 17 Aug 2021 13:31:15 +0200 Subject: [PATCH] remove deprecated config option --- ocis-pkg/config/utils.go | 8 -------- storage/pkg/command/authbasic.go | 1 - storage/pkg/command/authbearer.go | 1 - storage/pkg/command/frontend.go | 1 - storage/pkg/command/gateway.go | 1 - storage/pkg/command/groups.go | 1 - storage/pkg/command/sharing.go | 1 - storage/pkg/command/storagehome.go | 1 - storage/pkg/command/storagemetadata.go | 1 - storage/pkg/command/storagepubliclink.go | 1 - storage/pkg/command/storageusers.go | 1 - storage/pkg/command/users.go | 1 - 12 files changed, 19 deletions(-) delete mode 100644 ocis-pkg/config/utils.go diff --git a/ocis-pkg/config/utils.go b/ocis-pkg/config/utils.go deleted file mode 100644 index 9f3c32c9e..000000000 --- a/ocis-pkg/config/utils.go +++ /dev/null @@ -1,8 +0,0 @@ -package config - -func TracingService(enabled bool) string { - if enabled { - return "opentelemetry" - } - return "" -} diff --git a/storage/pkg/command/authbasic.go b/storage/pkg/command/authbasic.go index aade35027..3e0d11db4 100644 --- a/storage/pkg/command/authbasic.go +++ b/storage/pkg/command/authbasic.go @@ -95,7 +95,6 @@ func authBasicConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]in "tracing_enabled": cfg.Tracing.Enabled, "tracing_endpoint": cfg.Tracing.Endpoint, "tracing_collector": cfg.Tracing.Collector, - "tracing_service": ociscfg.TracingService(cfg.Tracing.Enabled), "tracing_service_name": c.Command.Name, }, "shared": map[string]interface{}{ diff --git a/storage/pkg/command/authbearer.go b/storage/pkg/command/authbearer.go index f70e14333..d15b726fc 100644 --- a/storage/pkg/command/authbearer.go +++ b/storage/pkg/command/authbearer.go @@ -90,7 +90,6 @@ func authBearerConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]i "tracing_enabled": cfg.Tracing.Enabled, "tracing_endpoint": cfg.Tracing.Endpoint, "tracing_collector": cfg.Tracing.Collector, - "tracing_service": ociscfg.TracingService(cfg.Tracing.Enabled), "tracing_service_name": c.Command.Name, }, "shared": map[string]interface{}{ diff --git a/storage/pkg/command/frontend.go b/storage/pkg/command/frontend.go index 35ee3a4d4..32a2904d2 100644 --- a/storage/pkg/command/frontend.go +++ b/storage/pkg/command/frontend.go @@ -122,7 +122,6 @@ func frontendConfigFromStruct(c *cli.Context, cfg *config.Config, filesCfg map[s "tracing_enabled": cfg.Tracing.Enabled, "tracing_endpoint": cfg.Tracing.Endpoint, "tracing_collector": cfg.Tracing.Collector, - "tracing_service": ociscfg.TracingService(cfg.Tracing.Enabled), "tracing_service_name": c.Command.Name, }, "shared": map[string]interface{}{ diff --git a/storage/pkg/command/gateway.go b/storage/pkg/command/gateway.go index 4c300a6c3..50032f2e7 100644 --- a/storage/pkg/command/gateway.go +++ b/storage/pkg/command/gateway.go @@ -113,7 +113,6 @@ func gatewayConfigFromStruct(c *cli.Context, cfg *config.Config, logger log.Logg "tracing_enabled": cfg.Tracing.Enabled, "tracing_endpoint": cfg.Tracing.Endpoint, "tracing_collector": cfg.Tracing.Collector, - "tracing_service": ociscfg.TracingService(cfg.Tracing.Enabled), "tracing_service_name": c.Command.Name, }, "shared": map[string]interface{}{ diff --git a/storage/pkg/command/groups.go b/storage/pkg/command/groups.go index 3f0dfa0ca..47f0bbb4e 100644 --- a/storage/pkg/command/groups.go +++ b/storage/pkg/command/groups.go @@ -99,7 +99,6 @@ func groupsConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]inter "tracing_enabled": cfg.Tracing.Enabled, "tracing_endpoint": cfg.Tracing.Endpoint, "tracing_collector": cfg.Tracing.Collector, - "tracing_service": ociscfg.TracingService(cfg.Tracing.Enabled), "tracing_service_name": c.Command.Name, }, "shared": map[string]interface{}{ diff --git a/storage/pkg/command/sharing.go b/storage/pkg/command/sharing.go index 17eda4899..08958b058 100644 --- a/storage/pkg/command/sharing.go +++ b/storage/pkg/command/sharing.go @@ -109,7 +109,6 @@ func sharingConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]inte "tracing_enabled": cfg.Tracing.Enabled, "tracing_endpoint": cfg.Tracing.Endpoint, "tracing_collector": cfg.Tracing.Collector, - "tracing_service": ociscfg.TracingService(cfg.Tracing.Enabled), "tracing_service_name": c.Command.Name, }, "shared": map[string]interface{}{ diff --git a/storage/pkg/command/storagehome.go b/storage/pkg/command/storagehome.go index c75f15c9a..ccc80bd32 100644 --- a/storage/pkg/command/storagehome.go +++ b/storage/pkg/command/storagehome.go @@ -104,7 +104,6 @@ func storageHomeConfigFromStruct(c *cli.Context, cfg *config.Config) map[string] "tracing_enabled": cfg.Tracing.Enabled, "tracing_endpoint": cfg.Tracing.Endpoint, "tracing_collector": cfg.Tracing.Collector, - "tracing_service": ociscfg.TracingService(cfg.Tracing.Enabled), "tracing_service_name": c.Command.Name, }, "shared": map[string]interface{}{ diff --git a/storage/pkg/command/storagemetadata.go b/storage/pkg/command/storagemetadata.go index d26003052..e6d0e331b 100644 --- a/storage/pkg/command/storagemetadata.go +++ b/storage/pkg/command/storagemetadata.go @@ -142,7 +142,6 @@ func storageMetadataFromStruct(c *cli.Context, cfg *config.Config) map[string]in "tracing_enabled": cfg.Tracing.Enabled, "tracing_endpoint": cfg.Tracing.Endpoint, "tracing_collector": cfg.Tracing.Collector, - "tracing_service": ociscfg.TracingService(cfg.Tracing.Enabled), "tracing_service_name": c.Command.Name, }, "shared": map[string]interface{}{ diff --git a/storage/pkg/command/storagepubliclink.go b/storage/pkg/command/storagepubliclink.go index 8180dbf36..87ca7e3ff 100644 --- a/storage/pkg/command/storagepubliclink.go +++ b/storage/pkg/command/storagepubliclink.go @@ -85,7 +85,6 @@ func storagePublicLinkConfigFromStruct(c *cli.Context, cfg *config.Config) map[s "tracing_enabled": cfg.Tracing.Enabled, "tracing_endpoint": cfg.Tracing.Endpoint, "tracing_collector": cfg.Tracing.Collector, - "tracing_service": ociscfg.TracingService(cfg.Tracing.Enabled), "tracing_service_name": c.Command.Name, }, "shared": map[string]interface{}{ diff --git a/storage/pkg/command/storageusers.go b/storage/pkg/command/storageusers.go index 88cc121fa..168bc0c7f 100644 --- a/storage/pkg/command/storageusers.go +++ b/storage/pkg/command/storageusers.go @@ -104,7 +104,6 @@ func storageUsersConfigFromStruct(c *cli.Context, cfg *config.Config) map[string "tracing_enabled": cfg.Tracing.Enabled, "tracing_endpoint": cfg.Tracing.Endpoint, "tracing_collector": cfg.Tracing.Collector, - "tracing_service": ociscfg.TracingService(cfg.Tracing.Enabled), "tracing_service_name": c.Command.Name, }, "shared": map[string]interface{}{ diff --git a/storage/pkg/command/users.go b/storage/pkg/command/users.go index 49e18dc98..f93171e1e 100644 --- a/storage/pkg/command/users.go +++ b/storage/pkg/command/users.go @@ -102,7 +102,6 @@ func usersConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]interf "tracing_enabled": cfg.Tracing.Enabled, "tracing_endpoint": cfg.Tracing.Endpoint, "tracing_collector": cfg.Tracing.Collector, - "tracing_service": ociscfg.TracingService(cfg.Tracing.Enabled), "tracing_service_name": c.Command.Name, }, "shared": map[string]interface{}{