From bd2ec2dcf2c32c01c6bdf0c6f06eb912d9633f30 Mon Sep 17 00:00:00 2001
From: Trong Huu Nguyen <trong.huu.nguyen@nav.no>
Date: Tue, 28 Jan 2025 14:54:19 +0100
Subject: [PATCH] refactor(otel): move logrus hook to otel

Co-authored-by: sindrerh2 <sindre.rodseth.hansen@nav.no>
---
 internal/observability/logging.go | 11 -----------
 internal/observability/otel.go    | 12 ++++++++++++
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/internal/observability/logging.go b/internal/observability/logging.go
index eb2190c..96ebc80 100644
--- a/internal/observability/logging.go
+++ b/internal/observability/logging.go
@@ -5,7 +5,6 @@ import (
 	"time"
 
 	log "github.com/sirupsen/logrus"
-	"github.com/uptrace/opentelemetry-go-extra/otellogrus"
 )
 
 func textFormatter() log.Formatter {
@@ -40,15 +39,5 @@ func SetupLogger(level, format string) error {
 	log.SetLevel(logLevel)
 	log.Tracef("Trace logging enabled")
 
-	// Add OpenTelemetry logging hook.
-	// This attaches logs to the associated span in the given log context as events.
-	log.AddHook(otellogrus.NewHook(otellogrus.WithLevels(
-		log.PanicLevel,
-		log.FatalLevel,
-		log.ErrorLevel,
-		log.WarnLevel,
-		log.InfoLevel,
-	)))
-
 	return nil
 }
diff --git a/internal/observability/otel.go b/internal/observability/otel.go
index 365da49..628c3c2 100644
--- a/internal/observability/otel.go
+++ b/internal/observability/otel.go
@@ -5,6 +5,7 @@ import (
 	"time"
 
 	log "github.com/sirupsen/logrus"
+	"github.com/uptrace/opentelemetry-go-extra/otellogrus"
 	"go.opentelemetry.io/otel/trace/noop"
 
 	"go.opentelemetry.io/otel"
@@ -47,6 +48,17 @@ func SetupOpenTelemetry(ctx context.Context, serviceName, version string) (func(
 	shutdown := func(ctx context.Context) error {
 		return tracerProvider.Shutdown(ctx)
 	}
+
+	// Add OpenTelemetry logging hook to logrus.
+	// This attaches logs to the associated span in the given log context as events.
+	log.AddHook(otellogrus.NewHook(otellogrus.WithLevels(
+		log.PanicLevel,
+		log.FatalLevel,
+		log.ErrorLevel,
+		log.WarnLevel,
+		log.InfoLevel,
+	)))
+
 	return shutdown, nil
 }