The cross-harness, self-improving memory layer for AI agents. Join our community: https://discord.com/invite/zdNChS2fBu
Go agent-ai-cliagent-harnessesagent-securitybrowser-extensionciclaude-codecloudcodexcursordetection-engineeringjevknowledge-basememorymobile-device-managementobservabilitysecuritysecurity-information-and-event-managementsecurity-toolstelemetrytraces
Populate OTel trace identity on span and log events
Claude7bc09bfc49f5
diff --git a/collector-builder/exporter/beaconjsonexporter/internal/beaconevent/converter.go b/collector-builder/exporter/beaconjsonexporter/internal/beaconevent/converter.goindex 2b44deb6..ea28a0a0 100644--- a/collector-builder/exporter/beaconjsonexporter/internal/beaconevent/converter.go+++ b/collector-builder/exporter/beaconjsonexporter/internal/beaconevent/converter.go@@ -261,6 +261,12 @@ func (c Converter) EventFromLog(resourceAttrs map[string]interface{}, record ploevent := NewEvent(action, EventCategory(action, FirstString(attrs, "beacon.event.category", "event.category", "category")), Severity(record.SeverityText(), record.SeverityNumber().String()), HarnessName(attrs, message), ts)event.Message = messagec.PopulateCommon(&event, attrs)+ if !record.TraceID().IsEmpty() {+ event.Trace = &TraceInfo{ID: record.TraceID().String()}+ if !record.SpanID().IsEmpty() {+ event.Trace.SpanID = record.SpanID().String()+ }+ }event.Raw = c.RawPayload(attrs, map[string]interface{}{"otel_signal": "logs","severity": record.SeverityText(),@@ -279,6 +285,15 @@ func (c Converter) EventFromSpan(resourceAttrs map[string]interface{}, span ptraevent := NewEvent(action, EventCategory(action, FirstString(attrs, "beacon.event.category", "event.category", "tool")), SpanSeverity(span.Status().Code().String()), HarnessName(attrs, message, span.Name()), Timestamp(span.StartTimestamp().AsTime()))event.Message = messagec.PopulateCommon(&event, attrs)+ if !span.TraceID().IsEmpty() {+ event.Trace = &TraceInfo{ID: span.TraceID().String()}+ if !span.SpanID().IsEmpty() {+ event.Trace.SpanID = span.SpanID().String()+ }+ if !span.ParentSpanID().IsEmpty() {+ event.Trace.ParentSpanID = span.ParentSpanID().String()+ }+ }event.Raw = c.RawPayload(attrs, map[string]interface{}{"otel_signal": "traces","span_name": span.Name(),diff --git a/collector-builder/exporter/beaconjsonexporter/internal/beaconevent/converter_test.go b/collector-builder/exporter/beaconjsonexporter/internal/beaconevent/converter_test.goindex 917ffdfa..e1343f55 100644--- a/collector-builder/exporter/beaconjsonexporter/internal/beaconevent/converter_test.go+++ b/collector-builder/exporter/beaconjsonexporter/internal/beaconevent/converter_test.go@@ -7,6 +7,7 @@ import ("time""go.opentelemetry.io/collector/pdata/pcommon"+ "go.opentelemetry.io/collector/pdata/plog""go.opentelemetry.io/collector/pdata/ptrace")@@ -142,6 +143,66 @@ func TestEventsFromTracesNormalizesClaudeAgentSDKSpan(t *testing.T) {}}+func TestEventFromSpanCapturesTraceIdentity(t *testing.T) {+ span, traces := newObserveSDKTraceSpan("agent.step")+ span.SetTraceID(pcommon.TraceID([16]byte{0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef}))+ span.SetSpanID(pcommon.SpanID([8]byte{0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef}))+ span.SetParentSpanID(pcommon.SpanID([8]byte{0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10}))++ events := NewConverter(Options{}).EventsFromTraces(traces)+ if len(events) != 1 {+ t.Fatalf("expected 1 event, got %d", len(events))+ }+ trace := events[0].Trace+ if trace == nil {+ t.Fatalf("trace identity missing: %#v", events[0])+ }+ if trace.ID != "0123456789abcdef0123456789abcdef" {+ t.Fatalf("trace.id = %q, want hex trace id", trace.ID)+ }+ if trace.SpanID != "0123456789abcdef" {+ t.Fatalf("trace.span_id = %q, want hex span id", trace.SpanID)+ }+ if trace.ParentSpanID != "fedcba9876543210" {+ t.Fatalf("trace.parent_span_id = %q, want hex parent span id", trace.ParentSpanID)+ }+}++func TestEventFromSpanOmitsTraceWhenUnset(t *testing.T) {+ _, traces := newObserveSDKTraceSpan("agent.step")++ events := NewConverter(Options{}).EventsFromTraces(traces)+ if len(events) != 1 {+ t.Fatalf("expected 1 event, got %d", len(events))+ }+ if events[0].Trace != nil {+ t.Fatalf("trace = %#v, want nil for span without trace identity", events[0].Trace)+ }+}++func TestEventFromLogCapturesTraceContext(t *testing.T) {+ logs := plog.NewLogs()+ resourceLogs := logs.ResourceLogs().AppendEmpty()+ scopeLogs := resourceLogs.ScopeLogs().AppendEmpty()+ record := scopeLogs.LogRecords().AppendEmpty()+ record.Body().SetStr("model call completed")+ record.SetTimestamp(pcommon.NewTimestampFromTime(time.Unix(1700000000, 0).UTC()))+ record.SetTraceID(pcommon.TraceID([16]byte{0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef}))+ record.SetSpanID(pcommon.SpanID([8]byte{0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef}))++ events := NewConverter(Options{}).EventsFromLogs(logs)+ if len(events) != 1 {+ t.Fatalf("expected 1 event, got %d", len(events))+ }+ trace := events[0].Trace+ if trace == nil || trace.ID != "0123456789abcdef0123456789abcdef" || trace.SpanID != "0123456789abcdef" {+ t.Fatalf("trace = %#v, want log trace context", trace)+ }+ if trace.ParentSpanID != "" {+ t.Fatalf("trace.parent_span_id = %q, want empty for logs", trace.ParentSpanID)+ }+}+func newObserveSDKTraceSpan(name string) (ptrace.Span, ptrace.Traces) {traces := ptrace.NewTraces()resourceSpans := traces.ResourceSpans().AppendEmpty()