From 3015d54c173abc5746cdf78f440b643c64a636f8 Mon Sep 17 00:00:00 2001 From: AndrewZuo01 Date: Tue, 16 Jan 2024 10:09:47 +0800 Subject: [PATCH] fix: operation id invalid --- pkg/common/discoveryregister/direct/directconn.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/common/discoveryregister/direct/directconn.go b/pkg/common/discoveryregister/direct/directconn.go index 3a455b2e9..c045764fb 100644 --- a/pkg/common/discoveryregister/direct/directconn.go +++ b/pkg/common/discoveryregister/direct/directconn.go @@ -95,7 +95,7 @@ func (cm *ConnManager) GetConn(ctx context.Context, serviceName string, opts ... return nil, errs.Wrap(errors.New("unknown service name"), "serviceName", serviceName) } - conn, err := dialService(address, append(cm.additionalOpts, opts...)...) + conn, err := dialService(ctx, address, append(cm.additionalOpts, opts...)...) if err != nil { return nil, err } @@ -117,9 +117,9 @@ func (cm *ConnManager) CloseConn(conn *grpc.ClientConn) { } } -func dialService(address string, opts ...grpc.DialOption) (*grpc.ClientConn, error) { +func dialService(ctx context.Context, address string, opts ...grpc.DialOption) (*grpc.ClientConn, error) { options := append(opts, grpc.WithInsecure()) // Replace WithInsecure with proper security options - conn, err := grpc.DialContext(context.Background(), address, options...) + conn, err := grpc.DialContext(ctx, address, options...) if err != nil { return nil, err }