Skip to content
This repository was archived by the owner on Jul 31, 2023. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 44 additions & 0 deletions jaeger.go
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,9 @@ func spanDataToThrift(data *trace.SpanData) *jaeger.Span {
SpanId: bytesToInt64(link.SpanID[:]),
})
}
for _, me := range data.MessageEvents {
logs = append(logs, timedMessageEventToLog(me))
}
return &jaeger.Span{
TraceIdHigh: bytesToInt64(data.TraceID[0:8]),
TraceIdLow: bytesToInt64(data.TraceID[8:16]),
Expand Down Expand Up @@ -306,6 +309,47 @@ func attributeToTag(key string, a interface{}) *jaeger.Tag {
return tag
}

func timedMessageEventToLog(evt trace.MessageEvent) *jaeger.Log {
id := evt.MessageID
cSize := evt.CompressedByteSize
ucSize := evt.UncompressedByteSize
var description string
if evt.EventType == trace.MessageEventTypeRecv {
description = "received message"
} else if evt.EventType == trace.MessageEventTypeSent {
description = "sent message"
} else {
description = "unknown message event type"
}
fields := []*jaeger.Tag{
&jaeger.Tag{
Key: "id",
VLong: &id,
VType: jaeger.TagType_LONG,
},
&jaeger.Tag{
Key: "compressed_size",
VLong: &cSize,
VType: jaeger.TagType_LONG,
},
&jaeger.Tag{
Key: "uncompressed_size",
VLong: &ucSize,
VType: jaeger.TagType_LONG,
},
&jaeger.Tag{
Key: "message",
VStr: &description,
VType: jaeger.TagType_STRING,
},
}

return &jaeger.Log{
Timestamp: evt.Time.UnixNano() / 1000,
Fields: fields,
}
}

// Flush waits for exported trace spans to be uploaded.
//
// This is useful if your program is ending and you do not want to lose recent spans.
Expand Down
22 changes: 21 additions & 1 deletion jaeger_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@ import (

"github.com/uber/jaeger-client-go/thrift-gen/jaeger"

"go.opencensus.io/trace"
"sort"

"go.opencensus.io/trace"
)

// TODO(jbd): Test export.
Expand Down Expand Up @@ -67,6 +68,10 @@ func Test_spanDataToThrift(t *testing.T) {
doubleValue := float64(123.456)
boolTrue := true
statusMessage := "error"
messageID := int64(1234)
uncompressedByteSize := int64(5000)
compressedByteSize := int64(4000)
eventMessage := "sent message"

tests := []struct {
name string
Expand Down Expand Up @@ -104,6 +109,15 @@ func Test_spanDataToThrift(t *testing.T) {
},
},
Status: trace.Status{Code: trace.StatusCodeUnknown, Message: "error"},
MessageEvents: []trace.MessageEvent{
{
Time: now,
EventType: trace.MessageEventTypeSent,
MessageID: messageID,
UncompressedByteSize: uncompressedByteSize,
CompressedByteSize: compressedByteSize,
},
},
},
want: &jaeger.Span{
TraceIdLow: 651345242494996240,
Expand All @@ -128,6 +142,12 @@ func Test_spanDataToThrift(t *testing.T) {
{Key: "result", VType: jaeger.TagType_BOOL, VBool: &resultValue},
{Key: "message", VType: jaeger.TagType_STRING, VStr: &statusMessage},
}},
{Timestamp: now.UnixNano() / 1000, Fields: []*jaeger.Tag{
{Key: "id", VType: jaeger.TagType_LONG, VLong: &messageID},
{Key: "compressed_size", VType: jaeger.TagType_LONG, VLong: &compressedByteSize},
{Key: "uncompressed_size", VType: jaeger.TagType_LONG, VLong: &uncompressedByteSize},
{Key: "message", VType: jaeger.TagType_STRING, VStr: &eventMessage},
}},
},
},
},
Expand Down