Remove forking logger (#825)

- no longer needed, the race conditions were fixed

Signed-off-by: Laurentiu Niculae <niculae.laurentiu1@gmail.com>

pkg/extensions/extension_metrics.go

@@ -26,10 +26,8 @@ func EnableMetricsExtension(config *config.Config, log log.Logger, rootDir strin
 }
 
 func SetupMetricsRoutes(config *config.Config, router *mux.Router, storeController storage.StoreController,
-	l log.Logger,
+	log log.Logger,
 ) {
-	// fork a new zerolog child to avoid data race
-	log := log.Logger{Logger: l.With().Caller().Timestamp().Logger()}
 	log.Info().Msg("setting up metrics routes")
 
 	if config.Extensions.Metrics != nil && *config.Extensions.Metrics.Enable {

pkg/extensions/extension_search.go

@@ -62,10 +62,8 @@ func downloadTrivyDB(log log.Logger, updateInterval time.Duration) error {
 }
 
 func SetupSearchRoutes(config *config.Config, router *mux.Router, storeController storage.StoreController,
-	l log.Logger,
+	log log.Logger,
 ) {
-	// fork a new zerolog child to avoid data race
-	log := log.Logger{Logger: l.With().Caller().Timestamp().Logger()}
 	log.Info().Msg("setting up search routes")
 
 	if config.Extensions.Search != nil && *config.Extensions.Search.Enable {

pkg/extensions/sync/sync.go

@@ -614,9 +614,6 @@ func Run(ctx context.Context, cfg Config,
 
 		ticker := time.NewTicker(regCfg.PollInterval)
 
-		// fork a new zerolog child to avoid data race
-		tlogger := log.Logger{Logger: logger.Logger}
-
 		retryOptions := &retry.RetryOptions{}
 
 		if regCfg.MaxRetries != nil {
@@ -658,7 +655,7 @@ func Run(ctx context.Context, cfg Config,
 					continue
 				}
 			}
-		}(ctx, regCfg, tlogger)
+		}(ctx, regCfg, logger)
 	}
 
 	logger.Info().Msg("finished setting up sync")