remove dead code

This commit is contained in:
A.Unger
2021-08-18 14:06:02 +02:00
parent 06fda516ec
commit 46f0d6f7e4
2 changed files with 2 additions and 14 deletions

View File

@@ -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
}

View File

@@ -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))