diff --git a/cmd/wonderwall/main.go b/cmd/wonderwall/main.go index 5e23ea6..f6c8ef9 100644 --- a/cmd/wonderwall/main.go +++ b/cmd/wonderwall/main.go @@ -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) } diff --git a/pkg/logging/logging.go b/internal/observability/logging.go similarity index 80% rename from pkg/logging/logging.go rename to internal/observability/logging.go index 79b0996..1271f8e 100644 --- a/pkg/logging/logging.go +++ b/internal/observability/logging.go @@ -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) } diff --git a/internal/observability/otel.go b/internal/observability/otel.go index 5f57a83..365da49 100644 --- a/internal/observability/otel.go +++ b/internal/observability/otel.go @@ -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 } diff --git a/pkg/config/config.go b/pkg/config/config.go index 285b9e6..b7e1fd3 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -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 }