Consolidate Module and DefaultOptions

temporalio · Oct 18, 2023 · de3f2ea · de3f2ea
1 parent b1f5d5e
commit de3f2ea
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 10 deletions.
diff --git a/common/resource/fx.go b/common/resource/fx.go
@@ -126,11 +126,7 @@ var Module = fx.Options(
 	fx.Provide(PersistenceConfigProvider),
 	fx.Provide(health.NewServer),
 	deadlock.Module,
-	config.Module,
-)
-
-var DefaultOptions = fx.Options(
-	ringpop.Module,
+	config.Module, ringpop.Module,
 	fx.Provide(RPCFactoryProvider),
 	fx.Provide(ArchivalMetadataProvider),
 	fx.Provide(ArchiverProviderProvider),

diff --git a/service/frontend/fx.go b/service/frontend/fx.go
@@ -71,7 +71,6 @@ import (
 type FEReplicatorNamespaceReplicationQueue persistence.NamespaceReplicationQueue
 
 var Module = fx.Options(
-	resource.Module,
 	fx.Provide(dynamicconfig.NewCollection),
 	fx.Provide(ConfigProvider),
 	fx.Provide(NamespaceLogInterceptorProvider),

diff --git a/service/history/fx.go b/service/history/fx.go
@@ -61,7 +61,6 @@ import (
 )
 
 var Module = fx.Options(
-	resource.Module,
 	workflow.Module,
 	shard.Module,
 	cache.Module,

diff --git a/service/matching/fx.go b/service/matching/fx.go
@@ -49,7 +49,6 @@ import (
 )
 
 var Module = fx.Options(
-	resource.Module,
 	fx.Provide(dynamicconfig.NewCollection),
 	fx.Provide(ConfigProvider),
 	fx.Provide(PersistenceRateLimitingParamsProvider),

diff --git a/service/worker/fx.go b/service/worker/fx.go
@@ -52,7 +52,6 @@ import (
 var Module = fx.Options(
 	migration.Module,
 	addsearchattributes.Module,
-	resource.Module,
 	deletenamespace.Module,
 	scheduler.Module,
 	batcher.Module,

diff --git a/temporal/fx.go b/temporal/fx.go
@@ -428,7 +428,7 @@ func (params ServiceProviderParamsCommon) GetCommonServiceOptions(serviceName pr
 			},
 		),
 		ServiceTracingModule,
-		resource.DefaultOptions,
+		resource.Module,
 		FxLogAdapter,
 	)
 }