Fix the improperly formatted link trace ID (#697)

rakyll · web-flow · commit c7be888bcabf · 2018-04-12T10:29:34.000-07:00
Fixes #690.
diff --git a/exporter/stackdriver/trace_proto.go b/exporter/stackdriver/trace_proto.go
@@ -15,7 +15,6 @@
 package stackdriver
 
 import (
-	"fmt"
 	"math"
 	"time"
 	"unicode/utf8"
@@ -144,15 +143,14 @@ func protoFromSpanData(s *trace.SpanData, projectID string) *tracepb.Span {
 		sp.Links.Link = make([]*tracepb.Span_Link, 0, len(s.Links))
 		for _, l := range s.Links {
 			link := &tracepb.Span_Link{
-				TraceId: fmt.Sprintf("projects/%s/traces/%s", projectID, l.TraceID),
+				TraceId: l.TraceID.String(),
 				SpanId:  l.SpanID.String(),
 				Type:    tracepb.Span_Link_Type(l.Type),
 			}
 			copyAttributes(&link.Attributes, l.Attributes)
 			sp.Links.Link = append(sp.Links.Link, link)
 		}
 	}
-
 	return sp
 }
 
diff --git a/exporter/stackdriver/trace_proto_test.go b/exporter/stackdriver/trace_proto_test.go
@@ -289,7 +289,7 @@ func TestExportTrace(t *testing.T) {
 			Links: &tracepb.Span_Links{
 				Link: []*tracepb.Span_Link{
 					{
-						TraceId: "projects/testproject/traces/01020000000000000000000000000000",
+						TraceId: "01020000000000000000000000000000",
 						SpanId:  "0300000000000000",
 						Type:    tracepb.Span_Link_PARENT_LINKED_SPAN,
 						Attributes: &tracepb.Span_Attributes{

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@`
`15`	`15`	`package stackdriver`
`16`	`16`
`17`	`17`	`import (`
`18`		`- "fmt"`
`19`	`18`	`"math"`
`20`	`19`	`"time"`
`21`	`20`	`"unicode/utf8"`
`@@ -144,15 +143,14 @@ func protoFromSpanData(s trace.SpanData, projectID string) tracepb.Span {`
`144`	`143`	`sp.Links.Link = make([]*tracepb.Span_Link, 0, len(s.Links))`
`145`	`144`	`for _, l := range s.Links {`
`146`	`145`	`link := &tracepb.Span_Link{`
`147`		`- TraceId: fmt.Sprintf("projects/%s/traces/%s", projectID, l.TraceID),`
	`146`	`+ TraceId: l.TraceID.String(),`
`148`	`147`	`SpanId: l.SpanID.String(),`
`149`	`148`	`Type: tracepb.Span_Link_Type(l.Type),`
`150`	`149`	`}`
`151`	`150`	`copyAttributes(&link.Attributes, l.Attributes)`
`152`	`151`	`sp.Links.Link = append(sp.Links.Link, link)`
`153`	`152`	`}`
`154`	`153`	`}`
`155`		`-`
`156`	`154`	`return sp`
`157`	`155`	`}`
`158`	`156`
Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,7 @@ func TestExportTrace(t *testing.T) {`
`289`	`289`	`Links: &tracepb.Span_Links{`
`290`	`290`	`Link: []*tracepb.Span_Link{`
`291`	`291`	`{`
`292`		`- TraceId: "projects/testproject/traces/01020000000000000000000000000000",`
	`292`	`+ TraceId: "01020000000000000000000000000000",`
`293`	`293`	`SpanId: "0300000000000000",`
`294`	`294`	`Type: tracepb.Span_Link_PARENT_LINKED_SPAN,`
`295`	`295`	`Attributes: &tracepb.Span_Attributes{`