Query: add query metrics to calls going through the Store API #5741

douglascamata · 2022-09-29T10:21:21Z

I added CHANGELOG entry for this change.
Change is not relevant to the end user.

Changes

Overall, this pull request's intent is to implement the first step in the proposal More granular query performance metrics.

Verification

Built the containers and ran it locally.
Added some tests, including e2e tests.

These are grabbed from the data returned by multiple Store APIs after execution of a query. Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

…ent-reloader Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

pkg/store/metrics/metrics.go

…etrics

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

douglascamata · 2022-10-10T12:47:42Z

I wanted to re-request review from the 3 reviewers, but Github is drunk. Sorry for the possible notification spam.

…etrics

jessicalins

🚀

…etrics Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

pkg/store/telemetry/telemetry.go

bwplotka

LGTM, thanks 💪🏽 (:

pkg/store/telemetry/telemetry.go

bwplotka · 2022-10-17T10:44:21Z

pkg/store/telemetry/telemetry.go

+		"series_le":  strconv.Itoa(int(seriesLeBucket)),
+		"samples_le": strconv.Itoa(int(samplesLeBucket)),


My main concerns is still this: Is such "weird" metric usable in PromQL? (two dimensional histogram)

Discussed in #5741 (comment)

OK, it's actually len(series_le) * len(samples_le) number of histograms.

OK, I am fine then, thanks for explanation (:

bwplotka · 2022-10-17T10:47:22Z

pkg/store/telemetry/telemetry.go

+		"series_le":  strconv.Itoa(int(seriesLeBucket)),
+		"samples_le": strconv.Itoa(int(samplesLeBucket)),


OK, it's actually len(series_le) * len(samples_le) number of histograms.

bwplotka · 2022-10-17T10:47:39Z

pkg/store/telemetry/telemetry.go

+		"series_le":  strconv.Itoa(int(seriesLeBucket)),
+		"samples_le": strconv.Itoa(int(samplesLeBucket)),


OK, I am fine then, thanks for explanation (:

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

Signed-off-by: Matej Gera <38492574+matej-g@users.noreply.github.com>

matej-g

(previously approved, approving after merging main and merging this PR now)

…-io#5741) * Implement granular query performance metrics for Thanos Query These are grabbed from the data returned by multiple Store APIs after execution of a query. Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Fix some linter warnings Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove useless logs Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Refactor query tests Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Fix long function definition (newQuerier) Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove TODO comment Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Fix query tests Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Reformat query docs Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove useless return Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Put back old query docs Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Update query docs again Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Fix e2e env name Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Retrigger CI Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Add missing copyright notice. Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Retrigger CI Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Retrigger CI Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Bump wait time to twice scrape interval Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Retrigger CI Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Attempt to fix randomly failing test Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Checking more metrics to ensure the store is ready Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Clean up test Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Do not record store api metrics when didn't touch series or samples Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Retrigger CI Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Also skip store api metrics on zero chunks touched Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Update changelog Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Fix broken changelog after merge Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove extra empty line Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Refactor names and (un)exported types and fields Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Start listing metrics exported by Thanos Query Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Rename pkg/store/metrics -> pkg/store/telemetry Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Get rid of the pkg/store/telemetry package Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> Signed-off-by: Matej Gera <38492574+matej-g@users.noreply.github.com> Co-authored-by: Matej Gera <38492574+matej-g@users.noreply.github.com> Signed-off-by: utukj <utukphd@gmail.com>

…thanos-io#5741)" This reverts commit eec4fd0.

…thanos-io#5741)" This reverts commit eec4fd0. Signed-off-by: utukj <utukphd@gmail.com>

…-io#5741) * Implement granular query performance metrics for Thanos Query These are grabbed from the data returned by multiple Store APIs after execution of a query. Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Fix some linter warnings Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove useless logs Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Refactor query tests Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Fix long function definition (newQuerier) Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove TODO comment Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Fix query tests Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Reformat query docs Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove useless return Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Put back old query docs Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Update query docs again Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Fix e2e env name Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Retrigger CI Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Add missing copyright notice. Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Retrigger CI Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Retrigger CI Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Bump wait time to twice scrape interval Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Retrigger CI Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Attempt to fix randomly failing test Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Checking more metrics to ensure the store is ready Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Clean up test Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Do not record store api metrics when didn't touch series or samples Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Retrigger CI Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Also skip store api metrics on zero chunks touched Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Update changelog Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Fix broken changelog after merge Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove extra empty line Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Refactor names and (un)exported types and fields Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Start listing metrics exported by Thanos Query Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Rename pkg/store/metrics -> pkg/store/telemetry Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Get rid of the pkg/store/telemetry package Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> Signed-off-by: Matej Gera <38492574+matej-g@users.noreply.github.com> Co-authored-by: Matej Gera <38492574+matej-g@users.noreply.github.com> Signed-off-by: utukj <utukphd@gmail.com>

…thanos-io#5741)" This reverts commit 7a77769. Signed-off-by: utukj <utukphd@gmail.com>

…specify metric labels to collect (#5785) * added unit tests for long labels and no external labels Signed-off-by: utukj <utukphd@gmail.com> * trimmed too long external labels Signed-off-by: utukj <utukphd@gmail.com> * added optional label selection Signed-off-by: utukj <utukphd@gmail.com> * added cmd flag for choosing metric labels Signed-off-by: utukj <utukphd@gmail.com> * updated docs Signed-off-by: utukj <utukphd@gmail.com> * Update pkg/query/endpointset.go full sentence fix Co-authored-by: Bartlomiej Plotka <bwplotka@gmail.com> Signed-off-by: Uwakmfon Utuk <41128987+utukJ@users.noreply.github.com> * Update pkg/query/endpointset.go Co-authored-by: Bartlomiej Plotka <bwplotka@gmail.com> Signed-off-by: Uwakmfon Utuk <41128987+utukJ@users.noreply.github.com> * minor fixes from code review Signed-off-by: utukj <utukphd@gmail.com> * fixed code comments Signed-off-by: utukj <utukphd@gmail.com> * used enum for labels Signed-off-by: utukj <utukphd@gmail.com> * updated query docs Signed-off-by: utukj <utukphd@gmail.com> * cleaned up tests Signed-off-by: utukj <utukphd@gmail.com> * Updates busybox SHA (#5793) Signed-off-by: GitHub <noreply@github.com> Signed-off-by: GitHub <noreply@github.com> Co-authored-by: yeya24 <yeya24@users.noreply.github.com> Signed-off-by: utukj <utukphd@gmail.com> * Receive: Reload tenant limit configuration on file change (#5673) * Create a PathOrContent reloader Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Add docs to staticPathContent.Rewrite Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Run goimports Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Properly cancel the context in the test Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Watch parent directory of file This helps handling deletes and other situations. Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove useless ctx.Done() Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Add a debounce timer to config reload It helps managing situations where a create event is followed by a write or when a big file write is sent by the fsnotify backend as many write events. Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Fix event.Op bitmask check Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Update lastReload Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Fix debouncer for path content reloader Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Improve documentation of the PathContentRealoder Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Dain reload timer before resetting Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Run tests in parallel Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Simplify debouncing logic Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Add more tests to file reloader Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Simplify condition for triggering reload Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Use absolute path to config file Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Get rid of parallel test Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Put back 2s wait between fs operations Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove useless sleep Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Stop reloadTimer when context cancelled Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove unused fucntion Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Add missing copyright to test file Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Auto-reload tenant limit config on file changes Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Wrap error when reloading config Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Move limiter config reloader and update logs Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Get rid of useless types and allocations Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove errorChan from config reload starter Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Retrigger CI Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Use UnRegisterer in the Limiter To ensure that limit reloads will be able to re-register their metrics. Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Better guard against nil registerer in the limiter Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove wrong nil guard Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Retrigger CI Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> Signed-off-by: utukj <utukphd@gmail.com> * Query: add query metrics to calls going through the Store API (#5741) * Implement granular query performance metrics for Thanos Query These are grabbed from the data returned by multiple Store APIs after execution of a query. Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Fix some linter warnings Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove useless logs Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Refactor query tests Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Fix long function definition (newQuerier) Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove TODO comment Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Fix query tests Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Reformat query docs Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove useless return Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Put back old query docs Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Update query docs again Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Fix e2e env name Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Retrigger CI Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Add missing copyright notice. Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Retrigger CI Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Retrigger CI Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Bump wait time to twice scrape interval Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Retrigger CI Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Attempt to fix randomly failing test Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Checking more metrics to ensure the store is ready Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Clean up test Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Do not record store api metrics when didn't touch series or samples Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Retrigger CI Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Also skip store api metrics on zero chunks touched Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Update changelog Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Fix broken changelog after merge Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove extra empty line Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Refactor names and (un)exported types and fields Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Start listing metrics exported by Thanos Query Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Rename pkg/store/metrics -> pkg/store/telemetry Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Get rid of the pkg/store/telemetry package Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> Signed-off-by: Matej Gera <38492574+matej-g@users.noreply.github.com> Co-authored-by: Matej Gera <38492574+matej-g@users.noreply.github.com> Signed-off-by: utukj <utukphd@gmail.com> * docs: mark me as shepherd for next release (#5797) Let's release the RC on Friday. Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> Signed-off-by: utukj <utukphd@gmail.com> * Revert "docs: mark me as shepherd for next release (#5797)" This reverts commit ea646a6. Signed-off-by: utukj <utukphd@gmail.com> * Revert "Query: add query metrics to calls going through the Store API (#5741)" This reverts commit eec4fd0. Signed-off-by: utukj <utukphd@gmail.com> * Revert "Receive: Reload tenant limit configuration on file change (#5673)" This reverts commit 24e1cc0. Signed-off-by: utukj <utukphd@gmail.com> * Revert "Updates busybox SHA (#5793)" This reverts commit 9474c00. Signed-off-by: utukj <utukphd@gmail.com> * Updates busybox SHA (#5793) Signed-off-by: GitHub <noreply@github.com> Signed-off-by: GitHub <noreply@github.com> Co-authored-by: yeya24 <yeya24@users.noreply.github.com> Signed-off-by: utukj <utukphd@gmail.com> * Receive: Reload tenant limit configuration on file change (#5673) * Create a PathOrContent reloader Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Add docs to staticPathContent.Rewrite Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Run goimports Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Properly cancel the context in the test Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Watch parent directory of file This helps handling deletes and other situations. Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove useless ctx.Done() Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Add a debounce timer to config reload It helps managing situations where a create event is followed by a write or when a big file write is sent by the fsnotify backend as many write events. Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Fix event.Op bitmask check Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Update lastReload Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Fix debouncer for path content reloader Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Improve documentation of the PathContentRealoder Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Dain reload timer before resetting Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Run tests in parallel Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Simplify debouncing logic Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Add more tests to file reloader Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Simplify condition for triggering reload Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Use absolute path to config file Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Get rid of parallel test Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Put back 2s wait between fs operations Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove useless sleep Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Stop reloadTimer when context cancelled Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove unused fucntion Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Add missing copyright to test file Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Auto-reload tenant limit config on file changes Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Wrap error when reloading config Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Move limiter config reloader and update logs Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Get rid of useless types and allocations Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove errorChan from config reload starter Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Retrigger CI Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Use UnRegisterer in the Limiter To ensure that limit reloads will be able to re-register their metrics. Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Better guard against nil registerer in the limiter Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove wrong nil guard Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Retrigger CI Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> Signed-off-by: utukj <utukphd@gmail.com> * Query: add query metrics to calls going through the Store API (#5741) * Implement granular query performance metrics for Thanos Query These are grabbed from the data returned by multiple Store APIs after execution of a query. Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Fix some linter warnings Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove useless logs Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Refactor query tests Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Fix long function definition (newQuerier) Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove TODO comment Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Fix query tests Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Reformat query docs Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove useless return Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Put back old query docs Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Update query docs again Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Fix e2e env name Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Retrigger CI Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Add missing copyright notice. Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Retrigger CI Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Retrigger CI Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Bump wait time to twice scrape interval Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Retrigger CI Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Attempt to fix randomly failing test Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Checking more metrics to ensure the store is ready Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Clean up test Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Do not record store api metrics when didn't touch series or samples Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Retrigger CI Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Also skip store api metrics on zero chunks touched Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Update changelog Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Fix broken changelog after merge Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove extra empty line Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Refactor names and (un)exported types and fields Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Start listing metrics exported by Thanos Query Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Rename pkg/store/metrics -> pkg/store/telemetry Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Get rid of the pkg/store/telemetry package Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> Signed-off-by: Matej Gera <38492574+matej-g@users.noreply.github.com> Co-authored-by: Matej Gera <38492574+matej-g@users.noreply.github.com> Signed-off-by: utukj <utukphd@gmail.com> * docs: mark me as shepherd for next release (#5797) Let's release the RC on Friday. Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> Signed-off-by: utukj <utukphd@gmail.com> * Revert "docs: mark me as shepherd for next release (#5797)" This reverts commit c509c0e. Signed-off-by: utukj <utukphd@gmail.com> * Revert "Updates busybox SHA (#5793)" This reverts commit ad11a03. Signed-off-by: utukj <utukphd@gmail.com> * Revert "Query: add query metrics to calls going through the Store API (#5741)" This reverts commit 7a77769. Signed-off-by: utukj <utukphd@gmail.com> * Revert "Receive: Reload tenant limit configuration on file change (#5673)" This reverts commit 32ca327. Signed-off-by: utukj <utukphd@gmail.com> * fixed lint issue Signed-off-by: utukj <utukphd@gmail.com> * added unit test for truncate and clean up Signed-off-by: utukj <utukphd@gmail.com> * fixed truncate label func and added more tests Signed-off-by: utukj <utukphd@gmail.com> * removed name from truncate test Signed-off-by: utukj <utukphd@gmail.com> * reorganized test cases and removed redundant comments Signed-off-by: utukj <utukphd@gmail.com> * Update pkg/query/endpointset_test.go Co-authored-by: Bartlomiej Plotka <bwplotka@gmail.com> Signed-off-by: Uwakmfon Utuk <41128987+utukJ@users.noreply.github.com> * Update pkg/query/endpointset.go Co-authored-by: Bartlomiej Plotka <bwplotka@gmail.com> Signed-off-by: Uwakmfon Utuk <41128987+utukJ@users.noreply.github.com> * fixed failing checks Signed-off-by: utukj <utukphd@gmail.com> * e2e: Adding test for querier with two stores loadbalancing across them. Signed-off-by: bwplotka <bwplotka@gmail.com> * Update pkg/query/endpointset_test.go Co-authored-by: Bartlomiej Plotka <bwplotka@gmail.com> Signed-off-by: Uwakmfon Utuk <41128987+utukJ@users.noreply.github.com> * dumped long expected output in unittest Signed-off-by: utukj <utukphd@gmail.com> * Revert "e2e: Adding test for querier with two stores loadbalancing across them." This reverts commit 96b1545. Signed-off-by: utukj <utukphd@gmail.com> * Update pkg/query/endpointset_test.go Co-authored-by: Bartlomiej Plotka <bwplotka@gmail.com> Signed-off-by: Uwakmfon Utuk <41128987+utukJ@users.noreply.github.com> * Update pkg/query/endpointset_test.go Co-authored-by: Bartlomiej Plotka <bwplotka@gmail.com> Signed-off-by: Uwakmfon Utuk <41128987+utukJ@users.noreply.github.com> * moved label definition to endpointset Signed-off-by: utukj <utukphd@gmail.com> Signed-off-by: utukj <utukphd@gmail.com> Signed-off-by: Uwakmfon Utuk <41128987+utukJ@users.noreply.github.com> Signed-off-by: GitHub <noreply@github.com> Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> Signed-off-by: Matej Gera <38492574+matej-g@users.noreply.github.com> Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> Signed-off-by: bwplotka <bwplotka@gmail.com> Co-authored-by: Bartlomiej Plotka <bwplotka@gmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: yeya24 <yeya24@users.noreply.github.com> Co-authored-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> Co-authored-by: Matej Gera <38492574+matej-g@users.noreply.github.com> Co-authored-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>

…specify metric labels to collect (thanos-io#5785) * added unit tests for long labels and no external labels Signed-off-by: utukj <utukphd@gmail.com> * trimmed too long external labels Signed-off-by: utukj <utukphd@gmail.com> * added optional label selection Signed-off-by: utukj <utukphd@gmail.com> * added cmd flag for choosing metric labels Signed-off-by: utukj <utukphd@gmail.com> * updated docs Signed-off-by: utukj <utukphd@gmail.com> * Update pkg/query/endpointset.go full sentence fix Co-authored-by: Bartlomiej Plotka <bwplotka@gmail.com> Signed-off-by: Uwakmfon Utuk <41128987+utukJ@users.noreply.github.com> * Update pkg/query/endpointset.go Co-authored-by: Bartlomiej Plotka <bwplotka@gmail.com> Signed-off-by: Uwakmfon Utuk <41128987+utukJ@users.noreply.github.com> * minor fixes from code review Signed-off-by: utukj <utukphd@gmail.com> * fixed code comments Signed-off-by: utukj <utukphd@gmail.com> * used enum for labels Signed-off-by: utukj <utukphd@gmail.com> * updated query docs Signed-off-by: utukj <utukphd@gmail.com> * cleaned up tests Signed-off-by: utukj <utukphd@gmail.com> * Updates busybox SHA (thanos-io#5793) Signed-off-by: GitHub <noreply@github.com> Signed-off-by: GitHub <noreply@github.com> Co-authored-by: yeya24 <yeya24@users.noreply.github.com> Signed-off-by: utukj <utukphd@gmail.com> * Receive: Reload tenant limit configuration on file change (thanos-io#5673) * Create a PathOrContent reloader Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Add docs to staticPathContent.Rewrite Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Run goimports Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Properly cancel the context in the test Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Watch parent directory of file This helps handling deletes and other situations. Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove useless ctx.Done() Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Add a debounce timer to config reload It helps managing situations where a create event is followed by a write or when a big file write is sent by the fsnotify backend as many write events. Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Fix event.Op bitmask check Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Update lastReload Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Fix debouncer for path content reloader Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Improve documentation of the PathContentRealoder Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Dain reload timer before resetting Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Run tests in parallel Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Simplify debouncing logic Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Add more tests to file reloader Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Simplify condition for triggering reload Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Use absolute path to config file Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Get rid of parallel test Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Put back 2s wait between fs operations Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove useless sleep Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Stop reloadTimer when context cancelled Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove unused fucntion Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Add missing copyright to test file Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Auto-reload tenant limit config on file changes Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Wrap error when reloading config Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Move limiter config reloader and update logs Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Get rid of useless types and allocations Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove errorChan from config reload starter Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Retrigger CI Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Use UnRegisterer in the Limiter To ensure that limit reloads will be able to re-register their metrics. Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Better guard against nil registerer in the limiter Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove wrong nil guard Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Retrigger CI Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> Signed-off-by: utukj <utukphd@gmail.com> * Query: add query metrics to calls going through the Store API (thanos-io#5741) * Implement granular query performance metrics for Thanos Query These are grabbed from the data returned by multiple Store APIs after execution of a query. Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Fix some linter warnings Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove useless logs Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Refactor query tests Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Fix long function definition (newQuerier) Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove TODO comment Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Fix query tests Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Reformat query docs Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove useless return Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Put back old query docs Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Update query docs again Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Fix e2e env name Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Retrigger CI Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Add missing copyright notice. Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Retrigger CI Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Retrigger CI Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Bump wait time to twice scrape interval Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Retrigger CI Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Attempt to fix randomly failing test Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Checking more metrics to ensure the store is ready Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Clean up test Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Do not record store api metrics when didn't touch series or samples Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Retrigger CI Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Also skip store api metrics on zero chunks touched Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Update changelog Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Fix broken changelog after merge Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove extra empty line Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Refactor names and (un)exported types and fields Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Start listing metrics exported by Thanos Query Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Rename pkg/store/metrics -> pkg/store/telemetry Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Get rid of the pkg/store/telemetry package Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> Signed-off-by: Matej Gera <38492574+matej-g@users.noreply.github.com> Co-authored-by: Matej Gera <38492574+matej-g@users.noreply.github.com> Signed-off-by: utukj <utukphd@gmail.com> * docs: mark me as shepherd for next release (thanos-io#5797) Let's release the RC on Friday. Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> Signed-off-by: utukj <utukphd@gmail.com> * Revert "docs: mark me as shepherd for next release (thanos-io#5797)" This reverts commit ea646a6. Signed-off-by: utukj <utukphd@gmail.com> * Revert "Query: add query metrics to calls going through the Store API (thanos-io#5741)" This reverts commit eec4fd0. Signed-off-by: utukj <utukphd@gmail.com> * Revert "Receive: Reload tenant limit configuration on file change (thanos-io#5673)" This reverts commit 24e1cc0. Signed-off-by: utukj <utukphd@gmail.com> * Revert "Updates busybox SHA (thanos-io#5793)" This reverts commit 9474c00. Signed-off-by: utukj <utukphd@gmail.com> * Updates busybox SHA (thanos-io#5793) Signed-off-by: GitHub <noreply@github.com> Signed-off-by: GitHub <noreply@github.com> Co-authored-by: yeya24 <yeya24@users.noreply.github.com> Signed-off-by: utukj <utukphd@gmail.com> * Receive: Reload tenant limit configuration on file change (thanos-io#5673) * Create a PathOrContent reloader Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Add docs to staticPathContent.Rewrite Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Run goimports Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Properly cancel the context in the test Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Watch parent directory of file This helps handling deletes and other situations. Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove useless ctx.Done() Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Add a debounce timer to config reload It helps managing situations where a create event is followed by a write or when a big file write is sent by the fsnotify backend as many write events. Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Fix event.Op bitmask check Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Update lastReload Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Fix debouncer for path content reloader Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Improve documentation of the PathContentRealoder Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Dain reload timer before resetting Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Run tests in parallel Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Simplify debouncing logic Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Add more tests to file reloader Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Simplify condition for triggering reload Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Use absolute path to config file Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Get rid of parallel test Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Put back 2s wait between fs operations Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove useless sleep Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Stop reloadTimer when context cancelled Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove unused fucntion Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Add missing copyright to test file Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Auto-reload tenant limit config on file changes Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Wrap error when reloading config Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Move limiter config reloader and update logs Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Get rid of useless types and allocations Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove errorChan from config reload starter Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Retrigger CI Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Use UnRegisterer in the Limiter To ensure that limit reloads will be able to re-register their metrics. Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Better guard against nil registerer in the limiter Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove wrong nil guard Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Retrigger CI Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> Signed-off-by: utukj <utukphd@gmail.com> * Query: add query metrics to calls going through the Store API (thanos-io#5741) * Implement granular query performance metrics for Thanos Query These are grabbed from the data returned by multiple Store APIs after execution of a query. Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Fix some linter warnings Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove useless logs Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Refactor query tests Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Fix long function definition (newQuerier) Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove TODO comment Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Fix query tests Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Reformat query docs Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove useless return Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Put back old query docs Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Update query docs again Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Fix e2e env name Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Retrigger CI Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Add missing copyright notice. Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Retrigger CI Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Retrigger CI Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Bump wait time to twice scrape interval Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Retrigger CI Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Attempt to fix randomly failing test Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Checking more metrics to ensure the store is ready Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Clean up test Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Do not record store api metrics when didn't touch series or samples Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Retrigger CI Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Also skip store api metrics on zero chunks touched Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Update changelog Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Fix broken changelog after merge Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove extra empty line Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Refactor names and (un)exported types and fields Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Start listing metrics exported by Thanos Query Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Rename pkg/store/metrics -> pkg/store/telemetry Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Get rid of the pkg/store/telemetry package Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> Signed-off-by: Matej Gera <38492574+matej-g@users.noreply.github.com> Co-authored-by: Matej Gera <38492574+matej-g@users.noreply.github.com> Signed-off-by: utukj <utukphd@gmail.com> * docs: mark me as shepherd for next release (thanos-io#5797) Let's release the RC on Friday. Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> Signed-off-by: utukj <utukphd@gmail.com> * Revert "docs: mark me as shepherd for next release (thanos-io#5797)" This reverts commit c509c0e. Signed-off-by: utukj <utukphd@gmail.com> * Revert "Updates busybox SHA (thanos-io#5793)" This reverts commit ad11a03. Signed-off-by: utukj <utukphd@gmail.com> * Revert "Query: add query metrics to calls going through the Store API (thanos-io#5741)" This reverts commit 7a77769. Signed-off-by: utukj <utukphd@gmail.com> * Revert "Receive: Reload tenant limit configuration on file change (thanos-io#5673)" This reverts commit 32ca327. Signed-off-by: utukj <utukphd@gmail.com> * fixed lint issue Signed-off-by: utukj <utukphd@gmail.com> * added unit test for truncate and clean up Signed-off-by: utukj <utukphd@gmail.com> * fixed truncate label func and added more tests Signed-off-by: utukj <utukphd@gmail.com> * removed name from truncate test Signed-off-by: utukj <utukphd@gmail.com> * reorganized test cases and removed redundant comments Signed-off-by: utukj <utukphd@gmail.com> * Update pkg/query/endpointset_test.go Co-authored-by: Bartlomiej Plotka <bwplotka@gmail.com> Signed-off-by: Uwakmfon Utuk <41128987+utukJ@users.noreply.github.com> * Update pkg/query/endpointset.go Co-authored-by: Bartlomiej Plotka <bwplotka@gmail.com> Signed-off-by: Uwakmfon Utuk <41128987+utukJ@users.noreply.github.com> * fixed failing checks Signed-off-by: utukj <utukphd@gmail.com> * e2e: Adding test for querier with two stores loadbalancing across them. Signed-off-by: bwplotka <bwplotka@gmail.com> * Update pkg/query/endpointset_test.go Co-authored-by: Bartlomiej Plotka <bwplotka@gmail.com> Signed-off-by: Uwakmfon Utuk <41128987+utukJ@users.noreply.github.com> * dumped long expected output in unittest Signed-off-by: utukj <utukphd@gmail.com> * Revert "e2e: Adding test for querier with two stores loadbalancing across them." This reverts commit 96b1545. Signed-off-by: utukj <utukphd@gmail.com> * Update pkg/query/endpointset_test.go Co-authored-by: Bartlomiej Plotka <bwplotka@gmail.com> Signed-off-by: Uwakmfon Utuk <41128987+utukJ@users.noreply.github.com> * Update pkg/query/endpointset_test.go Co-authored-by: Bartlomiej Plotka <bwplotka@gmail.com> Signed-off-by: Uwakmfon Utuk <41128987+utukJ@users.noreply.github.com> * moved label definition to endpointset Signed-off-by: utukj <utukphd@gmail.com> Signed-off-by: utukj <utukphd@gmail.com> Signed-off-by: Uwakmfon Utuk <41128987+utukJ@users.noreply.github.com> Signed-off-by: GitHub <noreply@github.com> Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> Signed-off-by: Matej Gera <38492574+matej-g@users.noreply.github.com> Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> Signed-off-by: bwplotka <bwplotka@gmail.com> Co-authored-by: Bartlomiej Plotka <bwplotka@gmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: yeya24 <yeya24@users.noreply.github.com> Co-authored-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> Co-authored-by: Matej Gera <38492574+matej-g@users.noreply.github.com> Co-authored-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>

christopherzli · 2024-05-10T23:21:14Z

pkg/store/telemetry.go

+
+// Aggregate is an aggregator for merging `storepb.SeriesStatsCounter` for each incoming fanned out query.
+func (s *seriesStatsAggregator) Aggregate(stats storepb.SeriesStatsCounter) {
+	s.seriesStats.Series += stats.Series


doesn't number of series overlap too?

It does, but we are (or were back then) not tracking the what individual series was touched. It would be quite expensive to do the tracking.

christopherzli · 2024-05-14T00:41:15Z

pkg/api/query/grpc.go

@@ -168,6 +169,7 @@ func (g *GRPCAPI) QueryRange(request *querypb.QueryRangeRequest, srv querypb.Que
 		request.EnableQueryPushdown,
 		false,
 		request.ShardInfo,
+		query.NoopSeriesStatsReporter,


why is this set to no-op here?

Because this is an internally initiated request, not something started by a user.

christopherzli · 2024-05-16T09:32:35Z

just curious if we thought about expose these stats with the query response as well?

douglascamata added 7 commits September 16, 2022 18:31

Implement granular query performance metrics for Thanos Query

595b7e2

These are grabbed from the data returned by multiple Store APIs after execution of a query. Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

Merge branch 'main' of github.com:thanos-io/thanos into add-path-cont…

ff5a716

…ent-reloader Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

Fix some linter warnings

f6e2511

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

Remove useless logs

193d76f

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

Refactor query tests

86f56e0

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

Fix long function definition (newQuerier)

f0c1a22

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

Remove TODO comment

6803e4a

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

pull-request-size bot added the size/L label Sep 29, 2022

douglascamata added 2 commits September 29, 2022 15:28

Fix query tests

3b3bc0c

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

Reformat query docs

2e8778d

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

pull-request-size bot added size/XL and removed size/L labels Sep 29, 2022

sonatype-lift bot reviewed Sep 29, 2022

View reviewed changes

pkg/store/metrics/metrics.go Outdated Show resolved Hide resolved

sonatype-lift bot reviewed Sep 29, 2022

View reviewed changes

pkg/store/metrics/metrics.go Outdated Show resolved Hide resolved

sonatype-lift bot reviewed Sep 29, 2022

View reviewed changes

pkg/store/metrics/metrics.go Outdated Show resolved Hide resolved

sonatype-lift bot reviewed Sep 29, 2022

View reviewed changes

pkg/store/metrics/metrics.go Outdated Show resolved Hide resolved

douglascamata added 4 commits September 29, 2022 15:54

Merge branch 'main' of github.com:thanos-io/thanos into query-store-m…

d218f82

…etrics

Remove useless return

a738407

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

Put back old query docs

9057263

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

Update query docs again

f0567a9

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

pull-request-size bot added size/L and removed size/XL labels Sep 29, 2022

douglascamata added 8 commits September 29, 2022 17:19

Fix e2e env name

792487f

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

Retrigger CI

d373d28

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

Add missing copyright notice.

3470ded

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

Retrigger CI

63d45e8

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

Retrigger CI

2a4241d

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

Bump wait time to twice scrape interval

e04acb2

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

Retrigger CI

8e999ba

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

Attempt to fix randomly failing test

6a097f0

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

douglascamata requested review from jessicalins and matej-g and removed request for matej-g and jessicalins October 10, 2022 12:44

Merge branch 'main' of github.com:thanos-io/thanos into query-store-m…

8f1b75b

…etrics

jessicalins previously approved these changes Oct 13, 2022

View reviewed changes

Merge branch 'main' of github.com:thanos-io/thanos into query-store-m…

d6125e7

…etrics Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

matej-g reviewed Oct 17, 2022

View reviewed changes

pkg/store/telemetry/telemetry.go Outdated Show resolved Hide resolved

bwplotka approved these changes Oct 17, 2022

View reviewed changes

bwplotka previously approved these changes Oct 17, 2022

View reviewed changes

Get rid of the pkg/store/telemetry package

0951370

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

douglascamata dismissed stale reviews from bwplotka and jessicalins via 0951370 October 17, 2022 12:39

matej-g previously approved these changes Oct 17, 2022

View reviewed changes

Merge branch 'main' into query-store-metrics

5eda104

Signed-off-by: Matej Gera <38492574+matej-g@users.noreply.github.com>

matej-g dismissed their stale review via 5eda104 October 17, 2022 15:54

matej-g approved these changes Oct 18, 2022

View reviewed changes

matej-g merged commit be95bb1 into thanos-io:main Oct 18, 2022

utukJ added a commit to utukJ/thanos that referenced this pull request Oct 18, 2022

Revert "Query: add query metrics to calls going through the Store API (…

b813ff0

…thanos-io#5741)" This reverts commit eec4fd0.

utukJ added a commit to utukJ/thanos that referenced this pull request Oct 18, 2022

Revert "Query: add query metrics to calls going through the Store API (…

3d6dd07

…thanos-io#5741)" This reverts commit eec4fd0. Signed-off-by: utukj <utukphd@gmail.com>

utukJ added a commit to utukJ/thanos that referenced this pull request Oct 18, 2022

Revert "Query: add query metrics to calls going through the Store API (…

60f308c

…thanos-io#5741)" This reverts commit 7a77769. Signed-off-by: utukj <utukphd@gmail.com>

christopherzli reviewed May 10, 2024

View reviewed changes

christopherzli reviewed May 14, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Query: add query metrics to calls going through the Store API #5741

Query: add query metrics to calls going through the Store API #5741

douglascamata commented Sep 29, 2022 •

edited

Loading

douglascamata commented Oct 10, 2022

jessicalins left a comment

bwplotka left a comment •

edited

Loading

bwplotka Oct 17, 2022

bwplotka Oct 17, 2022

bwplotka Oct 17, 2022

bwplotka Oct 17, 2022

bwplotka Oct 17, 2022

bwplotka Oct 17, 2022

matej-g left a comment

christopherzli May 10, 2024

douglascamata May 13, 2024

christopherzli May 14, 2024

douglascamata May 14, 2024

christopherzli commented May 16, 2024 •

edited

Loading

		"series_le": strconv.Itoa(int(seriesLeBucket)),
		"samples_le": strconv.Itoa(int(samplesLeBucket)),

Query: add query metrics to calls going through the Store API #5741

Query: add query metrics to calls going through the Store API #5741

Conversation

douglascamata commented Sep 29, 2022 • edited Loading

Changes

Verification

douglascamata commented Oct 10, 2022

jessicalins left a comment

Choose a reason for hiding this comment

bwplotka left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

matej-g left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

christopherzli commented May 16, 2024 • edited Loading

douglascamata commented Sep 29, 2022 •

edited

Loading

bwplotka left a comment •

edited

Loading

christopherzli commented May 16, 2024 •

edited

Loading