Merge pull request #99 from keep94/30158

Send span lines with span logs.
wavefrontHQ · Aug 19, 2022 · c3769c5 · c3769c5
2 parents 10ec95b + 135bff5
commit c3769c5
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/senders/client.go b/senders/client.go
@@ -135,7 +135,7 @@ func (sender *wavefrontSender) SendSpan(name string, startMillis, durationMillis
 	}
 
 	if len(spanLogs) > 0 {
-		logs, err := SpanLogJSON(traceId, spanId, spanLogs)
+		logs, err := SpanLogJSON(traceId, spanId, spanLogs, line)
 		if err != nil {
 			sender.spanLogsInvalid.Inc()
 			return err

diff --git a/senders/direct.go b/senders/direct.go
@@ -192,7 +192,7 @@ func (sender *directSender) SendSpan(name string, startMillis, durationMillis in
 	}
 
 	if len(spanLogs) > 0 {
-		logs, err := SpanLogJSON(traceId, spanId, spanLogs)
+		logs, err := SpanLogJSON(traceId, spanId, spanLogs, line)
 		if err != nil {
 			sender.spanLogsInvalid.Inc()
 			return err

diff --git a/senders/formatter.go b/senders/formatter.go
@@ -195,11 +195,12 @@ func SpanLine(name string, startMillis, durationMillis int64, source, traceId, s
 }
 
 // SpanLogJSON is for internal use only.
-func SpanLogJSON(traceId, spanId string, spanLogs []SpanLog) (string, error) {
+func SpanLogJSON(traceId, spanId string, spanLogs []SpanLog, span string) (string, error) {
 	l := SpanLogs{
 		TraceId: traceId,
 		SpanId:  spanId,
 		Logs:    spanLogs,
+		Span:    span,
 	}
 	out, err := json.Marshal(l)
 	if err != nil {

diff --git a/senders/proxy.go b/senders/proxy.go
@@ -255,7 +255,7 @@ func (sender *proxySender) SendSpan(name string, startMillis, durationMillis int
 	}
 
 	if len(spanLogs) > 0 {
-		logs, err := SpanLogJSON(traceId, spanId, spanLogs)
+		logs, err := SpanLogJSON(traceId, spanId, spanLogs, line)
 		if err != nil {
 			sender.spanLogsInvalid.Inc()
 			return err

diff --git a/senders/types.go b/senders/types.go
@@ -20,6 +20,7 @@ type SpanLogs struct {
 	TraceId string    `json:"traceId"`
 	SpanId  string    `json:"spanId"`
 	Logs    []SpanLog `json:"logs"`
+	Span    string    `json:"span"`
 }
 
 // MetricSender Interface for sending metrics to Wavefront