Skip to content
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

Jump to bottom

Use retryable client again #11

Merged
merged 1 commit into from
Jun 7, 2024
Merged

Use retryable client again #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 10 additions & 16 deletions client/duneapi/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import (
"encoding/json"
"fmt"
"log/slog"
"net/http"
"sync"
"time"

"github.com/duneanalytics/blockchain-ingester/models"
"github.com/hashicorp/go-retryablehttp"
"github.com/klauspost/compress/zstd"
)

Expand All @@ -28,10 +28,8 @@ type BlockchainIngester interface {
}

type client struct {
log *slog.Logger
// TODO: Use retryable client
// httpClient *retryablehttp.Client
httpClient *http.Client
log *slog.Logger
httpClient *retryablehttp.Client
cfg Config
compressor *zstd.Encoder
bufPool *sync.Pool
Expand All @@ -44,16 +42,14 @@ func New(log *slog.Logger, cfg Config) (*client, error) { // revive:disable-line
if err != nil {
return nil, err
}
// TODO: Use retryable client
// httpClient := retryablehttp.NewClient()
// httpClient.RetryMax = MaxRetries
// httpClient.Logger = log
// httpClient.CheckRetry = retryablehttp.DefaultRetryPolicy
// httpClient.Backoff = retryablehttp.LinearJitterBackoff
httpClient := retryablehttp.NewClient()
httpClient.RetryMax = MaxRetries
httpClient.Logger = log
httpClient.CheckRetry = retryablehttp.DefaultRetryPolicy
httpClient.Backoff = retryablehttp.LinearJitterBackoff
return &client{
log: log,
httpClient: &http.Client{},
// httpClient: httpClient,
httpClient: httpClient,
cfg: cfg,
compressor: comp,
bufPool: &sync.Pool{
Expand Down Expand Up @@ -128,9 +124,7 @@ func (c *client) sendRequest(ctx context.Context, request BlockchainIngestReques

url := fmt.Sprintf("%s/beta/blockchain/%s/ingest", c.cfg.URL, c.cfg.BlockchainName)
c.log.Debug("Sending request", "url", url)
// TODO: Use retryable client
// req, err := retryablehttp.NewRequest("POST", url, bytes.NewReader(request.Payload))
req, err := http.NewRequest("POST", url, bytes.NewReader(request.Payload))
req, err := retryablehttp.NewRequestWithContext(ctx, "POST", url, bytes.NewReader(request.Payload))
if err != nil {
return err
}
Expand Down
Loading