revert storage, remove tracing.service and bring back common

settings/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"`
@@ -27,4 +31,3 @@ type Config struct {
 type Asset struct {
 	Path string `ocisConfig:"path" env:"SETTINGS_ASSET_PATH"`
 }
-

settings/pkg/config/defaultconfig.go

@@ -38,7 +38,6 @@ func DefaultConfig() *Config {
 			Type:      "jaeger",
 			Endpoint:  "",
 			Collector: "",
-			Service:   "settings",
 		},
 		DataPath: path.Join(defaults.BaseDataPath(), "settings"),
 		Asset: Asset{

settings/pkg/config/tracing.go

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