refactor(http.go): remove grpc.SetHeader and use metadata.AppendToOut…

…goingContext instead to improve code readability refactor(grpc.go): remove commented out code and use metadata.AppendToOutgoingContext instead of grpc.SetHeader to improve code readability feat(grpc.go): add logging of traceparent metadata to aid in debugging
shumkovdenis · May 13, 2023 · bcbbc30 · bcbbc30
1 parent ad7061b
commit bcbbc30
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/services/gateway/http.go b/services/gateway/http.go
@@ -115,7 +115,7 @@ func (s *HTTPServer) GRPC(c *fiber.Ctx) error {
 	client := pb.NewGreeterClient(conn)
 
 	ctx := metadata.AppendToOutgoingContext(c.UserContext(), "dapr-app-id", "integration-grpc")
-	grpc.SetHeader(ctx, metadata.Pairs("traceparent", helpers.ExtractTraceHeader(c.UserContext(), "traceparent")))
+	ctx = metadata.AppendToOutgoingContext(ctx, "traceparent", helpers.ExtractTraceHeader(c.UserContext(), "traceparent"))
 
 	out, err := client.SayHello(ctx, &pb.HelloRequest{Name: "gateway"})
 	if err != nil {

diff --git a/services/integration/grpc.go b/services/integration/grpc.go
@@ -48,16 +48,18 @@ func (s *GRPCServer) SayHello(ctx context.Context, in *pb.HelloRequest) (*pb.Hel
 
 	md, _ := metadata.FromIncomingContext(ctx)
 
+	traceParent := md["traceparent"][0]
 	grpcTraceBin := md["grpc-trace-bin"][0]
+	log.Println("metadata traceParent:", traceParent)
 	log.Println("metadata grpc-trace-bin:", grpcTraceBin)
 
-	ctx = metadata.AppendToOutgoingContext(ctx, "dapr-app-id", "remote")
-
 	sc, ok := helpers.SpanContextFromBinary([]byte(grpcTraceBin))
 	log.Println("sc:", sc.TraceID(), sc.SpanID(), "ok:", ok)
-	// ctx = metadata.AppendToOutgoingContext(ctx, "grpc-trace-bin", string(md["grpc-trace-bin"][0]))
 
-	grpc.SetHeader(ctx, metadata.Pairs("grpc-trace-bin", grpcTraceBin))
+	ctx = metadata.AppendToOutgoingContext(ctx, "dapr-app-id", "remote")
+	ctx = metadata.AppendToOutgoingContext(ctx, "grpc-trace-bin", grpcTraceBin)
+
+	// grpc.SetHeader(ctx, metadata.Pairs("grpc-trace-bin", grpcTraceBin))
 
 	req := &pb.HelloRequest{Name: in.GetName()}
 	out, err := client.SayHello(ctx, req)

diff --git a/services/remote/grpc.go b/services/remote/grpc.go
@@ -33,7 +33,9 @@ func NewGRPCServer(cfg Config) error {
 func (s *GRPCServer) SayHello(ctx context.Context, in *pb.HelloRequest) (*pb.HelloReply, error) {
 	md, _ := metadata.FromIncomingContext(ctx)
 
+	traceParent := md["traceparent"][0]
 	grpcTraceBin := md["grpc-trace-bin"][0]
+	log.Println("metadata traceParent:", traceParent)
 	log.Println("metadata grpc-trace-bin:", grpcTraceBin)
 
 	return &pb.HelloReply{Message: "grpc remote"}, nil