Skip to content
This repository has been archived by the owner on Jul 31, 2023. It is now read-only.

Commit

Permalink
Don't use deprecated grpc.Code and grpc.ErrorDesc (#551)
Browse files Browse the repository at this point in the history
  • Loading branch information
rakyll authored Mar 9, 2018
1 parent 0499798 commit 4fa1543
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions plugin/ocgrpc/trace_common.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,14 @@ package ocgrpc
import (
"strings"

"google.golang.org/grpc/codes"

"go.opencensus.io/trace"
"go.opencensus.io/trace/propagation"
"golang.org/x/net/context"
"google.golang.org/grpc"
"google.golang.org/grpc/metadata"
"google.golang.org/grpc/stats"
"google.golang.org/grpc/status"
)

const traceContextKey = "grpc-trace-bin"
Expand Down Expand Up @@ -84,8 +86,12 @@ func handleRPC(ctx context.Context, rs stats.RPCStats) {
span.AddMessageSendEvent(0, int64(rs.Length), int64(rs.WireLength))
case *stats.End:
if rs.Error != nil {
code, desc := grpc.Code(rs.Error), grpc.ErrorDesc(rs.Error)
span.SetStatus(trace.Status{Code: int32(code), Message: desc})
s, ok := status.FromError(rs.Error)
if ok {
span.SetStatus(trace.Status{Code: int32(s.Code()), Message: s.Message()})
} else {
span.SetStatus(trace.Status{Code: int32(codes.Internal), Message: rs.Error.Error()})
}
}
span.End()
}
Expand Down

0 comments on commit 4fa1543

Please sign in to comment.