Skip to content

feat: link ColdBrew trace ID to OTEL span as attribute #22

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
ankurs merged 3 commits into from
Apr 3, 2026
Merged

feat: link ColdBrew trace ID to OTEL span as attribute #22

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
67e7db8
feat: link ColdBrew trace ID to OTEL span as attribute
ankurs Apr 2, 2026
3eb643d
chore: bump go-coldbrew/log v0.2.7 -> v0.2.8 (slog default)
ankurs Apr 3, 2026
fe5d5cb
fix: set coldbrew.trace_id on OTEL span even on early return
ankurs Apr 3, 2026
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
6 changes: 2 additions & 4 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ go 1.25.8
require (
github.com/airbrake/gobrake/v5 v5.6.2
github.com/getsentry/sentry-go v0.43.0
github.com/go-coldbrew/log v0.2.7
github.com/go-coldbrew/log v0.2.8
github.com/go-coldbrew/options v0.2.6
github.com/google/uuid v1.6.0
github.com/rollbar/rollbar-go v1.4.8
go.opentelemetry.io/otel v1.42.0
go.opentelemetry.io/otel/trace v1.42.0
google.golang.org/grpc v1.79.3
)
Expand Down Expand Up @@ -87,8 +88,6 @@ require (
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
github.com/go-git/go-billy/v5 v5.8.0 // indirect
github.com/go-git/go-git/v5 v5.17.1 // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logfmt/logfmt v0.6.1 // indirect
github.com/go-toolsmith/astcast v1.1.0 // indirect
github.com/go-toolsmith/astcopy v1.1.0 // indirect
github.com/go-toolsmith/astequal v1.2.0 // indirect
Expand Down Expand Up @@ -236,7 +235,6 @@ require (
go-simpler.org/sloglint v0.11.1 // indirect
go.augendre.info/arangolint v0.4.0 // indirect
go.augendre.info/fatcontext v0.9.0 // indirect
go.opentelemetry.io/otel v1.42.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.1 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,8 +221,8 @@ github.com/ghostiam/protogetter v0.3.20 h1:oW7OPFit2FxZOpmMRPP9FffU4uUpfeE/rEdE1
github.com/ghostiam/protogetter v0.3.20/go.mod h1:FjIu5Yfs6FT391m+Fjp3fbAYJ6rkL/J6ySpZBfnODuI=
github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c=
github.com/gliderlabs/ssh v0.3.8/go.mod h1:xYoytBv1sV0aL3CavoDuJIQNURXkkfPA/wxQ1pL1fAU=
github.com/go-coldbrew/log v0.2.7 h1:kRQeTYLPLcjjAWuCcGZpNn8twSY/NbsGpjIKbpXEnRA=
github.com/go-coldbrew/log v0.2.7/go.mod h1:BB+2VecklLXTaDQdNNe2h3r5rSZL2DGvJBXAgrXq1dk=
github.com/go-coldbrew/log v0.2.8 h1:aF+vw23zMyh5S9vhhofERiaPpSDyeJH1Tv1CYREn/a0=
github.com/go-coldbrew/log v0.2.8/go.mod h1:RKvGzMZMt7FpQ9u36adkDigRxkOvRj1diwgAgRJZH4E=
github.com/go-coldbrew/options v0.2.6 h1:Nr93v7PbO+EYLHhzA8biGumaTTSHLHqTYLg70n/foXE=
github.com/go-coldbrew/options v0.2.6/go.mod h1:Os4pZwIgMHES079iOKXTlzcipWXbxw0OhsAN5D9m2mM=
github.com/go-critic/go-critic v0.14.3 h1:5R1qH2iFeo4I/RJU8vTezdqs08Egi4u5p6vOESA0pog=
Expand Down
16 changes: 13 additions & 3 deletions notifier/notifier.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
"github.com/go-coldbrew/options"
"github.com/google/uuid"
rollbar "github.com/rollbar/rollbar-go"
otelattr "go.opentelemetry.io/otel/attribute"
oteltrace "go.opentelemetry.io/otel/trace"
"google.golang.org/grpc/metadata"
)
Expand Down Expand Up @@ -537,24 +538,33 @@ func SetTraceId(ctx context.Context) context.Context {
return ctx
}
Comment thread
ankurs marked this conversation as resolved.
var traceID string
// Check gRPC metadata first — client-supplied trace ID takes priority.
if md, ok := metadata.FromIncomingContext(ctx); ok {
if id, ok := md["grpcmetadata-"+traceHeader]; ok {
traceID = strings.Join(id, ",")
} else if id, ok := md[traceHeader]; ok {
traceID = strings.Join(id, ",")
}
Comment thread
ankurs marked this conversation as resolved.
}
if span := oteltrace.SpanFromContext(ctx); span.SpanContext().IsValid() && strings.TrimSpace(traceID) == "" {
traceID = span.SpanContext().TraceID().String()
// Fall back to OTEL span trace ID.
if strings.TrimSpace(traceID) == "" {
if span := oteltrace.SpanFromContext(ctx); span.SpanContext().IsValid() {
traceID = span.SpanContext().TraceID().String()
}
}
// if no trace id then create one
// Last resort: generate UUID.
if strings.TrimSpace(traceID) == "" {
u, err := uuid.NewRandom()
if err != nil {
u, _ = uuid.NewUUID()
}
traceID = u.String()
}
// Link the resolved trace ID to the OTEL span as an attribute
// so ColdBrew correlation ID and distributed trace are connected.
if span := oteltrace.SpanFromContext(ctx); span.SpanContext().IsValid() {
span.SetAttributes(otelattr.String("coldbrew.trace_id", traceID))
}
Comment thread
ankurs marked this conversation as resolved.
ctx = loggers.AddToLogContext(ctx, "trace", traceID)
return options.AddToOptions(ctx, tracerID, traceID)
}
Expand Down
Loading