From f5819972a4abec2c4c7ef04111766018b6cb8c2b Mon Sep 17 00:00:00 2001 From: Natalia Goc Date: Mon, 20 May 2024 13:39:55 +0200 Subject: [PATCH] allow skipping callstack in errors and events --- pkg/event/event.go | 10 ++++++++++ pkg/exporters/console_exporter/console_exporter.go | 4 ++-- pkg/level/level.go | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/pkg/event/event.go b/pkg/event/event.go index 2d2493e..6b3ac35 100644 --- a/pkg/event/event.go +++ b/pkg/event/event.go @@ -47,6 +47,11 @@ func (e Event) AsOpts() trace.EventOption { return trace.WithAttributes(e.IntoTraceAttributes()...) } +func (e Event) SkipMoreInCallStack(skip int) Event { + e.extraSkipInStack += skip + return e +} + func NewInSpan[E IntoEvent](ev E, span trace.Span) { event := ev.IntoEvent() event.extraSkipInStack += 1 @@ -93,6 +98,11 @@ func (e Error) AsOpts() trace.EventOption { return trace.WithAttributes(e.IntoTraceAttributes()...) } +func (e Error) SkipMoreInCallStack(skip int) Error { + e.extraSkipInStack += skip + return e +} + func NewErrInSpan[E IntoErrorEvent](err E, span trace.Span) E { er := err.IntoErrorEvent() er.extraSkipInStack += 1 diff --git a/pkg/exporters/console_exporter/console_exporter.go b/pkg/exporters/console_exporter/console_exporter.go index 4df6c44..284d45c 100644 --- a/pkg/exporters/console_exporter/console_exporter.go +++ b/pkg/exporters/console_exporter/console_exporter.go @@ -79,10 +79,10 @@ func NewProcessor(opts ProcessorOptions) trace.SpanProcessor { fmt := NewPrettyMultilineFormatter() formatter = fmt } - if opts.FilterOnLevel != 0 { + if opts.FilterOnLevel != level.SeverityLevel(0) { lvl = opts.FilterOnLevel } else { - lvl = level.TRACE + 10 + lvl = level.TRACE + 1 } return &Processor{ diff --git a/pkg/level/level.go b/pkg/level/level.go index 5193d80..bab75aa 100644 --- a/pkg/level/level.go +++ b/pkg/level/level.go @@ -77,7 +77,7 @@ func FromString(level string) SeverityLevel { case "TRACE": return TRACE default: - return CRIT + return unset } }