From 871a3667e7d3339f59c6da5d9e9f221f601a7624 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emir=20Ribi=C4=87?= <e@ribic.ba>
Date: Wed, 4 Sep 2024 15:28:36 +0200
Subject: [PATCH] Move ResponseWriter wrapper to internal (#880)

* move ResponseWriter middleware to internal

* move ResponseWriter middleware to internal
---
 http/sentryhttp.go                                            | 3 ++-
 wrap_writer.go => internal/httputils/wrap_writer.go           | 2 +-
 wrap_writer_test.go => internal/httputils/wrap_writer_test.go | 2 +-
 negroni/sentrynegroni.go                                      | 3 ++-
 4 files changed, 6 insertions(+), 4 deletions(-)
 rename wrap_writer.go => internal/httputils/wrap_writer.go (99%)
 rename wrap_writer_test.go => internal/httputils/wrap_writer_test.go (99%)

diff --git a/http/sentryhttp.go b/http/sentryhttp.go
index 62549e5e..1bb8819d 100644
--- a/http/sentryhttp.go
+++ b/http/sentryhttp.go
@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/getsentry/sentry-go"
+	"github.com/getsentry/sentry-go/internal/httputils"
 	"github.com/getsentry/sentry-go/internal/traceutils"
 )
 
@@ -107,7 +108,7 @@ func (h *Handler) handle(handler http.Handler) http.HandlerFunc {
 		)
 		transaction.SetData("http.request.method", r.Method)
 
-		rw := sentry.NewWrapResponseWriter(w, r.ProtoMajor)
+		rw := httputils.NewWrapResponseWriter(w, r.ProtoMajor)
 
 		defer func() {
 			status := rw.Status()
diff --git a/wrap_writer.go b/internal/httputils/wrap_writer.go
similarity index 99%
rename from wrap_writer.go
rename to internal/httputils/wrap_writer.go
index 01f5f45c..481353a1 100644
--- a/wrap_writer.go
+++ b/internal/httputils/wrap_writer.go
@@ -1,4 +1,4 @@
-package sentry
+package httputils
 
 import (
 	"bufio"
diff --git a/wrap_writer_test.go b/internal/httputils/wrap_writer_test.go
similarity index 99%
rename from wrap_writer_test.go
rename to internal/httputils/wrap_writer_test.go
index b4cdc9e0..2487cd3a 100644
--- a/wrap_writer_test.go
+++ b/internal/httputils/wrap_writer_test.go
@@ -1,4 +1,4 @@
-package sentry
+package httputils
 
 import (
 	"bufio"
diff --git a/negroni/sentrynegroni.go b/negroni/sentrynegroni.go
index 6740ee6f..c1afef75 100644
--- a/negroni/sentrynegroni.go
+++ b/negroni/sentrynegroni.go
@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"github.com/getsentry/sentry-go"
+	"github.com/getsentry/sentry-go/internal/httputils"
 	"github.com/getsentry/sentry-go/internal/traceutils"
 	"github.com/urfave/negroni"
 )
@@ -69,7 +70,7 @@ func (h *handler) ServeHTTP(w http.ResponseWriter, r *http.Request, next http.Ha
 	)
 
 	transaction.SetData("http.request.method", r.Method)
-	rw := sentry.NewWrapResponseWriter(w, r.ProtoMajor)
+	rw := httputils.NewWrapResponseWriter(w, r.ProtoMajor)
 
 	defer func() {
 		status := rw.Status()