Merge pull request #1736 from openmeterio/wire

Drop separate logger initialization
openmeterio · Oct 22, 2024 · 6e482f1 · 6e482f1
2 parents ef8ba11 + 5b563ff
commit 6e482f1
Show file tree

Hide file tree

Showing 14 changed files with 76 additions and 109 deletions.
diff --git a/app/common/telemetry.go b/app/common/telemetry.go
@@ -30,6 +30,13 @@ import (
 	"github.com/openmeterio/openmeter/pkg/gosundheit"
 )
 
+// Set the default logger to JSON for messages emitted before the "real" logger is initialized.
+//
+// We use JSON as a best-effort to make the logs machine-readable.
+func init() {
+	slog.SetDefault(slog.New(slog.NewJSONHandler(os.Stderr, nil)))
+}
+
 const (
 	DefaultShutdownTimeout = 5 * time.Second
 )

diff --git a/app/common/wire.go b/app/common/wire.go
@@ -83,6 +83,8 @@ var KafkaTopic = wire.NewSet(
 var Telemetry = wire.NewSet(
 	NewTelemetryResource,
 
+	NewLogger,
+
 	NewMeterProvider,
 	wire.Bind(new(metric.MeterProvider), new(*sdkmetric.MeterProvider)),
 	NewMeter,
@@ -96,11 +98,6 @@ var Telemetry = wire.NewSet(
 	NewTelemetryServer,
 )
 
-var Logger = wire.NewSet(
-	NewTelemetryResource,
-	NewLogger,
-)
-
 var OpenMeter = wire.NewSet(
 	NewMeterRepository,
 	wire.Bind(new(meter.Repository), new(*meter.InMemoryRepository)),

diff --git a/cmd/balance-worker/main.go b/cmd/balance-worker/main.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"log/slog"
 	"os"
 
 	"github.com/spf13/pflag"
@@ -56,17 +57,20 @@ func main() {
 		os.Exit(0)
 	}
 
-	logger := initializeLogger(conf)
-
-	app, cleanup, err := initializeApplication(ctx, conf, logger)
+	app, cleanup, err := initializeApplication(ctx, conf)
 	if err != nil {
-		logger.Error("failed to initialize application", "error", err)
+		slog.Error("failed to initialize application", "error", err)
+
+		cleanup()
+
 		os.Exit(1)
 	}
 	defer cleanup()
 
 	app.SetGlobals()
 
+	logger := app.Logger
+
 	// Validate service prerequisites
 
 	if !conf.Events.Enabled {

diff --git a/cmd/balance-worker/wire.go b/cmd/balance-worker/wire.go
@@ -17,9 +17,11 @@ type Application struct {
 	common.GlobalInitializer
 	common.Migrator
 	common.Runner
+
+	Logger *slog.Logger
 }
 
-func initializeApplication(ctx context.Context, conf config.Configuration, logger *slog.Logger) (Application, func(), error) {
+func initializeApplication(ctx context.Context, conf config.Configuration) (Application, func(), error) {
 	wire.Build(
 		metadata,
 		common.Config,
@@ -39,13 +41,6 @@ func initializeApplication(ctx context.Context, conf config.Configuration, logge
 	return Application{}, nil, nil
 }
 
-// TODO: is this necessary? Do we need a logger first?
-func initializeLogger(conf config.Configuration) *slog.Logger {
-	wire.Build(metadata, common.Config, common.Logger)
-
-	return new(slog.Logger)
-}
-
 func metadata(conf config.Configuration) common.Metadata {
 	return common.Metadata{
 		ServiceName:       "openmeter",

diff --git a/cmd/balance-worker/wire_gen.go b/cmd/balance-worker/wire_gen.go
diff --git a/cmd/notification-service/main.go b/cmd/notification-service/main.go
@@ -67,17 +67,20 @@ func main() {
 		os.Exit(0)
 	}
 
-	logger := initializeLogger(conf)
-
-	app, cleanup, err := initializeApplication(ctx, conf, logger)
+	app, cleanup, err := initializeApplication(ctx, conf)
 	if err != nil {
-		logger.Error("failed to initialize application", "error", err)
+		slog.Error("failed to initialize application", "error", err)
+
+		cleanup()
+
 		os.Exit(1)
 	}
 	defer cleanup()
 
 	app.SetGlobals()
 
+	logger := app.Logger
+
 	// Validate service prerequisites
 
 	if !conf.Events.Enabled {

diff --git a/cmd/notification-service/wire.go b/cmd/notification-service/wire.go
@@ -34,10 +34,11 @@ type Application struct {
 	MessagePublisher   message.Publisher
 	EventPublisher     eventbus.Publisher
 
-	Meter metric.Meter
+	Logger *slog.Logger
+	Meter  metric.Meter
 }
 
-func initializeApplication(ctx context.Context, conf config.Configuration, logger *slog.Logger) (Application, func(), error) {
+func initializeApplication(ctx context.Context, conf config.Configuration) (Application, func(), error) {
 	wire.Build(
 		metadata,
 		common.Config,
@@ -55,13 +56,6 @@ func initializeApplication(ctx context.Context, conf config.Configuration, logge
 	return Application{}, nil, nil
 }
 
-// TODO: is this necessary? Do we need a logger first?
-func initializeLogger(conf config.Configuration) *slog.Logger {
-	wire.Build(metadata, common.Config, common.Logger)
-
-	return new(slog.Logger)
-}
-
 func metadata(conf config.Configuration) common.Metadata {
 	return common.Metadata{
 		ServiceName:       "openmeter",

diff --git a/cmd/notification-service/wire_gen.go b/cmd/notification-service/wire_gen.go
diff --git a/cmd/server/main.go b/cmd/server/main.go
@@ -89,17 +89,20 @@ func main() {
 		os.Exit(0)
 	}
 
-	logger := initializeLogger(conf)
-
-	app, cleanup, err := initializeApplication(ctx, conf, logger)
+	app, cleanup, err := initializeApplication(ctx, conf)
 	if err != nil {
-		logger.Error("failed to initialize application", "error", err)
+		slog.Error("failed to initialize application", "error", err)
+
+		cleanup()
+
 		os.Exit(1)
 	}
 	defer cleanup()
 
 	app.SetGlobals()
 
+	logger := app.Logger
+
 	logger.Info("starting OpenMeter server", "config", map[string]string{
 		"address":             conf.Address,
 		"telemetry.address":   conf.Telemetry.Address,

diff --git a/cmd/server/wire.go b/cmd/server/wire.go
@@ -40,12 +40,13 @@ type Application struct {
 	NamespaceHandlers []namespace.Handler
 	NamespaceManager  *namespace.Manager
 
-	Meter metric.Meter
+	Logger *slog.Logger
+	Meter  metric.Meter
 
 	RouterHook func(chi.Router)
 }
 
-func initializeApplication(ctx context.Context, conf config.Configuration, logger *slog.Logger) (Application, func(), error) {
+func initializeApplication(ctx context.Context, conf config.Configuration) (Application, func(), error) {
 	wire.Build(
 		metadata,
 		common.Config,
@@ -66,13 +67,6 @@ func initializeApplication(ctx context.Context, conf config.Configuration, logge
 	return Application{}, nil, nil
 }
 
-// TODO: is this necessary? Do we need a logger first?
-func initializeLogger(conf config.Configuration) *slog.Logger {
-	wire.Build(metadata, common.Config, common.Logger)
-
-	return new(slog.Logger)
-}
-
 func metadata(conf config.Configuration) common.Metadata {
 	return common.Metadata{
 		ServiceName:       "openmeter",

diff --git a/cmd/server/wire_gen.go b/cmd/server/wire_gen.go