TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2024-12-12 02:54:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: correct tracing in access interceptor (#5766)

Browse Source
This commit is contained in:
Silvan 2023-05-02 10:46:44 +02:00 committed by GitHub
parent 39bdef35e7
commit 40bf7e49cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
internal/api/http/middleware/access_interceptor.go
View File

@ -43,12 +43,10 @@ func (a *AccessInterceptor) Handle(next http.Handler) http.Handler {
return next return next
} }
return http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) { return http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
ctx := request.Context() ctx := request.Context()
var err error var err error
tracingCtx, span := tracing.NewServerInterceptorSpan(ctx) tracingCtx, checkSpan := tracing.NewNamedSpan(ctx, "checkAccess")
defer func() { span.EndWithError(err) }()
wrappedWriter := &statusRecorder{ResponseWriter: writer, status: 0} wrappedWriter := &statusRecorder{ResponseWriter: writer, status: 0}
@ -63,8 +61,13 @@ func (a *AccessInterceptor) Handle(next http.Handler) http.Handler {
wrappedWriter.ignoreWrites = true wrappedWriter.ignoreWrites = true
} }
checkSpan.End()
next.ServeHTTP(wrappedWriter, request) next.ServeHTTP(wrappedWriter, request)
tracingCtx, writeSpan := tracing.NewNamedSpan(tracingCtx, "writeAccess")
defer writeSpan.End()
requestURL := request.RequestURI requestURL := request.RequestURI
unescapedURL, err := url.QueryUnescape(requestURL) unescapedURL, err := url.QueryUnescape(requestURL)
if err != nil { if err != nil {