feat: add span.Warnings to cassandra schema

Signed-off-by: Rohan Kumar <rohankmr414@gmail.com>
jaegertracing · Feb 6, 2023 · e6f6953 · e6f6953
1 parent 3fc45f5
commit e6f6953
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/examples/hotrod/pkg/tracing/rpcmetrics/observer_test.go b/examples/hotrod/pkg/tracing/rpcmetrics/observer_test.go
@@ -21,12 +21,12 @@ import (
 	"time"
 
 	opentracing "github.com/opentracing/opentracing-go"
+	"github.com/opentracing/opentracing-go/ext"
 	"github.com/stretchr/testify/assert"
 	otbridge "go.opentelemetry.io/otel/bridge/opentracing"
 	"go.opentelemetry.io/otel/sdk/resource"
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
 	semconv "go.opentelemetry.io/otel/semconv/v1.7.0"
-	"github.com/opentracing/opentracing-go/ext"
 
 	u "github.com/jaegertracing/jaeger/internal/metricstest"
 )

diff --git a/plugin/storage/cassandra/spanstore/dbmodel/converter.go b/plugin/storage/cassandra/spanstore/dbmodel/converter.go
@@ -73,6 +73,7 @@ func (c converter) fromDomain(span *model.Span) *Span {
 		Logs:          logs,
 		Refs:          refs,
 		Process:       udtProcess,
+		Warnings:      span.Warnings,
 		ServiceName:   span.Process.ServiceName,
 		SpanHash:      int64(spanHash),
 	}
@@ -107,6 +108,7 @@ func (c converter) toDomain(dbSpan *Span) (*model.Span, error) {
 		Tags:          tags,
 		Logs:          logs,
 		Process:       process,
+		Warnings:      dbSpan.Warnings,
 	}
 	return span, nil
 }

diff --git a/plugin/storage/cassandra/spanstore/dbmodel/model.go b/plugin/storage/cassandra/spanstore/dbmodel/model.go
@@ -49,6 +49,7 @@ type Span struct {
 	Logs          []Log
 	Refs          []SpanRef
 	Process       Process
+	Warnings      []string
 	ServiceName   string
 	SpanHash      int64
 }

diff --git a/plugin/storage/cassandra/spanstore/reader.go b/plugin/storage/cassandra/spanstore/reader.go
@@ -172,8 +172,9 @@ func (s *SpanReader) readTraceInSpan(ctx context.Context, traceID dbmodel.TraceI
 	var refs []dbmodel.SpanRef
 	var tags []dbmodel.KeyValue
 	var logs []dbmodel.Log
+	var warnings []string
 	retMe := &model.Trace{}
-	for i.Scan(&traceIDFromSpan, &spanID, &parentID, &operationName, &flags, &startTime, &duration, &tags, &logs, &refs, &dbProcess) {
+	for i.Scan(&traceIDFromSpan, &spanID, &parentID, &operationName, &flags, &startTime, &duration, &tags, &logs, &refs, &dbProcess, &warnings) {
 		dbSpan := dbmodel.Span{
 			TraceID:       traceIDFromSpan,
 			SpanID:        spanID,
@@ -186,6 +187,7 @@ func (s *SpanReader) readTraceInSpan(ctx context.Context, traceID dbmodel.TraceI
 			Logs:          logs,
 			Refs:          refs,
 			Process:       dbProcess,
+			Warnings:      warnings,
 			ServiceName:   dbProcess.ServiceName,
 		}
 		span, err := dbmodel.ToDomain(&dbSpan)

diff --git a/plugin/storage/cassandra/spanstore/writer.go b/plugin/storage/cassandra/spanstore/writer.go
@@ -36,8 +36,8 @@ const (
 	insertSpan = `
 		INSERT
 		INTO traces(trace_id, span_id, span_hash, parent_id, operation_name, flags,
-				    start_time, duration, tags, logs, refs, process)
-		VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
+				    start_time, duration, tags, logs, refs, process, warnings)
+		VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
 
 	serviceNameIndex = `
 		INSERT
@@ -168,6 +168,7 @@ func (s *SpanWriter) writeSpan(span *model.Span, ds *dbmodel.Span) error {
 		ds.Logs,
 		ds.Refs,
 		ds.Process,
+		ds.Warnings,
 	)
 	if err := s.writerMetrics.traces.Exec(mainQuery, s.logger); err != nil {
 		return s.logError(ds, err, "Failed to insert span", s.logger)