refactor (#977)
This commit is contained in:
@@ -4,20 +4,20 @@ import (
|
||||
"context"
|
||||
|
||||
"github.com/tal-tech/go-zero/core/opentelemetry"
|
||||
|
||||
"go.opentelemetry.io/otel"
|
||||
"go.opentelemetry.io/otel/baggage"
|
||||
"go.opentelemetry.io/otel/codes"
|
||||
"go.opentelemetry.io/otel/trace"
|
||||
"google.golang.org/grpc"
|
||||
grpc_codes "google.golang.org/grpc/codes"
|
||||
gcodes "google.golang.org/grpc/codes"
|
||||
"google.golang.org/grpc/metadata"
|
||||
"google.golang.org/grpc/status"
|
||||
)
|
||||
|
||||
func UnaryOpenTracingInterceptor() grpc.UnaryServerInterceptor {
|
||||
propagator := otel.GetTextMapPropagator()
|
||||
return func(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (interface{}, error) {
|
||||
return func(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo,
|
||||
handler grpc.UnaryHandler) (interface{}, error) {
|
||||
if !opentelemetry.Enabled() {
|
||||
return handler(ctx, req)
|
||||
}
|
||||
@@ -41,20 +41,19 @@ func UnaryOpenTracingInterceptor() grpc.UnaryServerInterceptor {
|
||||
defer span.End()
|
||||
|
||||
opentelemetry.MessageReceived.Event(ctx, 1, req)
|
||||
|
||||
resp, err := handler(ctx, req)
|
||||
|
||||
if err != nil {
|
||||
s, _ := status.FromError(err)
|
||||
span.SetStatus(codes.Error, s.Message())
|
||||
span.SetAttributes(opentelemetry.StatusCodeAttr(s.Code()))
|
||||
opentelemetry.MessageSent.Event(ctx, 1, s.Proto())
|
||||
} else {
|
||||
span.SetAttributes(opentelemetry.StatusCodeAttr(grpc_codes.OK))
|
||||
opentelemetry.MessageSent.Event(ctx, 1, resp)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return resp, err
|
||||
span.SetAttributes(opentelemetry.StatusCodeAttr(gcodes.OK))
|
||||
opentelemetry.MessageSent.Event(ctx, 1, resp)
|
||||
|
||||
return resp, nil
|
||||
}
|
||||
}
|
||||
|
||||
@@ -89,7 +88,7 @@ func StreamOpenTracingInterceptor() grpc.StreamServerInterceptor {
|
||||
span.SetStatus(codes.Error, s.Message())
|
||||
span.SetAttributes(opentelemetry.StatusCodeAttr(s.Code()))
|
||||
} else {
|
||||
span.SetAttributes(opentelemetry.StatusCodeAttr(grpc_codes.OK))
|
||||
span.SetAttributes(opentelemetry.StatusCodeAttr(gcodes.OK))
|
||||
}
|
||||
|
||||
return err
|
||||
|
||||
Reference in New Issue
Block a user