Merge pull request #8989 from owncloud/log-and-trace-fixes

log and trace fixes
owncloud · Apr 29, 2024 · 32e44a9 · 32e44a9
2 parents a36a176 + e414722
commit 32e44a9
Show file tree

Hide file tree

Showing 16 changed files with 38 additions and 31 deletions.
diff --git a/services/frontend/pkg/command/events.go b/services/frontend/pkg/command/events.go
@@ -56,23 +56,24 @@ func ListenForEvents(ctx context.Context, cfg *config.Config, l log.Logger) erro
 		return err
 	}
 
+	traceProvider, err := tracing.GetServiceTraceProvider(cfg.Tracing, cfg.Service.Name)
+	if err != nil {
+		l.Error().Err(err).Msg("cannot initialize tracing")
+		return err
+	}
+
 	gatewaySelector, err := pool.GatewaySelector(
 		cfg.Reva.Address,
 		pool.WithTLSCACert(cfg.GRPCClientTLS.CACert),
 		pool.WithTLSMode(tm),
 		pool.WithRegistry(registry.GetRegistry()),
+		pool.WithTracerProvider(traceProvider),
 	)
 	if err != nil {
 		l.Error().Err(err).Msg("cannot get gateway selector")
 		return err
 	}
 
-	traceProvider, err := tracing.GetServiceTraceProvider(cfg.Tracing, cfg.Service.Name)
-	if err != nil {
-		l.Error().Err(err).Msg("cannot initialize tracing")
-		return err
-	}
-
 	grpcClient, err := grpc.NewClient(
 		append(
 			grpc.GetClientOptions(cfg.GRPCClientTLS),

diff --git a/services/graph/pkg/identity/cache.go b/services/graph/pkg/identity/cache.go
@@ -88,6 +88,9 @@ func (cache IdentityCache) GetUser(ctx context.Context, userid string) (libregra
 	var user libregraph.User
 	if item := cache.users.Get(userid); item == nil {
 		gatewayClient, err := cache.gatewaySelector.Next()
+		if err != nil {
+			return libregraph.User{}, errorcode.New(errorcode.GeneralException, err.Error())
+		}
 		cs3UserID := &cs3User.UserId{
 			OpaqueId: userid,
 		}

diff --git a/services/postprocessing/pkg/command/server.go b/services/postprocessing/pkg/command/server.go
@@ -85,6 +85,7 @@ func Server(cfg *config.Config) *cli.Command {
 				}, func(err error) {
 					logger.Error().
 						Err(err).
+						Str("server", "http").
 						Msg("Shutting down server")
 					cancel()
 					os.Exit(1)

diff --git a/services/search/pkg/config/http.go b/services/search/pkg/config/http.go
diff --git a/services/settings/pkg/command/server.go b/services/settings/pkg/command/server.go
@@ -73,8 +73,11 @@ func Server(cfg *config.Config) *cli.Command {
 					Msg("Error initializing http service")
 				return fmt.Errorf("could not initialize http service: %w", err)
 			}
-			servers.Add(httpServer.Run, func(_ error) {
-				logger.Info().Str("server", "http").Msg("Shutting down server")
+			servers.Add(httpServer.Run, func(err error) {
+				logger.Error().
+					Err(err).
+					Str("server", "http").
+					Msg("shutting down server")
 				cancel()
 				os.Exit(1)
 			})
@@ -90,7 +93,10 @@ func Server(cfg *config.Config) *cli.Command {
 				grpc.TraceProvider(traceProvider),
 			)
 			servers.Add(grpcServer.Run, func(_ error) {
-				logger.Info().Str("server", "grpc").Msg("Shutting down server")
+				logger.Error().
+					Err(err).
+					Str("server", "grpc").
+					Msg("shutting down server")
 				cancel()
 				os.Exit(1)
 			})

diff --git a/services/sharing/pkg/command/server.go b/services/sharing/pkg/command/server.go
@@ -73,7 +73,7 @@ func Server(cfg *config.Config) *cli.Command {
 			}, func(err error) {
 				logger.Error().
 					Err(err).
-					Str("server", cfg.Service.Name).
+					Str("server", "reva").
 					Msg("Shutting down server")
 
 				cancel()

diff --git a/services/storage-publiclink/pkg/command/server.go b/services/storage-publiclink/pkg/command/server.go
@@ -57,7 +57,7 @@ func Server(cfg *config.Config) *cli.Command {
 			}, func(err error) {
 				logger.Error().
 					Err(err).
-					Str("server", cfg.Service.Name).
+					Str("server", "reva").
 					Msg("Shutting down server")
 
 				cancel()

diff --git a/services/storage-shares/pkg/command/server.go b/services/storage-shares/pkg/command/server.go
@@ -57,7 +57,7 @@ func Server(cfg *config.Config) *cli.Command {
 			}, func(err error) {
 				logger.Error().
 					Err(err).
-					Str("server", cfg.Service.Name).
+					Str("server", "reva").
 					Msg("Shutting down server")
 
 				cancel()

diff --git a/services/storage-system/pkg/command/server.go b/services/storage-system/pkg/command/server.go
@@ -57,7 +57,7 @@ func Server(cfg *config.Config) *cli.Command {
 			}, func(err error) {
 				logger.Error().
 					Err(err).
-					Str("server", cfg.Service.Name).
+					Str("server", "reva").
 					Msg("Shutting down server")
 
 				cancel()

diff --git a/services/storage-users/pkg/command/server.go b/services/storage-users/pkg/command/server.go
@@ -59,7 +59,7 @@ func Server(cfg *config.Config) *cli.Command {
 			}, func(err error) {
 				logger.Error().
 					Err(err).
-					Str("server", cfg.Service.Name).
+					Str("server", "reva").
 					Msg("Shutting down server")
 
 				cancel()

diff --git a/services/thumbnails/pkg/command/server.go b/services/thumbnails/pkg/command/server.go
@@ -109,7 +109,10 @@ func Server(cfg *config.Config) *cli.Command {
 			}
 
 			gr.Add(httpServer.Run, func(_ error) {
-				logger.Info().Str("server", "http").Msg("shutting down server")
+				logger.Error().
+					Err(err).
+					Str("server", "http").
+					Msg("Shutting down server")
 				cancel()
 			})
 

diff --git a/services/userlog/pkg/command/server.go b/services/userlog/pkg/command/server.go
@@ -141,8 +141,8 @@ func Server(cfg *config.Config) *cli.Command {
 					return server.Run()
 				}, func(err error) {
 					logger.Error().
-						Str("transport", "http").
 						Err(err).
+						Str("server", "http").
 						Msg("Shutting down server")
 
 					cancel()

diff --git a/services/users/pkg/command/server.go b/services/users/pkg/command/server.go
@@ -70,7 +70,7 @@ func Server(cfg *config.Config) *cli.Command {
 			}, func(err error) {
 				logger.Error().
 					Err(err).
-					Str("server", cfg.Service.Name).
+					Str("server", "reva").
 					Msg("Shutting down server")
 
 				cancel()

diff --git a/services/web/pkg/command/server.go b/services/web/pkg/command/server.go
@@ -88,8 +88,9 @@ func Server(cfg *config.Config) *cli.Command {
 					}
 					return err
 				}, func(err error) {
-					logger.Info().
-						Str("transport", "http").
+					logger.Error().
+						Err(err).
+						Str("server", "http").
 						Msg("Shutting down server")
 
 					cancel()

diff --git a/services/webdav/pkg/command/server.go b/services/webdav/pkg/command/server.go
@@ -69,7 +69,7 @@ func Server(cfg *config.Config) *cli.Command {
 				if err != nil {
 					logger.Info().
 						Err(err).
-						Str("transport", "http").
+						Str("server", "http").
 						Msg("Failed to initialize server")
 
 					return err
@@ -80,7 +80,7 @@ func Server(cfg *config.Config) *cli.Command {
 				}, func(err error) {
 					logger.Error().
 						Err(err).
-						Str("transport", "http").
+						Str("server", "http").
 						Msg("Shutting down server")
 
 					cancel()

diff --git a/services/webfinger/pkg/command/server.go b/services/webfinger/pkg/command/server.go
@@ -82,7 +82,7 @@ func Server(cfg *config.Config) *cli.Command {
 				if err != nil {
 					logger.Info().
 						Err(err).
-						Str("transport", "http").
+						Str("server", "http").
 						Msg("Failed to initialize server")
 
 					return err
@@ -93,7 +93,7 @@ func Server(cfg *config.Config) *cli.Command {
 				}, func(err error) {
 					logger.Error().
 						Err(err).
-						Str("transport", "http").
+						Str("server", "http").
 						Msg("Shutting down server")
 
 					cancel()