unistack-org/micro-client-grpc
4
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases 40 Wiki Activity

improve metadata handling
All checks were successful
coverage / build (push) Successful in 1m45s
Details
test / test (push) Successful in 3m56s
Details
sync / sync (push) Successful in 21s
Details

Browse Source 
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов
2025-05-13 09:22:12 +03:00
parent 0706a76f3c
commit 52bbed93c4
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
grpc.go
View File

@@ -74,12 +74,12 @@ func (g *grpcClient) secure(addr string) grpc.DialOption {
} }
func (g *grpcClient) call(ctx context.Context, addr string, req client.Request, rsp interface{}, opts client.CallOptions) error { func (g *grpcClient) call(ctx context.Context, addr string, req client.Request, rsp interface{}, opts client.CallOptions) error {
var header map[string][]string var header gmetadata.MD
if md, ok := metadata.FromOutgoingContext(ctx); ok { if md, ok := metadata.FromOutgoingContext(ctx); ok {
header = metadata.Copy(md).AsHTTP2() header = metadata.Copy(md).AsHTTP2()
} else { } else {
header = make(map[string][]string, 2) header = make(gmetadata.MD, 4)
} }
if opts.RequestMetadata != nil { if opts.RequestMetadata != nil {
for k, v := range opts.RequestMetadata { for k, v := range opts.RequestMetadata {
@@ -87,9 +87,11 @@ func (g *grpcClient) call(ctx context.Context, addr string, req client.Request,
} }
} }
// set timeout in nanoseconds // set timeout in nanoseconds
header["grpc-timeout"] = append(header["grpc-timeout"], fmt.Sprintf("%dn", opts.RequestTimeout)) if opts.RequestTimeout > time.Duration(0) {
header["timeout"] = append(header["timeout"], fmt.Sprintf("%dn", opts.RequestTimeout)) header.Set("grpc-timeout", fmt.Sprintf("%dn", opts.RequestTimeout))
header["content-type"] = append(header["content-type"], req.ContentType()) header.Set("timeout", fmt.Sprintf("%dn", opts.RequestTimeout))
}
header.Set("content-type", req.ContentType())
ctx = gmetadata.NewOutgoingContext(ctx, header) ctx = gmetadata.NewOutgoingContext(ctx, header)
@@ -185,21 +187,19 @@ func (g *grpcClient) call(ctx context.Context, addr string, req client.Request,
} }
func (g *grpcClient) stream(ctx context.Context, addr string, req client.Request, rsp interface{}, opts client.CallOptions) error { func (g *grpcClient) stream(ctx context.Context, addr string, req client.Request, rsp interface{}, opts client.CallOptions) error {
var header map[string][]string var header gmetadata.MD
if md, ok := metadata.FromOutgoingContext(ctx); ok { if md, ok := metadata.FromOutgoingContext(ctx); ok {
header = metadata.Copy(md).AsHTTP2() header = metadata.Copy(md).AsHTTP2()
} else { } else {
header = make(map[string][]string) header = make(gmetadata.MD, 4)
} }
// set timeout in nanoseconds if opts.RequestTimeout > time.Duration(0) {
if opts.StreamTimeout > time.Duration(0) { header.Set("grpc-timeout", fmt.Sprintf("%dn", opts.RequestTimeout))
header["grpc-timeout"] = append(header["grpc-timeout"], fmt.Sprintf("%dn", opts.RequestTimeout)) header.Set("timeout", fmt.Sprintf("%dn", opts.RequestTimeout))
header["timeout"] = append(header["timeout"], fmt.Sprintf("%dn", opts.RequestTimeout))
} }
// set the content type for the request header.Set("content-type", req.ContentType())
header["content-type"] = append(header["content-type"], req.ContentType())
ctx = gmetadata.NewOutgoingContext(ctx, header) ctx = gmetadata.NewOutgoingContext(ctx, header)