Implement hijacker interface for Negroni integration (#871)

CHANGELOG.md

@@ -5,6 +5,11 @@
 - Remove Martini integration ([#861](https://github.com/getsentry/sentry-go/pull/861))
 - Fix closure functions name grouping ([#877](https://github.com/getsentry/sentry-go/pull/877))
 
+
+### Breaking Changes
+
+- WrapResponseWriter has been moved from sentryhttp to sentry. If you've imported it from sentryhttp, you'll need to update your imports.
+
 ## 0.28.1
 
 The Sentry SDK team is happy to announce the immediate availability of Sentry Go SDK v0.28.1.

http/sentryhttp.go

@@ -107,7 +107,7 @@ func (h *Handler) handle(handler http.Handler) http.HandlerFunc {
 		)
 		transaction.SetData("http.request.method", r.Method)
 
-		rw := NewWrapResponseWriter(w, r.ProtoMajor)
+		rw := sentry.NewWrapResponseWriter(w, r.ProtoMajor)
 
 		defer func() {
 			status := rw.Status()

negroni/sentrynegroni.go

@@ -45,22 +45,6 @@ func New(options Options) negroni.Handler {
 	}
 }
 
-// responseWriter is a wrapper around http.ResponseWriter that captures the status code.
-type responseWriter struct {
-	http.ResponseWriter
-	statusCode int
-}
-
-// WriteHeader captures the status code and calls the original WriteHeader method.
-func (rw *responseWriter) WriteHeader(code int) {
-	rw.statusCode = code
-	rw.ResponseWriter.WriteHeader(code)
-}
-
-func newResponseWriter(w http.ResponseWriter) *responseWriter {
-	return &responseWriter{ResponseWriter: w, statusCode: http.StatusOK}
-}
-
 func (h *handler) ServeHTTP(w http.ResponseWriter, r *http.Request, next http.HandlerFunc) {
 	ctx := r.Context()
 	hub := sentry.GetHubFromContext(ctx)
@@ -91,10 +75,10 @@ func (h *handler) ServeHTTP(w http.ResponseWriter, r *http.Request, next http.Ha
 		options...,
 	)
 	transaction.SetData("http.request.method", r.Method)
-	rw := newResponseWriter(w)
+	rw := sentry.NewWrapResponseWriter(w, r.ProtoMajor)
 
 	defer func() {
-		status := rw.statusCode
+		status := rw.Status()
 		transaction.Status = sentry.HTTPtoSpanStatus(status)
 		transaction.SetData("http.response.status_code", status)
 		transaction.Finish()

http/wrap_writer.go → wrap_writer.go

@@ -1,4 +1,4 @@
-package sentryhttp
+package sentry
 
 import (
 	"bufio"

http/wrap_writer_test.go → wrap_writer_test.go

@@ -1,4 +1,4 @@
-package sentryhttp
+package sentry
 
 import (
 	"bufio"