From 46f0d6f7e4e1d6cfbbeaf1fb5cc4f90bfe797288 Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Wed, 18 Aug 2021 14:06:02 +0200 Subject: [PATCH] remove dead code --- proxy/pkg/middleware/accesslog.go | 12 ------------ proxy/pkg/proxy/proxy.go | 4 ++-- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/proxy/pkg/middleware/accesslog.go b/proxy/pkg/middleware/accesslog.go index de2cdd48c31..c8c5adb143b 100644 --- a/proxy/pkg/middleware/accesslog.go +++ b/proxy/pkg/middleware/accesslog.go @@ -1,7 +1,6 @@ package middleware import ( - "context" "net/http" "time" @@ -31,14 +30,3 @@ func AccessLog(logger log.Logger) func(http.Handler) http.Handler { }) } } - -// ExtractRequestID extracts the request ID from the context. Since we now use the go-chi middleware to write the request -// id, this is propagated using the context, therefore read it from there. -func ExtractRequestID(ctx context.Context) string { - var rid string - if v, ok := ctx.Value(chimiddleware.RequestIDKey).(string); ok { - rid = v - } - - return rid -} diff --git a/proxy/pkg/proxy/proxy.go b/proxy/pkg/proxy/proxy.go index 315803d4fc9..f6b76ac237d 100644 --- a/proxy/pkg/proxy/proxy.go +++ b/proxy/pkg/proxy/proxy.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/owncloud/ocis/proxy/pkg/middleware" + chimiddleware "github.com/go-chi/chi/middleware" "go.opentelemetry.io/otel/attribute" @@ -231,7 +231,7 @@ func (p *MultiHostReverseProxy) ServeHTTP(w http.ResponseWriter, r *http.Request span.SetAttributes( attribute.KeyValue{ Key: "x-request-id", - Value: attribute.StringValue(middleware.ExtractRequestID(r.Context())), + Value: attribute.StringValue(chimiddleware.GetReqID(r.Context())), }) pkgtrace.Propagator.Inject(ctx, propagation.HeaderCarrier(r.Header))