github/wonderwall
1
0
Fork 0
mirror of https://github.com/nais/wonderwall.git synced 2026-05-13 03:47:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(otel): clean up shutdown hook

Browse Source 
Co-authored-by: tronghn <trong.huu.nguyen@nav.no>
This commit is contained in:
Sindre Rødseth Hansen
2025-01-29 09:18:26 +01:00
committed by Trong Huu Nguyen
parent 13b11790fe
commit 1ed1b611af
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/wonderwall/main.go
View File

@@ -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

15
internal/observability/otel.go
View File

@@ -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.