Skip to content

feat: add agent metadata to OTEL trace attributes #3587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DrJosh9000 merged 1 commit into from
Nov 20, 2025
Merged

feat: add agent metadata to OTEL trace attributes #3587

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 15 additions & 1 deletion internal/job/tracing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"os"
"slices"
"strconv"
"strings"

"github.com/buildkite/agent/v3/env"
"github.com/buildkite/agent/v3/tracetools"
Expand Down Expand Up @@ -259,7 +260,7 @@ func GenericTracingExtras(e *Executor, env *env.Environment) map[string]any {
jobKey = "n/a"
}

return map[string]any{
result := map[string]any{
"buildkite.agent": e.AgentName,
"buildkite.version": version.Version(),
"buildkite.queue": e.Queue,
Expand All @@ -279,6 +280,19 @@ func GenericTracingExtras(e *Executor, env *env.Environment) map[string]any {
"buildkite.rebuilt_from_id": rebuiltFromID,
"buildkite.triggered_from_id": triggeredFromID,
}

// Add agent metadata from BUILDKITE_AGENT_META_DATA_* env vars
// These come from the agent's registration tags
const metaDataPrefix = "BUILDKITE_AGENT_META_DATA_"
for key, value := range env.Dump() {
if after, found := strings.CutPrefix(key, metaDataPrefix); found {
// Convert key to lowercase for attribute naming
attrKey := "buildkite.agent.metadata." + strings.ToLower(after)
result[attrKey] = value
}
}

return result
}

func DDTracingExtras() map[string]any {
Expand Down