Skip to content

Commit 55fc869

Browse files
committed
fix bugs
Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com>
1 parent cf2f655 commit 55fc869

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

pkg/bench/query_runner.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ func (q *queryRunner) resolveAddrs() error {
245245
defer cancel()
246246

247247
// If some of the dns resolution fails, log the error.
248-
if err := q.dnsProvider.Resolve(ctx, []string{q.cfg.Endpoint}); err != nil {
248+
if err := q.dnsProvider.Resolve(ctx, []string{q.cfg.Endpoint}, true); err != nil {
249249
level.Error(q.logger).Log("msg", "failed to resolve addresses", "err", err)
250250
}
251251

pkg/bench/write_runner.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ func (w *WriteBenchmarkRunner) resolveAddrs() error {
223223
defer cancel()
224224

225225
// If some of the dns resolution fails, log the error.
226-
if err := w.dnsProvider.Resolve(ctx, []string{w.cfg.Endpoint}); err != nil {
226+
if err := w.dnsProvider.Resolve(ctx, []string{w.cfg.Endpoint}, true); err != nil {
227227
level.Error(w.logger).Log("msg", "failed to resolve addresses", "err", err)
228228
}
229229

pkg/commands/bucket_validation.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ func (b *BucketValidationCommand) validate(_ *kingpin.ParseContext) error {
115115
b.logger = log.NewLogfmtLogger(log.NewSyncWriter(os.Stderr))
116116
ctx := context.Background()
117117

118-
bucketClient, err := bucket.NewClient(ctx, b.cfg, "testClient", b.logger, prometheus.DefaultRegisterer)
118+
bucketClient, err := bucket.NewClient(ctx, b.cfg, nil, "testClient", b.logger, prometheus.DefaultRegisterer)
119119
if err != nil {
120120
return errors.Wrap(err, "failed to create the bucket client")
121121
}

pkg/commands/remote_read.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,12 +252,17 @@ func (c *RemoteReadCommand) prepare() (query func(context.Context) ([]*prompb.Ti
252252

253253
return func(ctx context.Context) ([]*prompb.TimeSeries, error) {
254254
log.Infof("Querying time from=%s to=%s with selector=%s", from.Format(time.RFC3339), to.Format(time.RFC3339), c.selector)
255-
resp, err := readClient.Read(ctx, pbQuery)
255+
ss, err := readClient.Read(ctx, pbQuery, false)
256256
if err != nil {
257257
return nil, err
258258
}
259259

260-
return resp.Timeseries, nil
260+
result, _, err := remote.ToQueryResult(ss, 0)
261+
if err != nil {
262+
return nil, err
263+
}
264+
265+
return result.Timeseries, nil
261266

262267
}, from, to, nil
263268
}

0 commit comments

Comments
 (0)