Remove FactoryProvider interface

temporalio · Jun 27, 2023 · cdb171c · cdb171c
1 parent 1e18621
commit cdb171c
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 107 deletions.
diff --git a/client/clientFactory_mock.go b/client/clientFactory_mock.go
diff --git a/client/clientfactory.go b/client/clientfactory.go
@@ -59,19 +59,6 @@ type (
 		NewLocalAdminClientWithTimeout(timeout time.Duration, largeTimeout time.Duration) (adminservice.AdminServiceClient, error)
 	}
 
-	// FactoryProvider can be used to provide a customized client Factory implementation.
-	FactoryProvider interface {
-		NewFactory(
-			rpcFactory common.RPCFactory,
-			monitor membership.Monitor,
-			metricsHandler metrics.Handler,
-			dc *dynamicconfig.Collection,
-			numberOfHistoryShards int32,
-			logger log.Logger,
-			throttledLogger log.Logger,
-		) Factory
-	}
-
 	// NamespaceIDToNameFunc maps a namespaceID to namespace name. Returns error when mapping is not possible.
 	NamespaceIDToNameFunc func(id namespace.ID) (namespace.Name, error)
 
@@ -85,21 +72,13 @@ type (
 		throttledLogger       log.Logger
 	}
 
-	factoryProviderImpl struct {
-	}
-
 	serviceKeyResolverImpl struct {
 		resolver membership.ServiceResolver
 	}
 )
 
-// NewFactoryProvider creates a default implementation of FactoryProvider.
-func NewFactoryProvider() FactoryProvider {
-	return &factoryProviderImpl{}
-}
-
 // NewFactory creates an instance of client factory that knows how to dispatch RPC calls.
-func (p *factoryProviderImpl) NewFactory(
+func NewFactory(
 	rpcFactory common.RPCFactory,
 	monitor membership.Monitor,
 	metricsHandler metrics.Handler,

diff --git a/common/resource/fx.go b/common/resource/fx.go
@@ -216,7 +216,6 @@ func NamespaceRegistryProvider(
 }
 
 func ClientFactoryProvider(
-	factoryProvider client.FactoryProvider,
 	rpcFactory common.RPCFactory,
 	membershipMonitor membership.Monitor,
 	metricsHandler metrics.Handler,
@@ -225,7 +224,7 @@ func ClientFactoryProvider(
 	logger log.SnTaggedLogger,
 	throttledLogger log.ThrottledLogger,
 ) client.Factory {
-	return factoryProvider.NewFactory(
+	return client.NewFactory(
 		rpcFactory,
 		membershipMonitor,
 		metricsHandler,

diff --git a/temporal/fx.go b/temporal/fx.go
@@ -42,7 +42,6 @@ import (
 	"google.golang.org/grpc"
 
 	persistencespb "go.temporal.io/server/api/persistence/v1"
-	"go.temporal.io/server/client"
 	"go.temporal.io/server/common/authorization"
 	"go.temporal.io/server/common/cluster"
 	"go.temporal.io/server/common/collection"
@@ -119,13 +118,12 @@ type (
 		AudienceGetter         authorization.JWTAudienceMapper
 
 		// below are things that could be over write by server options or may have default if not supplied by serverOptions.
-		Logger                log.Logger
-		ClientFactoryProvider client.FactoryProvider
-		DynamicConfigClient   dynamicconfig.Client
-		TLSConfigProvider     encryption.TLSConfigProvider
-		EsConfig              *esclient.Config
-		EsClient              esclient.Client
-		MetricsHandler        metrics.Handler
+		Logger              log.Logger
+		DynamicConfigClient dynamicconfig.Client
+		TLSConfigProvider   encryption.TLSConfigProvider
+		EsConfig            *esclient.Config
+		EsClient            esclient.Client
+		MetricsHandler      metrics.Handler
 	}
 )
 
@@ -185,12 +183,6 @@ func ServerOptionsProvider(opts []ServerOption) (serverOptionsProvider, error) {
 		logger = log.NewZapLogger(log.BuildZapLogger(so.config.Log))
 	}
 
-	// ClientFactoryProvider
-	clientFactoryProvider := so.clientFactoryProvider
-	if clientFactoryProvider == nil {
-		clientFactoryProvider = client.NewFactoryProvider()
-	}
-
 	// MetricsHandler
 	metricHandler := so.metricHandler
 	if metricHandler == nil {
@@ -276,13 +268,12 @@ func ServerOptionsProvider(opts []ServerOption) (serverOptionsProvider, error) {
 		ClaimMapper:            so.claimMapper,
 		AudienceGetter:         so.audienceGetter,
 
-		Logger:                logger,
-		ClientFactoryProvider: clientFactoryProvider,
-		DynamicConfigClient:   dcClient,
-		TLSConfigProvider:     tlsConfigProvider,
-		EsConfig:              esConfig,
-		EsClient:              esClient,
-		MetricsHandler:        metricHandler,
+		Logger:              logger,
+		DynamicConfigClient: dcClient,
+		TLSConfigProvider:   tlsConfigProvider,
+		EsConfig:            esConfig,
+		EsClient:            esClient,
+		MetricsHandler:      metricHandler,
 	}, nil
 }
 
@@ -340,7 +331,6 @@ type (
 		TlsConfigProvider          encryption.TLSConfigProvider
 		PersistenceConfig          config.Persistence
 		ClusterMetadata            *cluster.Config
-		ClientFactoryProvider      client.FactoryProvider
 		AudienceGetter             authorization.JWTAudienceMapper
 		PersistenceServiceResolver resolver.ServiceResolver
 		PersistenceFactoryProvider persistenceClient.FactoryProviderFn
@@ -386,7 +376,6 @@ func HistoryServiceProvider(
 			serviceName,
 		),
 		fx.Provide(func() persistenceClient.AbstractDataStoreFactory { return params.DataStoreFactory }),
-		fx.Provide(func() client.FactoryProvider { return params.ClientFactoryProvider }),
 		fx.Provide(func() authorization.JWTAudienceMapper { return params.AudienceGetter }),
 		fx.Provide(func() resolver.ServiceResolver { return params.PersistenceServiceResolver }),
 		fx.Provide(func() searchattribute.Mapper { return params.SearchAttributesMapper }),
@@ -436,7 +425,6 @@ func MatchingServiceProvider(
 			serviceName,
 		),
 		fx.Provide(func() persistenceClient.AbstractDataStoreFactory { return params.DataStoreFactory }),
-		fx.Provide(func() client.FactoryProvider { return params.ClientFactoryProvider }),
 		fx.Provide(func() authorization.JWTAudienceMapper { return params.AudienceGetter }),
 		fx.Provide(func() resolver.ServiceResolver { return params.PersistenceServiceResolver }),
 		fx.Provide(func() searchattribute.Mapper { return params.SearchAttributesMapper }),
@@ -494,7 +482,6 @@ func genericFrontendServiceProvider(
 			serviceName,
 		),
 		fx.Provide(func() persistenceClient.AbstractDataStoreFactory { return params.DataStoreFactory }),
-		fx.Provide(func() client.FactoryProvider { return params.ClientFactoryProvider }),
 		fx.Provide(func() authorization.JWTAudienceMapper { return params.AudienceGetter }),
 		fx.Provide(func() resolver.ServiceResolver { return params.PersistenceServiceResolver }),
 		fx.Provide(func() searchattribute.Mapper { return params.SearchAttributesMapper }),
@@ -560,7 +547,6 @@ func WorkerServiceProvider(
 			serviceName,
 		),
 		fx.Provide(func() persistenceClient.AbstractDataStoreFactory { return params.DataStoreFactory }),
-		fx.Provide(func() client.FactoryProvider { return params.ClientFactoryProvider }),
 		fx.Provide(func() authorization.JWTAudienceMapper { return params.AudienceGetter }),
 		fx.Provide(func() resolver.ServiceResolver { return params.PersistenceServiceResolver }),
 		fx.Provide(func() searchattribute.Mapper { return params.SearchAttributesMapper }),

diff --git a/temporal/server_option.go b/temporal/server_option.go
@@ -29,7 +29,6 @@ import (
 
 	"google.golang.org/grpc"
 
-	"go.temporal.io/server/client"
 	"go.temporal.io/server/common/authorization"
 	"go.temporal.io/server/common/config"
 	"go.temporal.io/server/common/dynamicconfig"
@@ -155,14 +154,6 @@ func WithCustomDataStoreFactory(customFactory persistenceclient.AbstractDataStor
 	})
 }
 
-// WithClientFactoryProvider sets a custom ClientFactoryProvider
-// NOTE: this option is experimental and may be changed or removed in future release.
-func WithClientFactoryProvider(clientFactoryProvider client.FactoryProvider) ServerOption {
-	return applyFunc(func(s *serverOptions) {
-		s.clientFactoryProvider = clientFactoryProvider
-	})
-}
-
 // WithSearchAttributesMapper sets a custom search attributes mapper which converts search attributes aliases to field names and vice versa.
 func WithSearchAttributesMapper(m searchattribute.Mapper) ServerOption {
 	return applyFunc(func(s *serverOptions) {

diff --git a/temporal/server_options.go b/temporal/server_options.go
@@ -31,7 +31,6 @@ import (
 	"golang.org/x/exp/slices"
 	"google.golang.org/grpc"
 
-	"go.temporal.io/server/client"
 	"go.temporal.io/server/common/authorization"
 	"go.temporal.io/server/common/config"
 	"go.temporal.io/server/common/dynamicconfig"
@@ -70,7 +69,6 @@ type (
 		elasticsearchHttpClient    *http.Client
 		dynamicConfigClient        dynamicconfig.Client
 		customDataStoreFactory     persistenceClient.AbstractDataStoreFactory
-		clientFactoryProvider      client.FactoryProvider
 		searchAttributesMapper     searchattribute.Mapper
 		customInterceptors         []grpc.UnaryServerInterceptor
 		metricHandler              metrics.Handler

diff --git a/tests/onebox.go b/tests/onebox.go
@@ -398,7 +398,6 @@ func (c *temporalImpl) startFrontend(hosts map[primitives.ServiceName][]string,
 		fx.Provide(func() authorization.Authorizer { return nil }),
 		fx.Provide(func() authorization.ClaimMapper { return nil }),
 		fx.Provide(func() authorization.JWTAudienceMapper { return nil }),
-		fx.Provide(func() client.FactoryProvider { return client.NewFactoryProvider() }),
 		fx.Provide(func() searchattribute.Mapper { return nil }),
 		// Comment the line above and uncomment the line below to test with search attributes mapper.
 		// fx.Provide(func() searchattribute.Mapper { return NewSearchAttributeTestMapper() }),
@@ -489,7 +488,6 @@ func (c *temporalImpl) startHistory(
 			fx.Provide(func() carchiver.ArchivalMetadata { return c.archiverMetadata }),
 			fx.Provide(func() provider.ArchiverProvider { return c.archiverProvider }),
 			fx.Provide(sdkClientFactoryProvider),
-			fx.Provide(func() client.FactoryProvider { return client.NewFactoryProvider() }),
 			fx.Provide(func() searchattribute.Mapper { return nil }),
 			// Comment the line above and uncomment the line below to test with search attributes mapper.
 			// fx.Provide(func() searchattribute.Mapper { return NewSearchAttributeTestMapper() }),
@@ -585,7 +583,6 @@ func (c *temporalImpl) startMatching(hosts map[primitives.ServiceName][]string,
 		fx.Provide(func() *cluster.Config { return c.clusterMetadataConfig }),
 		fx.Provide(func() carchiver.ArchivalMetadata { return c.archiverMetadata }),
 		fx.Provide(func() provider.ArchiverProvider { return c.archiverProvider }),
-		fx.Provide(func() client.FactoryProvider { return client.NewFactoryProvider() }),
 		fx.Provide(func() searchattribute.Mapper { return nil }),
 		fx.Provide(func() resolver.ServiceResolver { return resolver.NewNoopResolver() }),
 		fx.Provide(persistenceClient.FactoryProvider),
@@ -681,7 +678,6 @@ func (c *temporalImpl) startWorker(hosts map[primitives.ServiceName][]string, st
 		fx.Provide(func() carchiver.ArchivalMetadata { return c.archiverMetadata }),
 		fx.Provide(func() provider.ArchiverProvider { return c.archiverProvider }),
 		fx.Provide(sdkClientFactoryProvider),
-		fx.Provide(func() client.FactoryProvider { return client.NewFactoryProvider() }),
 		fx.Provide(func() searchattribute.Mapper { return nil }),
 		fx.Provide(func() resolver.ServiceResolver { return resolver.NewNoopResolver() }),
 		fx.Provide(persistenceClient.FactoryProvider),