Skip to content
Merged
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
17 changes: 16 additions & 1 deletion core/schemas/trace.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,25 @@ const (

// AddSpan adds a span to the trace in a thread-safe manner
func (t *Trace) AddSpan(span *Span) {
if t == nil || span == nil {
return
}
t.mu.Lock()
defer t.mu.Unlock()
t.Spans = append(t.Spans, span)
}

// GetSpan retrieves a span by ID
func (t *Trace) GetSpan(spanID string) *Span {
if t == nil || spanID == "" {
return nil
}
t.mu.Lock()
defer t.mu.Unlock()
for _, span := range t.Spans {
if span == nil {
continue
}
if span.SpanID == spanID {
return span
}
Expand Down Expand Up @@ -146,7 +155,7 @@ type Span struct {

// SetAttribute sets an attribute on the span in a thread-safe manner
func (s *Span) SetAttribute(key string, value any) {
if value == nil {
if s == nil || value == nil {
return
}
s.mu.Lock()
Expand All @@ -159,13 +168,19 @@ func (s *Span) SetAttribute(key string, value any) {

// AddEvent adds an event to the span in a thread-safe manner
func (s *Span) AddEvent(event SpanEvent) {
if s == nil {
return
}
s.mu.Lock()
defer s.mu.Unlock()
s.Events = append(s.Events, event)
}

// End marks the span as complete with the given status
func (s *Span) End(status SpanStatus, statusMsg string) {
if s == nil {
return
}
s.mu.Lock()
defer s.mu.Unlock()
s.EndTime = time.Now()
Expand Down
37 changes: 37 additions & 0 deletions core/schemas/trace_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
package schemas

import "testing"

func TestTraceGetSpanNilSafe(t *testing.T) {
var nilTrace *Trace
if span := nilTrace.GetSpan("span"); span != nil {
t.Fatalf("nil trace GetSpan returned %v, want nil", span)
}

trace := &Trace{Spans: []*Span{nil, &Span{SpanID: "target"}}}
if span := trace.GetSpan(""); span != nil {
t.Fatalf("empty span ID = %v, want nil", span)
}
if span := trace.GetSpan("missing"); span != nil {
t.Fatalf("missing span = %v, want nil", span)
}
if span := trace.GetSpan("target"); span == nil || span.SpanID != "target" {
t.Fatalf("target span = %v, want target", span)
}
}

func TestTraceAndSpanNilMutatorsNoop(t *testing.T) {
trace := &Trace{}
trace.AddSpan(nil)
if len(trace.Spans) != 0 {
t.Fatalf("nil span was appended: %v", trace.Spans)
}

var nilTrace *Trace
nilTrace.AddSpan(&Span{SpanID: "ignored"})

var nilSpan *Span
nilSpan.SetAttribute("key", "value")
nilSpan.AddEvent(SpanEvent{Name: "event"})
nilSpan.End(SpanStatusOk, "")
}