Add check for rate limiting and debugging logs

Author: MB Burch

pkg/linear/client.go

@@ -971,9 +971,36 @@ func (c *Client) doRequest(ctx context.Context, body interface{}, res interface{
 	}
 
 	resp, err := c.httpClient.Do(req, doOptions...)
+
+	// Add logging for troubleshooting
+	l := ctxzap.Extract(ctx)
+	l.Info("doRequest completed",
+		zap.Error(err),
+		zap.Int("status_code", func() int {
+			if resp != nil {
+				return resp.StatusCode
+			}
+			return 0
+		}()),
+		zap.Any("rate_limit_data", rlData),
+		zap.Bool("gql_err_is_rate_limited", gqlErr.IsRateLimited()))
+
 	// Linear returns 400 when rate limited, so change it to a retryable error
-	if err != nil && resp != nil && resp.StatusCode == http.StatusBadRequest {
+	if err != nil && resp != nil && (resp.StatusCode == http.StatusBadRequest || gqlErr.IsRateLimited()) {
+		l.Info("rate limiting detected", zap.Int("status_code", resp.StatusCode))
+
+		rlData.Status = v2.RateLimitDescription_STATUS_OVERLIMIT
 		return resp, rlData, uhttp.WrapErrorsWithRateLimitInfo(codes.Unavailable, resp, err)
 	}
+
+	// Ensure error is wrapped with rate limit info when using WithRatelimitData
+	if err != nil && resp != nil {
+		l.Info("wrapping error with rate limit info",
+			zap.Int("status_code", resp.StatusCode),
+			zap.Error(err))
+		return resp, rlData, uhttp.WrapErrorsWithRateLimitInfo(codes.Unavailable, resp, err)
+	}
+
+	l.Info("returning without rate limit wrapping")
 	return resp, rlData, err
 }

pkg/linear/models.go

@@ -1,6 +1,14 @@
 package linear
 
-import "time"
+import (
+	"context"
+	"fmt"
+	"strings"
+	"time"
+
+	"github.com/grpc-ecosystem/go-grpc-middleware/logging/zap/ctxzap"
+	"go.uber.org/zap"
+)
 
 type PageInfo struct {
 	EndCursor       string `json:"endCursor"`
@@ -93,7 +101,8 @@ type Project struct {
 type GraphQLError struct {
 	Error  string `json:"error"`
 	Errors []struct {
-		Message string `json:"message"`
+		Message    string                 `json:"message"`
+		Extensions map[string]interface{} `json:"extensions,omitempty"`
 	} `json:"errors"`
 }
 
@@ -107,6 +116,50 @@ func (e *GraphQLError) Message() string {
 	return e.Errors[0].Message
 }
 
+// IsRateLimited checks if the error contains Linear's RATELIMITED error code.
+func (e *GraphQLError) IsRateLimited() bool {
+	// Get logger from context if available, otherwise use a default logger
+	ctx := context.Background()
+	l := ctxzap.Extract(ctx)
+
+	for _, err := range e.Errors {
+		// Log the error message and extensions for debugging
+		l.Info("checking GraphQL error for rate limiting",
+			zap.String("message", err.Message),
+			zap.Any("extensions", err.Extensions))
+
+		if extensions, ok := err.Extensions["code"]; ok {
+			l.Info("found 'code' extension",
+				zap.Any("code_value", extensions),
+				zap.String("code_type", fmt.Sprintf("%T", extensions)))
+
+			if code, ok := extensions.(string); ok && code == "RATELIMITED" {
+				l.Info("rate limited detected via code extension",
+					zap.String("code", code))
+				return true
+			} else {
+				l.Info("code extension is not 'RATELIMITED'",
+					zap.Any("got_value", extensions),
+					zap.String("got_type", fmt.Sprintf("%T", extensions)))
+			}
+		} else {
+			l.Info("no 'code' extension found")
+		}
+
+		// Also check the message for backward compatibility
+		if strings.Contains(strings.ToLower(err.Message), "ratelimited") {
+			l.Info("rate limited detected via message",
+				zap.String("message", err.Message))
+			return true
+		} else {
+			l.Info("message does not contain 'ratelimited'",
+				zap.String("message", err.Message))
+		}
+	}
+	l.Info("no rate limiting detected in any GraphQL errors")
+	return false
+}
+
 type ViewerPermissions struct {
 	Guest bool   `json:"guest"`
 	Admin bool   `json:"admin"`