Restructure based on hello reference

pkg/command/health.go

@@ -5,7 +5,6 @@ import (
 	"net/http"
 
 	"github.com/micro/cli"
-	"github.com/micro/go-micro/util/log"
 	"github.com/owncloud/ocis-graph/pkg/config"
 	"github.com/owncloud/ocis-graph/pkg/flagset"
 )
@@ -17,6 +16,8 @@ func Health(cfg *config.Config) cli.Command {
 		Usage: "Check health status",
 		Flags: flagset.HealthWithConfig(cfg),
 		Action: func(c *cli.Context) error {
+			logger := NewLogger(cfg)
+
 			resp, err := http.Get(
 				fmt.Sprintf(
 					"http://%s/healthz",
@@ -25,16 +26,22 @@ func Health(cfg *config.Config) cli.Command {
 			)
 
 			if err != nil {
-				log.Fatalf("Failed to request health check: %w", err)
+				logger.Fatal().
+					Err(err).
+					Msg("Failed to request health check")
 			}
 
 			defer resp.Body.Close()
 
 			if resp.StatusCode != 200 {
-				log.Fatalf("Health check responds with [%d]", resp.StatusCode)
+				logger.Fatal().
+					Int("code", resp.StatusCode).
+					Msg("Health seems to be in bad state")
 			}
 
-			log.Debugf("Health got good state with [%d]", resp.StatusCode)
+			logger.Debug().
+				Int("code", resp.StatusCode).
+				Msg("Health got a good state")
 
 			return nil
 		},

pkg/command/root.go

@@ -5,10 +5,10 @@ import (
 	"strings"
 
 	"github.com/micro/cli"
-	"github.com/micro/go-micro/util/log"
 	"github.com/owncloud/ocis-graph/pkg/config"
 	"github.com/owncloud/ocis-graph/pkg/flagset"
 	"github.com/owncloud/ocis-graph/pkg/version"
+	"github.com/owncloud/ocis-pkg/log"
 	"github.com/spf13/viper"
 )
 
@@ -19,7 +19,7 @@ func Execute() error {
 	app := &cli.App{
 		Name:     "ocis-graph",
 		Version:  version.String,
-		Usage:    "Example service for Reva/oCIS",
+		Usage:    "Serve Graph API for oCIS",
 		Compiled: version.Compiled(),
 
 		Authors: []cli.Author{
@@ -32,10 +32,10 @@ func Execute() error {
 		Flags: flagset.RootWithConfig(cfg),
 
 		Before: func(c *cli.Context) error {
-			NewLogger(cfg)
+			logger := NewLogger(cfg)
 
 			viper.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
-			viper.SetEnvPrefix("graph")
+			viper.SetEnvPrefix("GRAPH")
 			viper.AutomaticEnv()
 
 			if c.IsSet("config-file") {
@@ -51,16 +51,23 @@ func Execute() error {
 			if err := viper.ReadInConfig(); err != nil {
 				switch err.(type) {
 				case viper.ConfigFileNotFoundError:
-					log.Info("Continue without config")
+					logger.Info().
+						Msg("Continue without config")
 				case viper.UnsupportedConfigError:
-					log.Fatalf("Unsupported config type: %w", err)
+					logger.Fatal().
+						Err(err).
+						Msg("Unsupported config type")
 				default:
-					log.Fatalf("Failed to read config: %w", err)
+					logger.Fatal().
+						Err(err).
+						Msg("Failed to read config")
 				}
 			}
 
 			if err := viper.Unmarshal(&cfg); err != nil {
-				log.Fatalf("Failed to parse config: %w", err)
+				logger.Fatal().
+					Err(err).
+					Msg("Failed to parse config")
 			}
 
 			return nil
@@ -85,23 +92,12 @@ func Execute() error {
 	return app.Run(os.Args)
 }
 
-func NewLogger(cfg *config.Config) {
-	switch strings.ToLower(cfg.Log.Level) {
-	case "fatal":
-		log.SetLevel(log.LevelFatal)
-	case "error":
-		log.SetLevel(log.LevelError)
-	case "info":
-		log.SetLevel(log.LevelInfo)
-	case "warn":
-		log.SetLevel(log.LevelWarn)
-	case "debug":
-		log.SetLevel(log.LevelDebug)
-	case "trace":
-		log.SetLevel(log.LevelTrace)
-	default:
-		log.SetLevel(log.LevelInfo)
-	}
-
-	log.Name("graph")
+// NewLogger initializes a service-specific logger instance.
+func NewLogger(cfg *config.Config) log.Logger {
+	return log.NewLogger(
+		log.Name("graph"),
+		log.Level(cfg.Log.Level),
+		log.Pretty(cfg.Log.Pretty),
+		log.Color(cfg.Log.Color),
+	)
 }

pkg/command/server.go

@@ -10,12 +10,12 @@ import (
 	"contrib.go.opencensus.io/exporter/ocagent"
 	"contrib.go.opencensus.io/exporter/zipkin"
 	"github.com/micro/cli"
-	"github.com/micro/go-micro/util/log"
 	"github.com/oklog/run"
 	openzipkin "github.com/openzipkin/zipkin-go"
 	zipkinhttp "github.com/openzipkin/zipkin-go/reporter/http"
 	"github.com/owncloud/ocis-graph/pkg/config"
 	"github.com/owncloud/ocis-graph/pkg/flagset"
+	"github.com/owncloud/ocis-graph/pkg/metrics"
 	"github.com/owncloud/ocis-graph/pkg/server/debug"
 	"github.com/owncloud/ocis-graph/pkg/server/http"
 	"go.opencensus.io/stats/view"
@@ -29,6 +29,8 @@ func Server(cfg *config.Config) cli.Command {
 		Usage: "Start integrated server",
 		Flags: flagset.ServerWithConfig(cfg),
 		Action: func(c *cli.Context) error {
+			logger := NewLogger(cfg)
+
 			if cfg.Tracing.Enabled {
 				switch t := cfg.Tracing.Type; t {
 				case "agent":
@@ -39,12 +41,11 @@ func Server(cfg *config.Config) cli.Command {
 					)
 
 					if err != nil {
-						log.Error(
-							"Failed to create agent tracing on [%s] endpoint and [%s] collector: %w",
-							cfg.Tracing.Endpoint,
-							cfg.Tracing.Collector,
-							err,
-						)
+						logger.Error().
+							Err(err).
+							Str("endpoint", cfg.Tracing.Endpoint).
+							Str("collector", cfg.Tracing.Collector).
+							Msg("Failed to create agent tracing")
 
 						return err
 					}
@@ -62,12 +63,11 @@ func Server(cfg *config.Config) cli.Command {
 					)
 
 					if err != nil {
-						log.Error(
-							"Failed to create jaeger tracing on [%s] endpoint and [%s] collector: %w",
-							cfg.Tracing.Endpoint,
-							cfg.Tracing.Collector,
-							err,
-						)
+						logger.Error().
+							Err(err).
+							Str("endpoint", cfg.Tracing.Endpoint).
+							Str("collector", cfg.Tracing.Collector).
+							Msg("Failed to create jaeger tracing")
 
 						return err
 					}
@@ -81,12 +81,11 @@ func Server(cfg *config.Config) cli.Command {
 					)
 
 					if err != nil {
-						log.Error(
-							"Failed to create zipkin tracing on [%s] endpoint and [%s] collector: %w",
-							cfg.Tracing.Endpoint,
-							cfg.Tracing.Collector,
-							err,
-						)
+						logger.Error().
+							Err(err).
+							Str("endpoint", cfg.Tracing.Endpoint).
+							Str("collector", cfg.Tracing.Collector).
+							Msg("Failed to create zipkin tracing")
 
 						return err
 					}
@@ -101,7 +100,9 @@ func Server(cfg *config.Config) cli.Command {
 					trace.RegisterExporter(exporter)
 
 				default:
-					log.Warnf("Unknown tracing backend [%s]", t)
+					logger.Warn().
+						Str("type", t).
+						Msg("Unknown tracing backend")
 				}
 
 				trace.ApplyConfig(
@@ -110,42 +111,59 @@ func Server(cfg *config.Config) cli.Command {
 					},
 				)
 			} else {
-				log.Debug("Tracing is not enabled")
+				logger.Debug().
+					Msg("Tracing is not enabled")
 			}
 
 			var (
 				gr          = run.Group{}
 				ctx, cancel = context.WithCancel(context.Background())
+				metrics     = metrics.New()
 			)
 
+			defer cancel()
+
 			{
 				server, err := http.Server(
+					http.Logger(logger),
 					http.Context(ctx),
 					http.Config(cfg),
+					http.Metrics(metrics),
 				)
 
 				if err != nil {
-					log.Errorf("Server [http] failed to initialize: %w", err)
-					cancel()
+					logger.Info().
+						Err(err).
+						Str("transport", "http").
+						Msg("Failed to initialize server")
+
 					return err
 				}
 
 				gr.Add(func() error {
 					return server.Run()
 				}, func(_ error) {
-					log.Infof("Server [http] shutting down")
+					logger.Info().
+						Str("transport", "http").
+						Msg("Shutting down server")
+
 					cancel()
 				})
 			}
 
 			{
 				server, err := debug.Server(
+					debug.Logger(logger),
 					debug.Context(ctx),
 					debug.Config(cfg),
 				)
 
 				if err != nil {
-					log.Errorf("Server [debug] failed to initialize: %w", err)
+					logger.Info().
+						Err(err).
+						Str("transport", "debug").
+						Msg("Failed to initialize server")
+
 					return err
 				}
 
@@ -158,9 +176,14 @@ func Server(cfg *config.Config) cli.Command {
 					defer cancel()
 
 					if err := server.Shutdown(ctx); err != nil {
-						log.Errorf("Server [debug] shutdown failed: %w", err)
+						logger.Info().
+							Err(err).
+							Str("transport", "debug").
+							Msg("Failed to shutdown server")
 					} else {
-						log.Infof("Server [debug] shutting down")
+						logger.Info().
+							Str("transport", "debug").
+							Msg("Shutting down server")
 					}
 				})
 			}