Merge pull request #1643 from openmeterio/wire-config

refactor: move config to a different wire set
openmeterio · Oct 9, 2024 · 2ae5789 · 2ae5789
2 parents a32a84a + 3bf8af5
commit 2ae5789
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 19 deletions.
diff --git a/cmd/balance-worker/wire.go b/cmd/balance-worker/wire.go
@@ -36,6 +36,7 @@ type Application struct {
 
 func initializeApplication(ctx context.Context, conf config.Configuration, logger *slog.Logger) (Application, func(), error) {
 	wire.Build(
+		app.Config,
 		NewOtelResource,
 		app.Telemetry,
 		NewMeter,
@@ -52,7 +53,7 @@ func initializeApplication(ctx context.Context, conf config.Configuration, logge
 
 // TODO: is this necessary? Do we need a logger first?
 func initializeLogger(conf config.Configuration) *slog.Logger {
-	wire.Build(NewOtelResource, app.Logger)
+	wire.Build(app.Config, NewOtelResource, app.Logger)
 
 	return new(slog.Logger)
 }

diff --git a/cmd/notification-service/wire.go b/cmd/notification-service/wire.go
@@ -36,6 +36,7 @@ type Application struct {
 
 func initializeApplication(ctx context.Context, conf config.Configuration, logger *slog.Logger) (Application, func(), error) {
 	wire.Build(
+		app.Config,
 		NewOtelResource,
 		app.Telemetry,
 		NewMeter,
@@ -52,7 +53,7 @@ func initializeApplication(ctx context.Context, conf config.Configuration, logge
 
 // TODO: is this necessary? Do we need a logger first?
 func initializeLogger(conf config.Configuration) *slog.Logger {
-	wire.Build(NewOtelResource, app.Logger)
+	wire.Build(app.Config, NewOtelResource, app.Logger)
 
 	return new(slog.Logger)
 }

diff --git a/cmd/server/wire.go b/cmd/server/wire.go
@@ -48,6 +48,7 @@ type Application struct {
 
 func initializeApplication(ctx context.Context, conf config.Configuration, logger *slog.Logger) (Application, func(), error) {
 	wire.Build(
+		app.Config,
 		NewOtelResource,
 		app.Telemetry,
 		NewMeter,
@@ -65,7 +66,7 @@ func initializeApplication(ctx context.Context, conf config.Configuration, logge
 
 // TODO: is this necessary? Do we need a logger first?
 func initializeLogger(conf config.Configuration) *slog.Logger {
-	wire.Build(NewOtelResource, app.Logger)
+	wire.Build(app.Config, NewOtelResource, app.Logger)
 
 	return new(slog.Logger)
 }

diff --git a/cmd/sink-worker/wire.go b/cmd/sink-worker/wire.go
@@ -33,6 +33,7 @@ type Application struct {
 
 func initializeApplication(ctx context.Context, conf config.Configuration, logger *slog.Logger) (Application, func(), error) {
 	wire.Build(
+		app.Config,
 		NewOtelResource,
 		app.Telemetry,
 		NewMeter,
@@ -44,8 +45,7 @@ func initializeApplication(ctx context.Context, conf config.Configuration, logge
 
 // TODO: is this necessary? Do we need a logger first?
 func initializeLogger(conf config.Configuration) *slog.Logger {
-	// wire.Build(NewOtelResource, app.Logger)
-	wire.Build(NewOtelResource, NewLogger)
+	wire.Build(app.Config, NewOtelResource, app.Logger)
 
 	return new(slog.Logger)
 }

diff --git a/cmd/sink-worker/wire_gen.go b/cmd/sink-worker/wire_gen.go
diff --git a/openmeter/app/wire.go b/openmeter/app/wire.go
@@ -14,16 +14,30 @@ import (
 	"github.com/openmeterio/openmeter/openmeter/streaming/clickhouse_connector"
 )
 
-var ClickHouse = wire.NewSet(
+var Config = wire.NewSet(
 	wire.FieldsOf(new(config.Configuration), "Aggregation"),
 	wire.FieldsOf(new(config.AggregationConfiguration), "ClickHouse"),
 
+	wire.FieldsOf(new(config.Configuration), "Postgres"),
+
+	wire.FieldsOf(new(config.Configuration), "Telemetry"),
+	TelemetryConfig,
+
+	wire.FieldsOf(new(config.Configuration), "Meters"),
+	wire.FieldsOf(new(config.Configuration), "Namespace"),
+)
+
+var TelemetryConfig = wire.NewSet(
+	wire.FieldsOf(new(config.TelemetryConfig), "Metrics"),
+	wire.FieldsOf(new(config.TelemetryConfig), "Trace"),
+	wire.FieldsOf(new(config.TelemetryConfig), "Log"),
+)
+
+var ClickHouse = wire.NewSet(
 	NewClickHouse,
 )
 
 var Database = wire.NewSet(
-	wire.FieldsOf(new(config.Configuration), "Postgres"),
-
 	NewPostgresDriver,
 	NewDB,
 	NewEntPostgresDriver,
@@ -39,10 +53,6 @@ var Kafka = wire.NewSet(
 )
 
 var Telemetry = wire.NewSet(
-	wire.FieldsOf(new(config.Configuration), "Telemetry"),
-	wire.FieldsOf(new(config.TelemetryConfig), "Metrics"),
-	wire.FieldsOf(new(config.TelemetryConfig), "Trace"),
-
 	NewMeterProvider,
 	wire.Bind(new(metric.MeterProvider), new(*sdkmetric.MeterProvider)),
 	NewTracerProvider,
@@ -55,15 +65,10 @@ var Telemetry = wire.NewSet(
 )
 
 var Logger = wire.NewSet(
-	wire.FieldsOf(new(config.Configuration), "Telemetry"),
-	wire.FieldsOf(new(config.TelemetryConfig), "Log"),
-
 	NewLogger,
 )
 
 var OpenMeter = wire.NewSet(
-	wire.FieldsOf(new(config.Configuration), "Meters"),
-
 	NewMeterRepository,
 	wire.Bind(new(meter.Repository), new(*meter.InMemoryRepository)),
 
@@ -77,7 +82,6 @@ var OpenMeter = wire.NewSet(
 	NewKafkaNamespaceHandler,
 	NewIngestCollector,
 
-	wire.FieldsOf(new(config.Configuration), "Namespace"),
 	NewNamespaceHandlers,
 	NewNamespaceManager,
 )