fix: Ensure resp is not nil before calling sentry.CheckResponse (#549)

jianyuan · web-flow · commit 8cbd7bdf1bb2 · 2024-12-24T22:58:36.000Z
diff --git a/internal/sentryclient/rate_limiter.go b/internal/sentryclient/rate_limiter.go
@@ -20,8 +20,10 @@ func NewRateLimiterRoundTripper(delegate http.RoundTripper) http.RoundTripper {
 	retryClient.ErrorHandler = retryablehttp.PassthroughErrorHandler
 	retryClient.Logger = nil // Disable DEBUG logs
 	retryClient.Backoff = func(min, max time.Duration, attemptNum int, resp *http.Response) time.Duration {
-		if rateLimitErr, ok := sentry.CheckResponse(resp).(*sentry.RateLimitError); ok {
-			return time.Until(rateLimitErr.Rate.Reset)
+		if resp != nil {
+			if rateLimitErr, ok := sentry.CheckResponse(resp).(*sentry.RateLimitError); ok {
+				return time.Until(rateLimitErr.Rate.Reset)
+			}
 		}
 		return retryablehttp.DefaultBackoff(min, max, attemptNum, resp)
 	}

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,10 @@ func NewRateLimiterRoundTripper(delegate http.RoundTripper) http.RoundTripper {`
`20`	`20`	`retryClient.ErrorHandler = retryablehttp.PassthroughErrorHandler`
`21`	`21`	`retryClient.Logger = nil // Disable DEBUG logs`
`22`	`22`	`retryClient.Backoff = func(min, max time.Duration, attemptNum int, resp *http.Response) time.Duration {`
`23`		`- if rateLimitErr, ok := sentry.CheckResponse(resp).(*sentry.RateLimitError); ok {`
`24`		`- return time.Until(rateLimitErr.Rate.Reset)`
	`23`	`+ if resp != nil {`
	`24`	`+ if rateLimitErr, ok := sentry.CheckResponse(resp).(*sentry.RateLimitError); ok {`
	`25`	`+ return time.Until(rateLimitErr.Rate.Reset)`
	`26`	`+ }`
`25`	`27`	`}`
`26`	`28`	`return retryablehttp.DefaultBackoff(min, max, attemptNum, resp)`
`27`	`29`	`}`