diff --git a/pb/trace.pb.go b/pb/trace.pb.go
index 7da395d5c08774a3646f5efc48af5e18b922c794..00d4f45709ba7b62ec4e0aabeafebaa3f0470702 100644
--- a/pb/trace.pb.go
+++ b/pb/trace.pb.go
@@ -86,7 +86,7 @@ func (x *TraceEvent_Type) UnmarshalJSON(data []byte) error {
 	return nil
 }
 func (TraceEvent_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_trace_31b365b8afda32be, []int{0, 0}
+	return fileDescriptor_trace_f5041bb48e7a4810, []int{0, 0}
 }
 
 type TraceEvent struct {
@@ -115,7 +115,7 @@ func (m *TraceEvent) Reset()         { *m = TraceEvent{} }
 func (m *TraceEvent) String() string { return proto.CompactTextString(m) }
 func (*TraceEvent) ProtoMessage()    {}
 func (*TraceEvent) Descriptor() ([]byte, []int) {
-	return fileDescriptor_trace_31b365b8afda32be, []int{0}
+	return fileDescriptor_trace_f5041bb48e7a4810, []int{0}
 }
 func (m *TraceEvent) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -258,6 +258,7 @@ func (m *TraceEvent) GetPrune() *TraceEvent_Prune {
 
 type TraceEvent_PublishMessage struct {
 	MessageID            []byte   `protobuf:"bytes,1,opt,name=messageID" json:"messageID,omitempty"`
+	Topics               []string `protobuf:"bytes,2,rep,name=topics" json:"topics,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -267,7 +268,7 @@ func (m *TraceEvent_PublishMessage) Reset()         { *m = TraceEvent_PublishMes
 func (m *TraceEvent_PublishMessage) String() string { return proto.CompactTextString(m) }
 func (*TraceEvent_PublishMessage) ProtoMessage()    {}
 func (*TraceEvent_PublishMessage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_trace_31b365b8afda32be, []int{0, 0}
+	return fileDescriptor_trace_f5041bb48e7a4810, []int{0, 0}
 }
 func (m *TraceEvent_PublishMessage) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -303,6 +304,13 @@ func (m *TraceEvent_PublishMessage) GetMessageID() []byte {
 	return nil
 }
 
+func (m *TraceEvent_PublishMessage) GetTopics() []string {
+	if m != nil {
+		return m.Topics
+	}
+	return nil
+}
+
 type TraceEvent_RejectMessage struct {
 	MessageID            []byte   `protobuf:"bytes,1,opt,name=messageID" json:"messageID,omitempty"`
 	ReceivedFrom         []byte   `protobuf:"bytes,2,opt,name=receivedFrom" json:"receivedFrom,omitempty"`
@@ -316,7 +324,7 @@ func (m *TraceEvent_RejectMessage) Reset()         { *m = TraceEvent_RejectMessa
 func (m *TraceEvent_RejectMessage) String() string { return proto.CompactTextString(m) }
 func (*TraceEvent_RejectMessage) ProtoMessage()    {}
 func (*TraceEvent_RejectMessage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_trace_31b365b8afda32be, []int{0, 1}
+	return fileDescriptor_trace_f5041bb48e7a4810, []int{0, 1}
 }
 func (m *TraceEvent_RejectMessage) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -378,7 +386,7 @@ func (m *TraceEvent_DuplicateMessage) Reset()         { *m = TraceEvent_Duplicat
 func (m *TraceEvent_DuplicateMessage) String() string { return proto.CompactTextString(m) }
 func (*TraceEvent_DuplicateMessage) ProtoMessage()    {}
 func (*TraceEvent_DuplicateMessage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_trace_31b365b8afda32be, []int{0, 2}
+	return fileDescriptor_trace_f5041bb48e7a4810, []int{0, 2}
 }
 func (m *TraceEvent_DuplicateMessage) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -432,7 +440,7 @@ func (m *TraceEvent_DeliverMessage) Reset()         { *m = TraceEvent_DeliverMes
 func (m *TraceEvent_DeliverMessage) String() string { return proto.CompactTextString(m) }
 func (*TraceEvent_DeliverMessage) ProtoMessage()    {}
 func (*TraceEvent_DeliverMessage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_trace_31b365b8afda32be, []int{0, 3}
+	return fileDescriptor_trace_f5041bb48e7a4810, []int{0, 3}
 }
 func (m *TraceEvent_DeliverMessage) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -480,7 +488,7 @@ func (m *TraceEvent_AddPeer) Reset()         { *m = TraceEvent_AddPeer{} }
 func (m *TraceEvent_AddPeer) String() string { return proto.CompactTextString(m) }
 func (*TraceEvent_AddPeer) ProtoMessage()    {}
 func (*TraceEvent_AddPeer) Descriptor() ([]byte, []int) {
-	return fileDescriptor_trace_31b365b8afda32be, []int{0, 4}
+	return fileDescriptor_trace_f5041bb48e7a4810, []int{0, 4}
 }
 func (m *TraceEvent_AddPeer) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -534,7 +542,7 @@ func (m *TraceEvent_RemovePeer) Reset()         { *m = TraceEvent_RemovePeer{} }
 func (m *TraceEvent_RemovePeer) String() string { return proto.CompactTextString(m) }
 func (*TraceEvent_RemovePeer) ProtoMessage()    {}
 func (*TraceEvent_RemovePeer) Descriptor() ([]byte, []int) {
-	return fileDescriptor_trace_31b365b8afda32be, []int{0, 5}
+	return fileDescriptor_trace_f5041bb48e7a4810, []int{0, 5}
 }
 func (m *TraceEvent_RemovePeer) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -582,7 +590,7 @@ func (m *TraceEvent_RecvRPC) Reset()         { *m = TraceEvent_RecvRPC{} }
 func (m *TraceEvent_RecvRPC) String() string { return proto.CompactTextString(m) }
 func (*TraceEvent_RecvRPC) ProtoMessage()    {}
 func (*TraceEvent_RecvRPC) Descriptor() ([]byte, []int) {
-	return fileDescriptor_trace_31b365b8afda32be, []int{0, 6}
+	return fileDescriptor_trace_f5041bb48e7a4810, []int{0, 6}
 }
 func (m *TraceEvent_RecvRPC) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -637,7 +645,7 @@ func (m *TraceEvent_SendRPC) Reset()         { *m = TraceEvent_SendRPC{} }
 func (m *TraceEvent_SendRPC) String() string { return proto.CompactTextString(m) }
 func (*TraceEvent_SendRPC) ProtoMessage()    {}
 func (*TraceEvent_SendRPC) Descriptor() ([]byte, []int) {
-	return fileDescriptor_trace_31b365b8afda32be, []int{0, 7}
+	return fileDescriptor_trace_f5041bb48e7a4810, []int{0, 7}
 }
 func (m *TraceEvent_SendRPC) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -692,7 +700,7 @@ func (m *TraceEvent_DropRPC) Reset()         { *m = TraceEvent_DropRPC{} }
 func (m *TraceEvent_DropRPC) String() string { return proto.CompactTextString(m) }
 func (*TraceEvent_DropRPC) ProtoMessage()    {}
 func (*TraceEvent_DropRPC) Descriptor() ([]byte, []int) {
-	return fileDescriptor_trace_31b365b8afda32be, []int{0, 8}
+	return fileDescriptor_trace_f5041bb48e7a4810, []int{0, 8}
 }
 func (m *TraceEvent_DropRPC) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -746,7 +754,7 @@ func (m *TraceEvent_Join) Reset()         { *m = TraceEvent_Join{} }
 func (m *TraceEvent_Join) String() string { return proto.CompactTextString(m) }
 func (*TraceEvent_Join) ProtoMessage()    {}
 func (*TraceEvent_Join) Descriptor() ([]byte, []int) {
-	return fileDescriptor_trace_31b365b8afda32be, []int{0, 9}
+	return fileDescriptor_trace_f5041bb48e7a4810, []int{0, 9}
 }
 func (m *TraceEvent_Join) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -793,7 +801,7 @@ func (m *TraceEvent_Leave) Reset()         { *m = TraceEvent_Leave{} }
 func (m *TraceEvent_Leave) String() string { return proto.CompactTextString(m) }
 func (*TraceEvent_Leave) ProtoMessage()    {}
 func (*TraceEvent_Leave) Descriptor() ([]byte, []int) {
-	return fileDescriptor_trace_31b365b8afda32be, []int{0, 10}
+	return fileDescriptor_trace_f5041bb48e7a4810, []int{0, 10}
 }
 func (m *TraceEvent_Leave) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -841,7 +849,7 @@ func (m *TraceEvent_Graft) Reset()         { *m = TraceEvent_Graft{} }
 func (m *TraceEvent_Graft) String() string { return proto.CompactTextString(m) }
 func (*TraceEvent_Graft) ProtoMessage()    {}
 func (*TraceEvent_Graft) Descriptor() ([]byte, []int) {
-	return fileDescriptor_trace_31b365b8afda32be, []int{0, 11}
+	return fileDescriptor_trace_f5041bb48e7a4810, []int{0, 11}
 }
 func (m *TraceEvent_Graft) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -896,7 +904,7 @@ func (m *TraceEvent_Prune) Reset()         { *m = TraceEvent_Prune{} }
 func (m *TraceEvent_Prune) String() string { return proto.CompactTextString(m) }
 func (*TraceEvent_Prune) ProtoMessage()    {}
 func (*TraceEvent_Prune) Descriptor() ([]byte, []int) {
-	return fileDescriptor_trace_31b365b8afda32be, []int{0, 12}
+	return fileDescriptor_trace_f5041bb48e7a4810, []int{0, 12}
 }
 func (m *TraceEvent_Prune) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -940,19 +948,19 @@ func (m *TraceEvent_Prune) GetTopic() string {
 }
 
 type TraceEvent_RPCMeta struct {
-	MessageIDs           [][]byte                `protobuf:"bytes,1,rep,name=messageIDs" json:"messageIDs,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"`
+	XXX_NoUnkeyedLiteral struct{}                  `json:"-"`
+	XXX_unrecognized     []byte                    `json:"-"`
+	XXX_sizecache        int32                     `json:"-"`
 }
 
 func (m *TraceEvent_RPCMeta) Reset()         { *m = TraceEvent_RPCMeta{} }
 func (m *TraceEvent_RPCMeta) String() string { return proto.CompactTextString(m) }
 func (*TraceEvent_RPCMeta) ProtoMessage()    {}
 func (*TraceEvent_RPCMeta) Descriptor() ([]byte, []int) {
-	return fileDescriptor_trace_31b365b8afda32be, []int{0, 13}
+	return fileDescriptor_trace_f5041bb48e7a4810, []int{0, 13}
 }
 func (m *TraceEvent_RPCMeta) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -981,9 +989,9 @@ func (m *TraceEvent_RPCMeta) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_TraceEvent_RPCMeta proto.InternalMessageInfo
 
-func (m *TraceEvent_RPCMeta) GetMessageIDs() [][]byte {
+func (m *TraceEvent_RPCMeta) GetMessages() []*TraceEvent_MessageMeta {
 	if m != nil {
-		return m.MessageIDs
+		return m.Messages
 	}
 	return nil
 }
@@ -1002,6 +1010,61 @@ func (m *TraceEvent_RPCMeta) GetControl() *TraceEvent_ControlMeta {
 	return nil
 }
 
+type TraceEvent_MessageMeta struct {
+	MessageID            []byte   `protobuf:"bytes,1,opt,name=messageID" json:"messageID,omitempty"`
+	Topics               []string `protobuf:"bytes,2,rep,name=topics" json:"topics,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TraceEvent_MessageMeta) Reset()         { *m = TraceEvent_MessageMeta{} }
+func (m *TraceEvent_MessageMeta) String() string { return proto.CompactTextString(m) }
+func (*TraceEvent_MessageMeta) ProtoMessage()    {}
+func (*TraceEvent_MessageMeta) Descriptor() ([]byte, []int) {
+	return fileDescriptor_trace_f5041bb48e7a4810, []int{0, 14}
+}
+func (m *TraceEvent_MessageMeta) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *TraceEvent_MessageMeta) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_TraceEvent_MessageMeta.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (dst *TraceEvent_MessageMeta) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TraceEvent_MessageMeta.Merge(dst, src)
+}
+func (m *TraceEvent_MessageMeta) XXX_Size() int {
+	return m.Size()
+}
+func (m *TraceEvent_MessageMeta) XXX_DiscardUnknown() {
+	xxx_messageInfo_TraceEvent_MessageMeta.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TraceEvent_MessageMeta proto.InternalMessageInfo
+
+func (m *TraceEvent_MessageMeta) GetMessageID() []byte {
+	if m != nil {
+		return m.MessageID
+	}
+	return nil
+}
+
+func (m *TraceEvent_MessageMeta) GetTopics() []string {
+	if m != nil {
+		return m.Topics
+	}
+	return nil
+}
+
 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"`
@@ -1014,7 +1077,7 @@ func (m *TraceEvent_SubMeta) Reset()         { *m = TraceEvent_SubMeta{} }
 func (m *TraceEvent_SubMeta) String() string { return proto.CompactTextString(m) }
 func (*TraceEvent_SubMeta) ProtoMessage()    {}
 func (*TraceEvent_SubMeta) Descriptor() ([]byte, []int) {
-	return fileDescriptor_trace_31b365b8afda32be, []int{0, 14}
+	return fileDescriptor_trace_f5041bb48e7a4810, []int{0, 15}
 }
 func (m *TraceEvent_SubMeta) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1071,7 +1134,7 @@ func (m *TraceEvent_ControlMeta) Reset()         { *m = TraceEvent_ControlMeta{}
 func (m *TraceEvent_ControlMeta) String() string { return proto.CompactTextString(m) }
 func (*TraceEvent_ControlMeta) ProtoMessage()    {}
 func (*TraceEvent_ControlMeta) Descriptor() ([]byte, []int) {
-	return fileDescriptor_trace_31b365b8afda32be, []int{0, 15}
+	return fileDescriptor_trace_f5041bb48e7a4810, []int{0, 16}
 }
 func (m *TraceEvent_ControlMeta) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1140,7 +1203,7 @@ func (m *TraceEvent_ControlIHaveMeta) Reset()         { *m = TraceEvent_ControlI
 func (m *TraceEvent_ControlIHaveMeta) String() string { return proto.CompactTextString(m) }
 func (*TraceEvent_ControlIHaveMeta) ProtoMessage()    {}
 func (*TraceEvent_ControlIHaveMeta) Descriptor() ([]byte, []int) {
-	return fileDescriptor_trace_31b365b8afda32be, []int{0, 16}
+	return fileDescriptor_trace_f5041bb48e7a4810, []int{0, 17}
 }
 func (m *TraceEvent_ControlIHaveMeta) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1194,7 +1257,7 @@ func (m *TraceEvent_ControlIWantMeta) Reset()         { *m = TraceEvent_ControlI
 func (m *TraceEvent_ControlIWantMeta) String() string { return proto.CompactTextString(m) }
 func (*TraceEvent_ControlIWantMeta) ProtoMessage()    {}
 func (*TraceEvent_ControlIWantMeta) Descriptor() ([]byte, []int) {
-	return fileDescriptor_trace_31b365b8afda32be, []int{0, 17}
+	return fileDescriptor_trace_f5041bb48e7a4810, []int{0, 18}
 }
 func (m *TraceEvent_ControlIWantMeta) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1241,7 +1304,7 @@ func (m *TraceEvent_ControlGraftMeta) Reset()         { *m = TraceEvent_ControlG
 func (m *TraceEvent_ControlGraftMeta) String() string { return proto.CompactTextString(m) }
 func (*TraceEvent_ControlGraftMeta) ProtoMessage()    {}
 func (*TraceEvent_ControlGraftMeta) Descriptor() ([]byte, []int) {
-	return fileDescriptor_trace_31b365b8afda32be, []int{0, 18}
+	return fileDescriptor_trace_f5041bb48e7a4810, []int{0, 19}
 }
 func (m *TraceEvent_ControlGraftMeta) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1288,7 +1351,7 @@ func (m *TraceEvent_ControlPruneMeta) Reset()         { *m = TraceEvent_ControlP
 func (m *TraceEvent_ControlPruneMeta) String() string { return proto.CompactTextString(m) }
 func (*TraceEvent_ControlPruneMeta) ProtoMessage()    {}
 func (*TraceEvent_ControlPruneMeta) Descriptor() ([]byte, []int) {
-	return fileDescriptor_trace_31b365b8afda32be, []int{0, 19}
+	return fileDescriptor_trace_f5041bb48e7a4810, []int{0, 20}
 }
 func (m *TraceEvent_ControlPruneMeta) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1340,6 +1403,7 @@ func init() {
 	proto.RegisterType((*TraceEvent_Graft)(nil), "pubsub.pb.TraceEvent.Graft")
 	proto.RegisterType((*TraceEvent_Prune)(nil), "pubsub.pb.TraceEvent.Prune")
 	proto.RegisterType((*TraceEvent_RPCMeta)(nil), "pubsub.pb.TraceEvent.RPCMeta")
+	proto.RegisterType((*TraceEvent_MessageMeta)(nil), "pubsub.pb.TraceEvent.MessageMeta")
 	proto.RegisterType((*TraceEvent_SubMeta)(nil), "pubsub.pb.TraceEvent.SubMeta")
 	proto.RegisterType((*TraceEvent_ControlMeta)(nil), "pubsub.pb.TraceEvent.ControlMeta")
 	proto.RegisterType((*TraceEvent_ControlIHaveMeta)(nil), "pubsub.pb.TraceEvent.ControlIHaveMeta")
@@ -1538,6 +1602,21 @@ func (m *TraceEvent_PublishMessage) MarshalTo(dAtA []byte) (int, error) {
 		i = encodeVarintTrace(dAtA, i, uint64(len(m.MessageID)))
 		i += copy(dAtA[i:], m.MessageID)
 	}
+	if len(m.Topics) > 0 {
+		for _, s := range m.Topics {
+			dAtA[i] = 0x12
+			i++
+			l = len(s)
+			for l >= 1<<7 {
+				dAtA[i] = uint8(uint64(l)&0x7f | 0x80)
+				l >>= 7
+				i++
+			}
+			dAtA[i] = uint8(l)
+			i++
+			i += copy(dAtA[i:], s)
+		}
+	}
 	if m.XXX_unrecognized != nil {
 		i += copy(dAtA[i:], m.XXX_unrecognized)
 	}
@@ -1949,12 +2028,16 @@ func (m *TraceEvent_RPCMeta) MarshalTo(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
-	if len(m.MessageIDs) > 0 {
-		for _, b := range m.MessageIDs {
+	if len(m.Messages) > 0 {
+		for _, msg := range m.Messages {
 			dAtA[i] = 0xa
 			i++
-			i = encodeVarintTrace(dAtA, i, uint64(len(b)))
-			i += copy(dAtA[i:], b)
+			i = encodeVarintTrace(dAtA, i, uint64(msg.Size()))
+			n, err := msg.MarshalTo(dAtA[i:])
+			if err != nil {
+				return 0, err
+			}
+			i += n
 		}
 	}
 	if len(m.Subscription) > 0 {
@@ -1985,6 +2068,48 @@ func (m *TraceEvent_RPCMeta) MarshalTo(dAtA []byte) (int, error) {
 	return i, nil
 }
 
+func (m *TraceEvent_MessageMeta) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalTo(dAtA)
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *TraceEvent_MessageMeta) MarshalTo(dAtA []byte) (int, error) {
+	var i int
+	_ = i
+	var l int
+	_ = l
+	if m.MessageID != nil {
+		dAtA[i] = 0xa
+		i++
+		i = encodeVarintTrace(dAtA, i, uint64(len(m.MessageID)))
+		i += copy(dAtA[i:], m.MessageID)
+	}
+	if len(m.Topics) > 0 {
+		for _, s := range m.Topics {
+			dAtA[i] = 0x12
+			i++
+			l = len(s)
+			for l >= 1<<7 {
+				dAtA[i] = uint8(uint64(l)&0x7f | 0x80)
+				l >>= 7
+				i++
+			}
+			dAtA[i] = uint8(l)
+			i++
+			i += copy(dAtA[i:], s)
+		}
+	}
+	if m.XXX_unrecognized != nil {
+		i += copy(dAtA[i:], m.XXX_unrecognized)
+	}
+	return i, nil
+}
+
 func (m *TraceEvent_SubMeta) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
@@ -2302,6 +2427,12 @@ func (m *TraceEvent_PublishMessage) Size() (n int) {
 		l = len(m.MessageID)
 		n += 1 + l + sovTrace(uint64(l))
 	}
+	if len(m.Topics) > 0 {
+		for _, s := range m.Topics {
+			l = len(s)
+			n += 1 + l + sovTrace(uint64(l))
+		}
+	}
 	if m.XXX_unrecognized != nil {
 		n += len(m.XXX_unrecognized)
 	}
@@ -2542,9 +2673,9 @@ func (m *TraceEvent_RPCMeta) Size() (n int) {
 	}
 	var l int
 	_ = l
-	if len(m.MessageIDs) > 0 {
-		for _, b := range m.MessageIDs {
-			l = len(b)
+	if len(m.Messages) > 0 {
+		for _, e := range m.Messages {
+			l = e.Size()
 			n += 1 + l + sovTrace(uint64(l))
 		}
 	}
@@ -2564,6 +2695,28 @@ func (m *TraceEvent_RPCMeta) Size() (n int) {
 	return n
 }
 
+func (m *TraceEvent_MessageMeta) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	if m.MessageID != nil {
+		l = len(m.MessageID)
+		n += 1 + l + sovTrace(uint64(l))
+	}
+	if len(m.Topics) > 0 {
+		for _, s := range m.Topics {
+			l = len(s)
+			n += 1 + l + sovTrace(uint64(l))
+		}
+	}
+	if m.XXX_unrecognized != nil {
+		n += len(m.XXX_unrecognized)
+	}
+	return n
+}
+
 func (m *TraceEvent_SubMeta) Size() (n int) {
 	if m == nil {
 		return 0
@@ -3315,6 +3468,35 @@ func (m *TraceEvent_PublishMessage) Unmarshal(dAtA []byte) error {
 				m.MessageID = []byte{}
 			}
 			iNdEx = postIndex
+		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Topics", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTrace
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= (uint64(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthTrace
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Topics = append(m.Topics, string(dAtA[iNdEx:postIndex]))
+			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
 			skippy, err := skipTrace(dAtA[iNdEx:])
@@ -4631,9 +4813,9 @@ func (m *TraceEvent_RPCMeta) Unmarshal(dAtA []byte) error {
 		switch fieldNum {
 		case 1:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field MessageIDs", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field Messages", wireType)
 			}
-			var byteLen int
+			var msglen int
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
 					return ErrIntOverflowTrace
@@ -4643,20 +4825,22 @@ func (m *TraceEvent_RPCMeta) Unmarshal(dAtA []byte) error {
 				}
 				b := dAtA[iNdEx]
 				iNdEx++
-				byteLen |= (int(b) & 0x7F) << shift
+				msglen |= (int(b) & 0x7F) << shift
 				if b < 0x80 {
 					break
 				}
 			}
-			if byteLen < 0 {
+			if msglen < 0 {
 				return ErrInvalidLengthTrace
 			}
-			postIndex := iNdEx + byteLen
+			postIndex := iNdEx + msglen
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.MessageIDs = append(m.MessageIDs, make([]byte, postIndex-iNdEx))
-			copy(m.MessageIDs[len(m.MessageIDs)-1], dAtA[iNdEx:postIndex])
+			m.Messages = append(m.Messages, &TraceEvent_MessageMeta{})
+			if err := m.Messages[len(m.Messages)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
 			iNdEx = postIndex
 		case 2:
 			if wireType != 2 {
@@ -4744,6 +4928,117 @@ func (m *TraceEvent_RPCMeta) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
+func (m *TraceEvent_MessageMeta) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowTrace
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= (uint64(b) & 0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: MessageMeta: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: MessageMeta: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field MessageID", wireType)
+			}
+			var byteLen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTrace
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				byteLen |= (int(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if byteLen < 0 {
+				return ErrInvalidLengthTrace
+			}
+			postIndex := iNdEx + byteLen
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.MessageID = append(m.MessageID[:0], dAtA[iNdEx:postIndex]...)
+			if m.MessageID == nil {
+				m.MessageID = []byte{}
+			}
+			iNdEx = postIndex
+		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Topics", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTrace
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= (uint64(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthTrace
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Topics = append(m.Topics, string(dAtA[iNdEx:postIndex]))
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipTrace(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if skippy < 0 {
+				return ErrInvalidLengthTrace
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...)
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
 func (m *TraceEvent_SubMeta) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
@@ -5478,67 +5773,68 @@ var (
 	ErrIntOverflowTrace   = fmt.Errorf("proto: integer overflow")
 )
 
-func init() { proto.RegisterFile("trace.proto", fileDescriptor_trace_31b365b8afda32be) }
-
-var fileDescriptor_trace_31b365b8afda32be = []byte{
-	// 931 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x96, 0xcd, 0x6e, 0xdb, 0x46,
-	0x10, 0xc7, 0x4b, 0x7d, 0x58, 0xd2, 0x88, 0x96, 0xd9, 0x6d, 0x5a, 0x10, 0x6c, 0x62, 0xa8, 0x6e,
-	0x10, 0xe8, 0x24, 0x20, 0x06, 0x8a, 0x1c, 0x9a, 0x02, 0x55, 0xc4, 0x8d, 0x2d, 0x43, 0xb6, 0x89,
-	0x91, 0xec, 0x1e, 0x5d, 0x4a, 0xda, 0x26, 0x0c, 0x24, 0x92, 0x20, 0x57, 0x2a, 0xf2, 0x00, 0x7d,
-	0x98, 0xbe, 0x49, 0x6f, 0xed, 0x23, 0x14, 0x3e, 0xf7, 0x21, 0x8a, 0xdd, 0x25, 0x25, 0x51, 0xa1,
-	0xe8, 0xf4, 0xe3, 0xc6, 0x99, 0xfd, 0xff, 0x66, 0x77, 0xd6, 0xff, 0x59, 0x0b, 0x9a, 0x3c, 0x72,
-	0xa7, 0xac, 0x1b, 0x46, 0x01, 0x0f, 0x48, 0x23, 0x5c, 0x4e, 0xe2, 0xe5, 0xa4, 0x1b, 0x4e, 0x4e,
-	0xfe, 0x7a, 0x04, 0x30, 0x16, 0x4b, 0x74, 0xc5, 0x7c, 0x4e, 0xba, 0x50, 0xe1, 0xef, 0x43, 0x66,
-	0x6a, 0x6d, 0xad, 0xd3, 0x3a, 0xb5, 0xba, 0x6b, 0x61, 0x77, 0x23, 0xea, 0x8e, 0xdf, 0x87, 0x0c,
-	0xa5, 0x8e, 0x7c, 0x01, 0x07, 0x21, 0x63, 0xd1, 0xc0, 0x36, 0x4b, 0x6d, 0xad, 0xa3, 0x63, 0x12,
-	0x91, 0xc7, 0xd0, 0xe0, 0xde, 0x82, 0xc5, 0xdc, 0x5d, 0x84, 0x66, 0xb9, 0xad, 0x75, 0xca, 0xb8,
-	0x49, 0x90, 0x21, 0xb4, 0xc2, 0xe5, 0x64, 0xee, 0xc5, 0x6f, 0x2f, 0x59, 0x1c, 0xbb, 0x6f, 0x98,
-	0x59, 0x69, 0x6b, 0x9d, 0xe6, 0xe9, 0xd3, 0xfc, 0xfd, 0x9c, 0x8c, 0x16, 0x77, 0x58, 0x32, 0x80,
-	0xc3, 0x88, 0xbd, 0x63, 0x53, 0x9e, 0x16, 0xab, 0xca, 0x62, 0x5f, 0xe7, 0x17, 0xc3, 0x6d, 0x29,
-	0x66, 0x49, 0x82, 0x60, 0xcc, 0x96, 0xe1, 0xdc, 0x9b, 0xba, 0x9c, 0xa5, 0xd5, 0x0e, 0x64, 0xb5,
-	0x67, 0xf9, 0xd5, 0xec, 0x1d, 0x35, 0x7e, 0xc0, 0x8b, 0x66, 0x67, 0x6c, 0xee, 0xad, 0x58, 0x94,
-	0x56, 0xac, 0x15, 0x35, 0x6b, 0x67, 0xb4, 0xb8, 0xc3, 0x92, 0x17, 0x50, 0x73, 0x67, 0x33, 0x87,
-	0xb1, 0xc8, 0xac, 0xcb, 0x32, 0x4f, 0xf2, 0xcb, 0xf4, 0x94, 0x08, 0x53, 0x35, 0xf9, 0x1e, 0x20,
-	0x62, 0x8b, 0x60, 0xc5, 0x24, 0xdb, 0x90, 0x6c, 0x7b, 0xdf, 0x15, 0xa5, 0x3a, 0xdc, 0x62, 0xc4,
-	0xd6, 0x11, 0x9b, 0xae, 0xd0, 0xe9, 0x9b, 0x50, 0xb4, 0x35, 0x2a, 0x11, 0xa6, 0x6a, 0x01, 0xc6,
-	0xcc, 0x9f, 0x09, 0xb0, 0x59, 0x04, 0x8e, 0x94, 0x08, 0x53, 0xb5, 0x00, 0x67, 0x51, 0x10, 0x0a,
-	0x50, 0x2f, 0x02, 0x6d, 0x25, 0xc2, 0x54, 0x2d, 0x6c, 0xfc, 0x2e, 0xf0, 0x7c, 0xf3, 0x50, 0x52,
-	0x7b, 0x6c, 0x7c, 0x11, 0x78, 0x3e, 0x4a, 0x1d, 0x79, 0x0e, 0xd5, 0x39, 0x73, 0x57, 0xcc, 0x6c,
-	0x49, 0xe0, 0xcb, 0x7c, 0x60, 0x28, 0x24, 0xa8, 0x94, 0x02, 0x79, 0x13, 0xb9, 0x3f, 0x71, 0xf3,
-	0xa8, 0x08, 0x39, 0x13, 0x12, 0x54, 0x4a, 0x81, 0x84, 0xd1, 0xd2, 0x67, 0xa6, 0x51, 0x84, 0x38,
-	0x42, 0x82, 0x4a, 0x69, 0x75, 0xa1, 0x95, 0x75, 0xbf, 0x98, 0xac, 0x85, 0xfa, 0x1c, 0xd8, 0x72,
-	0x4c, 0x75, 0xdc, 0x24, 0x2c, 0x0f, 0x0e, 0x33, 0x06, 0x2f, 0x96, 0x93, 0x13, 0xd0, 0x23, 0x36,
-	0x65, 0xde, 0x8a, 0xcd, 0x5e, 0x47, 0xc1, 0x22, 0x19, 0xe2, 0x4c, 0x4e, 0x8c, 0x78, 0xc4, 0xdc,
-	0x38, 0xf0, 0xe5, 0x1c, 0x37, 0x30, 0x89, 0xac, 0x31, 0x18, 0xbb, 0xee, 0xff, 0xef, 0xbb, 0x89,
-	0x86, 0xb3, 0x13, 0xf0, 0x40, 0xc3, 0x2f, 0xa0, 0x96, 0x58, 0x7d, 0xeb, 0x2d, 0xd2, 0x32, 0x6f,
-	0xd1, 0x23, 0x71, 0xed, 0x01, 0x0f, 0xe4, 0x7e, 0x0d, 0x54, 0x81, 0xf5, 0x14, 0x60, 0xe3, 0xf3,
-	0x7d, 0xac, 0xf5, 0x23, 0xd4, 0x12, 0x3b, 0x7f, 0x70, 0x7a, 0x2d, 0xe7, 0xae, 0x9e, 0x43, 0x65,
-	0xc1, 0xb8, 0x2b, 0x77, 0xda, 0x3f, 0x1f, 0x4e, 0xff, 0x92, 0x71, 0x17, 0xa5, 0xd4, 0x1a, 0x43,
-	0x2d, 0xf1, 0xbd, 0x38, 0x84, 0x70, 0xfe, 0x38, 0x48, 0x0f, 0xa1, 0xa2, 0x7f, 0x59, 0x35, 0x19,
-	0x8a, 0xff, 0xb3, 0xea, 0x63, 0xa8, 0x88, 0xa1, 0x11, 0x37, 0xca, 0x83, 0xd0, 0x9b, 0xca, 0x8a,
-	0x0d, 0x54, 0x81, 0xf5, 0x04, 0xaa, 0x72, 0x42, 0x36, 0xcb, 0xa5, 0xed, 0xe5, 0x6f, 0xa0, 0x2a,
-	0xa7, 0xa1, 0xe8, 0xef, 0x94, 0x8f, 0xc9, 0x89, 0xf8, 0x87, 0xd8, 0xaf, 0x1a, 0xd4, 0x92, 0xc3,
-	0x93, 0x63, 0x80, 0xb5, 0x61, 0x62, 0x53, 0x6b, 0x97, 0x3b, 0x3a, 0x6e, 0x65, 0x48, 0x0f, 0xf4,
-	0x78, 0x39, 0x89, 0xa7, 0x91, 0x17, 0x72, 0x2f, 0xf0, 0xcd, 0x52, 0xbb, 0x5c, 0xf0, 0x48, 0x2d,
-	0x27, 0xf2, 0x46, 0x32, 0x08, 0xf9, 0x16, 0x6a, 0xd3, 0xc0, 0xe7, 0x51, 0x30, 0x97, 0x53, 0xd2,
-	0x3c, 0xfd, 0x2a, 0x9f, 0xee, 0x2b, 0x91, 0xac, 0x90, 0x12, 0xd6, 0x77, 0x50, 0x4b, 0xaa, 0x0a,
-	0xb3, 0x27, 0x75, 0x27, 0xea, 0x9f, 0x70, 0x1d, 0x37, 0x89, 0x3d, 0xad, 0xfe, 0x52, 0x82, 0xe6,
-	0x56, 0x5d, 0xf2, 0x12, 0xaa, 0xde, 0x5b, 0xf1, 0x98, 0x69, 0xb2, 0x8f, 0x67, 0x85, 0x27, 0x19,
-	0x9c, 0xbb, 0x2b, 0x26, 0x8f, 0xa3, 0x20, 0x49, 0xff, 0xec, 0xfa, 0x3c, 0xb9, 0x85, 0x07, 0xe8,
-	0x1f, 0x5c, 0x9f, 0x27, 0xb4, 0x80, 0x04, 0xad, 0x5e, 0xc5, 0xf2, 0x47, 0xd0, 0xd2, 0x0e, 0x8a,
-	0x56, 0x0f, 0xe4, 0xcb, 0xf4, 0x81, 0xac, 0x7c, 0x04, 0x2d, 0x5d, 0xa1, 0x68, 0xf5, 0x56, 0x9e,
-	0x83, 0xb1, 0xdb, 0x54, 0xbe, 0x53, 0x77, 0x0c, 0x51, 0xda, 0x35, 0x84, 0x75, 0xba, 0xa9, 0x94,
-	0x36, 0xf8, 0x90, 0x89, 0xac, 0xce, 0x9a, 0x59, 0xb7, 0xb5, 0x67, 0x4e, 0x36, 0xca, 0x75, 0x0b,
-	0xf9, 0xca, 0x93, 0xdf, 0x35, 0xa8, 0x88, 0x1f, 0x5b, 0xe4, 0x33, 0x38, 0x72, 0x6e, 0x5e, 0x0d,
-	0x07, 0xa3, 0xf3, 0xbb, 0x4b, 0x3a, 0x1a, 0xf5, 0xce, 0xa8, 0xf1, 0x09, 0x21, 0xd0, 0x42, 0x7a,
-	0x41, 0xfb, 0xe3, 0x75, 0x4e, 0x23, 0x9f, 0xc3, 0xa7, 0xf6, 0x8d, 0x33, 0x1c, 0xf4, 0x7b, 0x63,
-	0xba, 0x4e, 0x97, 0x04, 0x6f, 0xd3, 0xe1, 0xe0, 0x96, 0xe2, 0x3a, 0x59, 0x26, 0x3a, 0xd4, 0x7b,
-	0xb6, 0x7d, 0xe7, 0x50, 0x8a, 0x46, 0x85, 0x1c, 0x41, 0x13, 0xe9, 0xe5, 0xf5, 0x2d, 0x55, 0x89,
-	0xaa, 0x58, 0x46, 0xda, 0xbf, 0xbd, 0x43, 0xa7, 0x6f, 0x1c, 0x88, 0x68, 0x44, 0xaf, 0x6c, 0x19,
-	0xd5, 0x44, 0x64, 0xe3, 0xb5, 0x23, 0xa3, 0x3a, 0xa9, 0x43, 0xe5, 0xe2, 0x7a, 0x70, 0x65, 0x34,
-	0x48, 0x03, 0xaa, 0x43, 0xda, 0xbb, 0xa5, 0x06, 0x88, 0xcf, 0x33, 0xec, 0xbd, 0x1e, 0x1b, 0x4d,
-	0xf1, 0xe9, 0xe0, 0xcd, 0x15, 0x35, 0xf4, 0x57, 0xfa, 0x6f, 0xf7, 0xc7, 0xda, 0x1f, 0xf7, 0xc7,
-	0xda, 0x9f, 0xf7, 0xc7, 0xda, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xf8, 0x22, 0x93, 0xfa, 0x95,
-	0x0a, 0x00, 0x00,
+func init() { proto.RegisterFile("trace.proto", fileDescriptor_trace_f5041bb48e7a4810) }
+
+var fileDescriptor_trace_f5041bb48e7a4810 = []byte{
+	// 958 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x96, 0xcf, 0x6e, 0xdb, 0x46,
+	0x10, 0xc6, 0x4b, 0xfd, 0x31, 0xc5, 0x11, 0x2d, 0xb3, 0xdb, 0xa6, 0x20, 0xd8, 0xc4, 0x50, 0xdd,
+	0x20, 0xd0, 0x49, 0x40, 0x0c, 0x14, 0x39, 0x34, 0x01, 0xaa, 0x88, 0xb4, 0x2d, 0x43, 0xb6, 0x89,
+	0x91, 0xac, 0x1e, 0x5d, 0x4a, 0xda, 0x26, 0x0c, 0x24, 0x92, 0x20, 0x29, 0x15, 0x79, 0x80, 0xbe,
+	0x5b, 0x6e, 0xed, 0x23, 0x14, 0x3e, 0xf5, 0x31, 0x8a, 0xdd, 0x25, 0x29, 0x51, 0xa6, 0x98, 0x34,
+	0xed, 0x8d, 0xb3, 0xfc, 0x7e, 0xb3, 0x3b, 0xcb, 0xf9, 0x06, 0x84, 0x66, 0x1c, 0x3a, 0x33, 0xda,
+	0x0d, 0x42, 0x3f, 0xf6, 0x89, 0x12, 0xac, 0xa6, 0xd1, 0x6a, 0xda, 0x0d, 0xa6, 0x27, 0x7f, 0x3f,
+	0x02, 0x18, 0xb3, 0x57, 0xd6, 0x9a, 0x7a, 0x31, 0xe9, 0x42, 0x2d, 0x7e, 0x1f, 0x50, 0x5d, 0x6a,
+	0x4b, 0x9d, 0xd6, 0xa9, 0xd1, 0xcd, 0x84, 0xdd, 0x8d, 0xa8, 0x3b, 0x7e, 0x1f, 0x50, 0xe4, 0x3a,
+	0xf2, 0x0d, 0x1c, 0x04, 0x94, 0x86, 0x03, 0x53, 0xaf, 0xb4, 0xa5, 0x8e, 0x8a, 0x49, 0x44, 0x1e,
+	0x83, 0x12, 0xbb, 0x4b, 0x1a, 0xc5, 0xce, 0x32, 0xd0, 0xab, 0x6d, 0xa9, 0x53, 0xc5, 0xcd, 0x02,
+	0x19, 0x42, 0x2b, 0x58, 0x4d, 0x17, 0x6e, 0xf4, 0xf6, 0x8a, 0x46, 0x91, 0xf3, 0x86, 0xea, 0xb5,
+	0xb6, 0xd4, 0x69, 0x9e, 0x3e, 0x2d, 0xde, 0xcf, 0xce, 0x69, 0x71, 0x87, 0x25, 0x03, 0x38, 0x0c,
+	0xe9, 0x3b, 0x3a, 0x8b, 0xd3, 0x64, 0x75, 0x9e, 0xec, 0xfb, 0xe2, 0x64, 0xb8, 0x2d, 0xc5, 0x3c,
+	0x49, 0x10, 0xb4, 0xf9, 0x2a, 0x58, 0xb8, 0x33, 0x27, 0xa6, 0x69, 0xb6, 0x03, 0x9e, 0xed, 0x59,
+	0x71, 0x36, 0x73, 0x47, 0x8d, 0x0f, 0x78, 0x56, 0xec, 0x9c, 0x2e, 0xdc, 0x35, 0x0d, 0xd3, 0x8c,
+	0x72, 0x59, 0xb1, 0x66, 0x4e, 0x8b, 0x3b, 0x2c, 0x79, 0x01, 0xb2, 0x33, 0x9f, 0xdb, 0x94, 0x86,
+	0x7a, 0x83, 0xa7, 0x79, 0x52, 0x9c, 0xa6, 0x27, 0x44, 0x98, 0xaa, 0xc9, 0x4f, 0x00, 0x21, 0x5d,
+	0xfa, 0x6b, 0xca, 0x59, 0x85, 0xb3, 0xed, 0x7d, 0x57, 0x94, 0xea, 0x70, 0x8b, 0x61, 0x5b, 0x87,
+	0x74, 0xb6, 0x46, 0xbb, 0xaf, 0x43, 0xd9, 0xd6, 0x28, 0x44, 0x98, 0xaa, 0x19, 0x18, 0x51, 0x6f,
+	0xce, 0xc0, 0x66, 0x19, 0x38, 0x12, 0x22, 0x4c, 0xd5, 0x0c, 0x9c, 0x87, 0x7e, 0xc0, 0x40, 0xb5,
+	0x0c, 0x34, 0x85, 0x08, 0x53, 0x35, 0x6b, 0xe3, 0x77, 0xbe, 0xeb, 0xe9, 0x87, 0x9c, 0xda, 0xd3,
+	0xc6, 0x97, 0xbe, 0xeb, 0x21, 0xd7, 0x91, 0xe7, 0x50, 0x5f, 0x50, 0x67, 0x4d, 0xf5, 0x16, 0x07,
+	0xbe, 0x2d, 0x06, 0x86, 0x4c, 0x82, 0x42, 0xc9, 0x90, 0x37, 0xa1, 0xf3, 0x6b, 0xac, 0x1f, 0x95,
+	0x21, 0xe7, 0x4c, 0x82, 0x42, 0xc9, 0x90, 0x20, 0x5c, 0x79, 0x54, 0xd7, 0xca, 0x10, 0x9b, 0x49,
+	0x50, 0x28, 0x8d, 0x33, 0x68, 0xe5, 0xbb, 0x9f, 0x39, 0x6b, 0x29, 0x1e, 0x07, 0x26, 0xb7, 0xa9,
+	0x8a, 0x9b, 0x05, 0xe6, 0xc7, 0xd8, 0x0f, 0xdc, 0x59, 0xa4, 0x57, 0xda, 0xd5, 0x8e, 0x82, 0x49,
+	0x64, 0xb8, 0x70, 0x98, 0x6b, 0xfc, 0x8f, 0xa4, 0x39, 0x01, 0x35, 0xa4, 0x33, 0xea, 0xae, 0xe9,
+	0xfc, 0x2c, 0xf4, 0x97, 0x89, 0xb9, 0x73, 0x6b, 0x6c, 0xab, 0x90, 0x3a, 0x91, 0xef, 0x71, 0x7f,
+	0x2b, 0x98, 0x44, 0xc6, 0x18, 0xb4, 0x5d, 0x57, 0xfc, 0xf7, 0xdd, 0x8c, 0x2e, 0xb4, 0xf2, 0xce,
+	0x28, 0xcf, 0x69, 0xbc, 0x00, 0x39, 0xb1, 0xc0, 0xd6, 0x8c, 0x92, 0x72, 0x33, 0xea, 0x6b, 0xf6,
+	0x39, 0xfc, 0xd8, 0xe7, 0xfb, 0x29, 0x28, 0x02, 0xe3, 0x29, 0xc0, 0xa6, 0xff, 0xf7, 0xb1, 0xc6,
+	0x2f, 0x20, 0x27, 0x6d, 0xfe, 0xe0, 0xf4, 0x52, 0xc1, 0x5d, 0x3d, 0x87, 0xda, 0x92, 0xc6, 0x0e,
+	0xdf, 0x69, 0xbf, 0x6f, 0xec, 0xfe, 0x15, 0x8d, 0x1d, 0xe4, 0x52, 0x63, 0x0c, 0x72, 0xe2, 0x07,
+	0x76, 0x08, 0xe6, 0x88, 0xb1, 0x9f, 0x1e, 0x42, 0x44, 0x9f, 0x99, 0x35, 0x31, 0xcb, 0xff, 0x99,
+	0xf5, 0x31, 0xd4, 0x98, 0x99, 0xd8, 0x8d, 0xf2, 0x7e, 0xe3, 0x19, 0x15, 0x14, 0x81, 0xf1, 0x04,
+	0xea, 0xdc, 0x39, 0x9b, 0xd7, 0x95, 0xed, 0xd7, 0x3f, 0x40, 0x9d, 0xbb, 0xa4, 0xec, 0x3b, 0x15,
+	0x63, 0xdc, 0x29, 0xff, 0x12, 0xfb, 0x20, 0x81, 0x9c, 0x1c, 0x9e, 0xbc, 0x82, 0x46, 0xd2, 0x30,
+	0x91, 0x2e, 0xb5, 0xab, 0x9d, 0xe6, 0xe9, 0x77, 0xc5, 0xd5, 0x26, 0x2d, 0xc7, 0x2b, 0xce, 0x10,
+	0xd2, 0x03, 0x35, 0x5a, 0x4d, 0xa3, 0x59, 0xe8, 0x06, 0xb1, 0xeb, 0x7b, 0xdc, 0x71, 0xfb, 0x67,
+	0xdb, 0x6a, 0xca, 0xf1, 0x1c, 0x42, 0x7e, 0x04, 0x79, 0xe6, 0x7b, 0x71, 0xe8, 0x2f, 0xb8, 0x89,
+	0xf6, 0x1e, 0xa0, 0x2f, 0x44, 0x3c, 0x43, 0x4a, 0x18, 0x7d, 0x68, 0x6e, 0x1d, 0xec, 0x33, 0x07,
+	0xc3, 0x2b, 0x90, 0x93, 0xa3, 0xb1, 0x04, 0xc9, 0xe1, 0xa6, 0xe2, 0x07, 0xa0, 0x81, 0x9b, 0x85,
+	0x3d, 0xd7, 0xf9, 0x7b, 0x05, 0x9a, 0x5b, 0x87, 0x23, 0x2f, 0xa1, 0xee, 0xbe, 0x65, 0x83, 0x54,
+	0xdc, 0xe7, 0xb3, 0xd2, 0x72, 0x06, 0x17, 0xce, 0x5a, 0x5c, 0xaa, 0x80, 0x38, 0xfd, 0x9b, 0xe3,
+	0xc5, 0xc9, 0x55, 0x7e, 0x84, 0xfe, 0xd9, 0xf1, 0xe2, 0x84, 0x66, 0x10, 0xa3, 0xc5, 0x44, 0xae,
+	0x7e, 0x02, 0xcd, 0x5b, 0x4e, 0xd0, 0x62, 0x38, 0xbf, 0x4c, 0x87, 0x73, 0xed, 0x13, 0x68, 0xde,
+	0x79, 0x82, 0x16, 0x73, 0xfa, 0x02, 0xb4, 0xdd, 0xa2, 0x8a, 0xdd, 0x40, 0x8e, 0x01, 0xb2, 0xaf,
+	0x22, 0x3e, 0x86, 0x8a, 0x5b, 0x2b, 0xc6, 0xe9, 0x26, 0x53, 0x5a, 0xe0, 0x0e, 0x23, 0x3d, 0x60,
+	0x3a, 0x19, 0x93, 0x95, 0xb5, 0xc7, 0x8b, 0x1b, 0x65, 0x56, 0x42, 0xb1, 0xf2, 0xe4, 0x0f, 0x09,
+	0x6a, 0xec, 0x47, 0x8f, 0x7c, 0x05, 0x47, 0xf6, 0xed, 0xeb, 0xe1, 0x60, 0x74, 0x71, 0x77, 0x65,
+	0x8d, 0x46, 0xbd, 0x73, 0x4b, 0xfb, 0x82, 0x10, 0x68, 0xa1, 0x75, 0x69, 0xf5, 0xc7, 0xd9, 0x9a,
+	0x44, 0x1e, 0xc1, 0x97, 0xe6, 0xad, 0x3d, 0x1c, 0xf4, 0x7b, 0x63, 0x2b, 0x5b, 0xae, 0x30, 0xde,
+	0xb4, 0x86, 0x83, 0x89, 0x85, 0xd9, 0x62, 0x95, 0xa8, 0xd0, 0xe8, 0x99, 0xe6, 0x9d, 0x6d, 0x59,
+	0xa8, 0xd5, 0xc8, 0x11, 0x34, 0xd1, 0xba, 0xba, 0x99, 0x58, 0x62, 0xa1, 0xce, 0x5e, 0xa3, 0xd5,
+	0x9f, 0xdc, 0xa1, 0xdd, 0xd7, 0x0e, 0x58, 0x34, 0xb2, 0xae, 0x4d, 0x1e, 0xc9, 0x2c, 0x32, 0xf1,
+	0xc6, 0xe6, 0x51, 0x83, 0x34, 0xa0, 0x76, 0x79, 0x33, 0xb8, 0xd6, 0x14, 0xa2, 0x40, 0x7d, 0x68,
+	0xf5, 0x26, 0x96, 0x06, 0xec, 0xf1, 0x1c, 0x7b, 0x67, 0x63, 0xad, 0xc9, 0x1e, 0x6d, 0xbc, 0xbd,
+	0xb6, 0x34, 0xf5, 0xb5, 0xfa, 0xe1, 0xfe, 0x58, 0xfa, 0xf3, 0xfe, 0x58, 0xfa, 0xeb, 0xfe, 0x58,
+	0xfa, 0x27, 0x00, 0x00, 0xff, 0xff, 0xfe, 0x5e, 0x59, 0x8a, 0x11, 0x0b, 0x00, 0x00,
 }
diff --git a/pb/trace.proto b/pb/trace.proto
index 3659c5a25c5a3fcaaf1126c071c09573431bb9c9..e6369ed3ee1ab830a449df767943156188dc94cb 100644
--- a/pb/trace.proto
+++ b/pb/trace.proto
@@ -39,6 +39,7 @@ message TraceEvent {
 
   message PublishMessage {
     optional bytes messageID = 1;
+    repeated string topics = 2;
   }
 
   message RejectMessage {
@@ -99,11 +100,16 @@ message TraceEvent {
   }
 
   message RPCMeta {
-    repeated bytes messageIDs = 1;
+    repeated MessageMeta messages = 1;
     repeated SubMeta subscription = 2;
     optional ControlMeta control = 3;
   }
 
+  message MessageMeta {
+    optional bytes messageID = 1;
+    repeated string topics = 2;
+  }
+
   message SubMeta {
     optional bool subscribe = 1;
     optional string topic = 2;
diff --git a/trace.go b/trace.go
index af0fc038daeb7b5fd83fccc84069110290e9f1a8..eecd638963aebe69281a9e6c1dff25e56b6512da 100644
--- a/trace.go
+++ b/trace.go
@@ -31,6 +31,7 @@ func (t *pubsubTracer) PublishMessage(msg *Message) {
 		Timestamp: &now,
 		PublishMessage: &pb.TraceEvent_PublishMessage{
 			MessageID: []byte(msgID(msg.Message)),
+			Topics:    msg.Message.TopicIDs,
 		},
 	}
 
@@ -192,11 +193,14 @@ func (t *pubsubTracer) DropRPC(rpc *RPC, p peer.ID) {
 func traceRPCMeta(rpc *RPC) *pb.TraceEvent_RPCMeta {
 	rpcMeta := new(pb.TraceEvent_RPCMeta)
 
-	var mids [][]byte
+	var msgs []*pb.TraceEvent_MessageMeta
 	for _, m := range rpc.Publish {
-		mids = append(mids, []byte(msgID(m)))
+		msgs = append(msgs, &pb.TraceEvent_MessageMeta{
+			MessageID: []byte(msgID(m)),
+			Topics:    m.TopicIDs,
+		})
 	}
-	rpcMeta.MessageIDs = mids
+	rpcMeta.Messages = msgs
 
 	var subs []*pb.TraceEvent_SubMeta
 	for _, sub := range rpc.Subscriptions {