sour-is/ev
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: add named span

Browse Source
This commit is contained in:
Jon Lundy 2022-11-20 10:22:15 -07:00
parent 165492e3ec
commit 92b813c9ed
Signed by untrusted user who does not match committer: xuu
GPG Key ID: C63E6D61F3035024
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
internal/lg/tracer.go
View File

@ -44,7 +44,6 @@ func attrs(ctx context.Context) (string, []attribute.KeyValue) {
attribute.String("pc", fmt.Sprintf("%v", pc)), attribute.String("pc", fmt.Sprintf("%v", pc)),
attribute.String("file", file), attribute.String("file", file),
attribute.Int("line", line), attribute.Int("line", line),
attribute.String("name", name),
) )
} }
return name, attrs return name, attrs
@ -52,6 +51,15 @@ func attrs(ctx context.Context) (string, []attribute.KeyValue) {
func Span(ctx context.Context, opts ...trace.SpanStartOption) (context.Context, trace.Span) { func Span(ctx context.Context, opts ...trace.SpanStartOption) (context.Context, trace.Span) {
name, attrs := attrs(ctx) name, attrs := attrs(ctx)
attrs = append(attrs, attribute.String("name", name))
ctx, span := Tracer(ctx).Start(ctx, name, opts...)
span.SetAttributes(attrs...)
return ctx, span
}
func NamedSpan(ctx context.Context, name string, opts ...trace.SpanStartOption) (context.Context, trace.Span) {
_, attrs := attrs(ctx)
attrs = append(attrs, attribute.String("name", name))
ctx, span := Tracer(ctx).Start(ctx, name, opts...) ctx, span := Tracer(ctx).Start(ctx, name, opts...)
span.SetAttributes(attrs...) span.SetAttributes(attrs...)
@ -151,7 +159,9 @@ func reverse[T any](s []T) {
} }
func Htrace(h http.Handler, name string) http.Handler { func Htrace(h http.Handler, name string) http.Handler {
return otelhttp.NewHandler(h, name) return otelhttp.NewHandler(h, name, otelhttp.WithSpanNameFormatter(func(operation string, r *http.Request) string {
return fmt.Sprintf("%s: %s", operation, r.RequestURI)
}))
} }
func toContext[K comparable, V any](ctx context.Context, key K, value V) context.Context { func toContext[K comparable, V any](ctx context.Context, key K, value V) context.Context {