Remove unused code and update rate handling in httpclient package

Author: ShocOne

httpclient/httpclient_helpers.go helpers/helpers.gohttpclient/httpclient_helpers.go renamed to helpers/helpers.go

@@ -1,5 +1,5 @@
-// http_helpers.go
-package httpclient
+// helpers/helpers_test.go
+package helpers
 
 import (
 	"time"

httpclient/httpclient_helpers_test.go helpers/helpers_test.gohttpclient/httpclient_helpers_test.go renamed to helpers/helpers_test.go

@@ -1,5 +1,5 @@
-// http_helpers.go
-package httpclient
+// helpers/helpers.go
+package helpers
 
 import (
 	"testing"

httpclient/httpclient_ping.go

@@ -8,6 +8,8 @@ import (
 	"os"
 	"time"
 
+	"github.com/deploymenttheory/go-api-http-client/ratehandler"
+
 	"go.uber.org/zap"
 	"golang.org/x/net/icmp"
 	"golang.org/x/net/ipv4"
@@ -74,7 +76,7 @@ func (c *Client) DoPing(method, endpoint string, body, out interface{}) (*http.R
 		log.Warn("Ping failed, retrying...", zap.String("method", method), zap.String("endpoint", endpoint), zap.Int("retryCount", retryCount))
 
 		// Calculate backoff duration and wait before retrying
-		backoffDuration := calculateBackoff(retryCount)
+		backoffDuration := ratehandler.CalculateBackoff(retryCount)
 		time.Sleep(backoffDuration)
 	}
 

httpclient/httpclient_request.go

@@ -10,6 +10,7 @@ import (
 	"github.com/deploymenttheory/go-api-http-client/authenticationhandler"
 	"github.com/deploymenttheory/go-api-http-client/headers"
 	"github.com/deploymenttheory/go-api-http-client/logger"
+	"github.com/deploymenttheory/go-api-http-client/ratehandler"
 	"github.com/deploymenttheory/go-api-http-client/status"
 	"github.com/google/uuid"
 	"go.uber.org/zap"
@@ -207,7 +208,7 @@ func (c *Client) executeRequestWithRetries(method, endpoint string, body, out in
 
 		// Parsing rate limit headers if a rate-limit error is detected
 		if status.IsRateLimitError(resp) {
-			waitDuration := parseRateLimitHeaders(resp, log)
+			waitDuration := ratehandler.ParseRateLimitHeaders(resp, log)
 			if waitDuration > 0 {
 				log.Warn("Rate limit encountered, waiting before retrying", zap.Duration("waitDuration", waitDuration))
 				time.Sleep(waitDuration)
@@ -222,7 +223,7 @@ func (c *Client) executeRequestWithRetries(method, endpoint string, body, out in
 				log.Warn("Max retry attempts reached", zap.String("method", method), zap.String("endpoint", endpoint))
 				break // Stop retrying if max attempts are reached
 			}
-			waitDuration := calculateBackoff(retryCount)
+			waitDuration := ratehandler.CalculateBackoff(retryCount)
 			log.Warn("Retrying request due to transient error", zap.String("method", method), zap.String("endpoint", endpoint), zap.Int("retryCount", retryCount), zap.Duration("waitDuration", waitDuration), zap.Error(err))
 			time.Sleep(waitDuration) // Wait before retrying
 			continue                 // Continue to next iteration after waiting

…tpclient/httpclient_rate_handler_test.go …ehandler/httpclient_rate_handler_test.gohttpclient/httpclient_rate_handler_test.go renamed to ratehandler/httpclient_rate_handler_test.go httpclient/httpclient_rate_handler_test.go renamed to ratehandler/httpclient_rate_handler_test.go

@@ -1,5 +1,5 @@
-// http_rate_handler_test.go
-package httpclient
+// ratehandler/ratehandler.go
+package ratehandler
 
 import (
 	"net/http"
@@ -26,7 +26,7 @@ func TestCalculateBackoff(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run("RetryCount"+strconv.Itoa(tt.retry), func(t *testing.T) {
-			delay := calculateBackoff(tt.retry)
+			delay := CalculateBackoff(tt.retry)
 
 			// The delay should be within the expected range
 			assert.GreaterOrEqual(t, delay, tt.expectedMin, "Delay should be greater than or equal to expected minimum after jitter adjustment")
@@ -86,7 +86,7 @@ func TestParseRateLimitHeaders(t *testing.T) {
 			}
 
 			mockLog := mocklogger.NewMockLogger()
-			wait := parseRateLimitHeaders(resp, mockLog)
+			wait := ParseRateLimitHeaders(resp, mockLog)
 
 			// Adjust the delta based on the expected wait duration
 			delta := time.Duration(1) * time.Second

httpclient/httpclient_rate_handler.go ratehandler/rate_handler.gohttpclient/httpclient_rate_handler.go renamed to ratehandler/rate_handler.go

@@ -1,4 +1,4 @@
-// http_rate_handler.go
+// ratehandler/ratehandler.go
 
 /*
 Components:
@@ -16,7 +16,7 @@ behavior accordingly.
 
 */
 
-package httpclient
+package ratehandler
 
 import (
 	"math"
@@ -36,11 +36,11 @@ const (
 	jitterFactor = 0.5                    // Random jitter factor
 )
 
-// calculateBackoff calculates the next delay for retry with exponential backoff and jitter.
+// CalculateBackoff calculates the next delay for retry with exponential backoff and jitter.
 // The baseDelay is the initial delay duration, which is exponentially increased on each retry.
 // The jitterFactor adds randomness to the delay to avoid simultaneous retries (thundering herd problem).
 // The delay is capped at maxDelay to prevent excessive wait times.
-func calculateBackoff(retry int) time.Duration {
+func CalculateBackoff(retry int) time.Duration {
 	if retry < 0 {
 		retry = 0 // Ensure non-negative retry count
 	}
@@ -55,9 +55,9 @@ func calculateBackoff(retry int) time.Duration {
 	return time.Duration(delayWithJitter)
 }
 
-// parseRateLimitHeaders parses common rate limit headers and adjusts behavior accordingly.
+// ParseRateLimitHeaders parses common rate limit headers and adjusts behavior accordingly.
 // It handles both Retry-After (in seconds or HTTP-date format) and X-RateLimit-Reset headers.
-func parseRateLimitHeaders(resp *http.Response, log logger.Logger) time.Duration {
+func ParseRateLimitHeaders(resp *http.Response, log logger.Logger) time.Duration {
 	// Check for the Retry-After header in seconds
 	if retryAfter := resp.Header.Get("Retry-After"); retryAfter != "" {
 		if waitSeconds, err := strconv.Atoi(retryAfter); err == nil {