From 1ed1b611af2dab3c98cbf38cae86a95642fc2cb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sindre=20R=C3=B8dseth=20Hansen?=
 <sindre.rodseth.hansen@nav.no>
Date: Wed, 29 Jan 2025 09:18:26 +0100
Subject: [PATCH] refactor(otel): clean up shutdown hook

Co-authored-by: tronghn <trong.huu.nguyen@nav.no>
---
 cmd/wonderwall/main.go         |  6 +-----
 internal/observability/otel.go | 15 ++++++++-------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/cmd/wonderwall/main.go b/cmd/wonderwall/main.go
index f6c8ef9..913d568 100644
--- a/cmd/wonderwall/main.go
+++ b/cmd/wonderwall/main.go
@@ -57,11 +57,7 @@ func run() error {
 		if err != nil {
 			return fmt.Errorf("initializing OpenTelemetry: %w", err)
 		}
-		defer func() {
-			if err := otelShutdown(ctx); err != nil {
-				log.Fatalf("fatal: otel shutdown error: %+v", err)
-			}
-		}()
+		defer otelShutdown(ctx)
 	}
 
 	var src router.Source
diff --git a/internal/observability/otel.go b/internal/observability/otel.go
index 628c3c2..78351ff 100644
--- a/internal/observability/otel.go
+++ b/internal/observability/otel.go
@@ -14,7 +14,6 @@ import (
 	"go.opentelemetry.io/otel/sdk/resource"
 	"go.opentelemetry.io/otel/sdk/trace"
 	"go.opentelemetry.io/otel/semconv/v1.26.0"
-	oteltrace "go.opentelemetry.io/otel/trace"
 )
 
 const (
@@ -24,11 +23,11 @@ const (
 
 var tracer = noop.NewTracerProvider().Tracer("noop")
 
-func Tracer() oteltrace.Tracer {
-	return tracer
-}
+//func Tracer() oteltrace.Tracer {
+//	return tracer
+//}
 
-func SetupOpenTelemetry(ctx context.Context, serviceName, version string) (func(context.Context) error, error) {
+func SetupOpenTelemetry(ctx context.Context, serviceName, version string) (func(context.Context), error) {
 	prop := newPropagator()
 	otel.SetTextMapPropagator(prop)
 
@@ -45,8 +44,10 @@ func SetupOpenTelemetry(ctx context.Context, serviceName, version string) (func(
 	tracer = tracerProvider.Tracer("wonderwall")
 
 	log.Infof("opentelemetry: initialized configuration")
-	shutdown := func(ctx context.Context) error {
-		return tracerProvider.Shutdown(ctx)
+	shutdown := func(ctx context.Context) {
+		if err := tracerProvider.Shutdown(ctx); err != nil {
+			log.Fatalf("fatal: otel shutdown error: %+v", err)
+		}
 	}
 
 	// Add OpenTelemetry logging hook to logrus.