Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: add grpc opts in apiClient #17966

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: add grpc opts in apiClient #17966

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 12 additions & 2 deletions pkg/apiclient/apiclient.go
View file
Open in desktop
Expand Up @@ -128,6 +128,8 @@ type ClientOptions struct {
RedisHaProxyName string
RedisName string
RepoServerName string
GRPCDialOpts []grpc.DialOption
GRPCRetryOpts []grpc_retry.CallOption
}

type client struct {
Expand All @@ -141,6 +143,8 @@ type client struct {
UserAgent string
GRPCWeb bool
GRPCWebRootPath string
GRPCDialOpts []grpc.DialOption
GRPCRetryOpts []grpc_retry.CallOption
Headers []string

proxyMutex *sync.Mutex
Expand Down Expand Up @@ -310,7 +314,8 @@ func NewClient(opts *ClientOptions) (Client, error) {
}
}
c.Headers = opts.Headers

c.GRPCRetryOpts = opts.GRPCRetryOpts
c.GRPCDialOpts = opts.GRPCDialOpts
return &c, nil
}

Expand Down Expand Up @@ -517,14 +522,19 @@ func (c *client) newConn() (*grpc.ClientConn, io.Closer, error) {
grpc_retry.WithMax(3),
grpc_retry.WithBackoff(grpc_retry.BackoffLinear(1000 * time.Millisecond)),
}
if len(c.GRPCRetryOpts) > 0 {
retryOpts = append(retryOpts, c.GRPCRetryOpts...)
}
var dialOpts []grpc.DialOption
dialOpts = append(dialOpts, grpc.WithPerRPCCredentials(endpointCredentials))
dialOpts = append(dialOpts, grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(MaxGRPCMessageSize), grpc.MaxCallSendMsgSize(MaxGRPCMessageSize)))
dialOpts = append(dialOpts, grpc.WithStreamInterceptor(grpc_retry.StreamClientInterceptor(retryOpts...)))
dialOpts = append(dialOpts, grpc.WithUnaryInterceptor(grpc_middleware.ChainUnaryClient(grpc_retry.UnaryClientInterceptor(retryOpts...))))
dialOpts = append(dialOpts, grpc.WithUnaryInterceptor(grpc_util.OTELUnaryClientInterceptor()))
dialOpts = append(dialOpts, grpc.WithStreamInterceptor(grpc_util.OTELStreamClientInterceptor()))

if c.GRPCDialOpts != nil {
dialOpts = append(dialOpts, c.GRPCDialOpts...)
}
ctx := context.Background()

headers, err := parseHeaders(c.Headers)
Expand Down