From d708f9ae044cd2fe756b21e5f3666f2fd8362530 Mon Sep 17 00:00:00 2001 From: Natalia Goc Date: Tue, 21 May 2024 08:16:26 +0200 Subject: [PATCH] go back to using OriginalURL to better support salego which uses Groups on fiber.Router --- pkg/fiber_tracing/fiber_tracing.go | 2 +- pkg/fiber_tracing/middleware.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/fiber_tracing/fiber_tracing.go b/pkg/fiber_tracing/fiber_tracing.go index 57ba08c..50a5ac8 100644 --- a/pkg/fiber_tracing/fiber_tracing.go +++ b/pkg/fiber_tracing/fiber_tracing.go @@ -46,7 +46,7 @@ func Start(ctx context.Context, spanName string, opts ...trace.SpanStartOption) // NOTE: You can use [trace.WithAttributes] as a parameter to opts argument // Returns [c.UserContext] as [context.Context] func FStart(c *fiber.Ctx, opts ...trace.SpanStartOption) (context.Context, trace.Span) { - return Tracer.Start(c.UserContext(), c.Method()+" "+c.Route().Path, opts...) + return Tracer.Start(c.UserContext(), c.Method()+" "+c.OriginalURL(), opts...) } // Just like [FStart] but makes it possible to assign custom span name. diff --git a/pkg/fiber_tracing/middleware.go b/pkg/fiber_tracing/middleware.go index 3f9e73b..a96979e 100644 --- a/pkg/fiber_tracing/middleware.go +++ b/pkg/fiber_tracing/middleware.go @@ -71,7 +71,7 @@ func new(config ...middlewareConfig) fiber.Handler { otelCtx, span := Tracer.Start( c.UserContext(), - c.Method()+" "+c.Route().Path, + c.Method()+" "+c.OriginalURL(), opts..., )