From 5532991ff6aaf816268ef6bcfcaad0fc80256811 Mon Sep 17 00:00:00 2001 From: chahatsagarmain Date: Sat, 12 Oct 2024 14:02:48 +0530 Subject: [PATCH] added host to contructor Signed-off-by: chahatsagarmain --- cmd/jaeger/internal/extension/jaegerstorage/extension.go | 2 +- plugin/storage/grpc/factory.go | 7 +++++-- plugin/storage/grpc/factory_test.go | 6 +++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/cmd/jaeger/internal/extension/jaegerstorage/extension.go b/cmd/jaeger/internal/extension/jaegerstorage/extension.go index 3c9ce5684e8..ec4d2a3ae46 100644 --- a/cmd/jaeger/internal/extension/jaegerstorage/extension.go +++ b/cmd/jaeger/internal/extension/jaegerstorage/extension.go @@ -126,7 +126,7 @@ func (s *storageExt) Start(_ context.Context, _ component.Host) error { factory, err = badger.NewFactoryWithConfig(*cfg.Badger, mf, s.telset.Logger) case cfg.GRPC != nil: //nolint: contextcheck - factory, err = grpc.NewFactoryWithConfig(*cfg.GRPC, mf, s.telset.Logger) + factory, err = grpc.NewFactoryWithConfig(*cfg.GRPC, mf, s.telset.Logger, grpc.NewHost()) case cfg.Cassandra != nil: factory, err = cassandra.NewFactoryWithConfig(*cfg.Cassandra, mf, s.telset.Logger) case cfg.Elasticsearch != nil: diff --git a/plugin/storage/grpc/factory.go b/plugin/storage/grpc/factory.go index bab8a609602..e2d5d6023d9 100644 --- a/plugin/storage/grpc/factory.go +++ b/plugin/storage/grpc/factory.go @@ -46,6 +46,7 @@ type Factory struct { config Config services *ClientPluginServices remoteConn *grpc.ClientConn + host component.Host } type host struct { @@ -76,9 +77,11 @@ func NewFactoryWithConfig( cfg Config, metricsFactory metrics.Factory, logger *zap.Logger, + host component.Host, ) (*Factory, error) { f := NewFactory() f.config = cfg + f.host = host if err := f.Initialize(metricsFactory, logger); err != nil { return nil, err } @@ -115,8 +118,8 @@ func (f *Factory) Initialize(metricsFactory metrics.Factory, logger *zap.Logger) for _, opt := range opts { clientOpts = append(clientOpts, configgrpc.WithGrpcDialOption(opt)) } - host := NewHost() - return f.config.ToClientConn(context.Background(), host, telset, clientOpts...) + + return f.config.ToClientConn(context.Background(), f.host, telset, clientOpts...) } var err error diff --git a/plugin/storage/grpc/factory_test.go b/plugin/storage/grpc/factory_test.go index 71adb34bbd3..c40a0641f7b 100644 --- a/plugin/storage/grpc/factory_test.go +++ b/plugin/storage/grpc/factory_test.go @@ -105,7 +105,7 @@ func TestNewFactoryError(t *testing.T) { }, } t.Run("with_config", func(t *testing.T) { - _, err := NewFactoryWithConfig(*cfg, metrics.NullFactory, zap.NewNop()) + _, err := NewFactoryWithConfig(*cfg, metrics.NullFactory, zap.NewNop(), NewHost()) require.Error(t, err) assert.Contains(t, err.Error(), "authenticator") }) @@ -121,7 +121,7 @@ func TestNewFactoryError(t *testing.T) { t.Run("client", func(t *testing.T) { // this is a silly test to verify handling of error from grpc.NewClient, which cannot be induced via params. - f, err := NewFactoryWithConfig(Config{}, metrics.NullFactory, zap.NewNop()) + f, err := NewFactoryWithConfig(Config{}, metrics.NullFactory, zap.NewNop(), NewHost()) require.NoError(t, err) t.Cleanup(func() { require.NoError(t, f.Close()) }) newClientFn := func(_ ...grpc.DialOption) (conn *grpc.ClientConn, err error) { @@ -173,7 +173,7 @@ func TestGRPCStorageFactoryWithConfig(t *testing.T) { Enabled: true, }, } - f, err := NewFactoryWithConfig(cfg, metrics.NullFactory, zap.NewNop()) + f, err := NewFactoryWithConfig(cfg, metrics.NullFactory, zap.NewNop(), NewHost()) require.NoError(t, err) require.NoError(t, f.Close()) }