revert storage, remove tracing.service and bring back common

accounts/pkg/command/root.go

@@ -67,16 +67,16 @@ func ParseConfig(c *cli.Context, cfg *config.Config) error {
 	}
 
 	// provide with defaults for shared logging, since we need a valid destination address for BindEnv.
-	//if cfg.Log == nil && cfg.Commons != nil && cfg.Commons.Log != nil {
-	//	cfg.Log = &shared.Log{
-	//		Level:  cfg.Commons.Log.Level,
-	//		Pretty: cfg.Commons.Log.Pretty,
-	//		Color:  cfg.Commons.Log.Color,
-	//		File:   cfg.Commons.Log.File,
-	//	}
-	//} else if cfg.Log == nil && cfg.Commons == nil {
-	//	cfg.Log = &shared.Log{}
-	//}
+	if cfg.Log == nil && cfg.Commons != nil && cfg.Commons.Log != nil {
+		cfg.Log = &config.Log{
+			Level:  cfg.Commons.Log.Level,
+			Pretty: cfg.Commons.Log.Pretty,
+			Color:  cfg.Commons.Log.Color,
+			File:   cfg.Commons.Log.File,
+		}
+	} else if cfg.Log == nil && cfg.Commons == nil {
+		cfg.Log = &config.Log{}
+	}
 
 	// load all env variables relevant to the config in the current context.
 	envCfg := config.Config{}
@@ -99,7 +99,7 @@ type SutureService struct {
 
 // NewSutureService creates a new accounts.SutureService
 func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	//cfg.Accounts.Commons = cfg.Commons
+	cfg.Accounts.Commons = cfg.Commons
 	return SutureService{
 		cfg: cfg.Accounts,
 	}

accounts/pkg/config/config.go

@@ -2,14 +2,18 @@ package config
 
 import (
 	"context"
+
+	"github.com/owncloud/ocis/ocis-pkg/shared"
 )
 
 // Config combines all available configuration parts.
 type Config struct {
+	*shared.Commons
+
 	Service Service
 
 	Tracing Tracing `ocisConfig:"tracing"`
-	Log     Log     `ocisConfig:"log"`
+	Log     *Log    `ocisConfig:"log"`
 	Debug   Debug   `ocisConfig:"debug"`
 
 	HTTP HTTP `ocisConfig:"http"`

accounts/pkg/config/defaultconfig.go

@@ -8,7 +8,6 @@ import (
 
 func DefaultConfig() *Config {
 	return &Config{
-
 		HTTP: HTTP{
 			Addr:      "127.0.0.1:9181",
 			Namespace: "com.owncloud.web",
@@ -60,9 +59,5 @@ func DefaultConfig() *Config {
 			UID:      0,
 			GID:      0,
 		},
-		Tracing: Tracing{
-			Type:    "jaeger",
-			Service: "accounts",
-		},
 	}
 }

accounts/pkg/config/tracing.go

@@ -6,5 +6,4 @@ type Tracing struct {
 	Type      string `ocisConfig:"type" env:"OCIS_TRACING_TYPE;ACCOUNTS_TRACING_TYPE"`
 	Endpoint  string `ocisConfig:"endpoint" env:"OCIS_TRACING_ENDPOINT;ACCOUNTS_TRACING_ENDPOINT"`
 	Collector string `ocisConfig:"collector" env:"OCIS_TRACING_COLLECTOR;ACCOUNTS_TRACING_COLLECTOR"`
-	Service   string `ocisConfig:"service" env:"ACCOUNTS_TRACING_SERVICE"` //TODO: should this be an ID? or the same as Service.Name?
 }

accounts/pkg/logging/logging.go

@@ -6,7 +6,7 @@ import (
 )
 
 // LoggerFromConfig initializes a service-specific logger instance.
-func Configure(name string, cfg config.Log) log.Logger {
+func Configure(name string, cfg *config.Log) log.Logger {
 	return log.NewLogger(
 		log.Name(name),
 		log.Level(cfg.Level),

accounts/pkg/service/v0/service.go

@@ -109,9 +109,9 @@ func (s Service) buildIndex() (*indexer.Indexer, error) {
 func configFromSvc(cfg *config.Config) (*idxcfg.Config, error) {
 	c := idxcfg.New()
 
-	//if cfg.Log == nil {
-	//	cfg.Log = &shared.Log{}
-	//}
+	if cfg.Log == nil {
+		cfg.Log = &config.Log{}
+	}
 
 	defer func(cfg *config.Config) {
 		l := log.NewLogger(log.Color(cfg.Log.Color), log.Pretty(cfg.Log.Pretty), log.Level(cfg.Log.Level))

accounts/pkg/tracing/tracing.go

@@ -14,7 +14,7 @@ var (
 func Configure(cfg *config.Config) error {
 	var err error
 	if cfg.Tracing.Enabled {
-		if TraceProvider, err = pkgtrace.GetTraceProvider(cfg.Tracing.Endpoint, cfg.Tracing.Collector, "accounts", cfg.Tracing.Type); err != nil {
+		if TraceProvider, err = pkgtrace.GetTraceProvider(cfg.Tracing.Endpoint, cfg.Tracing.Collector, cfg.Service.Name, cfg.Tracing.Type); err != nil {
 			return err
 		}
 	}