Revert "Use OTEL component host instead of no op host for prod code (jaegertracing#6085)"

This reverts commit bec885e.

Author: yurishkuro

cmd/jaeger/internal/extension/jaegerstorage/extension.go

@@ -112,7 +112,7 @@ func newStorageExt(config *Config, telset component.TelemetrySettings) *storageE
 	}
 }
 
-func (s *storageExt) Start(_ context.Context, host component.Host) error {
+func (s *storageExt) Start(_ context.Context, _ component.Host) error {
 	baseFactory := otelmetrics.NewFactory(s.telset.MeterProvider)
 	mf := baseFactory.Namespace(metrics.NSOptions{Name: "jaeger"})
 	for storageName, cfg := range s.config.Backends {
@@ -126,7 +126,7 @@ func (s *storageExt) Start(_ context.Context, host 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, host)
+			factory, err = grpc.NewFactoryWithConfig(*cfg.GRPC, mf, s.telset.Logger)
 		case cfg.Cassandra != nil:
 			factory, err = cassandra.NewFactoryWithConfig(*cfg.Cassandra, mf, s.telset.Logger)
 		case cfg.Elasticsearch != nil:

plugin/storage/grpc/factory.go

@@ -47,26 +47,21 @@ type Factory struct {
 	config         Config
 	services       *ClientPluginServices
 	remoteConn     *grpc.ClientConn
-	host           component.Host
 }
 
 // NewFactory creates a new Factory.
 func NewFactory() *Factory {
-	return &Factory{
-		host: componenttest.NewNopHost(),
-	}
+	return &Factory{}
 }
 
 // NewFactoryWithConfig is used from jaeger(v2).
 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
 	}
@@ -103,7 +98,7 @@ func (f *Factory) Initialize(metricsFactory metrics.Factory, logger *zap.Logger)
 		for _, opt := range opts {
 			clientOpts = append(clientOpts, configgrpc.WithGrpcDialOption(opt))
 		}
-		return f.config.ToClientConn(context.Background(), f.host, telset, clientOpts...)
+		return f.config.ToClientConn(context.Background(), componenttest.NewNopHost(), telset, clientOpts...)
 	}
 
 	var err error

plugin/storage/grpc/factory_test.go

@@ -16,7 +16,6 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/component"
-	"go.opentelemetry.io/collector/component/componenttest"
 	"go.opentelemetry.io/collector/config/configauth"
 	"go.opentelemetry.io/collector/config/configgrpc"
 	"go.opentelemetry.io/collector/exporter/exporterhelper"
@@ -106,7 +105,7 @@ func TestNewFactoryError(t *testing.T) {
 		},
 	}
 	t.Run("with_config", func(t *testing.T) {
-		_, err := NewFactoryWithConfig(*cfg, metrics.NullFactory, zap.NewNop(), componenttest.NewNopHost())
+		_, err := NewFactoryWithConfig(*cfg, metrics.NullFactory, zap.NewNop())
 		require.Error(t, err)
 		assert.Contains(t, err.Error(), "authenticator")
 	})
@@ -122,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(), componenttest.NewNopHost())
+		f, err := NewFactoryWithConfig(Config{}, metrics.NullFactory, zap.NewNop())
 		require.NoError(t, err)
 		t.Cleanup(func() { require.NoError(t, f.Close()) })
 		newClientFn := func(_ ...grpc.DialOption) (conn *grpc.ClientConn, err error) {
@@ -174,7 +173,7 @@ func TestGRPCStorageFactoryWithConfig(t *testing.T) {
 			Enabled: true,
 		},
 	}
-	f, err := NewFactoryWithConfig(cfg, metrics.NullFactory, zap.NewNop(), componenttest.NewNopHost())
+	f, err := NewFactoryWithConfig(cfg, metrics.NullFactory, zap.NewNop())
 	require.NoError(t, err)
 	require.NoError(t, f.Close())
 }