Skip to content

feat: add tracing information to log events #3

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
fmyAgi7 merged 4 commits into from
Mar 2, 2026
Merged

feat: add tracing information to log events #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
662f0a0
feat: add tracing information to log events
fmyAgi7 Feb 13, 2026
65f5fd2
feat: enhance logging with trace context information
fmyAgi7 Feb 13, 2026
a51d664
feat: add OpenTelemetry trace package to dependencies
fmyAgi7 Feb 13, 2026
d021e0b
feat: update logging to use string representation for trace context f…
fmyAgi7 Feb 13, 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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ require (
github.com/valyala/fasttemplate v1.2.2
go.etcd.io/bbolt v1.3.7
go.etcd.io/etcd/client/v3 v3.5.9
go.opentelemetry.io/otel/trace v1.26.0
go.uber.org/atomic v1.10.0
golang.org/x/crypto v0.24.0
golang.org/x/exp v0.0.0-20230811145659-89c5cff77bcb
Expand Down Expand Up @@ -142,7 +143,6 @@ require (
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
go.opentelemetry.io/otel v1.26.0 // indirect
go.opentelemetry.io/otel/metric v1.26.0 // indirect
go.opentelemetry.io/otel/trace v1.26.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.17.0 // indirect
golang.org/x/mod v0.17.0 // indirect
Expand Down
19 changes: 17 additions & 2 deletions log/impl.log.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,16 @@ import (
"github.com/pubgo/funk/errors"
"github.com/pubgo/funk/stack"
"github.com/rs/zerolog"
"go.opentelemetry.io/otel/trace"
"google.golang.org/protobuf/encoding/prototext"
)

const (
traceIDKey = "trace_id"
spanIDKey = "span_id"
traceFlagsKey = "trace_flags"
)

var _ Logger = (*loggerImpl)(nil)

type loggerImpl struct {
Expand Down Expand Up @@ -142,7 +149,7 @@ func (l *loggerImpl) Err(err error, ctxL ...context.Context) *zerolog.Event {
return nil
}

var fn = func(e *zerolog.Event) {
fn := func(e *zerolog.Event) {
if id := errors.GetErrorId(err); id != "" {
e.Str("error_id", id)
}
Expand Down Expand Up @@ -212,7 +219,7 @@ func (l *loggerImpl) newEvent(ctx context.Context, e *zerolog.Event) *zerolog.Ev
e = e.CallerSkipFrame(l.callerSkip)
}

if l.fields != nil && len(l.fields) > 0 {
if len(l.fields) > 0 {
e = e.Fields(l.fields)
}

Expand All @@ -221,5 +228,13 @@ func (l *loggerImpl) newEvent(ctx context.Context, e *zerolog.Event) *zerolog.Ev
e = e.Ctx(ctx)
}

span := trace.SpanFromContext(e.GetCtx())
spanCtx := span.SpanContext()
if spanCtx.IsValid() {
e.Str(spanIDKey, spanCtx.SpanID().String())
e.Str(traceIDKey, spanCtx.TraceID().String())
e.Str(traceFlagsKey, spanCtx.TraceFlags().String())
}

return mergeEvent(e, getEventFromCtx(ctx), l.content)
}