From f8a1b8ad8efb61d2c1664445809eb6fe105a7d61 Mon Sep 17 00:00:00 2001 From: Friedrich Gonzalez Date: Tue, 24 Dec 2024 18:20:51 +0100 Subject: [PATCH] fix building --- pkg/backfill/backfill.go | 2 +- pkg/bench/query_runner.go | 2 +- pkg/commands/analyse_prometheus.go | 2 +- pkg/commands/loadgen.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/backfill/backfill.go b/pkg/backfill/backfill.go index abc993690..eca0e65b9 100644 --- a/pkg/backfill/backfill.go +++ b/pkg/backfill/backfill.go @@ -72,7 +72,7 @@ func CreateBlocks(input IteratorCreator, mint, maxt int64, maxSamplesInAppender blockDuration := tsdb.DefaultBlockDuration mint = blockDuration * (mint / blockDuration) - db, err := tsdb.OpenDBReadOnly(outputDir, nil) + db, err := tsdb.OpenDBReadOnly(outputDir, "", nil) if err != nil { return err } diff --git a/pkg/bench/query_runner.go b/pkg/bench/query_runner.go index 8eb87c854..53a8d5994 100644 --- a/pkg/bench/query_runner.go +++ b/pkg/bench/query_runner.go @@ -145,7 +145,7 @@ func newQueryClient(url, tenantName, username, password string) (v1.API, error) Address: url, RoundTripper: &httpmiddleware.TenantIDRoundTripper{ TenantName: tenantName, - Next: config_util.NewBasicAuthRoundTripper(username, config_util.Secret(password), "", "", api.DefaultRoundTripper), + Next: config_util.NewBasicAuthRoundTripper(config_util.NewInlineSecret(username), config_util.NewInlineSecret(password), api.DefaultRoundTripper), }, }) diff --git a/pkg/commands/analyse_prometheus.go b/pkg/commands/analyse_prometheus.go index 8f53552b0..93c3d4afc 100644 --- a/pkg/commands/analyse_prometheus.go +++ b/pkg/commands/analyse_prometheus.go @@ -69,7 +69,7 @@ func (cmd *PrometheusAnalyseCommand) run(_ *kingpin.ParseContext) error { rt := api.DefaultRoundTripper if cmd.username != "" { - rt = config.NewBasicAuthRoundTripper(cmd.username, config.Secret(cmd.password), "", "", api.DefaultRoundTripper) + rt = config.NewBasicAuthRoundTripper(config.NewInlineSecret(cmd.username), config.NewInlineSecret(cmd.password), api.DefaultRoundTripper) } promClient, err := api.NewClient(api.Config{ Address: cmd.address, diff --git a/pkg/commands/loadgen.go b/pkg/commands/loadgen.go index 7697badec..4785ecd08 100644 --- a/pkg/commands/loadgen.go +++ b/pkg/commands/loadgen.go @@ -214,7 +214,7 @@ func (c *LoadgenCommand) runBatch(from, to int) error { start := time.Now() attempt := 0 // TODO: do retries - if err := c.writeClient.Store(context.Background(), compressed, attempt); err != nil { + if _, err := c.writeClient.Store(context.Background(), compressed, attempt); err != nil { writeRequestDuration.WithLabelValues("error").Observe(time.Since(start).Seconds()) return err }