feat: include tracing only for the recording spans

middleware.go

@@ -1,6 +1,7 @@
 package slogecho
 
 import (
+	"context"
 	"errors"
 	"net/http"
 	"strings"
@@ -178,14 +179,7 @@ func NewWithConfig(logger *slog.Logger, config Config) echo.MiddlewareFunc {
 			}
 
 			// otel
-			if config.WithTraceID {
-				traceID := trace.SpanFromContext(c.Request().Context()).SpanContext().TraceID().String()
-				baseAttributes = append(baseAttributes, slog.String(TraceIDKey, traceID))
-			}
-			if config.WithSpanID {
-				spanID := trace.SpanFromContext(c.Request().Context()).SpanContext().SpanID().String()
-				baseAttributes = append(baseAttributes, slog.String(SpanIDKey, spanID))
-			}
+			baseAttributes = append(baseAttributes, extractTraceSpanID(c.Request().Context(), config.WithTraceID, config.WithSpanID)...)
 
 			// request body
 			requestAttributes = append(requestAttributes, slog.Int("length", br.bytes))
@@ -304,3 +298,29 @@ func AddCustomAttributes(c echo.Context, attr slog.Attr) {
 		c.Set(customAttributesCtxKey, append(attrs, attr))
 	}
 }
+
+func extractTraceSpanID(ctx context.Context, withTraceID bool, withSpanID bool) []slog.Attr {
+	if !(withTraceID || withSpanID) {
+		return []slog.Attr{}
+	}
+
+	span := trace.SpanFromContext(ctx)
+	if !span.IsRecording() {
+		return []slog.Attr{}
+	}
+
+	attrs := []slog.Attr{}
+	spanCtx := span.SpanContext()
+
+	if withTraceID && spanCtx.HasTraceID() {
+		traceID := trace.SpanFromContext(ctx).SpanContext().TraceID().String()
+		attrs = append(attrs, slog.String(TraceIDKey, traceID))
+	}
+
+	if withSpanID && spanCtx.HasSpanID() {
+		spanID := spanCtx.SpanID().String()
+		attrs = append(attrs, slog.String(SpanIDKey, spanID))
+	}
+
+	return attrs
+}