diff --git a/comm.go b/comm.go index d38cce08..0b0474d3 100644 --- a/comm.go +++ b/comm.go @@ -63,6 +63,10 @@ func (p *PubSub) handleNewStream(s network.Stream) { r := msgio.NewVarintReaderSize(s, p.maxMessageSize) for { + // ignore the values. We only want to know when the first bytes came in. + _, _ = r.NextMsgLen() + // Start the time once we've received the message length + start := time.Now() msgbytes, err := r.ReadMsg() if err != nil { r.ReleaseMsg(msgbytes) @@ -84,6 +88,7 @@ func (p *PubSub) handleNewStream(s network.Stream) { rpc := new(RPC) err = rpc.Unmarshal(msgbytes) r.ReleaseMsg(msgbytes) + rpc.timeToReceive = time.Since(start) if err != nil { s.Reset() log.Warnf("bogus rpc from %s: %s", s.Conn().RemotePeer(), err) diff --git a/pb/trace.pb.go b/pb/trace.pb.go index 9361c393..1b97b866 100644 --- a/pb/trace.pb.go +++ b/pb/trace.pb.go @@ -5,11 +5,10 @@ package pubsub_pb import ( fmt "fmt" + proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" - - proto "github.com/gogo/protobuf/proto" ) // Reference imports to suppress errors if they are not otherwise used. @@ -987,12 +986,13 @@ func (m *TraceEvent_Prune) GetTopic() string { } type TraceEvent_RPCMeta struct { - Messages []*TraceEvent_MessageMeta `protobuf:"bytes,1,rep,name=messages" json:"messages,omitempty"` - Subscription []*TraceEvent_SubMeta `protobuf:"bytes,2,rep,name=subscription" json:"subscription,omitempty"` - Control *TraceEvent_ControlMeta `protobuf:"bytes,3,opt,name=control" json:"control,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Messages []*TraceEvent_MessageMeta `protobuf:"bytes,1,rep,name=messages" json:"messages,omitempty"` + Subscription []*TraceEvent_SubMeta `protobuf:"bytes,2,rep,name=subscription" json:"subscription,omitempty"` + Control *TraceEvent_ControlMeta `protobuf:"bytes,3,opt,name=control" json:"control,omitempty"` + MillisecondsToReceive *uint64 `protobuf:"varint,4,opt,name=millisecondsToReceive" json:"millisecondsToReceive,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *TraceEvent_RPCMeta) Reset() { *m = TraceEvent_RPCMeta{} } @@ -1049,9 +1049,17 @@ func (m *TraceEvent_RPCMeta) GetControl() *TraceEvent_ControlMeta { return nil } +func (m *TraceEvent_RPCMeta) GetMillisecondsToReceive() uint64 { + if m != nil && m.MillisecondsToReceive != nil { + return *m.MillisecondsToReceive + } + return 0 +} + type TraceEvent_MessageMeta struct { MessageID []byte `protobuf:"bytes,1,opt,name=messageID" json:"messageID,omitempty"` Topic *string `protobuf:"bytes,2,opt,name=topic" json:"topic,omitempty"` + MessageSize *uint64 `protobuf:"varint,3,opt,name=messageSize" json:"messageSize,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1104,6 +1112,13 @@ func (m *TraceEvent_MessageMeta) GetTopic() string { return "" } +func (m *TraceEvent_MessageMeta) GetMessageSize() uint64 { + if m != nil && m.MessageSize != nil { + return *m.MessageSize + } + return 0 +} + type TraceEvent_SubMeta struct { Subscribe *bool `protobuf:"varint,1,opt,name=subscribe" json:"subscribe,omitempty"` Topic *string `protobuf:"bytes,2,opt,name=topic" json:"topic,omitempty"` @@ -1567,72 +1582,74 @@ func init() { func init() { proto.RegisterFile("trace.proto", fileDescriptor_0571941a1d628a80) } var fileDescriptor_0571941a1d628a80 = []byte{ - // 1027 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x96, 0xdf, 0x6e, 0xe2, 0x46, - 0x14, 0xc6, 0xeb, 0x80, 0x03, 0x1c, 0x08, 0x71, 0xa7, 0xd9, 0xd6, 0x72, 0x77, 0x23, 0x9a, 0xae, - 0x56, 0xa8, 0x95, 0x90, 0x36, 0x52, 0xbb, 0x17, 0xdd, 0x5d, 0x95, 0x60, 0x6f, 0x42, 0x44, 0x12, - 0x6b, 0x20, 0xe9, 0x65, 0x6a, 0x60, 0xba, 0x71, 0x04, 0xb6, 0x65, 0x0f, 0x54, 0x7b, 0xd5, 0xd7, - 0xdb, 0xbb, 0xed, 0x23, 0x54, 0x79, 0x92, 0x6a, 0x66, 0xfc, 0x07, 0x83, 0xed, 0xec, 0x46, 0xb9, - 0xf3, 0x19, 0xbe, 0xdf, 0x99, 0x33, 0x67, 0xce, 0x37, 0x02, 0xea, 0xd4, 0xb7, 0x26, 0xa4, 0xe3, - 0xf9, 0x2e, 0x75, 0x51, 0xcd, 0x5b, 0x8c, 0x83, 0xc5, 0xb8, 0xe3, 0x8d, 0x0f, 0xee, 0xbe, 0x03, - 0x18, 0xb1, 0x9f, 0x8c, 0x25, 0x71, 0x28, 0xea, 0x40, 0x99, 0x7e, 0xf0, 0x88, 0x2a, 0xb5, 0xa4, - 0x76, 0xf3, 0x50, 0xeb, 0xc4, 0xc2, 0x4e, 0x22, 0xea, 0x8c, 0x3e, 0x78, 0x04, 0x73, 0x1d, 0xfa, - 0x16, 0xb6, 0x3d, 0x42, 0xfc, 0xbe, 0xae, 0x6e, 0xb5, 0xa4, 0x76, 0x03, 0x87, 0x11, 0x7a, 0x0a, - 0x35, 0x6a, 0xcf, 0x49, 0x40, 0xad, 0xb9, 0xa7, 0x96, 0x5a, 0x52, 0xbb, 0x84, 0x93, 0x05, 0x34, - 0x80, 0xa6, 0xb7, 0x18, 0xcf, 0xec, 0xe0, 0xe6, 0x8c, 0x04, 0x81, 0xf5, 0x9e, 0xa8, 0xe5, 0x96, - 0xd4, 0xae, 0x1f, 0x3e, 0xcf, 0xde, 0xcf, 0x4c, 0x69, 0xf1, 0x1a, 0x8b, 0xfa, 0xb0, 0xe3, 0x93, - 0x5b, 0x32, 0xa1, 0x51, 0x32, 0x99, 0x27, 0xfb, 0x31, 0x3b, 0x19, 0x5e, 0x95, 0xe2, 0x34, 0x89, - 0x30, 0x28, 0xd3, 0x85, 0x37, 0xb3, 0x27, 0x16, 0x25, 0x51, 0xb6, 0x6d, 0x9e, 0xed, 0x45, 0x76, - 0x36, 0x7d, 0x4d, 0x8d, 0x37, 0x78, 0x76, 0xd8, 0x29, 0x99, 0xd9, 0x4b, 0xe2, 0x47, 0x19, 0x2b, - 0x45, 0x87, 0xd5, 0x53, 0x5a, 0xbc, 0xc6, 0xa2, 0x57, 0x50, 0xb1, 0xa6, 0x53, 0x93, 0x10, 0x5f, - 0xad, 0xf2, 0x34, 0xcf, 0xb2, 0xd3, 0x74, 0x85, 0x08, 0x47, 0x6a, 0xf4, 0x3b, 0x80, 0x4f, 0xe6, - 0xee, 0x92, 0x70, 0xb6, 0xc6, 0xd9, 0x56, 0x5e, 0x8b, 0x22, 0x1d, 0x5e, 0x61, 0xd8, 0xd6, 0x3e, - 0x99, 0x2c, 0xb1, 0xd9, 0x53, 0xa1, 0x68, 0x6b, 0x2c, 0x44, 0x38, 0x52, 0x33, 0x30, 0x20, 0xce, - 0x94, 0x81, 0xf5, 0x22, 0x70, 0x28, 0x44, 0x38, 0x52, 0x33, 0x70, 0xea, 0xbb, 0x1e, 0x03, 0x1b, - 0x45, 0xa0, 0x2e, 0x44, 0x38, 0x52, 0xb3, 0x31, 0xbe, 0x75, 0x6d, 0x47, 0xdd, 0xe1, 0x54, 0xce, - 0x18, 0x9f, 0xba, 0xb6, 0x83, 0xb9, 0x0e, 0xbd, 0x04, 0x79, 0x46, 0xac, 0x25, 0x51, 0x9b, 0x1c, - 0xf8, 0x3e, 0x1b, 0x18, 0x30, 0x09, 0x16, 0x4a, 0x86, 0xbc, 0xf7, 0xad, 0xbf, 0xa8, 0xba, 0x5b, - 0x84, 0x1c, 0x33, 0x09, 0x16, 0x4a, 0x86, 0x78, 0xfe, 0xc2, 0x21, 0xaa, 0x52, 0x84, 0x98, 0x4c, - 0x82, 0x85, 0x52, 0xd3, 0xa1, 0x99, 0x9e, 0x7e, 0xe6, 0xac, 0xb9, 0xf8, 0xec, 0xeb, 0xdc, 0xa6, - 0x0d, 0x9c, 0x2c, 0xa0, 0x3d, 0x90, 0xa9, 0xeb, 0xd9, 0x13, 0x6e, 0xc7, 0x1a, 0x16, 0x81, 0xf6, - 0x0f, 0xec, 0xa4, 0xc6, 0xfe, 0x9e, 0x24, 0x07, 0xd0, 0xf0, 0xc9, 0x84, 0xd8, 0x4b, 0x32, 0x7d, - 0xe7, 0xbb, 0xf3, 0xd0, 0xda, 0xa9, 0x35, 0x66, 0x7c, 0x9f, 0x58, 0x81, 0xeb, 0x70, 0x77, 0xd7, - 0x70, 0x18, 0x25, 0x05, 0x94, 0x57, 0x0b, 0xb8, 0x05, 0x65, 0xdd, 0x29, 0x8f, 0x50, 0x43, 0xbc, - 0x57, 0x69, 0x75, 0xaf, 0x1b, 0x68, 0xa6, 0x3d, 0xf4, 0x90, 0x96, 0x6d, 0xec, 0x5f, 0xda, 0xdc, - 0x5f, 0x7b, 0x05, 0x95, 0xd0, 0x66, 0x2b, 0xef, 0xa0, 0x94, 0x7a, 0x07, 0xf7, 0xd8, 0x95, 0xbb, - 0xd4, 0x8d, 0x92, 0xf3, 0x40, 0x7b, 0x0e, 0x90, 0x78, 0x2c, 0x8f, 0xd5, 0xfe, 0x84, 0x4a, 0x68, - 0xa5, 0x8d, 0x6a, 0xa4, 0x8c, 0x6e, 0xbc, 0x84, 0xf2, 0x9c, 0x50, 0x8b, 0xef, 0x94, 0xef, 0x4d, - 0xb3, 0x77, 0x46, 0xa8, 0x85, 0xb9, 0x54, 0x1b, 0x41, 0x25, 0xf4, 0x1c, 0x2b, 0x82, 0xb9, 0x6e, - 0xe4, 0x46, 0x45, 0x88, 0xe8, 0x81, 0x59, 0x43, 0x43, 0x3e, 0x66, 0xd6, 0xa7, 0x50, 0x66, 0x86, - 0x4d, 0xae, 0x4b, 0x5a, 0xbd, 0xf4, 0x67, 0x20, 0x73, 0x77, 0xe6, 0x18, 0xe0, 0x17, 0x90, 0xb9, - 0x13, 0x8b, 0xee, 0x29, 0x1b, 0xe3, 0x6e, 0xfc, 0x42, 0xec, 0xa3, 0x04, 0x95, 0xb0, 0x78, 0xf4, - 0x06, 0xaa, 0xe1, 0xa8, 0x05, 0xaa, 0xd4, 0x2a, 0xb5, 0xeb, 0x87, 0x3f, 0x64, 0x9f, 0x36, 0x1c, - 0x56, 0x7e, 0xe2, 0x18, 0x41, 0x5d, 0x68, 0x04, 0x8b, 0x71, 0x30, 0xf1, 0x6d, 0x8f, 0xda, 0xae, - 0xa3, 0x6e, 0xf1, 0x14, 0x79, 0xef, 0xe7, 0x62, 0xcc, 0xf1, 0x14, 0x82, 0x7e, 0x83, 0xca, 0xc4, - 0x75, 0xa8, 0xef, 0xce, 0xf8, 0x10, 0xe7, 0x16, 0xd0, 0x13, 0x22, 0x9e, 0x21, 0x22, 0xb4, 0x2e, - 0xd4, 0x57, 0x0a, 0x7b, 0xd0, 0xe3, 0xf3, 0x06, 0x2a, 0x61, 0x61, 0x0c, 0x0f, 0x4b, 0x1b, 0x8b, - 0xbf, 0x18, 0x55, 0x9c, 0x2c, 0xe4, 0xe0, 0x9f, 0xb6, 0xa0, 0xbe, 0x52, 0x1a, 0x7a, 0x0d, 0xb2, - 0x7d, 0xc3, 0x9e, 0x6a, 0xd1, 0xcd, 0x17, 0x85, 0x87, 0xe9, 0x9f, 0x58, 0x4b, 0xd1, 0x52, 0x01, - 0x71, 0xfa, 0x6f, 0xcb, 0xa1, 0x61, 0x23, 0xef, 0xa1, 0xff, 0xb0, 0x1c, 0x1a, 0xd2, 0x0c, 0x62, - 0xb4, 0x78, 0xf3, 0x4b, 0x9f, 0x41, 0xf3, 0x81, 0x13, 0xb4, 0x78, 0xfe, 0x5f, 0x47, 0xcf, 0x7f, - 0xf9, 0x33, 0x68, 0x3e, 0x77, 0x82, 0xe6, 0x10, 0x3a, 0x81, 0x9a, 0x3d, 0x75, 0x1d, 0xca, 0xab, - 0x97, 0x79, 0x86, 0x9f, 0x8a, 0xab, 0xd7, 0x5d, 0x87, 0xc6, 0x27, 0x48, 0x60, 0xed, 0x04, 0x94, - 0xf5, 0xf6, 0x64, 0xbb, 0x0a, 0xed, 0x03, 0xc4, 0xb7, 0x1b, 0xf0, 0x96, 0x35, 0xf0, 0xca, 0x8a, - 0x76, 0x98, 0x64, 0x8a, 0x36, 0x5a, 0x63, 0xa4, 0x0d, 0xa6, 0x1d, 0x33, 0x71, 0x83, 0x72, 0x3c, - 0xfd, 0x36, 0x56, 0xc6, 0xcd, 0xc8, 0xa9, 0x93, 0xbd, 0xb2, 0x84, 0xf8, 0x51, 0x89, 0x22, 0xd0, - 0x7e, 0x85, 0xbd, 0xac, 0x56, 0xdc, 0x57, 0xe1, 0xc1, 0x27, 0x09, 0xca, 0xec, 0x2f, 0x2e, 0xfa, - 0x06, 0x76, 0xcd, 0xcb, 0xa3, 0x41, 0x7f, 0x78, 0x72, 0x7d, 0x66, 0x0c, 0x87, 0xdd, 0x63, 0x43, - 0xf9, 0x0a, 0x21, 0x68, 0x62, 0xe3, 0xd4, 0xe8, 0x8d, 0xe2, 0x35, 0x09, 0x3d, 0x81, 0xaf, 0xf5, - 0x4b, 0x73, 0xd0, 0xef, 0x75, 0x47, 0x46, 0xbc, 0xbc, 0xc5, 0x78, 0xdd, 0x18, 0xf4, 0xaf, 0x0c, - 0x1c, 0x2f, 0x96, 0x50, 0x03, 0xaa, 0x5d, 0x5d, 0xbf, 0x36, 0x0d, 0x03, 0x2b, 0x65, 0xb4, 0x0b, - 0x75, 0x6c, 0x9c, 0x5d, 0x5c, 0x19, 0x62, 0x41, 0x66, 0x3f, 0x63, 0xa3, 0x77, 0x75, 0x8d, 0xcd, - 0x9e, 0xb2, 0xcd, 0xa2, 0xa1, 0x71, 0xae, 0xf3, 0xa8, 0xc2, 0x22, 0x1d, 0x5f, 0x98, 0x3c, 0xaa, - 0xa2, 0x2a, 0x94, 0x4f, 0x2f, 0xfa, 0xe7, 0x4a, 0x0d, 0xd5, 0x40, 0x1e, 0x18, 0xdd, 0x2b, 0x43, - 0x01, 0xf6, 0x79, 0x8c, 0xbb, 0xef, 0x46, 0x4a, 0x9d, 0x7d, 0x9a, 0xf8, 0xf2, 0xdc, 0x50, 0x1a, - 0x07, 0x6f, 0x61, 0x37, 0x99, 0x8f, 0x23, 0x8b, 0x4e, 0x6e, 0xd0, 0xcf, 0x20, 0x8f, 0xd9, 0x47, - 0x68, 0xa3, 0x27, 0x99, 0xa3, 0x84, 0x85, 0xe6, 0xa8, 0xf1, 0xf1, 0x6e, 0x5f, 0xfa, 0xf7, 0x6e, - 0x5f, 0xfa, 0xef, 0x6e, 0x5f, 0xfa, 0x3f, 0x00, 0x00, 0xff, 0xff, 0x17, 0x7f, 0xbd, 0x0d, 0x4b, - 0x0c, 0x00, 0x00, + // 1070 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x96, 0xdf, 0x6e, 0xe2, 0xc6, + 0x17, 0xc7, 0x7f, 0x0e, 0x26, 0xc0, 0x81, 0x10, 0xff, 0xa6, 0x49, 0x65, 0xb9, 0xbb, 0x11, 0x4d, + 0x57, 0x2b, 0xd4, 0x4a, 0x48, 0x1b, 0xb5, 0xdd, 0x8b, 0xee, 0xae, 0x4a, 0xb0, 0x37, 0x21, 0x22, + 0x89, 0x35, 0x90, 0xf4, 0x32, 0x35, 0x66, 0xba, 0x71, 0x04, 0xb6, 0x65, 0x0f, 0x54, 0xdb, 0x9b, + 0xbe, 0x57, 0x9f, 0xa0, 0x77, 0xdb, 0x47, 0xa8, 0xf2, 0x20, 0x55, 0x35, 0x33, 0xfe, 0x07, 0xd8, + 0x64, 0x1b, 0xed, 0x9d, 0xe7, 0xf0, 0xfd, 0x9c, 0x73, 0x66, 0xe6, 0x7c, 0x6d, 0xa0, 0x4e, 0x03, + 0xcb, 0x26, 0x1d, 0x3f, 0xf0, 0xa8, 0x87, 0x6a, 0xfe, 0x7c, 0x1c, 0xce, 0xc7, 0x1d, 0x7f, 0x7c, + 0xf8, 0x87, 0x0a, 0x30, 0x62, 0x3f, 0x19, 0x0b, 0xe2, 0x52, 0xd4, 0x01, 0x99, 0xbe, 0xf7, 0x89, + 0x2a, 0xb5, 0xa4, 0x76, 0xf3, 0x48, 0xeb, 0x24, 0xc2, 0x4e, 0x2a, 0xea, 0x8c, 0xde, 0xfb, 0x04, + 0x73, 0x1d, 0xfa, 0x1c, 0xb6, 0x7d, 0x42, 0x82, 0xbe, 0xae, 0x6e, 0xb5, 0xa4, 0x76, 0x03, 0x47, + 0x2b, 0xf4, 0x04, 0x6a, 0xd4, 0x99, 0x91, 0x90, 0x5a, 0x33, 0x5f, 0x2d, 0xb5, 0xa4, 0x76, 0x09, + 0xa7, 0x01, 0x34, 0x80, 0xa6, 0x3f, 0x1f, 0x4f, 0x9d, 0xf0, 0xf6, 0x9c, 0x84, 0xa1, 0xf5, 0x8e, + 0xa8, 0x72, 0x4b, 0x6a, 0xd7, 0x8f, 0x9e, 0xe5, 0xd7, 0x33, 0x97, 0xb4, 0x78, 0x85, 0x45, 0x7d, + 0xd8, 0x09, 0xc8, 0x1d, 0xb1, 0x69, 0x9c, 0xac, 0xcc, 0x93, 0x7d, 0x95, 0x9f, 0x0c, 0x67, 0xa5, + 0x78, 0x99, 0x44, 0x18, 0x94, 0xc9, 0xdc, 0x9f, 0x3a, 0xb6, 0x45, 0x49, 0x9c, 0x6d, 0x9b, 0x67, + 0x7b, 0x9e, 0x9f, 0x4d, 0x5f, 0x51, 0xe3, 0x35, 0x9e, 0x6d, 0x76, 0x42, 0xa6, 0xce, 0x82, 0x04, + 0x71, 0xc6, 0xca, 0xa6, 0xcd, 0xea, 0x4b, 0x5a, 0xbc, 0xc2, 0xa2, 0x97, 0x50, 0xb1, 0x26, 0x13, + 0x93, 0x90, 0x40, 0xad, 0xf2, 0x34, 0x4f, 0xf3, 0xd3, 0x74, 0x85, 0x08, 0xc7, 0x6a, 0xf4, 0x23, + 0x40, 0x40, 0x66, 0xde, 0x82, 0x70, 0xb6, 0xc6, 0xd9, 0x56, 0xd1, 0x11, 0xc5, 0x3a, 0x9c, 0x61, + 0x58, 0xe9, 0x80, 0xd8, 0x0b, 0x6c, 0xf6, 0x54, 0xd8, 0x54, 0x1a, 0x0b, 0x11, 0x8e, 0xd5, 0x0c, + 0x0c, 0x89, 0x3b, 0x61, 0x60, 0x7d, 0x13, 0x38, 0x14, 0x22, 0x1c, 0xab, 0x19, 0x38, 0x09, 0x3c, + 0x9f, 0x81, 0x8d, 0x4d, 0xa0, 0x2e, 0x44, 0x38, 0x56, 0xb3, 0x31, 0xbe, 0xf3, 0x1c, 0x57, 0xdd, + 0xe1, 0x54, 0xc1, 0x18, 0x9f, 0x79, 0x8e, 0x8b, 0xb9, 0x0e, 0xbd, 0x80, 0xf2, 0x94, 0x58, 0x0b, + 0xa2, 0x36, 0x39, 0xf0, 0x45, 0x3e, 0x30, 0x60, 0x12, 0x2c, 0x94, 0x0c, 0x79, 0x17, 0x58, 0xbf, + 0x50, 0x75, 0x77, 0x13, 0x72, 0xc2, 0x24, 0x58, 0x28, 0x19, 0xe2, 0x07, 0x73, 0x97, 0xa8, 0xca, + 0x26, 0xc4, 0x64, 0x12, 0x2c, 0x94, 0x9a, 0x0e, 0xcd, 0xe5, 0xe9, 0x67, 0xce, 0x9a, 0x89, 0xc7, + 0xbe, 0xce, 0x6d, 0xda, 0xc0, 0x69, 0x00, 0xed, 0x41, 0x99, 0x7a, 0xbe, 0x63, 0x73, 0x3b, 0xd6, + 0xb0, 0x58, 0x68, 0xbf, 0xc3, 0xce, 0xd2, 0xd8, 0x3f, 0x90, 0xe4, 0x10, 0x1a, 0x01, 0xb1, 0x89, + 0xb3, 0x20, 0x93, 0xb7, 0x81, 0x37, 0x8b, 0xac, 0xbd, 0x14, 0x63, 0xc6, 0x0f, 0x88, 0x15, 0x7a, + 0x2e, 0x77, 0x77, 0x0d, 0x47, 0xab, 0xb4, 0x01, 0x39, 0xdb, 0xc0, 0x1d, 0x28, 0xab, 0x4e, 0xf9, + 0x04, 0x3d, 0x24, 0xb5, 0x4a, 0xd9, 0x5a, 0xb7, 0xd0, 0x5c, 0xf6, 0xd0, 0x63, 0x8e, 0x6c, 0xad, + 0x7e, 0x69, 0xbd, 0xbe, 0xf6, 0x12, 0x2a, 0x91, 0xcd, 0x32, 0xef, 0x41, 0x69, 0xe9, 0x3d, 0xb8, + 0xc7, 0xae, 0xdc, 0xa3, 0x5e, 0x9c, 0x9c, 0x2f, 0xb4, 0x67, 0x00, 0xa9, 0xc7, 0x8a, 0x58, 0xed, + 0x67, 0xa8, 0x44, 0x56, 0x5a, 0xeb, 0x46, 0xca, 0x39, 0x8d, 0x17, 0x20, 0xcf, 0x08, 0xb5, 0x78, + 0xa5, 0x62, 0x6f, 0x9a, 0xbd, 0x73, 0x42, 0x2d, 0xcc, 0xa5, 0xda, 0x08, 0x2a, 0x91, 0xe7, 0x58, + 0x13, 0xcc, 0x75, 0x23, 0x2f, 0x6e, 0x42, 0xac, 0x1e, 0x99, 0x35, 0x32, 0xe4, 0xa7, 0xcc, 0xfa, + 0x04, 0x64, 0x66, 0xd8, 0xf4, 0xba, 0xa4, 0xec, 0xa5, 0x3f, 0x85, 0x32, 0x77, 0x67, 0x81, 0x01, + 0xbe, 0x83, 0x32, 0x77, 0xe2, 0xa6, 0x7b, 0xca, 0xc7, 0xb8, 0x1b, 0xff, 0x23, 0xf6, 0x8f, 0x04, + 0x95, 0xa8, 0x79, 0xf4, 0x1a, 0xaa, 0xd1, 0xa8, 0x85, 0xaa, 0xd4, 0x2a, 0xb5, 0xeb, 0x47, 0x5f, + 0xe6, 0xef, 0x36, 0x1a, 0x56, 0xbe, 0xe3, 0x04, 0x41, 0x5d, 0x68, 0x84, 0xf3, 0x71, 0x68, 0x07, + 0x8e, 0x4f, 0x1d, 0xcf, 0x55, 0xb7, 0x78, 0x8a, 0xa2, 0xf7, 0xe7, 0x7c, 0xcc, 0xf1, 0x25, 0x04, + 0xfd, 0x00, 0x15, 0xdb, 0x73, 0x69, 0xe0, 0x4d, 0xf9, 0x10, 0x17, 0x36, 0xd0, 0x13, 0x22, 0x9e, + 0x21, 0x26, 0xd0, 0xb7, 0xb0, 0x3f, 0x73, 0xa6, 0x53, 0x27, 0x24, 0xb6, 0xe7, 0x4e, 0xc2, 0x91, + 0x87, 0xc5, 0xc8, 0x71, 0x7b, 0xcb, 0x38, 0xff, 0x47, 0xcd, 0x86, 0x7a, 0x66, 0x3b, 0x8f, 0xf2, + 0x5f, 0x0b, 0xea, 0x91, 0x64, 0xe8, 0xfc, 0x46, 0x78, 0xe7, 0x32, 0xce, 0x86, 0xb4, 0xd7, 0x50, + 0x89, 0x36, 0xcc, 0x0a, 0x44, 0x5b, 0x1e, 0x8b, 0xbf, 0x2e, 0x55, 0x9c, 0x06, 0x0a, 0x2e, 0xe9, + 0xc3, 0x16, 0xd4, 0x33, 0x5b, 0x46, 0xaf, 0xa0, 0xec, 0xdc, 0xb2, 0x4f, 0x80, 0xb8, 0xa5, 0xe7, + 0x1b, 0x0f, 0xa9, 0x7f, 0x6a, 0x2d, 0xc4, 0x55, 0x09, 0x88, 0xd3, 0xbf, 0x5a, 0x2e, 0x8d, 0x2e, + 0xe8, 0x01, 0xfa, 0x27, 0xcb, 0xa5, 0x11, 0xcd, 0x20, 0x46, 0x8b, 0x6f, 0x49, 0xe9, 0x23, 0x68, + 0x3e, 0xc8, 0x82, 0x16, 0x9f, 0x95, 0x57, 0xf1, 0x67, 0x45, 0xfe, 0x08, 0x9a, 0xcf, 0xb3, 0xa0, + 0x39, 0x84, 0x4e, 0xa1, 0xe6, 0x4c, 0x3c, 0x97, 0xf2, 0xee, 0xcb, 0x3c, 0xc3, 0xd7, 0x9b, 0xbb, + 0xd7, 0x3d, 0x97, 0x26, 0x3b, 0x48, 0x61, 0xed, 0x14, 0x94, 0xd5, 0xe3, 0xc9, 0x77, 0x2b, 0x3a, + 0x00, 0x48, 0xee, 0x3f, 0xe4, 0x47, 0xd6, 0xc0, 0x99, 0x88, 0x76, 0x94, 0x66, 0x8a, 0x0b, 0xad, + 0x30, 0xd2, 0x1a, 0xd3, 0x4e, 0x98, 0xe4, 0x80, 0x0a, 0xde, 0x15, 0x6f, 0x12, 0x65, 0x72, 0x18, + 0x05, 0x7d, 0xb2, 0xb7, 0x37, 0x21, 0x41, 0xdc, 0xa2, 0x58, 0x68, 0xdf, 0xc3, 0x5e, 0xde, 0x51, + 0x3c, 0xd4, 0xe1, 0xe1, 0x07, 0x09, 0x64, 0xf6, 0xd7, 0x19, 0x7d, 0x06, 0xbb, 0xe6, 0xd5, 0xf1, + 0xa0, 0x3f, 0x3c, 0xbd, 0x39, 0x37, 0x86, 0xc3, 0xee, 0x89, 0xa1, 0xfc, 0x0f, 0x21, 0x68, 0x62, + 0xe3, 0xcc, 0xe8, 0x8d, 0x92, 0x98, 0x84, 0xf6, 0xe1, 0xff, 0xfa, 0x95, 0x39, 0xe8, 0xf7, 0xba, + 0x23, 0x23, 0x09, 0x6f, 0x31, 0x5e, 0x37, 0x06, 0xfd, 0x6b, 0x03, 0x27, 0xc1, 0x12, 0x6a, 0x40, + 0xb5, 0xab, 0xeb, 0x37, 0xa6, 0x61, 0x60, 0x45, 0x46, 0xbb, 0x50, 0xc7, 0xc6, 0xf9, 0xe5, 0xb5, + 0x21, 0x02, 0x65, 0xf6, 0x33, 0x36, 0x7a, 0xd7, 0x37, 0xd8, 0xec, 0x29, 0xdb, 0x6c, 0x35, 0x34, + 0x2e, 0x74, 0xbe, 0xaa, 0xb0, 0x95, 0x8e, 0x2f, 0x4d, 0xbe, 0xaa, 0xa2, 0x2a, 0xc8, 0x67, 0x97, + 0xfd, 0x0b, 0xa5, 0x86, 0x6a, 0x50, 0x1e, 0x18, 0xdd, 0x6b, 0x43, 0x01, 0xf6, 0x78, 0x82, 0xbb, + 0x6f, 0x47, 0x4a, 0x9d, 0x3d, 0x9a, 0xf8, 0xea, 0xc2, 0x50, 0x1a, 0x87, 0x6f, 0x60, 0x37, 0x9d, + 0x8f, 0x63, 0x8b, 0xda, 0xb7, 0xe8, 0x1b, 0x28, 0x8f, 0xd9, 0x43, 0x64, 0xa3, 0xfd, 0xdc, 0x51, + 0xc2, 0x42, 0x73, 0xdc, 0xf8, 0xf3, 0xfe, 0x40, 0xfa, 0xeb, 0xfe, 0x40, 0xfa, 0xfb, 0xfe, 0x40, + 0xfa, 0x37, 0x00, 0x00, 0xff, 0xff, 0x17, 0x90, 0xf6, 0x77, 0xa3, 0x0c, 0x00, 0x00, } func (m *TraceEvent) Marshal() (dAtA []byte, err error) { @@ -2416,6 +2433,11 @@ func (m *TraceEvent_RPCMeta) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } + if m.MillisecondsToReceive != nil { + i = encodeVarintTrace(dAtA, i, uint64(*m.MillisecondsToReceive)) + i-- + dAtA[i] = 0x20 + } if m.Control != nil { { size, err := m.Control.MarshalToSizedBuffer(dAtA[:i]) @@ -2483,6 +2505,11 @@ func (m *TraceEvent_MessageMeta) MarshalToSizedBuffer(dAtA []byte) (int, error) i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } + if m.MessageSize != nil { + i = encodeVarintTrace(dAtA, i, uint64(*m.MessageSize)) + i-- + dAtA[i] = 0x18 + } if m.Topic != nil { i -= len(*m.Topic) copy(dAtA[i:], *m.Topic) @@ -3245,6 +3272,9 @@ func (m *TraceEvent_RPCMeta) Size() (n int) { l = m.Control.Size() n += 1 + l + sovTrace(uint64(l)) } + if m.MillisecondsToReceive != nil { + n += 1 + sovTrace(uint64(*m.MillisecondsToReceive)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -3265,6 +3295,9 @@ func (m *TraceEvent_MessageMeta) Size() (n int) { l = len(*m.Topic) n += 1 + l + sovTrace(uint64(l)) } + if m.MessageSize != nil { + n += 1 + sovTrace(uint64(*m.MessageSize)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -5755,6 +5788,26 @@ func (m *TraceEvent_RPCMeta) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 4: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field MillisecondsToReceive", wireType) + } + var v uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTrace + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.MillisecondsToReceive = &v default: iNdEx = preIndex skippy, err := skipTrace(dAtA[iNdEx:]) @@ -5873,6 +5926,26 @@ func (m *TraceEvent_MessageMeta) Unmarshal(dAtA []byte) error { s := string(dAtA[iNdEx:postIndex]) m.Topic = &s iNdEx = postIndex + case 3: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field MessageSize", wireType) + } + var v uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTrace + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.MessageSize = &v default: iNdEx = preIndex skippy, err := skipTrace(dAtA[iNdEx:]) diff --git a/pb/trace.proto b/pb/trace.proto index 5ee8401c..a77906c6 100644 --- a/pb/trace.proto +++ b/pb/trace.proto @@ -107,11 +107,13 @@ message TraceEvent { repeated MessageMeta messages = 1; repeated SubMeta subscription = 2; optional ControlMeta control = 3; + optional uint64 millisecondsToReceive = 4; } message MessageMeta { optional bytes messageID = 1; optional string topic = 2; + optional uint64 messageSize = 3; } message SubMeta { diff --git a/pubsub.go b/pubsub.go index 91017d1b..a519faef 100644 --- a/pubsub.go +++ b/pubsub.go @@ -255,6 +255,9 @@ type RPC struct { // unexported on purpose, not sending this over the wire from peer.ID + + // timeToReceive is how long it took to receive the message. + timeToReceive time.Duration } // split splits the given RPC If a sub RPC is too large and can't be split diff --git a/trace.go b/trace.go index 7dbb5409..01a17684 100644 --- a/trace.go +++ b/trace.go @@ -341,11 +341,17 @@ func (t *pubsubTracer) UndeliverableMessage(msg *Message) { func (t *pubsubTracer) traceRPCMeta(rpc *RPC) *pb.TraceEvent_RPCMeta { rpcMeta := new(pb.TraceEvent_RPCMeta) + if rpc != nil { + ms := uint64(rpc.timeToReceive.Milliseconds()) + rpcMeta.MillisecondsToReceive = &ms + } var msgs []*pb.TraceEvent_MessageMeta for _, m := range rpc.Publish { + msgSize := uint64(len(m.Data)) msgs = append(msgs, &pb.TraceEvent_MessageMeta{ - MessageID: []byte(t.idGen.RawID(m)), - Topic: m.Topic, + MessageID: []byte(t.idGen.RawID(m)), + Topic: m.Topic, + MessageSize: &msgSize, }) } rpcMeta.Messages = msgs