[#501] Add the trace id to the logs of middlware

Signed-off-by: Roman Loginov <r.loginov@yadro.com>

api/handler/util.go

@@ -15,7 +15,6 @@ import (
 	"git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/middleware"
 	"git.frostfs.info/TrueCloudLab/frostfs-s3-gw/internal/logs"
 	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
-	"go.opentelemetry.io/otel/trace"
 	"go.uber.org/zap"
 )
 
@@ -42,10 +41,7 @@ func (h *handler) logAndSendError(ctx context.Context, w http.ResponseWriter, lo
 		zap.String("user", reqInfo.User),
 		zap.Error(err)}
 	fields = append(fields, additional...)
-	if traceID, err := trace.TraceIDFromHex(reqInfo.TraceID); err == nil && traceID.IsValid() {
-		fields = append(fields, zap.String("trace_id", reqInfo.TraceID))
-	}
-	h.reqLogger(ctx).Error(logs.RequestFailed, fields...) // consider using h.reqLogger (it requires accept context.Context or http.Request)
+	h.reqLogger(ctx).Error(logs.RequestFailed, fields...)
 }
 
 func handleDeleteMarker(w http.ResponseWriter, err error) error {

api/middleware/reqinfo.go

@@ -187,14 +187,21 @@ func Request(log *zap.Logger, settings RequestSettings) Func {
 
 			r = r.WithContext(treepool.SetRequestID(r.Context(), reqInfo.RequestID))
 
-			reqLogger := log.With(zap.String("request_id", reqInfo.RequestID))
-			r = r.WithContext(SetReqLogger(r.Context(), reqLogger))
+			fields := []zap.Field{zap.String("request_id", reqInfo.RequestID)}
+			ctx, span := StartHTTPServerSpan(r, "REQUEST S3")
+			if traceID := span.SpanContext().TraceID(); traceID.IsValid() {
+				fields = append(fields, zap.String("trace_id", traceID.String()))
+			}
+			lw := &traceResponseWriter{ResponseWriter: w, ctx: ctx, span: span}
+
+			reqLogger := log.With(fields...)
+			r = r.WithContext(SetReqLogger(ctx, reqLogger))
 
 			reqLogger.Info(logs.RequestStart, zap.String("host", r.Host),
 				zap.String("remote_host", reqInfo.RemoteHost), zap.String("namespace", reqInfo.Namespace))
 
 			// continue execution
-			h.ServeHTTP(w, r)
+			h.ServeHTTP(lw, r)
 		})
 	}
 }

api/middleware/response.go

@@ -11,7 +11,6 @@ import (
 	"git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/errors"
 	"git.frostfs.info/TrueCloudLab/frostfs-s3-gw/internal/logs"
 	"git.frostfs.info/TrueCloudLab/frostfs-s3-gw/internal/version"
-	"go.opentelemetry.io/otel/trace"
 	"go.uber.org/zap"
 )
 
@@ -332,10 +331,6 @@ func LogSuccessResponse(l *zap.Logger) Func {
 				fields = append(fields, zap.String("user", reqInfo.User))
 			}
 
-			if traceID, err := trace.TraceIDFromHex(reqInfo.TraceID); err == nil && traceID.IsValid() {
-				fields = append(fields, zap.String("trace_id", reqInfo.TraceID))
-			}
-
 			reqLogger.Info(logs.RequestEnd, fields...)
 		})
 	}

api/middleware/tracing.go

@@ -11,20 +11,6 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-// Tracing adds tracing support for requests.
-// Must be placed after prepareRequest middleware.
-func Tracing() Func {
-	return func(h http.Handler) http.Handler {
-		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			appCtx, span := StartHTTPServerSpan(r, "REQUEST S3")
-			reqInfo := GetReqInfo(r.Context())
-			reqInfo.TraceID = span.SpanContext().TraceID().String()
-			lw := &traceResponseWriter{ResponseWriter: w, ctx: appCtx, span: span}
-			h.ServeHTTP(lw, r.WithContext(appCtx))
-		})
-	}
-}
-
 type traceResponseWriter struct {
 	sync.Once
 	http.ResponseWriter

api/router.go

@@ -134,7 +134,6 @@ func NewRouter(cfg Config) *chi.Mux {
 		s3middleware.Request(cfg.Log, cfg.MiddlewareSettings),
 		middleware.ThrottleWithOpts(cfg.Throttle),
 		middleware.Recoverer,
-		s3middleware.Tracing(),
 		s3middleware.Metrics(cfg.Log, cfg.Handler.ResolveCID, cfg.Metrics, cfg.MiddlewareSettings),
 		s3middleware.LogSuccessResponse(cfg.Log),
 		s3middleware.Auth(cfg.Center, cfg.Log),