Create new grpc storage configuration to align with OTEL

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

@@ -18,7 +18,7 @@ import (
 type Config struct {
 	Memory        map[string]memoryCfg.Configuration   `mapstructure:"memory"`
 	Badger        map[string]badgerCfg.NamespaceConfig `mapstructure:"badger"`
-	GRPC          map[string]grpcCfg.Configuration     `mapstructure:"grpc"`
+	GRPC          map[string]grpcCfg.ConfigV2          `mapstructure:"grpc"`
 	Opensearch    map[string]esCfg.Configuration       `mapstructure:"opensearch"`
 	Elasticsearch map[string]esCfg.Configuration       `mapstructure:"elasticsearch"`
 	Cassandra     map[string]cassandra.Options         `mapstructure:"cassandra"`

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

@@ -117,7 +117,7 @@ func (s *storageExt) Start(ctx context.Context, host component.Host) error {
 		cfg:         s.config.Badger,
 		builder:     badger.NewFactoryWithConfig,
 	}
-	grpcStarter := &starter[grpcCfg.Configuration, *grpc.Factory]{
+	grpcStarter := &starter[grpcCfg.ConfigV2, *grpc.Factory]{
 		ext:         s,
 		storageKind: "grpc",
 		cfg:         s.config.GRPC,

cmd/remote-storage/app/server.go

@@ -22,6 +22,7 @@ import (
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
+	_ "google.golang.org/grpc/encoding"
 	"google.golang.org/grpc/reflection"
 
 	"github.com/jaegertracing/jaeger/cmd/query/app/querysvc"

plugin/storage/grpc/config/config.go

@@ -15,10 +15,15 @@
 package config
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"time"
 
+	"go.opentelemetry.io/collector/component"
+	"go.opentelemetry.io/collector/component/componenttest"
+	"go.opentelemetry.io/collector/config/configgrpc"
+	"go.opentelemetry.io/collector/exporter/exporterhelper"
 	"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
 	"go.opentelemetry.io/otel/trace"
 	"go.uber.org/zap"
@@ -41,6 +46,30 @@ type Configuration struct {
 	remoteConn *grpc.ClientConn
 }
 
+type ConfigV2 struct {
+	Configuration `mapstructure:",squash"`
+
+	configgrpc.ClientConfig        `mapstructure:",squash"`
+	exporterhelper.TimeoutSettings `mapstructure:",squash"`
+}
+
+func (c *ConfigV2) translateToConfigV2(v1 Configuration) *ConfigV2 {
+	c.Endpoint = v1.RemoteServerAddr
+	c.Timeout = v1.RemoteConnectTimeout
+
+	c.ClientConfig.TLSSetting.ServerName = v1.RemoteTLS.ServerName
+	c.ClientConfig.TLSSetting.InsecureSkipVerify = v1.RemoteTLS.SkipHostVerify
+	c.ClientConfig.TLSSetting.CAFile = v1.RemoteTLS.CAPath
+	c.ClientConfig.TLSSetting.CertFile = v1.RemoteTLS.CertPath
+	c.ClientConfig.TLSSetting.KeyFile = v1.RemoteTLS.KeyPath
+	c.ClientConfig.TLSSetting.CipherSuites = v1.RemoteTLS.CipherSuites
+	c.ClientConfig.TLSSetting.MinVersion = v1.RemoteTLS.MinVersion
+	c.ClientConfig.TLSSetting.MaxVersion = v1.RemoteTLS.MaxVersion
+	c.ClientConfig.TLSSetting.ReloadInterval = v1.RemoteTLS.ReloadInterval
+
+	return c
+}
+
 // ClientPluginServices defines services plugin can expose and its capabilities
 type ClientPluginServices struct {
 	shared.PluginServices
@@ -55,17 +84,21 @@ type PluginBuilder interface {
 }
 
 // Build instantiates a PluginServices
-func (c *Configuration) Build(logger *zap.Logger, tracerProvider trace.TracerProvider) (*ClientPluginServices, error) {
-	return c.buildRemote(logger, tracerProvider, grpc.NewClient)
+func (c *ConfigV2) Build(logger *zap.Logger, tracerProvider trace.TracerProvider) (*ClientPluginServices, error) {
+	return c.buildRemote(logger, tracerProvider)
 }
 
-type newClientFn func(target string, opts ...grpc.DialOption) (conn *grpc.ClientConn, err error)
-
-func (c *Configuration) buildRemote(logger *zap.Logger, tracerProvider trace.TracerProvider, newClient newClientFn) (*ClientPluginServices, error) {
+func (c *ConfigV2) buildRemote(logger *zap.Logger, tracerProvider trace.TracerProvider) (*ClientPluginServices, error) {
+	c = c.translateToConfigV2(c.Configuration)
 	opts := []grpc.DialOption{
 		grpc.WithStatsHandler(otelgrpc.NewClientHandler(otelgrpc.WithTracerProvider(tracerProvider))),
 		grpc.WithBlock(),
 	}
+
+	if c.Auth != nil {
+		return nil, fmt.Errorf("authenticator is not supported")
+	}
+
 	if c.RemoteTLS.Enabled {
 		tlsCfg, err := c.RemoteTLS.Config(logger)
 		if err != nil {
@@ -83,7 +116,7 @@ func (c *Configuration) buildRemote(logger *zap.Logger, tracerProvider trace.Tra
 		opts = append(opts, grpc.WithStreamInterceptor(tenancy.NewClientStreamInterceptor(tenancyMgr)))
 	}
 	var err error
-	c.remoteConn, err = newClient(c.RemoteServerAddr, opts...)
+	c.remoteConn, err = c.ToClientConn(context.Background(), componenttest.NewNopHost(), component.TelemetrySettings{}, opts...)
 	if err != nil {
 		return nil, fmt.Errorf("error creating remote storage client: %w", err)
 	}
@@ -99,7 +132,7 @@ func (c *Configuration) buildRemote(logger *zap.Logger, tracerProvider trace.Tra
 	}, nil
 }
 
-func (c *Configuration) Close() error {
+func (c *ConfigV2) Close() error {
 	var errs []error
 	if c.remoteConn != nil {
 		errs = append(errs, c.remoteConn.Close())

plugin/storage/grpc/config/config_test.go

@@ -4,20 +4,16 @@
 package config
 
 import (
-	"errors"
 	"testing"
 
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap"
-	"google.golang.org/grpc"
 )
 
 func TestBuildRemoteNewClientError(t *testing.T) {
 	// this is a silly test to verify handling of error from grpc.NewClient, which cannot be induced via params.
-	c := &Configuration{}
-	_, err := c.buildRemote(zap.NewNop(), nil, func(target string, opts ...grpc.DialOption) (conn *grpc.ClientConn, err error) {
-		return nil, errors.New("test error")
-	})
+	c := &ConfigV2{}
+	_, err := c.buildRemote(zap.NewNop(), nil)
 	require.Error(t, err)
 	require.Contains(t, err.Error(), "error creating remote storage client")
 }

plugin/storage/grpc/factory.go

@@ -62,7 +62,7 @@ func NewFactory() *Factory {
 
 // NewFactoryWithConfig is used from jaeger(v2).
 func NewFactoryWithConfig(
-	cfg config.Configuration,
+	cfg config.ConfigV2,
 	metricsFactory metrics.Factory,
 	logger *zap.Logger,
 ) (*Factory, error) {

plugin/storage/grpc/factory_test.go

@@ -148,6 +148,9 @@ func TestGRPCStorageFactory(t *testing.T) {
 }
 
 func TestGRPCStorageFactoryWithConfig(t *testing.T) {
+	cfg := grpcConfig.ConfigV2{}
+	_, err := NewFactoryWithConfig(cfg, metrics.NullFactory, zap.NewNop())
+	require.ErrorContains(t, err, "grpc-plugin builder failed to create a store: error connecting to remote storage")
 	lis, err := net.Listen("tcp", ":0")
 	require.NoError(t, err, "failed to listen")
 
@@ -159,9 +162,11 @@ func TestGRPCStorageFactoryWithConfig(t *testing.T) {
 	}()
 	defer s.Stop()
 
-	cfg := grpcConfig.Configuration{
-		RemoteServerAddr:     lis.Addr().String(),
-		RemoteConnectTimeout: 1 * time.Second,
+	cfg = grpcConfig.ConfigV2{
+		Configuration: grpcConfig.Configuration{
+			RemoteServerAddr:     lis.Addr().String(),
+			RemoteConnectTimeout: 1 * time.Second,
+		},
 	}
 	f, err := NewFactoryWithConfig(cfg, metrics.NullFactory, zap.NewNop())
 	require.NoError(t, err)
@@ -312,8 +317,10 @@ func TestWithConfiguration(t *testing.T) {
 func TestConfigureFromOptions(t *testing.T) {
 	f := Factory{}
 	o := Options{
-		Configuration: grpcConfig.Configuration{
-			RemoteServerAddr: "foo:1234",
+		Configuration: grpcConfig.ConfigV2{
+			Configuration: grpcConfig.Configuration{
+				RemoteServerAddr: "foo:1234",
+			},
 		},
 	}
 	f.configureFromOptions(o)

plugin/storage/grpc/options.go

@@ -36,7 +36,7 @@ const (
 // Options contains GRPC plugins configs and provides the ability
 // to bind them to command line flags
 type Options struct {
-	Configuration config.Configuration `mapstructure:",squash"`
+	Configuration config.ConfigV2 `mapstructure:",squash"`
 }
 
 func tlsFlagsConfig() tlscfg.ClientFlagsConfig {