feat(go): test http-client integration (#362)

Co-authored-by: Michi Hoffmann <[email protected]>

Author: giortzisg

potal/go.mod

@@ -2,6 +2,9 @@ module github.com/getsentry/gib-potato
 
 go 1.25.0
 
+// Test httpclient integration, PR #876
+replace github.com/getsentry/sentry-go => github.com/aldy505/sentry-go v0.0.0-20251120002518-9de99efea3a2
+
 require (
 	github.com/getsentry/sentry-go v0.36.3-0.20251028153640-e2badbb7694c
 	github.com/google/go-cmp v0.5.9

potal/go.sum

@@ -1,13 +1,7 @@
+github.com/aldy505/sentry-go v0.0.0-20251120002518-9de99efea3a2 h1:JQ+3yeRe9T53bH29i2bqVRj2dbJsOrAaQMaQP59dnhc=
+github.com/aldy505/sentry-go v0.0.0-20251120002518-9de99efea3a2/go.mod h1:eRXCoh3uvmjQLY6qu63BjUZnaBu5L5WhMV1RwYO8W5s=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/getsentry/sentry-go v0.36.0 h1:UkCk0zV28PiGf+2YIONSSYiYhxwlERE5Li3JPpZqEns=
-github.com/getsentry/sentry-go v0.36.0/go.mod h1:p5Im24mJBeruET8Q4bbcMfCQ+F+Iadc4L48tB1apo2c=
-github.com/getsentry/sentry-go v0.36.2-0.20251024113619-cda84dbb8532 h1:j71Y2rcZmVoi3TQqO79Xn4JPwNLVw9PKhCLZDQSKFOI=
-github.com/getsentry/sentry-go v0.36.2-0.20251024113619-cda84dbb8532/go.mod h1:p5Im24mJBeruET8Q4bbcMfCQ+F+Iadc4L48tB1apo2c=
-github.com/getsentry/sentry-go v0.36.2 h1:uhuxRPTrUy0dnSzTd0LrYXlBYygLkKY0hhlG5LXarzM=
-github.com/getsentry/sentry-go v0.36.2/go.mod h1:p5Im24mJBeruET8Q4bbcMfCQ+F+Iadc4L48tB1apo2c=
-github.com/getsentry/sentry-go v0.36.3-0.20251028153640-e2badbb7694c h1:lEVNr8EyF7wu8URA7vlhVUPkg8ea57q3ZIrCS8zvwvI=
-github.com/getsentry/sentry-go v0.36.3-0.20251028153640-e2badbb7694c/go.mod h1:p5Im24mJBeruET8Q4bbcMfCQ+F+Iadc4L48tB1apo2c=
 github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
 github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
 github.com/go-test/deep v1.1.1 h1:0r/53hagsehfO4bzD2Pgr/+RgHqhmf+k1Bpse2cTu1U=

potal/internal/potalhttp/client.go

@@ -9,6 +9,8 @@ import (
 	"net/http"
 	"os"
 
+	sentryhttpclient "github.com/getsentry/sentry-go/httpclient"
+
 	"github.com/getsentry/gib-potato/internal/event"
 	"github.com/getsentry/sentry-go"
 )
@@ -17,10 +19,6 @@ func SendRequest(ctx context.Context, e event.PotalEvent) error {
 	url := os.Getenv("POTAL_URL")
 
 	hub := sentry.GetHubFromContext(ctx)
-	txn := sentry.TransactionFromContext(ctx)
-
-	span := txn.StartChild("http.client", sentry.WithDescription(fmt.Sprintf("POST %s", url)))
-	defer span.Finish()
 
 	body, jsonErr := json.Marshal(e)
 	if jsonErr != nil {
@@ -29,49 +27,32 @@ func SendRequest(ctx context.Context, e event.PotalEvent) error {
 		return jsonErr
 	}
 
-	r, newReqErr := http.NewRequest("POST", url, bytes.NewBuffer(body))
+	r, newReqErr := http.NewRequestWithContext(ctx, "POST", url, bytes.NewBuffer(body))
 	if newReqErr != nil {
 		hub.CaptureException(newReqErr)
 		log.Printf("An Error Occured %v", newReqErr)
 		return newReqErr
 	}
 
 	r.Header.Add("Content-Type", "application/json")
-	r.Header.Add("Sentry-Trace", span.ToSentryTrace())
-	r.Header.Add("Baggage", span.ToBaggage())
 	r.Header.Add("Authorization", os.Getenv("POTAL_TOKEN"))
 
-	client := &http.Client{}
+	client := &http.Client{
+		Transport: sentryhttpclient.NewSentryRoundTripper(nil),
+	}
+
 	res, reqErr := client.Do(r)
 	if reqErr != nil {
 		hub.CaptureException(reqErr)
-		span.Status = sentry.SpanStatusInternalError
-
 		log.Printf("An Error Occured %v", reqErr)
 		return reqErr
 	}
 	defer func() {
-		if err := res.Body.Close(); err != nil {
-			log.Printf("Failed to close response body: %v", err)
-		}
+		_ = res.Body.Close()
 	}()
 
-	span.Data = map[string]interface{}{
-		"http.response.status_code": res.StatusCode,
-	}
-
-	switch res.StatusCode {
-	case http.StatusOK:
-		span.Status = sentry.SpanStatusOK
+	if res.StatusCode == http.StatusOK {
 		return nil
-	case http.StatusUnauthorized:
-		fallthrough
-	case http.StatusForbidden:
-		span.Status = sentry.SpanStatusPermissionDenied
-	case http.StatusNotFound:
-		span.Status = sentry.SpanStatusNotFound
-	case http.StatusInternalServerError:
-		span.Status = sentry.SpanStatusInternalError
 	}
 
 	msg := fmt.Sprintf("GibPotato API: Got %s response", res.Status)

potal/main.go

@@ -16,15 +16,14 @@ var slackClient *slack.Client
 
 func main() {
 	sentryErr := sentry.Init(sentry.ClientOptions{
-		Dsn:                   os.Getenv("SENTRY_POTAL_DSN"),
-		Release:               os.Getenv("RELEASE"),
-		Environment:           os.Getenv("ENVIRONMENT"),
-		AttachStacktrace:      true,
-		SendDefaultPII:        true,
-		EnableTracing:         true,
-		TracesSampleRate:      1.0,
-		EnableLogs:            true,
-		EnableTelemetryBuffer: true,
+		Dsn:              os.Getenv("SENTRY_POTAL_DSN"),
+		Release:          os.Getenv("RELEASE"),
+		Environment:      os.Getenv("ENVIRONMENT"),
+		AttachStacktrace: true,
+		SendDefaultPII:   true,
+		EnableTracing:    true,
+		TracesSampleRate: 1.0,
+		EnableLogs:       true,
 	})
 	if sentryErr != nil {
 		log.Fatalf("An Error Occured: %v", sentryErr)