Skip to content

feat(graph): use chi HTTP response wrapper instead of a homegrown one #3517

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pbleser-oc wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −13
Open

feat(graph): use chi HTTP response wrapper instead of a homegrown one #3517

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 4 additions & 13 deletions services/graph/pkg/metrics/middleware.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,9 @@ import (
"time"

"github.com/go-chi/chi/v5"
"github.com/go-chi/chi/v5/middleware"
)

type statusResponseWriter struct {
http.ResponseWriter
statusCode int
}

func (rw *statusResponseWriter) WriteHeader(code int) {
rw.statusCode = code
rw.ResponseWriter.WriteHeader(code)
}

// A middleware that tracks the duration of every inbound Graph API HTTP call
// and calls a function to delegate the storage of that duration into a
// histogram metric, analyzing the incoming query and deconstructing it into
Expand All @@ -34,11 +25,11 @@ func HTTPMetrics(inFlight *atomic.Int64, observe func(method, pattern string, st
return func(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
start := time.Now()
responseWrapper := &statusResponseWriter{ResponseWriter: w, statusCode: 200} // 200 OK is the default when it's not set
inFlight.Add(1)
defer inFlight.Add(-1)

next.ServeHTTP(responseWrapper, r)
wrapper := middleware.NewWrapResponseWriter(w, r.ProtoMajor)
next.ServeHTTP(wrapper, r)

duration := time.Since(start)

Expand All @@ -53,7 +44,7 @@ func HTTPMetrics(inFlight *atomic.Int64, observe func(method, pattern string, st
}
}

observe(r.Method, routePattern, responseWrapper.statusCode, duration)
observe(r.Method, routePattern, wrapper.Status(), duration)
})
}
}