Rework response writer interceptor

gol4ng · Oct 22, 2020 · 717af24 · 717af24
1 parent 5460b92
commit 717af24
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/middleware/interceptor.go b/middleware/interceptor.go
@@ -12,7 +12,10 @@ func Interceptor(options ...InterceptorOption) httpware.Middleware {
 	config := NewInterceptorConfig(options...)
 	return func(next http.Handler) http.Handler {
 		return http.HandlerFunc(func(writer http.ResponseWriter, req *http.Request) {
-			writerInterceptor := NewResponseWriterInterceptor(writer)
+			writerInterceptor, ok := writer.(*ResponseWriterInterceptor)
+			if !ok {
+				writerInterceptor = NewResponseWriterInterceptor(writer)
+			}
 
 			req.Body = interceptor.NewCopyReadCloser(req.Body)
 			config.CallbackBefore(writerInterceptor, req)

diff --git a/middleware/metrics.go b/middleware/metrics.go
@@ -14,7 +14,10 @@ func Metrics(recorder metrics.Recorder, options ... metrics.Option) httpware.Mid
 	config := metrics.NewConfig(recorder, options...)
 	return func(next http.Handler) http.Handler {
 		return http.HandlerFunc(func(writer http.ResponseWriter, req *http.Request) {
-			writerInterceptor := NewResponseWriterInterceptor(writer)
+			writerInterceptor, ok := writer.(*ResponseWriterInterceptor)
+			if !ok {
+				writerInterceptor = NewResponseWriterInterceptor(writer)
+			}
 			handlerName := config.IdentifierProvider(req)
 			if config.MeasureInflightRequests {
 				config.Recorder.AddInflightRequests(req.Context(), handlerName, 1)