From eb7ed6491c5aacdd2d4dca1558617c1ef03b361a Mon Sep 17 00:00:00 2001 From: Alex Unger Date: Wed, 15 Apr 2020 14:33:37 +0200 Subject: [PATCH] Toggle traces (#129) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * add tracing_enabled to the list of core targets * add endpoint, collector and service_name parameters * add authbasic config * configure tracing for missing services Signed-off-by: Jörn Friedrich Dreyer Co-authored-by: Jörn Friedrich Dreyer --- pkg/command/authbasic.go | 6 +++++- pkg/command/authbearer.go | 6 +++++- pkg/command/frontend.go | 6 +++++- pkg/command/gateway.go | 6 +++++- pkg/command/sharing.go | 6 +++++- pkg/command/storageeos.go | 6 +++++- pkg/command/storageeosdata.go | 6 +++++- pkg/command/storagehome.go | 6 +++++- pkg/command/storagehomedata.go | 6 +++++- pkg/command/storageoc.go | 6 +++++- pkg/command/storageocdata.go | 6 +++++- pkg/command/storageroot.go | 6 +++++- pkg/command/users.go | 6 +++++- 13 files changed, 65 insertions(+), 13 deletions(-) diff --git a/pkg/command/authbasic.go b/pkg/command/authbasic.go index 04d8dff3fa..f6e299bee6 100644 --- a/pkg/command/authbasic.go +++ b/pkg/command/authbasic.go @@ -73,7 +73,11 @@ func AuthBasic(cfg *config.Config) *cli.Command { rcfg := map[string]interface{}{ "core": map[string]interface{}{ - "max_cpus": cfg.Reva.AuthBasic.MaxCPUs, + "max_cpus": cfg.Reva.Users.MaxCPUs, + "tracing_enabled": cfg.Tracing.Enabled, + "tracing_endpoint": cfg.Tracing.Endpoint, + "tracing_collector": cfg.Tracing.Collector, + "tracing_service_name": "auth-basic", }, "shared": map[string]interface{}{ "jwt_secret": cfg.Reva.JWTSecret, diff --git a/pkg/command/authbearer.go b/pkg/command/authbearer.go index 06c8f4a828..84afeafc7d 100644 --- a/pkg/command/authbearer.go +++ b/pkg/command/authbearer.go @@ -73,7 +73,11 @@ func AuthBearer(cfg *config.Config) *cli.Command { rcfg := map[string]interface{}{ "core": map[string]interface{}{ - "max_cpus": cfg.Reva.AuthBearer.MaxCPUs, + "max_cpus": cfg.Reva.Users.MaxCPUs, + "tracing_enabled": cfg.Tracing.Enabled, + "tracing_endpoint": cfg.Tracing.Endpoint, + "tracing_collector": cfg.Tracing.Collector, + "tracing_service_name": "auth-bearer", }, "shared": map[string]interface{}{ "jwt_secret": cfg.Reva.JWTSecret, diff --git a/pkg/command/frontend.go b/pkg/command/frontend.go index 4d4572ad19..5df60e90b0 100644 --- a/pkg/command/frontend.go +++ b/pkg/command/frontend.go @@ -80,7 +80,11 @@ func Frontend(cfg *config.Config) *cli.Command { rcfg := map[string]interface{}{ "core": map[string]interface{}{ - "max_cpus": cfg.Reva.Frontend.MaxCPUs, + "max_cpus": cfg.Reva.Users.MaxCPUs, + "tracing_enabled": cfg.Tracing.Enabled, + "tracing_endpoint": cfg.Tracing.Endpoint, + "tracing_collector": cfg.Tracing.Collector, + "tracing_service_name": "frontend", }, "shared": map[string]interface{}{ "jwt_secret": cfg.Reva.JWTSecret, diff --git a/pkg/command/gateway.go b/pkg/command/gateway.go index 10ac1c5109..08a2fba1af 100644 --- a/pkg/command/gateway.go +++ b/pkg/command/gateway.go @@ -74,7 +74,11 @@ func Gateway(cfg *config.Config) *cli.Command { rcfg := map[string]interface{}{ "core": map[string]interface{}{ - "max_cpus": cfg.Reva.Gateway.MaxCPUs, + "max_cpus": cfg.Reva.Users.MaxCPUs, + "tracing_enabled": cfg.Tracing.Enabled, + "tracing_endpoint": cfg.Tracing.Endpoint, + "tracing_collector": cfg.Tracing.Collector, + "tracing_service_name": "gateway", }, "shared": map[string]interface{}{ "jwt_secret": cfg.Reva.JWTSecret, diff --git a/pkg/command/sharing.go b/pkg/command/sharing.go index 9bee63b605..78b1456d82 100644 --- a/pkg/command/sharing.go +++ b/pkg/command/sharing.go @@ -73,7 +73,11 @@ func Sharing(cfg *config.Config) *cli.Command { rcfg := map[string]interface{}{ "core": map[string]interface{}{ - "max_cpus": cfg.Reva.Sharing.MaxCPUs, + "max_cpus": cfg.Reva.Users.MaxCPUs, + "tracing_enabled": cfg.Tracing.Enabled, + "tracing_endpoint": cfg.Tracing.Endpoint, + "tracing_collector": cfg.Tracing.Collector, + "tracing_service_name": "sharing", }, "shared": map[string]interface{}{ "jwt_secret": cfg.Reva.JWTSecret, diff --git a/pkg/command/storageeos.go b/pkg/command/storageeos.go index de5aca86b9..57c380d068 100644 --- a/pkg/command/storageeos.go +++ b/pkg/command/storageeos.go @@ -72,7 +72,11 @@ func StorageEOS(cfg *config.Config) *cli.Command { rcfg := map[string]interface{}{ "core": map[string]interface{}{ - "max_cpus": cfg.Reva.StorageEOS.MaxCPUs, + "max_cpus": cfg.Reva.StorageEOS.MaxCPUs, + "tracing_enabled": cfg.Tracing.Enabled, + "tracing_endpoint": cfg.Tracing.Endpoint, + "tracing_collector": cfg.Tracing.Collector, + "tracing_service_name": "storage-eos", }, "shared": map[string]interface{}{ "jwt_secret": cfg.Reva.JWTSecret, diff --git a/pkg/command/storageeosdata.go b/pkg/command/storageeosdata.go index 262fc7f71c..806d6d2216 100644 --- a/pkg/command/storageeosdata.go +++ b/pkg/command/storageeosdata.go @@ -72,7 +72,11 @@ func StorageEOSData(cfg *config.Config) *cli.Command { rcfg := map[string]interface{}{ "core": map[string]interface{}{ - "max_cpus": cfg.Reva.StorageEOSData.MaxCPUs, + "max_cpus": cfg.Reva.StorageEOSData.MaxCPUs, + "tracing_enabled": cfg.Tracing.Enabled, + "tracing_endpoint": cfg.Tracing.Endpoint, + "tracing_collector": cfg.Tracing.Collector, + "tracing_service_name": "storage-eos-data", }, "shared": map[string]interface{}{ "jwt_secret": cfg.Reva.JWTSecret, diff --git a/pkg/command/storagehome.go b/pkg/command/storagehome.go index c97ac938b9..3f662f2aff 100644 --- a/pkg/command/storagehome.go +++ b/pkg/command/storagehome.go @@ -72,7 +72,11 @@ func StorageHome(cfg *config.Config) *cli.Command { rcfg := map[string]interface{}{ "core": map[string]interface{}{ - "max_cpus": cfg.Reva.StorageHome.MaxCPUs, + "max_cpus": cfg.Reva.Users.MaxCPUs, + "tracing_enabled": cfg.Tracing.Enabled, + "tracing_endpoint": cfg.Tracing.Endpoint, + "tracing_collector": cfg.Tracing.Collector, + "tracing_service_name": "storage-home", }, "shared": map[string]interface{}{ "jwt_secret": cfg.Reva.JWTSecret, diff --git a/pkg/command/storagehomedata.go b/pkg/command/storagehomedata.go index 56b7d37419..c2d024626b 100644 --- a/pkg/command/storagehomedata.go +++ b/pkg/command/storagehomedata.go @@ -72,7 +72,11 @@ func StorageHomeData(cfg *config.Config) *cli.Command { rcfg := map[string]interface{}{ "core": map[string]interface{}{ - "max_cpus": cfg.Reva.StorageHomeData.MaxCPUs, + "max_cpus": cfg.Reva.Users.MaxCPUs, + "tracing_enabled": cfg.Tracing.Enabled, + "tracing_endpoint": cfg.Tracing.Endpoint, + "tracing_collector": cfg.Tracing.Collector, + "tracing_service_name": "storage-home-data", }, "shared": map[string]interface{}{ "jwt_secret": cfg.Reva.JWTSecret, diff --git a/pkg/command/storageoc.go b/pkg/command/storageoc.go index b0c8d5f7e8..60cfaf6fda 100644 --- a/pkg/command/storageoc.go +++ b/pkg/command/storageoc.go @@ -72,7 +72,11 @@ func StorageOC(cfg *config.Config) *cli.Command { rcfg := map[string]interface{}{ "core": map[string]interface{}{ - "max_cpus": cfg.Reva.StorageOC.MaxCPUs, + "max_cpus": cfg.Reva.StorageOC.MaxCPUs, + "tracing_enabled": cfg.Tracing.Enabled, + "tracing_endpoint": cfg.Tracing.Endpoint, + "tracing_collector": cfg.Tracing.Collector, + "tracing_service_name": "storage-oc", }, "shared": map[string]interface{}{ "jwt_secret": cfg.Reva.JWTSecret, diff --git a/pkg/command/storageocdata.go b/pkg/command/storageocdata.go index 60d864ab8d..f128918c79 100644 --- a/pkg/command/storageocdata.go +++ b/pkg/command/storageocdata.go @@ -72,7 +72,11 @@ func StorageOCData(cfg *config.Config) *cli.Command { rcfg := map[string]interface{}{ "core": map[string]interface{}{ - "max_cpus": cfg.Reva.StorageOCData.MaxCPUs, + "max_cpus": cfg.Reva.StorageOCData.MaxCPUs, + "tracing_enabled": cfg.Tracing.Enabled, + "tracing_endpoint": cfg.Tracing.Endpoint, + "tracing_collector": cfg.Tracing.Collector, + "tracing_service_name": "storage-oc-data", }, "shared": map[string]interface{}{ "jwt_secret": cfg.Reva.JWTSecret, diff --git a/pkg/command/storageroot.go b/pkg/command/storageroot.go index 935c697317..44cc481e9b 100644 --- a/pkg/command/storageroot.go +++ b/pkg/command/storageroot.go @@ -72,7 +72,11 @@ func StorageRoot(cfg *config.Config) *cli.Command { rcfg := map[string]interface{}{ "core": map[string]interface{}{ - "max_cpus": cfg.Reva.StorageRoot.MaxCPUs, + "max_cpus": cfg.Reva.StorageRoot.MaxCPUs, + "tracing_enabled": cfg.Tracing.Enabled, + "tracing_endpoint": cfg.Tracing.Endpoint, + "tracing_collector": cfg.Tracing.Collector, + "tracing_service_name": "storage-root", }, "shared": map[string]interface{}{ "jwt_secret": cfg.Reva.JWTSecret, diff --git a/pkg/command/users.go b/pkg/command/users.go index cfc2bc2926..8b3541abbb 100644 --- a/pkg/command/users.go +++ b/pkg/command/users.go @@ -72,7 +72,11 @@ func Users(cfg *config.Config) *cli.Command { rcfg := map[string]interface{}{ "core": map[string]interface{}{ - "max_cpus": cfg.Reva.Users.MaxCPUs, + "max_cpus": cfg.Reva.Users.MaxCPUs, + "tracing_enabled": cfg.Tracing.Enabled, + "tracing_endpoint": cfg.Tracing.Endpoint, + "tracing_collector": cfg.Tracing.Collector, + "tracing_service_name": "users", }, "shared": map[string]interface{}{ "jwt_secret": cfg.Reva.JWTSecret,