update with recent changes

Signed-off-by: Roman Dmytrenko <[email protected]>

Author: erka

.mockery.yml

@@ -44,9 +44,3 @@ packages:
     interfaces:
       Provider: {}
       Manager: {}
-  google.golang.org/grpc/stats:
-    interfaces:
-      Handler: {}
-    config:
-      pkgname: otel
-      dir: "./internal/otel/"

cmd/flipt/main.go

@@ -456,7 +456,6 @@ func run(ctx context.Context, logger *zap.Logger, cfg *config.Config) error {
 
 	// in-process client connection for grpc services
 	ipch := &inprocgrpc.Channel{}
-	ipch = ipch.WithStatsHandler(otel.NewInprocStatsHandler())
 
 	var grpcOptions []cmd.GRPCServerOption
 	if forceMigrate {

go.mod

@@ -548,7 +548,7 @@ replace (
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible => github.com/golang-jwt/jwt/v4 v4.2.0
 	// replace with fork while changes are in review
 	// https://github.com/fullstorydev/grpchan/pull/83
-	github.com/fullstorydev/grpchan => github.com/erka/grpchan v0.0.0-20251014172820-9b4242e94974
+	github.com/fullstorydev/grpchan => github.com/erka/grpchan v0.0.0-20251017173942-dbe3de95ae29
 )
 
 replace (

go.sum

@@ -413,8 +413,8 @@ github.com/envoyproxy/protoc-gen-validate v1.2.1 h1:DEo3O99U8j4hBFwbJfrz9VtgcDfU
 github.com/envoyproxy/protoc-gen-validate v1.2.1/go.mod h1:d/C80l/jxXLdfEIhX1W2TmLfsJ31lvEjwamM4DxlWXU=
 github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=
 github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM=
-github.com/erka/grpchan v0.0.0-20251014172820-9b4242e94974 h1:wSej1/pZPNE+PvnC3HAmoVsok7eHxYDRSaqGnEZhejs=
-github.com/erka/grpchan v0.0.0-20251014172820-9b4242e94974/go.mod h1:GrXuhvxw+EM9Z1c7pHQY7SOWn8cv1+SamuCsdNH0j9A=
+github.com/erka/grpchan v0.0.0-20251017173942-dbe3de95ae29 h1:CiPErPD3JCJDs1rVj307bWDnZoraUG8LbgnUMj5uM6s=
+github.com/erka/grpchan v0.0.0-20251017173942-dbe3de95ae29/go.mod h1:GrXuhvxw+EM9Z1c7pHQY7SOWn8cv1+SamuCsdNH0j9A=
 github.com/ettle/strcase v0.2.0 h1:fGNiVF21fHXpX1niBgk0aROov1LagYsOwV/xqKDKR/Q=
 github.com/ettle/strcase v0.2.0/go.mod h1:DajmHElDSaX76ITe3/VHVyMin4LWSJN5Z909Wp+ED1A=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=

internal/cmd/grpc.go

@@ -7,6 +7,7 @@ import (
 	"runtime/debug"
 	"sync"
 
+	"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
 	otlpruntime "go.opentelemetry.io/contrib/instrumentation/runtime"
 
 	"go.opentelemetry.io/contrib/propagators/autoprop"
@@ -114,6 +115,10 @@ func NewGRPCServer(
 		opt(options)
 	}
 
+	if cfg.Tracing.Enabled {
+		ipch = ipch.WithServerStatsHandler(otelgrpc.NewServerHandler())
+	}
+
 	logger = logger.With(zap.String("server", "grpc"))
 	server := &GRPCServer{
 		logger: logger,