[VOL-4291] Rw-core updates for gRPC migration
Change-Id: I8d5a554409115b29318089671ca4e1ab3fa98810
diff --git a/vendor/github.com/uber/jaeger-client-go/thrift/application_exception.go b/vendor/github.com/uber/jaeger-client-go/thrift/application_exception.go
index 6655cc5..32d5b01 100644
--- a/vendor/github.com/uber/jaeger-client-go/thrift/application_exception.go
+++ b/vendor/github.com/uber/jaeger-client-go/thrift/application_exception.go
@@ -19,6 +19,10 @@
package thrift
+import (
+ "context"
+)
+
const (
UNKNOWN_APPLICATION_EXCEPTION = 0
UNKNOWN_METHOD = 1
@@ -28,14 +32,31 @@
MISSING_RESULT = 5
INTERNAL_ERROR = 6
PROTOCOL_ERROR = 7
+ INVALID_TRANSFORM = 8
+ INVALID_PROTOCOL = 9
+ UNSUPPORTED_CLIENT_TYPE = 10
)
+var defaultApplicationExceptionMessage = map[int32]string{
+ UNKNOWN_APPLICATION_EXCEPTION: "unknown application exception",
+ UNKNOWN_METHOD: "unknown method",
+ INVALID_MESSAGE_TYPE_EXCEPTION: "invalid message type",
+ WRONG_METHOD_NAME: "wrong method name",
+ BAD_SEQUENCE_ID: "bad sequence ID",
+ MISSING_RESULT: "missing result",
+ INTERNAL_ERROR: "unknown internal error",
+ PROTOCOL_ERROR: "unknown protocol error",
+ INVALID_TRANSFORM: "Invalid transform",
+ INVALID_PROTOCOL: "Invalid protocol",
+ UNSUPPORTED_CLIENT_TYPE: "Unsupported client type",
+}
+
// Application level Thrift exception
type TApplicationException interface {
TException
TypeId() int32
- Read(iprot TProtocol) (TApplicationException, error)
- Write(oprot TProtocol) error
+ Read(ctx context.Context, iprot TProtocol) error
+ Write(ctx context.Context, oprot TProtocol) error
}
type tApplicationException struct {
@@ -43,8 +64,17 @@
type_ int32
}
+var _ TApplicationException = (*tApplicationException)(nil)
+
+func (tApplicationException) TExceptionType() TExceptionType {
+ return TExceptionTypeApplication
+}
+
func (e tApplicationException) Error() string {
- return e.message
+ if e.message != "" {
+ return e.message
+ }
+ return defaultApplicationExceptionMessage[e.type_]
}
func NewTApplicationException(type_ int32, message string) TApplicationException {
@@ -55,19 +85,20 @@
return p.type_
}
-func (p *tApplicationException) Read(iprot TProtocol) (TApplicationException, error) {
- _, err := iprot.ReadStructBegin()
+func (p *tApplicationException) Read(ctx context.Context, iprot TProtocol) error {
+ // TODO: this should really be generated by the compiler
+ _, err := iprot.ReadStructBegin(ctx)
if err != nil {
- return nil, err
+ return err
}
message := ""
type_ := int32(UNKNOWN_APPLICATION_EXCEPTION)
for {
- _, ttype, id, err := iprot.ReadFieldBegin()
+ _, ttype, id, err := iprot.ReadFieldBegin(ctx)
if err != nil {
- return nil, err
+ return err
}
if ttype == STOP {
break
@@ -75,68 +106,75 @@
switch id {
case 1:
if ttype == STRING {
- if message, err = iprot.ReadString(); err != nil {
- return nil, err
+ if message, err = iprot.ReadString(ctx); err != nil {
+ return err
}
} else {
- if err = SkipDefaultDepth(iprot, ttype); err != nil {
- return nil, err
+ if err = SkipDefaultDepth(ctx, iprot, ttype); err != nil {
+ return err
}
}
case 2:
if ttype == I32 {
- if type_, err = iprot.ReadI32(); err != nil {
- return nil, err
+ if type_, err = iprot.ReadI32(ctx); err != nil {
+ return err
}
} else {
- if err = SkipDefaultDepth(iprot, ttype); err != nil {
- return nil, err
+ if err = SkipDefaultDepth(ctx, iprot, ttype); err != nil {
+ return err
}
}
default:
- if err = SkipDefaultDepth(iprot, ttype); err != nil {
- return nil, err
+ if err = SkipDefaultDepth(ctx, iprot, ttype); err != nil {
+ return err
}
}
- if err = iprot.ReadFieldEnd(); err != nil {
- return nil, err
+ if err = iprot.ReadFieldEnd(ctx); err != nil {
+ return err
}
}
- return NewTApplicationException(type_, message), iprot.ReadStructEnd()
+ if err := iprot.ReadStructEnd(ctx); err != nil {
+ return err
+ }
+
+ p.message = message
+ p.type_ = type_
+
+ return nil
}
-func (p *tApplicationException) Write(oprot TProtocol) (err error) {
- err = oprot.WriteStructBegin("TApplicationException")
+func (p *tApplicationException) Write(ctx context.Context, oprot TProtocol) (err error) {
+ err = oprot.WriteStructBegin(ctx, "TApplicationException")
if len(p.Error()) > 0 {
- err = oprot.WriteFieldBegin("message", STRING, 1)
+ err = oprot.WriteFieldBegin(ctx, "message", STRING, 1)
if err != nil {
return
}
- err = oprot.WriteString(p.Error())
+ err = oprot.WriteString(ctx, p.Error())
if err != nil {
return
}
- err = oprot.WriteFieldEnd()
+ err = oprot.WriteFieldEnd(ctx)
if err != nil {
return
}
}
- err = oprot.WriteFieldBegin("type", I32, 2)
+ err = oprot.WriteFieldBegin(ctx, "type", I32, 2)
if err != nil {
return
}
- err = oprot.WriteI32(p.type_)
+ err = oprot.WriteI32(ctx, p.type_)
if err != nil {
return
}
- err = oprot.WriteFieldEnd()
+ err = oprot.WriteFieldEnd(ctx)
if err != nil {
return
}
- err = oprot.WriteFieldStop()
+ err = oprot.WriteFieldStop(ctx)
if err != nil {
return
}
- err = oprot.WriteStructEnd()
+ err = oprot.WriteStructEnd(ctx)
return
}