From a9a535ca85c7505d99eab0bbea262f035314b661 Mon Sep 17 00:00:00 2001 From: Milan Pavlik Date: Fri, 23 Sep 2022 08:28:17 +0000 Subject: [PATCH] Revert "[usage] Use DefaultClientOptions when creating grpc client connection" This reverts commit 0f5d689ce5af15e87f2c16a82f644c66b531cbd4. --- components/usage/pkg/server/server.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/components/usage/pkg/server/server.go b/components/usage/pkg/server/server.go index ac991343593f6c..f295b9c0c547ed 100644 --- a/components/usage/pkg/server/server.go +++ b/components/usage/pkg/server/server.go @@ -6,7 +6,6 @@ package server import ( "fmt" - gitpod_grpc "github.com/gitpod-io/gitpod/common-go/grpc" "net" "os" "time" @@ -71,11 +70,15 @@ func Start(cfg Config, version string) error { if err != nil { return fmt.Errorf("failed to register grpc client metrics: %w", err) } - selfConnection, err := grpc.Dial(srv.GRPCAddress(), append( - gitpod_grpc.DefaultClientOptions(), + selfConnection, err := grpc.Dial(srv.GRPCAddress(), grpc.WithTransportCredentials(insecure.NewCredentials()), - grpcDialerWithInitialDelay(1*time.Second))..., - ) + grpcDialerWithInitialDelay(1*time.Second), + grpc.WithUnaryInterceptor(grpcClientMetrics.UnaryClientInterceptor()), + grpc.WithStreamInterceptor(grpcClientMetrics.StreamClientInterceptor()), + grpc.WithDefaultCallOptions( + grpc.MaxCallRecvMsgSize(100*1024*1024), + grpc.MaxCallSendMsgSize(100*1024*1024), + )) if err != nil { return fmt.Errorf("failed to create self-connection to grpc server: %w", err) }