Skip to content

Remove debugging added for retries #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ggreer merged 2 commits into from
Dec 16, 2025
Merged

Remove debugging added for retries #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20ddbc9
Remove debugging added for retries
Aug 5, 2025
91d1671
Merge branch 'main' into mbburch/remove-rate-limit-debugging
ggreer Dec 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions pkg/connector/tickets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,12 +152,10 @@ func (ln *Linear) ListTicketSchemas(ctx context.Context, p *pagination.Token) ([
if err != nil {
return nil, "", nil, err
}
l := ctxzap.Extract(ctx)

teams, nextToken, _, rlData, err := ln.client.ListTeamWorkflowStates(ctx, linear.GetTeamsVars{TeamIDs: ln.ticketSchemaTeamIDs, After: bag.PageToken(), First: resourcePageSize})
annotations.WithRateLimiting(rlData)
if err != nil {
l.Debug("teams failed", zap.Error(err), zap.Any("rlData", rlData))
return nil, "", annotations, fmt.Errorf("baton-linear: failed to list teams: %w", err)
}

Expand All @@ -169,7 +167,6 @@ func (ln *Linear) ListTicketSchemas(ctx context.Context, p *pagination.Token) ([
fields, _, _, rlData, err := ln.client.ListIssueFields(ctx)
annotations.WithRateLimiting(rlData)
if err != nil {
l.Debug("fields failed", zap.Error(err), zap.Any("rlData", rlData))
return nil, "", annotations, fmt.Errorf("baton-linear: failed to list issue fields: %w", err)
}

Expand Down
8 changes: 0 additions & 8 deletions pkg/linear/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -975,20 +975,12 @@ func (c *Client) doRequest(ctx context.Context, body interface{}, res interface{

resp, err := c.httpClient.Do(req, doOptions...)

l := ctxzap.Extract(ctx)
// Linear returns 400 when rate limited, so change it to a retryable error
if err != nil && resp != nil && (resp.StatusCode == http.StatusBadRequest || resp.StatusCode == http.StatusTooManyRequests) {
l.Debug("rate limiting detected", zap.Int("status_code", resp.StatusCode))
resp.StatusCode = http.StatusTooManyRequests

rlData.Status = v2.RateLimitDescription_STATUS_OVERLIMIT
return resp, rlData, uhttp.WrapErrorsWithRateLimitInfo(codes.Unavailable, resp, err)
}

if resp != nil {
l.Debug("returning without rate limit wrapping", zap.Int("status_code", resp.StatusCode))
} else {
l.Debug("returning without rate limit wrapping", zap.String("status_code", "nil response"))
}
return resp, rlData, err
}
Loading