github/wonderwall
1
0
Fork 0
mirror of https://github.com/nais/wonderwall.git synced 2026-05-08 17:37:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: move logging to observability package

Browse Source 
Co-authored-by: sindrerh2 <sindre.rodseth.hansen@nav.no>
This commit is contained in:
Trong Huu Nguyen
2025-01-28 10:56:06 +01:00
parent 81058458e0
commit 1f730a3d68
4 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/wonderwall/main.go
View File

@@ -53,7 +53,7 @@ func run() error {
}
if cfg.OpenTelemetry.Enabled {
otelShutdown, err := observability.OpenTelemetry(ctx, cfg)
otelShutdown, err := observability.SetupOpenTelemetry(ctx, cfg.OpenTelemetry.ServiceName, cfg.Version)
if err != nil {
return fmt.Errorf("initializing OpenTelemetry: %w", err)
}

12
pkg/logging/logging.go → internal/observability/logging.go
View File

@@ -1,4 +1,4 @@
package logging
package observability
import (
"fmt"
@@ -8,7 +8,7 @@ import (
"github.com/uptrace/opentelemetry-go-extra/otellogrus"
)
func TextFormatter() log.Formatter {
func textFormatter() log.Formatter {
return &log.TextFormatter{
DisableTimestamp: false,
FullTimestamp: true,
@@ -16,18 +16,18 @@ func TextFormatter() log.Formatter {
}
}
func JsonFormatter() log.Formatter {
func jsonFormatter() log.Formatter {
return &log.JSONFormatter{
TimestampFormat: time.RFC3339Nano,
}
}
func Setup(level, format string) error {
func SetupLogger(level, format string) error {
switch format {
case "json":
log.SetFormatter(JsonFormatter())
log.SetFormatter(jsonFormatter())
case "text":
log.SetFormatter(TextFormatter())
log.SetFormatter(textFormatter())
default:
return fmt.Errorf("log format '%s' is not recognized", format)
}

5
internal/observability/otel.go
View File

@@ -4,7 +4,6 @@ import (
"context"
"time"
"github.com/nais/wonderwall/pkg/config"
log "github.com/sirupsen/logrus"
"go.opentelemetry.io/otel/trace/noop"
@@ -28,11 +27,11 @@ func Tracer() oteltrace.Tracer {
return tracer
}
func OpenTelemetry(ctx context.Context, cfg *config.Config) (func(context.Context) error, error) {
func SetupOpenTelemetry(ctx context.Context, serviceName, version string) (func(context.Context) error, error) {
prop := newPropagator()
otel.SetTextMapPropagator(prop)
res, err := newResource(cfg.OpenTelemetry.ServiceName, cfg.Version)
res, err := newResource(serviceName, version)
if err != nil {
return nil, err
}

4
pkg/config/config.go
View File

@@ -13,7 +13,7 @@ import (
flag "github.com/spf13/pflag"
"github.com/spf13/viper"
"github.com/nais/wonderwall/pkg/logging"
"github.com/nais/wonderwall/internal/observability"
)
type Config struct {
@@ -105,7 +105,7 @@ func Initialize() (*Config, error) {
level := viper.GetString(LogLevel)
format := viper.GetString(LogFormat)
if err := logging.Setup(level, format); err != nil {
if err := observability.SetupLogger(level, format); err != nil {
return nil, err
}