Skip to content

The cross-harness, self-improving memory layer for AI agents. Join our community: https://discord.com/invite/zdNChS2fBu

Normalize SDK usage and session attribute aliases at ingest

Claudeb45884a3ff18
diff --git a/collector-builder/exporter/beaconjsonexporter/internal/beaconevent/converter.go b/collector-builder/exporter/beaconjsonexporter/internal/beaconevent/converter.go
index 0817da36..35373047 100644
--- a/collector-builder/exporter/beaconjsonexporter/internal/beaconevent/converter.go
+++ b/collector-builder/exporter/beaconjsonexporter/internal/beaconevent/converter.go
@@ -557,10 +557,10 @@ func (c Converter) PopulateCommon(event *Event, attrs map[string]interface{}) {
event.Model = FirstString(attrs, "gen_ai.request.model", "gen_ai.response.model", "model", "ai.model")
event.Repository = FirstString(attrs, "vcs.repository.url", "repository", "repo.path", "workspace.repository")
event.Branch = FirstString(attrs, "vcs.branch.name", "git.branch", "branch")
- if id := FirstString(attrs, "gen_ai.conversation.id", "copilot_chat.session_id", "copilot_chat.chat_session_id", "conversation.id", "conversation_id", "session.id"); id != "" || FirstString(attrs, "cwd", "working_directory", "workspace") != "" {
+ if id := FirstString(attrs, "gen_ai.conversation.id", "beacon.session.id", "copilot_chat.session_id", "copilot_chat.chat_session_id", "conversation.id", "conversation_id", "session.id"); id != "" || FirstString(attrs, "cwd", "working_directory", "workspace") != "" {
event.Session = &SessionInfo{
ID: id,
- WorkingDirectory: FirstString(attrs, "cwd", "working_directory", "process.command_args.cwd", "workspace"),
+ WorkingDirectory: FirstString(attrs, "cwd", "working_directory", "beacon.session.working_directory", "process.command_args.cwd", "workspace"),
}
}
if name := FirstString(attrs, "tool.name", "gen_ai.tool.name", "mcp.tool.name", "function_name", "tool_name"); name != "" || ToolCommandString(attrs) != "" {
@@ -781,10 +781,10 @@ func GenAIToolFromAttrs(attrs map[string]interface{}) *GenAIToolInfo {
func GenAIUsageFromAttrs(attrs map[string]interface{}) *GenAIUsageInfo {
usage := &GenAIUsageInfo{}
- if value, ok := Int64Attr(attrs, "gen_ai.usage.cache_creation.input_tokens"); ok {
+ if value, ok := Int64Attr(attrs, "gen_ai.usage.cache_creation.input_tokens", "gen_ai.usage.cache_creation_input_tokens"); ok {
usage.CacheCreation = &GenAIUsageCacheCreationInfo{InputTokens: &value}
}
- if value, ok := Int64Attr(attrs, "gen_ai.usage.cache_read.input_tokens"); ok {
+ if value, ok := Int64Attr(attrs, "gen_ai.usage.cache_read.input_tokens", "gen_ai.usage.cache_read_input_tokens"); ok {
usage.CacheRead = &GenAIUsageCacheReadInfo{InputTokens: &value}
}
if value, ok := Int64Attr(attrs, "gen_ai.usage.input_tokens", "llm.usage.prompt_tokens", "gen_ai.usage.prompt_tokens"); ok {
@@ -796,6 +796,9 @@ func GenAIUsageFromAttrs(attrs map[string]interface{}) *GenAIUsageInfo {
if value, ok := Int64Attr(attrs, "gen_ai.usage.reasoning.output_tokens"); ok {
usage.Reasoning = &GenAIUsageReasoningInfo{OutputTokens: &value}
}
+ if value, ok := FloatAttr(attrs, "gen_ai.usage.cost"); ok {
+ usage.CostUSD = &value
+ }
if IsZeroJSON(usage) {
return nil
}
diff --git a/collector-builder/exporter/beaconjsonexporter/internal/beaconevent/converter_test.go b/collector-builder/exporter/beaconjsonexporter/internal/beaconevent/converter_test.go
index 7dd94f12..8cdea40b 100644
--- a/collector-builder/exporter/beaconjsonexporter/internal/beaconevent/converter_test.go
+++ b/collector-builder/exporter/beaconjsonexporter/internal/beaconevent/converter_test.go
@@ -388,6 +388,78 @@ func TestEventsFromMetricTokenUsageWithoutDataPointsFallsBack(t *testing.T) {
}
}
+func TestGenAIUsageFromAttrsNormalizesAliases(t *testing.T) {
+ tests := []struct {
+ name string
+ attrs map[string]interface{}
+ check func(t *testing.T, usage *GenAIUsageInfo)
+ }{
+ {
+ name: "underscore cache read alias",
+ attrs: map[string]interface{}{"gen_ai.usage.cache_read_input_tokens": int64(90)},
+ check: func(t *testing.T, usage *GenAIUsageInfo) {
+ if usage.CacheRead == nil || usage.CacheRead.InputTokens == nil || *usage.CacheRead.InputTokens != 90 {
+ t.Fatalf("cache_read = %#v, want 90", usage.CacheRead)
+ }
+ },
+ },
+ {
+ name: "underscore cache creation alias",
+ attrs: map[string]interface{}{"gen_ai.usage.cache_creation_input_tokens": int64(30)},
+ check: func(t *testing.T, usage *GenAIUsageInfo) {
+ if usage.CacheCreation == nil || usage.CacheCreation.InputTokens == nil || *usage.CacheCreation.InputTokens != 30 {
+ t.Fatalf("cache_creation = %#v, want 30", usage.CacheCreation)
+ }
+ },
+ },
+ {
+ name: "runtime reported cost attribute",
+ attrs: map[string]interface{}{"gen_ai.usage.cost": 0.0123},
+ check: func(t *testing.T, usage *GenAIUsageInfo) {
+ if usage.CostUSD == nil || *usage.CostUSD != 0.0123 {
+ t.Fatalf("cost_usd = %#v, want 0.0123", usage.CostUSD)
+ }
+ },
+ },
+ {
+ name: "semconv dotted names take precedence",
+ attrs: map[string]interface{}{"gen_ai.usage.cache_read.input_tokens": int64(7), "gen_ai.usage.cache_read_input_tokens": int64(99)},
+ check: func(t *testing.T, usage *GenAIUsageInfo) {
+ if usage.CacheRead == nil || usage.CacheRead.InputTokens == nil || *usage.CacheRead.InputTokens != 7 {
+ t.Fatalf("cache_read = %#v, want semconv value 7", usage.CacheRead)
+ }
+ },
+ },
+ }
+ for _, tt := range tests {
+ t.Run(tt.name, func(t *testing.T) {
+ usage := GenAIUsageFromAttrs(tt.attrs)
+ if usage == nil {
+ t.Fatalf("usage = nil, want populated usage")
+ }
+ tt.check(t, usage)
+ })
+ }
+}
+
+func TestPopulateCommonMapsBeaconSessionAttributes(t *testing.T) {
+ span, traces := newObserveSDKTraceSpan("agent.step")
+ span.Attributes().PutStr("beacon.session.id", "cloud-session-42")
+ span.Attributes().PutStr("beacon.session.working_directory", "/srv/agent")
+
+ events := NewConverter(Options{}).EventsFromTraces(traces)
+ if len(events) != 1 {
+ t.Fatalf("expected 1 event, got %d", len(events))
+ }
+ session := events[0].Session
+ if session == nil || session.ID != "cloud-session-42" {
+ t.Fatalf("session = %#v, want beacon.session.id mapped", session)
+ }
+ if session.WorkingDirectory != "/srv/agent" {
+ t.Fatalf("working directory = %q, want beacon.session.working_directory mapped", session.WorkingDirectory)
+ }
+}
+
func newObserveSDKTraceSpan(name string) (ptrace.Span, ptrace.Traces) {
traces := ptrace.NewTraces()
resourceSpans := traces.ResourceSpans().AppendEmpty()