chore: optimize the code (#43)

chenquan · Jul 1, 2023 · d58801d · d58801d
1 parent d3d8648
commit d58801d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/rest/internal/handler/tag_handler.go b/rest/internal/handler/tag_handler.go
@@ -23,15 +23,15 @@ func TagHandler(tagHeader string) func(next http.Handler) http.Handler {
 }
 
 func newBaggage(ctx context.Context, request *http.Request, tagHeader string) context.Context {
-	span := trace.SpanFromContext(ctx)
 	tagString := request.Header.Get(tagHeader)
 	if len(tagString) == 0 {
 		return ctx
 	}
+	ctx = tag.ContextWithTag(ctx, tagString)
 
 	logx.WithContext(ctx).Debugw("flow staining...", logx.Field(tag.Key, tagString))
 
-	ctx = tag.ContextWithTag(ctx, tagString)
+	span := trace.SpanFromContext(ctx)
 	span.SetAttributes(httpTagAttributeKey.String(tagString))
 
 	return ctx

diff --git a/zrpc/rpc.go b/zrpc/rpc.go
@@ -30,8 +30,8 @@ func init() {
 
 func MustNewClient(c RpcClientConf, options ...ClientOption) Client {
 	svcCfg := fmt.Sprintf(`{"loadBalancingPolicy":"%s"}`, p2c.Name)
-	options = append(options,
-		zrpc.WithDialOption(grpc.WithDefaultServiceConfig(svcCfg)),
+	options = append([]ClientOption{zrpc.WithDialOption(grpc.WithDefaultServiceConfig(svcCfg))},
+		options...,
 	)
 	return zrpc.MustNewClient(c.RpcClientConf, options...)
 }