diff --git a/ocis-pkg/config/utils.go b/ocis-pkg/config/utils.go deleted file mode 100644 index 9f3c32c9e6..0000000000 --- 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 aade350272..3e0d11db41 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 f70e14333f..d15b726fcd 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 35ee3a4d40..32a2904d20 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 4c300a6c3a..50032f2e70 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 3f0dfa0cab..47f0bbb4e8 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 17eda48992..08958b0586 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 c75f15c9ad..ccc80bd326 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 d260030520..e6d0e331bf 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 8180dbf368..87ca7e3ffd 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 88cc121fab..168bc0c7f5 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 49e18dc98f..f93171e1eb 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{}{