Skip to content

Commit

Permalink
tracing: exposed LoggerFromAttrs.
Browse files Browse the repository at this point in the history
  • Loading branch information
hugosantos committed Sep 14, 2024
1 parent 8b8a957 commit e8aea25
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions framework/tracing/collect.go
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ func Collect2[T any, R any](ctx context.Context, tracer trace.Tracer, name Colle
}

func CollectAndLog0(ctx context.Context, tracer trace.Tracer, name Collected, callback func(context.Context) error, opts ...trace.SpanStartOption) error {
zlb := loggerFromAttrs(zerolog.Ctx(ctx).With(), name.attributes).Logger()
zlb := LoggerFromAttrs(zerolog.Ctx(ctx).With(), name.attributes).Logger()

zlb.Info().Msgf("%s", name.name)
err := Collect0(zlb.WithContext(ctx), tracer, name, callback, opts...)
Expand All @@ -117,18 +117,18 @@ func CollectAndLog0(ctx context.Context, tracer trace.Tracer, name Collected, ca
}

func CollectAndLog1[T any](ctx context.Context, tracer trace.Tracer, name Collected, callback func(context.Context) (T, error), opts ...trace.SpanStartOption) (T, error) {
zlb := loggerFromAttrs(zerolog.Ctx(ctx).With(), name.attributes).Logger()
zlb := LoggerFromAttrs(zerolog.Ctx(ctx).With(), name.attributes).Logger()

zlb.Info().Msgf("%s", name.name)
v, err := Collect1[T](zlb.WithContext(ctx), tracer, name, callback, opts...)
v, err := Collect1(zlb.WithContext(ctx), tracer, name, callback, opts...)
if err != nil {
zlb.Err(err).Msgf("%s (failed)", name.name)
}
return v, err
}

func CollectAndLogDuration0(ctx context.Context, tracer trace.Tracer, name Collected, callback func(context.Context) error, opts ...trace.SpanStartOption) error {
zlb := loggerFromAttrs(zerolog.Ctx(ctx).With(), name.attributes).Logger()
zlb := LoggerFromAttrs(zerolog.Ctx(ctx).With(), name.attributes).Logger()

t := time.Now()
zlb.Info().Msgf("%s (started)", name.name)
Expand All @@ -142,7 +142,7 @@ func CollectAndLogDuration0(ctx context.Context, tracer trace.Tracer, name Colle
}

func CollectAndLogDuration1[T any](ctx context.Context, tracer trace.Tracer, name Collected, callback func(context.Context) (T, error), opts ...trace.SpanStartOption) (T, error) {
zlb := loggerFromAttrs(zerolog.Ctx(ctx).With(), name.attributes).Logger()
zlb := LoggerFromAttrs(zerolog.Ctx(ctx).With(), name.attributes).Logger()

t := time.Now()
zlb.Info().Msgf("%s (started)", name.name)
Expand All @@ -155,7 +155,7 @@ func CollectAndLogDuration1[T any](ctx context.Context, tracer trace.Tracer, nam
return v, err
}

func loggerFromAttrs(zlb zerolog.Context, attrs []attribute.KeyValue) zerolog.Context {
func LoggerFromAttrs(zlb zerolog.Context, attrs []attribute.KeyValue) zerolog.Context {
for _, attr := range attrs {
zlb = zlb.Interface(string(attr.Key), attr.Value.AsInterface())
}
Expand Down

0 comments on commit e8aea25

Please sign in to comment.