chore: wire up otel tracing in client

Signed-off-by: Mark Phelps <[email protected]>

cmd/flipt/main.go

@@ -30,8 +30,6 @@ import (
 	"go.uber.org/zap/zapcore"
 	"golang.org/x/sync/errgroup"
 	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials"
-	"google.golang.org/grpc/credentials/insecure"
 )
 
 var (
@@ -364,8 +362,12 @@ func run(ctx context.Context, logger *zap.Logger, cfg *config.Config) error {
 	// starts grpc server
 	g.Go(grpcServer.Run)
 
-	ipch := &inprocgrpc.Channel{}
-	handlers.ForEach(ipch.RegisterService)
+	var ipch grpc.ClientConnInterface = &inprocgrpc.Channel{}
+	handlers.ForEach(ipch.(*inprocgrpc.Channel).RegisterService)
+
+	if cfg.Tracing.Enabled {
+		ipch = grpchan.InterceptClientConn(ipch, otelgrpc.UnaryClientInterceptor(), nil)
+	}
 
 	httpServer, err := cmd.NewHTTPServer(ctx, logger, cfg, ipch, info)
 	if err != nil {
@@ -419,28 +421,3 @@ func initMetaStateDir(cfg *config.Config) error {
 
 	return ensureDir(cfg.Meta.StateDirectory)
 }
-
-// clientConn constructs and configures a client connection to the underlying gRPC server.
-func clientConn(ctx context.Context, cfg *config.Config) (*grpc.ClientConn, error) {
-	opts := []grpc.DialOption{grpc.WithBlock()}
-	if cfg.Tracing.Enabled {
-		opts = append(opts, grpc.WithStatsHandler(otelgrpc.NewClientHandler()))
-	}
-	switch cfg.Server.Protocol {
-	case config.HTTPS:
-		creds, err := credentials.NewClientTLSFromFile(cfg.Server.CertFile, "")
-		if err != nil {
-			return nil, fmt.Errorf("loading TLS credentials: %w", err)
-		}
-
-		opts = append(opts, grpc.WithTransportCredentials(creds))
-	case config.HTTP:
-		opts = append(opts, grpc.WithTransportCredentials(insecure.NewCredentials()))
-	}
-
-	dialCtx, dialCancel := context.WithTimeout(ctx, 5*time.Second)
-	defer dialCancel()
-
-	return grpc.DialContext(dialCtx,
-		fmt.Sprintf("%s:%d", cfg.Server.Host, cfg.Server.GRPCPort), opts...)
-}

internal/cmd/grpc.go

@@ -83,10 +83,9 @@ import (
 type GRPCServer struct {
 	*grpc.Server
 
-	logger    *zap.Logger
-	cfg       *config.Config
-	ln        net.Listener
-	registrar grpc.ServiceRegistrar
+	logger *zap.Logger
+	cfg    *config.Config
+	ln     net.Listener
 
 	shutdownFuncs []func(context.Context) error
 }