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

[backport v9] Change client dialOpts append order (#11322) #11624

Merged
merged 3 commits into from
Apr 4, 2022
+3 −1
Merged

[backport v9] Change client dialOpts append order (#11322) #11624

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
caef0a8
Change client dialOpts append order (#11322)
rcanderson23 Mar 24, 2022
be1a400
Merge branch 'branch/v9' into carson/v9/backport-dial-opts
rcanderson23 Apr 1, 2022
8397720
Merge branch 'branch/v9' into carson/v9/backport-dial-opts
rcanderson23 Apr 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion api/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ func (c *Client) dialGRPC(ctx context.Context, addr string) error {
dialContext, cancel := context.WithTimeout(ctx, c.c.DialTimeout)
defer cancel()

dialOpts := append([]grpc.DialOption{}, c.c.DialOpts...)
var dialOpts []grpc.DialOption
dialOpts = append(dialOpts, grpc.WithContextDialer(c.grpcDialer()))
dialOpts = append(dialOpts,
grpc.WithUnaryInterceptor(metadata.UnaryClientInterceptor),
Expand All @@ -368,6 +368,8 @@ func (c *Client) dialGRPC(ctx context.Context, addr string) error {
if c.tlsConfig != nil {
dialOpts = append(dialOpts, grpc.WithTransportCredentials(credentials.NewTLS(c.tlsConfig)))
}
// must come last, otherwise provided opts may get clobbered by defaults above
dialOpts = append(dialOpts, c.c.DialOpts...)

var err error
if c.conn, err = grpc.DialContext(dialContext, addr, dialOpts...); err != nil {
Expand Down