diff --git a/transport/http2_client_transport.go b/transport/http2_client_transport.go index a5232b50..f2147509 100644 --- a/transport/http2_client_transport.go +++ b/transport/http2_client_transport.go @@ -117,7 +117,7 @@ func newHTTP2Client(addr string, authOpts []credentials.Credentials) (_ ClientTr conn, connErr = net.Dial("tcp", addr) } if connErr != nil { - return nil, ConnectionErrorf("grpc/transport: %v", connErr) + return nil, ConnectionErrorf("transport: %v", connErr) } defer func() { if err != nil { @@ -127,14 +127,14 @@ func newHTTP2Client(addr string, authOpts []credentials.Credentials) (_ ClientTr // Send connection preface to server. n, err := conn.Write(clientPreface) if err != nil { - return nil, ConnectionErrorf("grpc/transport: %v", err) + return nil, ConnectionErrorf("transport: %v", err) } if n != len(clientPreface) { - return nil, ConnectionErrorf("grpc/transport: preface mismatch, wrote %d bytes; want %d", n, len(clientPreface)) + return nil, ConnectionErrorf("transport: preface mismatch, wrote %d bytes; want %d", n, len(clientPreface)) } framer := http2.NewFramer(conn, conn) if err := framer.WriteSettings(); err != nil { - return nil, ConnectionErrorf("grpc/transport: %v", err) + return nil, ConnectionErrorf("transport: %v", err) } var buf bytes.Buffer t := &http2Client{ @@ -225,7 +225,7 @@ func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Strea default: } if err != nil { - return nil, StreamErrorf(codes.InvalidArgument, "grpc/transport: %v", err) + return nil, StreamErrorf(codes.InvalidArgument, "transport: %v", err) } for k, v := range m { t.hEnc.WriteField(hpack.HeaderField{Name: k, Value: v}) @@ -265,7 +265,7 @@ func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Strea } if err != nil { t.notifyError() - return nil, ConnectionErrorf("grpc/transport: %v", err) + return nil, ConnectionErrorf("transport: %v", err) } } s := t.newStream(ctx, callHdr) @@ -276,7 +276,7 @@ func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Strea } if uint32(len(t.activeStreams)) >= t.maxStreams { t.mu.Unlock() - return nil, StreamErrorf(codes.Unavailable, "grpc/transport: failed to create new stream because the limit has been reached.") + return nil, StreamErrorf(codes.Unavailable, "transport: failed to create new stream because the limit has been reached.") } t.activeStreams[s.id] = s t.mu.Unlock() @@ -391,7 +391,7 @@ func (t *http2Client) Write(s *Stream, data []byte, opts *Options) error { // invoked. if err := t.framer.WriteData(s.id, endStream, p); err != nil { t.notifyError() - return ConnectionErrorf("grpc/transport: %v", err) + return ConnectionErrorf("transport: %v", err) } t.writableChan <- 0 if r.Len() == 0 { diff --git a/transport/http2_server_transport.go b/transport/http2_server_transport.go index 39cd0a62..633e3f51 100644 --- a/transport/http2_server_transport.go +++ b/transport/http2_server_transport.go @@ -52,7 +52,7 @@ import ( // ErrIllegalHeaderWrite indicates that setting header is illegal because of // the stream's state. -var ErrIllegalHeaderWrite = errors.New("grpc/transport: the stream is done or WriteHeader was already called") +var ErrIllegalHeaderWrite = errors.New("transport: the stream is done or WriteHeader was already called") // http2Server implements the ServerTransport interface with HTTP2. type http2Server struct { @@ -387,7 +387,7 @@ func (t *http2Server) writeHeaders(s *Stream, b *bytes.Buffer, endStream bool) e } if err != nil { t.Close() - return ConnectionErrorf("grpc/transport: %v", err) + return ConnectionErrorf("transport: %v", err) } } return nil @@ -478,7 +478,7 @@ func (t *http2Server) Write(s *Stream, data []byte, opts *Options) error { } if err := t.framer.WriteHeaders(p); err != nil { t.Close() - return ConnectionErrorf("grpc/transport: %v", err) + return ConnectionErrorf("transport: %v", err) } t.writableChan <- 0 } @@ -526,7 +526,7 @@ func (t *http2Server) Write(s *Stream, data []byte, opts *Options) error { } if err := t.framer.WriteData(s.id, false, p); err != nil { t.Close() - return ConnectionErrorf("grpc/transport: %v", err) + return ConnectionErrorf("transport: %v", err) } t.writableChan <- 0 } diff --git a/transport/http_util.go b/transport/http_util.go index 40125506..30fbd076 100644 --- a/transport/http_util.go +++ b/transport/http_util.go @@ -137,7 +137,7 @@ func newHPACKDecoder() *hpackDecoder { case "grpc-status": code, err := strconv.Atoi(f.Value) if err != nil { - d.err = StreamErrorf(codes.Internal, "grpc/transport: malformed grpc-status: %v", err) + d.err = StreamErrorf(codes.Internal, "transport: malformed grpc-status: %v", err) return } d.state.statusCode = codes.Code(code) @@ -148,7 +148,7 @@ func newHPACKDecoder() *hpackDecoder { var err error d.state.timeout, err = timeoutDecode(f.Value) if err != nil { - d.err = StreamErrorf(codes.Internal, "grpc/transport: malformed time-out: %v", err) + d.err = StreamErrorf(codes.Internal, "transport: malformed time-out: %v", err) return } case ":path": @@ -174,12 +174,12 @@ func (d *hpackDecoder) decodeClientHTTP2Headers(s *Stream, frame headerFrame) (e d.err = nil _, err = d.h.Write(frame.HeaderBlockFragment()) if err != nil { - err = StreamErrorf(codes.Internal, "grpc/transport: HPACK header decode error: %v", err) + err = StreamErrorf(codes.Internal, "transport: HPACK header decode error: %v", err) } if frame.HeadersEnded() { if closeErr := d.h.Close(); closeErr != nil && err == nil { - err = StreamErrorf(codes.Internal, "grpc/transport: HPACK decoder close error: %v", closeErr) + err = StreamErrorf(codes.Internal, "transport: HPACK decoder close error: %v", closeErr) } endHeaders = true } @@ -194,12 +194,12 @@ func (d *hpackDecoder) decodeServerHTTP2Headers(s *Stream, frame headerFrame) (e d.err = nil _, err = d.h.Write(frame.HeaderBlockFragment()) if err != nil { - err = StreamErrorf(codes.Internal, "grpc/transport: HPACK header decode error: %v", err) + err = StreamErrorf(codes.Internal, "transport: HPACK header decode error: %v", err) } if frame.HeadersEnded() { if closeErr := d.h.Close(); closeErr != nil && err == nil { - err = StreamErrorf(codes.Internal, "grpc/transport: HPACK decoder close error: %v", closeErr) + err = StreamErrorf(codes.Internal, "transport: HPACK decoder close error: %v", closeErr) } endHeaders = true } @@ -275,12 +275,12 @@ func timeoutEncode(t time.Duration) string { func timeoutDecode(s string) (time.Duration, error) { size := len(s) if size < 2 { - return 0, fmt.Errorf("grpc/transport: timeout string is too short: %q", s) + return 0, fmt.Errorf("transport: timeout string is too short: %q", s) } unit := timeoutUnit(s[size-1]) d, ok := timeoutUnitToDuration(unit) if !ok { - return 0, fmt.Errorf("grpc/transport: timeout unit is not recognized: %q", s) + return 0, fmt.Errorf("transport: timeout unit is not recognized: %q", s) } t, err := strconv.ParseInt(s[:size-1], 10, 64) if err != nil { diff --git a/transport/http_util_test.go b/transport/http_util_test.go index b4b66295..b5b18bf4 100644 --- a/transport/http_util_test.go +++ b/transport/http_util_test.go @@ -75,9 +75,9 @@ func TestTimeoutDecode(t *testing.T) { err error }{ {"1234S", time.Second * 1234, nil}, - {"1234x", 0, fmt.Errorf("grpc/transport: timeout unit is not recognized: %q", "1234x")}, - {"1", 0, fmt.Errorf("grpc/transport: timeout string is too short: %q", "1")}, - {"", 0, fmt.Errorf("grpc/transport: timeout string is too short: %q", "")}, + {"1234x", 0, fmt.Errorf("transport: timeout unit is not recognized: %q", "1234x")}, + {"1", 0, fmt.Errorf("transport: timeout string is too short: %q", "1")}, + {"", 0, fmt.Errorf("transport: timeout string is too short: %q", "")}, } { d, err := timeoutDecode(test.s) if d != test.d || fmt.Sprint(err) != fmt.Sprint(test.err) { diff --git a/transport/transport.go b/transport/transport.go index 5598a590..2cd211e6 100644 --- a/transport/transport.go +++ b/transport/transport.go @@ -247,7 +247,7 @@ func (s *Stream) StatusDesc() string { // ErrIllegalTrailerSet indicates that the trailer has already been set or it // is too late to do so. -var ErrIllegalTrailerSet = errors.New("grpc/transport: trailer has been set") +var ErrIllegalTrailerSet = errors.New("transport: trailer has been set") // SetTrailer sets the trailer metadata which will be sent with the RPC status // by the server. This can only be called at most once. Server side only.