remove deprecated config option

This commit is contained in:
A.Unger
2021-08-17 13:31:15 +02:00
parent aac45a46f4
commit 50381b2225
12 changed files with 0 additions and 19 deletions

View File

@@ -1,8 +0,0 @@
package config
func TracingService(enabled bool) string {
if enabled {
return "opentelemetry"
}
return ""
}

View File

@@ -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{}{

View File

@@ -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{}{

View File

@@ -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{}{

View File

@@ -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{}{

View File

@@ -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{}{

View File

@@ -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{}{

View File

@@ -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{}{

View File

@@ -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{}{

View File

@@ -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{}{

View File

@@ -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{}{

View File

@@ -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{}{