mirror of https://github.com/prometheus/prometheus
Browse Source
* Remote Write 1.1: e2e benchmarks (#13102) * Remote Write e2e benchmarks Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * Prometheus ports automatically assigned Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * make dashboard editable + more modular to different job label values Signed-off-by: Callum Styan <callumstyan@gmail.com> * Dashboard improvements * memory stats * diffs look at counter increases Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * run script: absolute path for config templates Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * grafana dashboard improvements * show actual values of metrics * add memory stats and diff Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * dashboard changes Signed-off-by: Callum Styan <callumstyan@gmail.com> --------- Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> Signed-off-by: Callum Styan <callumstyan@gmail.com> Co-authored-by: Callum Styan <callumstyan@gmail.com> * replace snappy encoding library Signed-off-by: Callum Styan <callumstyan@gmail.com> Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * add new proto types Signed-off-by: Callum Styan <callumstyan@gmail.com> Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * add decode function for new write request proto Signed-off-by: Callum Styan <callumstyan@gmail.com> Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * add lookup table struct that is used to build the symbol table in new write request format Signed-off-by: Callum Styan <callumstyan@gmail.com> Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * Implement code paths for new proto format Signed-off-by: Callum Styan <callumstyan@gmail.com> Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * update example server to include handler for new format Signed-off-by: Callum Styan <callumstyan@gmail.com> Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * Add new test client Signed-off-by: Callum Styan <callumstyan@gmail.com> Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * tests and new -> original proto mapping util Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * add new proto support on receiver end Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * Fix test Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * no-brainer copypaste but more performance write support Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * remove some comented code Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * fix mocks and fixture Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * add basic reduce remote write handler benchmark Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * refactor out common code between write methods Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * fix: queue manager to include float histograms in new requests Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * add sender-side tests and fix failing ones Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * refactor queue manager code to remove some duplication Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * fix build Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * Improve sender benchmarks and some allocations Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * Use github.com/golang/snappy Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * cleanup: remove hardcoded fake url for testing Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * Add 1.1 version handling code Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * Remove config, update proto Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * gofmt Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * fix NewWriteClient and change new flags wording Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * fields rewording in handler Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * remote write handler to checks version header Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * fix typo in log Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * lint Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * Add minmized remote write proto format Co-authored-by: Marco Pracucci <marco@pracucci.com> Signed-off-by: Callum Styan <callumstyan@gmail.com> Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * add functions for translating between new proto formats symbol table and actual prometheus labels Co-authored-by: Marco Pracucci <marco@pracucci.com> Signed-off-by: Callum Styan <callumstyan@gmail.com> Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * add functionality for new minimized remote write request format Signed-off-by: Callum Styan <callumstyan@gmail.com> Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * fix minor things Signed-off-by: Callum Styan <callumstyan@gmail.com> Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * Make LabelSymbols a fixed32 Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * remove unused proto type Signed-off-by: Callum Styan <callumstyan@gmail.com> Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * update tests Signed-off-by: Callum Styan <callumstyan@gmail.com> Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * fix build for stringlabels tag Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * Use two uint32 to encode (offset,leng) Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * manually optimize varint marshaling Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * Use unsafe []byte->string cast to reuse buffer Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * fix writeRequestMinimizedFixture Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * remove all code from previous interning approach the 'minimized' version is now the only v1.1 version Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * minimally-tested exemplar support for rw 1.1 Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * refactor new version flag to make it easier to pick a specific format instead of having multiple flags, plus add new formats for testing Signed-off-by: Callum Styan <callumstyan@gmail.com> Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * use exp slices for backwards compat. to go 1.20 plus add copyright header to test file Signed-off-by: Callum Styan <callumstyan@gmail.com> Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * fix label ranging Signed-off-by: Callum Styan <callumstyan@gmail.com> Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * Add bytes slice (instead of slice of 32bit vars) format for testing Co-authored-by: Nicolás Pazos <npazosmendez@gmail.com> Signed-off-by: Callum Styan <callumstyan@gmail.com> Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * test additional len and lenbytes formats Co-authored-by: Nicolás Pazos <npazosmendez@gmail.com> Signed-off-by: Callum Styan <callumstyan@gmail.com> Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * remove mistaken package lock changes Signed-off-by: Callum Styan <callumstyan@gmail.com> Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * remove formats we've decided not to use Signed-off-by: Callum Styan <callumstyan@gmail.com> Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * remove more format types we probably won't use Signed-off-by: Callum Styan <callumstyan@gmail.com> Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * More cleanup Signed-off-by: Callum Styan <callumstyan@gmail.com> Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * use require instead of assert in custom marshal test Signed-off-by: Callum Styan <callumstyan@gmail.com> Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * cleanup; remove some unused functions Signed-off-by: Callum Styan <callumstyan@gmail.com> Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * more cleanup, mostly linting fixes Signed-off-by: Callum Styan <callumstyan@gmail.com> Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * remove package-lock.json change again Signed-off-by: Callum Styan <callumstyan@gmail.com> Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * more cleanup, address review comments Signed-off-by: Callum Styan <callumstyan@gmail.com> Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * fix test panic Signed-off-by: Callum Styan <callumstyan@gmail.com> Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * fix minor lint issue + use labels Range function since it looks like the tests fail to do `range labels.Labels` on CI Signed-off-by: Callum Styan <callumstyan@gmail.com> Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * new interning format based on []string indeces Co-authored-by: bwplotka <bwplotka@gmail.com> Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * remove all new rw formats but the []string one also adapt tests to the new format Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * cleanup rwSymbolTable Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * add some TODOs for later Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * don't reserve field 3 for new proto and add TODO Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * fix custom marshaling Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * lint Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * additional merge fixes Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * lint fixes Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * fix server example Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * revert package-lock.json changes Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * update example prometheus version Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * define separate proto types for remote write 2.0 Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * lint Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * rename new proto types and move to separate pkg Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * update prometheus version for example Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * make proto Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * make Metadata not nullable Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * remove old MinSample proto message Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * change enum names to fit buf build recommend enum naming and lint rules Signed-off-by: Callum Styan <callumstyan@gmail.com> * remote: Added test for classic histogram grouping when sending rw; Fixed queue manager test delay. (#13421) Signed-off-by: bwplotka <bwplotka@gmail.com> * Remote write v2: metadata support in every write request (#13394) * Approach bundling metadata along with samples and exemplars Signed-off-by: Paschalis Tsilias <paschalist0@gmail.com> * Add first test; rebase with main Signed-off-by: Paschalis Tsilias <paschalist0@gmail.com> * Alternative approach: bundle metadata in TimeSeries protobuf Signed-off-by: Paschalis Tsilias <paschalist0@gmail.com> * update go mod to match main branch Signed-off-by: Callum Styan <callumstyan@gmail.com> * fix after rebase Signed-off-by: Callum Styan <callumstyan@gmail.com> * we're not going to modify the 1.X format anymore Signed-off-by: Callum Styan <callumstyan@gmail.com> * Modify AppendMetadata based on the fact that we be putting metadata into timeseries Signed-off-by: Callum Styan <callumstyan@gmail.com> * Rename enums for remote write versions to something that makes more sense + remove the added `sendMetadata` flag. Signed-off-by: Callum Styan <callumstyan@gmail.com> * rename flag that enables writing of metadata records to the WAL Signed-off-by: Callum Styan <callumstyan@gmail.com> * additional clean up Signed-off-by: Callum Styan <callumstyan@gmail.com> * lint Signed-off-by: Callum Styan <callumstyan@gmail.com> * fix usage of require.Len Signed-off-by: Callum Styan <callumstyan@gmail.com> * some clean up from review comments Signed-off-by: Callum Styan <callumstyan@gmail.com> * more review fixes Signed-off-by: Callum Styan <callumstyan@gmail.com> --------- Signed-off-by: Paschalis Tsilias <paschalist0@gmail.com> Signed-off-by: Callum Styan <callumstyan@gmail.com> Co-authored-by: Paschalis Tsilias <paschalist0@gmail.com> * remote write 2.0: sync with `main` branch (#13510) * consoles: exclude iowait and steal from CPU Utilisation 'iowait' and 'steal' indicate specific idle/wait states, which shouldn't be counted into CPU Utilisation. Also see https://github.com/prometheus-operator/kube-prometheus/pull/796 and https://github.com/kubernetes-monitoring/kubernetes-mixin/pull/667. Per the iostat man page: %idle Show the percentage of time that the CPU or CPUs were idle and the system did not have an outstanding disk I/O request. %iowait Show the percentage of time that the CPU or CPUs were idle during which the system had an outstanding disk I/O request. %steal Show the percentage of time spent in involuntary wait by the virtual CPU or CPUs while the hypervisor was servicing another virtual processor. Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com> * tsdb: shrink txRing with smaller integers 4 billion active transactions ought to be enough for anyone. Signed-off-by: Bryan Boreham <bjboreham@gmail.com> * tsdb: create isolation transaction slice on demand When Prometheus restarts it creates every series read in from the WAL, but many of those series will be finished, and never receive any more samples. By defering allocation of the txRing slice to when it is first needed, we save 32 bytes per stale series. Signed-off-by: Bryan Boreham <bjboreham@gmail.com> * add cluster variable to Overview dashboard Signed-off-by: Erik Sommer <ersotech@posteo.de> * promql: simplify Native Histogram arithmetics Signed-off-by: Linas Medziunas <linas.medziunas@gmail.com> * Cut 2.49.0-rc.0 (#13270) * Cut 2.49.0-rc.0 Signed-off-by: bwplotka <bwplotka@gmail.com> * Removed the duplicate. Signed-off-by: bwplotka <bwplotka@gmail.com> --------- Signed-off-by: bwplotka <bwplotka@gmail.com> * Add unit protobuf parser Signed-off-by: Arianna Vespri <arianna.vespri@yahoo.it> * Go on adding protobuf parsing for unit Signed-off-by: Arianna Vespri <arianna.vespri@yahoo.it> * ui: create a reproduction for https://github.com/prometheus/prometheus/issues/13292 Signed-off-by: machine424 <ayoubmrini424@gmail.com> * Get conditional right Signed-off-by: Arianna Vespri <arianna.vespri@yahoo.it> * Get VM Scale Set NIC (#13283) Calling `*armnetwork.InterfacesClient.Get()` doesn't work for Scale Set VM NIC, because these use a different Resource ID format. Use `*armnetwork.InterfacesClient.GetVirtualMachineScaleSetNetworkInterface()` instead. This needs both the scale set name and the instance ID, so add an `InstanceID` field to the `virtualMachine` struct. `InstanceID` is empty for a VM that isn't a ScaleSetVM. Signed-off-by: Daniel Nicholls <daniel.nicholls@resdiary.com> * Cut v2.49.0-rc.1 Signed-off-by: bwplotka <bwplotka@gmail.com> * Delete debugging lines, amend error message for unit Signed-off-by: Arianna Vespri <arianna.vespri@yahoo.it> * Correct order in error message Signed-off-by: Arianna Vespri <arianna.vespri@yahoo.it> * Consider storage.ErrTooOldSample as non-retryable Signed-off-by: Daniel Kerbel <nmdanny@gmail.com> * scrape_test.go: Increase scrape interval in TestScrapeLoopCache to reduce potential flakiness Signed-off-by: machine424 <ayoubmrini424@gmail.com> * Avoid creating string for suffix, consider counters without _total suffix Signed-off-by: Arianna Vespri <arianna.vespri@yahoo.it> * build(deps): bump github.com/prometheus/client_golang Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.17.0 to 1.18.0. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md) - [Commits](https://github.com/prometheus/client_golang/compare/v1.17.0...v1.18.0) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * build(deps): bump actions/setup-node from 3.8.1 to 4.0.1 Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3.8.1 to 4.0.1. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](pull/14416/head5e21ff4d9b...b39b52d121) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * scripts: sort file list in embed directive Otherwise the resulting string depends on find, which afaict depends on the underlying filesystem. A stable file list make it easier to detect UI changes in downstreams that need to track UI assets. Signed-off-by: Jan Fajerski <jfajersk@redhat.com> * Fix DataTableProps['data'] for resultType string Signed-off-by: Kevin Mingtarja <kevin.mingtarja@gmail.com> * Fix handling of scalar and string in isHeatmapData Signed-off-by: Kevin Mingtarja <kevin.mingtarja@gmail.com> * build(deps): bump github.com/influxdata/influxdb Bumps [github.com/influxdata/influxdb](https://github.com/influxdata/influxdb) from 1.11.2 to 1.11.4. - [Release notes](https://github.com/influxdata/influxdb/releases) - [Commits](https://github.com/influxdata/influxdb/compare/v1.11.2...v1.11.4) --- updated-dependencies: - dependency-name: github.com/influxdata/influxdb dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * build(deps): bump github.com/prometheus/prometheus Bumps [github.com/prometheus/prometheus](https://github.com/prometheus/prometheus) from 0.48.0 to 0.48.1. - [Release notes](https://github.com/prometheus/prometheus/releases) - [Changelog](https://github.com/prometheus/prometheus/blob/main/CHANGELOG.md) - [Commits](https://github.com/prometheus/prometheus/compare/v0.48.0...v0.48.1) --- updated-dependencies: - dependency-name: github.com/prometheus/prometheus dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Bump client_golang to v1.18.0 (#13373) Signed-off-by: Paschalis Tsilias <paschalis.tsilias@grafana.com> * Drop old inmemory samples (#13002) * Drop old inmemory samples Co-authored-by: Paschalis Tsilias <paschalis.tsilias@grafana.com> Signed-off-by: Paschalis Tsilias <paschalis.tsilias@grafana.com> Signed-off-by: Marc Tuduri <marctc@protonmail.com> * Avoid copying timeseries when the feature is disabled Signed-off-by: Paschalis Tsilias <paschalis.tsilias@grafana.com> Signed-off-by: Marc Tuduri <marctc@protonmail.com> * Run gofmt Signed-off-by: Paschalis Tsilias <paschalis.tsilias@grafana.com> Signed-off-by: Marc Tuduri <marctc@protonmail.com> * Clarify docs Signed-off-by: Marc Tuduri <marctc@protonmail.com> * Add more logging info Signed-off-by: Marc Tuduri <marctc@protonmail.com> * Remove loggers Signed-off-by: Marc Tuduri <marctc@protonmail.com> * optimize function and add tests Signed-off-by: Marc Tuduri <marctc@protonmail.com> * Simplify filter Signed-off-by: Marc Tuduri <marctc@protonmail.com> * rename var Signed-off-by: Marc Tuduri <marctc@protonmail.com> * Update help info from metrics Signed-off-by: Marc Tuduri <marctc@protonmail.com> * use metrics to keep track of drop elements during buildWriteRequest Signed-off-by: Marc Tuduri <marctc@protonmail.com> * rename var in tests Signed-off-by: Marc Tuduri <marctc@protonmail.com> * pass time.Now as parameter Signed-off-by: Marc Tuduri <marctc@protonmail.com> * Change buildwriterequest during retries Signed-off-by: Marc Tuduri <marctc@protonmail.com> * Revert "Remove loggers" This reverts commit 54f91dfcae20488944162335ab4ad8be459df1ab. Signed-off-by: Marc Tuduri <marctc@protonmail.com> * use log level debug for loggers Signed-off-by: Marc Tuduri <marctc@protonmail.com> * Fix linter Signed-off-by: Paschalis Tsilias <paschalis.tsilias@grafana.com> * Remove noisy debug-level logs; add 'reason' label to drop metrics Signed-off-by: Paschalis Tsilias <paschalis.tsilias@grafana.com> * Remove accidentally committed files Signed-off-by: Paschalis Tsilias <paschalis.tsilias@grafana.com> * Propagate logger to buildWriteRequest to log dropped data Signed-off-by: Paschalis Tsilias <paschalis.tsilias@grafana.com> * Fix docs comment Signed-off-by: Paschalis Tsilias <paschalis.tsilias@grafana.com> * Make drop reason more specific Signed-off-by: Paschalis Tsilias <paschalis.tsilias@grafana.com> * Remove unnecessary pass of logger Signed-off-by: Paschalis Tsilias <paschalis.tsilias@grafana.com> * Use snake_case for reason label Signed-off-by: Paschalis Tsilias <paschalis.tsilias@grafana.com> * Fix dropped samples metric Signed-off-by: Paschalis Tsilias <paschalis.tsilias@grafana.com> --------- Signed-off-by: Paschalis Tsilias <paschalis.tsilias@grafana.com> Signed-off-by: Marc Tuduri <marctc@protonmail.com> Signed-off-by: Paschalis Tsilias <tpaschalis@users.noreply.github.com> Co-authored-by: Paschalis Tsilias <paschalis.tsilias@grafana.com> Co-authored-by: Paschalis Tsilias <tpaschalis@users.noreply.github.com> * fix(discovery): allow requireUpdate util to timeout in discovery/file/file_test.go. The loop ran indefinitely if the condition isn't met. Before, each iteration created a new timer channel which was always outpaced by the other timer channel with smaller duration. minor detail: There was a memory leak: resources of the ~10 previous timers were constantly kept. With the fix, we may keep the resources of one timer around for defaultWait but this isn't worth the changes to make it right. Signed-off-by: machine424 <ayoubmrini424@gmail.com> * Merge pull request #13371 from kevinmingtarja/fix-isHeatmapData ui: fix handling of scalar and string in isHeatmapData * tsdb/{index,compact}: allow using custom postings encoding format (#13242) * tsdb/{index,compact}: allow using custom postings encoding format We would like to experiment with a different postings encoding format in Thanos so in this change I am proposing adding another argument to `NewWriter` which would allow users to change the format if needed. Also, wire the leveled compactor so that it would be possible to change the format there too. Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> * tsdb/compact: use a struct for leveled compactor options As discussed on Slack, let's use a struct for the options in leveled compactor. Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> * tsdb: make changes after Bryan's review - Make changes less intrusive - Turn the postings encoder type into a function - Add NewWriterWithEncoder() Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> --------- Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> * Cut 2.49.0-rc.2 Signed-off-by: bwplotka <bwplotka@gmail.com> * build(deps): bump actions/setup-go from 3.5.0 to 5.0.0 in /scripts (#13362) Bumps [actions/setup-go](https://github.com/actions/setup-go) from 3.5.0 to 5.0.0. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](6edd4406fa...0c52d547c9) --- updated-dependencies: - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump github/codeql-action from 2.22.8 to 3.22.12 (#13358) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.22.8 to 3.22.12. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](407ffafae6...012739e508) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * put @nexucis has a release shepherd (#13383) Signed-off-by: Augustin Husson <augustin.husson@amadeus.com> * Add analyze histograms command to promtool (#12331) Add `query analyze` command to promtool This command analyzes the buckets of classic and native histograms, based on data queried from the Prometheus query API, i.e. it doesn't require direct access to the TSDB files. Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com> --------- Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com> * included instance in all necessary descriptions Signed-off-by: Erik Sommer <ersotech@posteo.de> * tsdb/compact: fix passing merge func Fixing a very small logical problem I've introduced :(. Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> * tsdb: add enable overlapping compaction This functionality is needed in downstream projects because they have a separate component that does compaction. Upstreaming7c8e9a2a76/tsdb/compact.go (L323-L325). Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> * Cut 2.49.0 Signed-off-by: bwplotka <bwplotka@gmail.com> * promtool: allow setting multiple matchers to "promtool tsdb dump" command. (#13296) Conditions are ANDed inside the same matcher but matchers are ORed Including unit tests for "promtool tsdb dump". Refactor some matchers scraping utils. Signed-off-by: machine424 <ayoubmrini424@gmail.com> * Fixed changelog Signed-off-by: bwplotka <bwplotka@gmail.com> * tsdb/main: wire "EnableOverlappingCompaction" to tsdb.Options (#13398) This added the https://github.com/prometheus/prometheus/pull/13393 "EnableOverlappingCompaction" parameter to the compactor code but not to the tsdb.Options. I forgot about that. Add it to `tsdb.Options` too and set it to `true` in Prometheus. Copy/paste the description from https://github.com/prometheus/prometheus/pull/13393#issuecomment-1891787986 Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> * Issue #13268: fix quality value in accept header Signed-off-by: Kumar Kalpadiptya Roy <kalpadiptya.roy@outlook.com> * Cut 2.49.1 with scrape q= bugfix. Signed-off-by: bwplotka <bwplotka@gmail.com> * Cut 2.49.1 web package. Signed-off-by: bwplotka <bwplotka@gmail.com> * Restore more efficient version of NewPossibleNonCounterInfo annotation (#13022) Restore more efficient version of NewPossibleNonCounterInfo annotation Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com> --------- Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com> * Fix regressions introduced by #13242 Signed-off-by: Marco Pracucci <marco@pracucci.com> * fix slice copy in 1.20 (#13389) The slices package is added to the standard library in Go 1.21; we need to import from the exp area to maintain compatibility with Go 1.20. Signed-off-by: tyltr <tylitianrui@126.com> * Docs: Query Basics: link to rate (#10538) Co-authored-by: Julien Pivotto <roidelapluie@o11y.eu> * chore(kubernetes): check preconditions earlier and avoid unnecessary checks or iterations Signed-off-by: machine424 <ayoubmrini424@gmail.com> * Examples: link to `rate` for new users (#10535) * Examples: link to `rate` for new users Signed-off-by: Ted Robertson 10043369+tredondo@users.noreply.github.com Co-authored-by: Bryan Boreham <bjboreham@gmail.com> * promql: use natural sort in sort_by_label and sort_by_label_desc (#13411) These functions are intended for humans, as robots can already sort the results however they please. Humans like things sorted "naturally": * https://blog.codinghorror.com/sorting-for-humans-natural-sort-order/ A similar thing has been done to Grafana, which is also used by humans: * https://github.com/grafana/grafana/pull/78024 * https://github.com/grafana/grafana/pull/78494 Signed-off-by: Ivan Babrou <github@ivan.computer> * TestLabelValuesWithMatchers: Add test case Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * remove obsolete build tag Signed-off-by: tyltr <tylitianrui@126.com> * Upgrade some golang dependencies for resty 2.11 Signed-off-by: Israel Blancas <iblancasa@gmail.com> * Native Histograms: support `native_histogram_min_bucket_factor` in scrape_config (#13222) Native Histograms: support native_histogram_min_bucket_factor in scrape_config --------- Signed-off-by: Ziqi Zhao <zhaoziqi9146@gmail.com> Signed-off-by: Björn Rabenstein <github@rabenste.in> Co-authored-by: George Krajcsovits <krajorama@users.noreply.github.com> Co-authored-by: Björn Rabenstein <github@rabenste.in> * Add warnings for histogramRate applied with isCounter not matching counter/gauge histogram (#13392) Add warnings for histogramRate applied with isCounter not matching counter/gauge histogram --------- Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com> * Minor fixes to otlp vendor update script Signed-off-by: Goutham <gouthamve@gmail.com> * build(deps): bump github.com/hetznercloud/hcloud-go/v2 Bumps [github.com/hetznercloud/hcloud-go/v2](https://github.com/hetznercloud/hcloud-go) from 2.4.0 to 2.6.0. - [Release notes](https://github.com/hetznercloud/hcloud-go/releases) - [Changelog](https://github.com/hetznercloud/hcloud-go/blob/main/CHANGELOG.md) - [Commits](https://github.com/hetznercloud/hcloud-go/compare/v2.4.0...v2.6.0) --- updated-dependencies: - dependency-name: github.com/hetznercloud/hcloud-go/v2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Enhanced visibility for `promtool test rules` with JSON colored formatting (#13342) * Added diff flag for unit test to improvise readability & debugging Signed-off-by: Rewanth Tammana <22347290+rewanthtammana@users.noreply.github.com> * Removed blank spaces Signed-off-by: Rewanth Tammana <22347290+rewanthtammana@users.noreply.github.com> * Fixed linting error Signed-off-by: Rewanth Tammana <22347290+rewanthtammana@users.noreply.github.com> * Added cli flags to documentation Signed-off-by: Rewanth Tammana <22347290+rewanthtammana@users.noreply.github.com> * Revert unrrelated linting fixes Signed-off-by: Rewanth Tammana <22347290+rewanthtammana@users.noreply.github.com> * Fixed review suggestions Signed-off-by: Rewanth Tammana <22347290+rewanthtammana@users.noreply.github.com> * Cleanup Signed-off-by: Rewanth Tammana <22347290+rewanthtammana@users.noreply.github.com> * Updated flag description Signed-off-by: Rewanth Tammana <22347290+rewanthtammana@users.noreply.github.com> * Updated flag description Signed-off-by: Rewanth Tammana <22347290+rewanthtammana@users.noreply.github.com> --------- Signed-off-by: Rewanth Tammana <22347290+rewanthtammana@users.noreply.github.com> * storage: skip merging when no remote storage configured Prometheus is hard-coded to use a fanout storage between TSDB and a remote storage which by default is empty. This change detects the empty storage and skips merging between result sets, which would make `Select()` sort results. Bottom line: we skip a sort unless there really is some remote storage configured. Signed-off-by: Bryan Boreham <bjboreham@gmail.com> * Remove csmarchbanks from remote write owners (#13432) I have not had the time to keep up with remote write and have no plans to work on it in the near future so I am withdrawing my maintainership of that part of the codebase. I continue to focus on client_python. Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com> * add more context cancellation check at evaluation time Signed-off-by: Ben Ye <benye@amazon.com> * Optimize label values with matchers by taking shortcuts (#13426) Don't calculate postings beforehand: we may not need them. If all matchers are for the requested label, we can just filter its values. Also, if there are no values at all, no need to run any kind of logic. Also add more labelValuesWithMatchers benchmarks Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com> * Add automatic memory limit handling Enable automatic detection of memory limits and configure GOMEMLIMIT to match. * Also includes a flag to allow controlling the reserved ratio. Signed-off-by: SuperQ <superq@gmail.com> * Update OSSF badge link (#13433) Provide a more user friendly interface Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com> * SD Managers taking over responsibility for registration of debug metrics (#13375) SD Managers take over responsibility for SD metrics registration --------- Signed-off-by: Paulin Todev <paulin.todev@gmail.com> Signed-off-by: Björn Rabenstein <github@rabenste.in> Co-authored-by: Björn Rabenstein <github@rabenste.in> * Optimize histogram iterators (#13340) Optimize histogram iterators Histogram iterators allocate new objects in the AtHistogram and AtFloatHistogram methods, which makes calculating rates over long ranges expensive. In #13215 we allowed an existing object to be reused when converting an integer histogram to a float histogram. This commit follows the same idea and allows injecting an existing object in the AtHistogram and AtFloatHistogram methods. When the injected value is nil, iterators allocate new histograms, otherwise they populate and return the injected object. The commit also adds a CopyTo method to Histogram and FloatHistogram which is used in the BufferedIterator to overwrite items in the ring instead of making new copies. Note that a specialized HPoint pool is needed for all of this to work (`matrixSelectorHPool`). --------- Signed-off-by: Filip Petkovski <filip.petkovsky@gmail.com> Co-authored-by: George Krajcsovits <krajorama@users.noreply.github.com> * doc: Mark `mad_over_time` as experimental (#13440) We forgot to do that in https://github.com/prometheus/prometheus/pull/13059 Signed-off-by: beorn7 <beorn@grafana.com> * Change metric label for Puppetdb from 'http' to 'puppetdb' Signed-off-by: Paulin Todev <paulin.todev@gmail.com> * mirror metrics.proto change & generate code Signed-off-by: Ziqi Zhao <zhaoziqi9146@gmail.com> * TestHeadLabelValuesWithMatchers: Add test case (#13414) Add test case to TestHeadLabelValuesWithMatchers, while fixing a couple of typos in other test cases. Also enclosing some implicit sub-tests in a `t.Run` call to make them explicitly sub-tests. Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * update all go dependencies (#13438) Signed-off-by: Augustin Husson <husson.augustin@gmail.com> * build(deps): bump the k8s-io group with 2 updates (#13454) Bumps the k8s-io group with 2 updates: [k8s.io/api](https://github.com/kubernetes/api) and [k8s.io/client-go](https://github.com/kubernetes/client-go). Updates `k8s.io/api` from 0.28.4 to 0.29.1 - [Commits](https://github.com/kubernetes/api/compare/v0.28.4...v0.29.1) Updates `k8s.io/client-go` from 0.28.4 to 0.29.1 - [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md) - [Commits](https://github.com/kubernetes/client-go/compare/v0.28.4...v0.29.1) --- updated-dependencies: - dependency-name: k8s.io/api dependency-type: direct:production update-type: version-update:semver-minor dependency-group: k8s-io - dependency-name: k8s.io/client-go dependency-type: direct:production update-type: version-update:semver-minor dependency-group: k8s-io ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump the go-opentelemetry-io group with 1 update (#13453) Bumps the go-opentelemetry-io group with 1 update: [go.opentelemetry.io/collector/semconv](https://github.com/open-telemetry/opentelemetry-collector). Updates `go.opentelemetry.io/collector/semconv` from 0.92.0 to 0.93.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/v0.92.0...v0.93.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/collector/semconv dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-opentelemetry-io ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump actions/upload-artifact from 3.1.3 to 4.0.0 (#13355) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3.1.3 to 4.0.0. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](a8a3f3ad30...c7d193f32e) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump bufbuild/buf-push-action (#13357) Bumps [bufbuild/buf-push-action](https://github.com/bufbuild/buf-push-action) from 342fc4cdcf29115a01cf12a2c6dd6aac68dc51e1 to a654ff18effe4641ebea4a4ce242c49800728459. - [Release notes](https://github.com/bufbuild/buf-push-action/releases) - [Commits](342fc4cdcf...a654ff18ef) --- updated-dependencies: - dependency-name: bufbuild/buf-push-action dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Labels: Add DropMetricName function, used in PromQL (#13446) This function is called very frequently when executing PromQL functions, and we can do it much more efficiently inside Labels. In the common case that `__name__` comes first in the labels, we simply re-point to start at the next label, which is nearly free. `DropMetricName` is now so cheap I removed the cache - benchmarks show everything still goes faster. Signed-off-by: Bryan Boreham <bjboreham@gmail.com> * tsdb: simplify internal series delete function (#13261) Lifting an optimisation from Agent code, `seriesHashmap.del` can use the unique series reference, doesn't need to check Labels. Also streamline the logic for deleting from `unique` and `conflicts` maps, and add some comments to help the next person. Signed-off-by: Bryan Boreham <bjboreham@gmail.com> * otlptranslator/update-copy.sh: Fix sed command lines Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Rollback k8s.io requirements (#13462) Rollback k8s.io Go modules to v0.28.6 to avoid forcing upgrade of Go to 1.21. This allows us to keep compatibility with the currently supported upstream Go releases. Signed-off-by: SuperQ <superq@gmail.com> * Make update-copy.sh work for both OSX and GNU sed Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Name @beorn7 and @krajorama as maintainers for native histograms I have been the de-facto maintainer for native histograms from the beginning. So let's put this into MAINTAINERS.md. In addition, I hereby proposose George Krajcsovits AKA Krajo as a co-maintainer. He has contributed a lot of native histogram code, but more importantly, he has contributed substantially to reviewing other contributors' native histogram code, up to a point where I was merely rubberstamping the PRs he had already reviewed. I'm confident that he is ready to to be granted commit rights as outlined in the "Maintainers" section of the governance: https://prometheus.io/governance/#maintainers According to the same section of the governance, I will announce the proposed change on the developers mailing list and will give some time for lazy consensus before merging this PR. Signed-off-by: beorn7 <beorn@grafana.com> * ui/fix: correct url handling for stacked graphs (#13460) Signed-off-by: Yury Moladau <yurymolodov@gmail.com> * tsdb: use cheaper Mutex on series Mutex is 8 bytes; RWMutex is 24 bytes and much more complicated. Since `RLock` is only used in two places, `UpdateMetadata` and `Delete`, neither of which are hotspots, we should use the cheaper one. Signed-off-by: Bryan Boreham <bjboreham@gmail.com> * Fix last_over_time for native histograms The last_over_time retains a histogram sample without making a copy. This sample is now coming from the buffered iterator used for windowing functions, and can be reused for reading subsequent samples as the iterator progresses. I would propose copying the sample in the last_over_time function, similar to how it is done for rate, sum_over_time and others. Signed-off-by: Filip Petkovski <filip.petkovsky@gmail.com> * Implementation NOTE: Rebased from main after refactor in #13014 Signed-off-by: Danny Kopping <danny.kopping@grafana.com> * Add feature flag Signed-off-by: Danny Kopping <danny.kopping@grafana.com> * Refactor concurrency control Signed-off-by: Danny Kopping <danny.kopping@grafana.com> * Optimising dependencies/dependents funcs to not produce new slices each request Signed-off-by: Danny Kopping <danny.kopping@grafana.com> * Refactoring Signed-off-by: Danny Kopping <danny.kopping@grafana.com> * Rename flag Signed-off-by: Danny Kopping <danny.kopping@grafana.com> * Refactoring for performance, and to allow controller to be overridden Signed-off-by: Danny Kopping <danny.kopping@grafana.com> * Block until all rules, both sync & async, have completed evaluating Updated & added tests Review feedback nits Return empty map if not indeterminate Use highWatermark to track inflight requests counter Appease the linter Clarify feature flag Signed-off-by: Danny Kopping <danny.kopping@grafana.com> * Fix typo in CLI flag description Signed-off-by: Marco Pracucci <marco@pracucci.com> * Fixed auto-generated doc Signed-off-by: Marco Pracucci <marco@pracucci.com> * Improve doc Signed-off-by: Marco Pracucci <marco@pracucci.com> * Simplify the design to update concurrency controller once the rule evaluation has done Signed-off-by: Marco Pracucci <marco@pracucci.com> * Add more test cases to TestDependenciesEdgeCases Signed-off-by: Marco Pracucci <marco@pracucci.com> * Added more test cases to TestDependenciesEdgeCases Signed-off-by: Marco Pracucci <marco@pracucci.com> * Improved RuleConcurrencyController interface doc Signed-off-by: Marco Pracucci <marco@pracucci.com> * Introduced sequentialRuleEvalController Signed-off-by: Marco Pracucci <marco@pracucci.com> * Remove superfluous nil check in Group.metrics Signed-off-by: Marco Pracucci <marco@pracucci.com> * api: Serialize discovered and target labels into JSON directly (#13469) Converted maps into labels.Labels to avoid a lot of copying of data which leads to very high memory consumption while opening the /service-discovery endpoint in the Prometheus UI Signed-off-by: Leegin <114397475+Leegin-darknight@users.noreply.github.com> * api: Serialize discovered labels into JSON directly in dropped targets (#13484) Converted maps into labels.Labels to avoid a lot of copying of data which leads to very high memory consumption while opening the /service-discovery endpoint in the Prometheus UI Signed-off-by: Leegin <114397475+Leegin-darknight@users.noreply.github.com> * Add ShardedPostings() support to TSDB (#10421) This PR is a reference implementation of the proposal described in #10420. In addition to what described in #10420, in this PR I've introduced labels.StableHash(). The idea is to offer an hashing function which doesn't change over time, and that's used by query sharding in order to get a stable behaviour over time. The implementation of labels.StableHash() is the hashing function used by Prometheus before stringlabels, and what's used by Grafana Mimir for query sharding (because built before stringlabels was a thing). Follow up work As mentioned in #10420, if this PR is accepted I'm also open to upload another foundamental piece used by Grafana Mimir query sharding to accelerate the query execution: an optional, configurable and fast in-memory cache for the series hashes. Signed-off-by: Marco Pracucci <marco@pracucci.com> * storage/remote: document why two benchmarks are skipped One was silently doing nothing; one was doing something but the work didn't go up linearly with iteration count. Signed-off-by: Bryan Boreham <bjboreham@gmail.com> * Pod status changes not discovered by Kube Endpoints SD (#13337) * fix(discovery/kubernetes/endpoints): react to changes on Pods because some modifications can occur on them without triggering an update on the related Endpoints (The Pod phase changing from Pending to Running e.g.). --------- Signed-off-by: machine424 <ayoubmrini424@gmail.com> Co-authored-by: Guillermo Sanchez Gavier <gsanchez@newrelic.com> * Small improvements, add const, remove copypasta (#8106) Signed-off-by: Mikhail Fesenko <proggga@gmail.com> Signed-off-by: Jesus Vazquez <jesusvzpg@gmail.com> * Proposal to improve FPointSlice and HPointSlice allocation. (#13448) * Reusing points slice from previous series when the slice is under utilized * Adding comments on the bench test Signed-off-by: Alan Protasio <alanprot@gmail.com> * lint Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * go mod tidy Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> --------- Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com> Signed-off-by: Bryan Boreham <bjboreham@gmail.com> Signed-off-by: Erik Sommer <ersotech@posteo.de> Signed-off-by: Linas Medziunas <linas.medziunas@gmail.com> Signed-off-by: bwplotka <bwplotka@gmail.com> Signed-off-by: Arianna Vespri <arianna.vespri@yahoo.it> Signed-off-by: machine424 <ayoubmrini424@gmail.com> Signed-off-by: Daniel Nicholls <daniel.nicholls@resdiary.com> Signed-off-by: Daniel Kerbel <nmdanny@gmail.com> Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Jan Fajerski <jfajersk@redhat.com> Signed-off-by: Kevin Mingtarja <kevin.mingtarja@gmail.com> Signed-off-by: Paschalis Tsilias <paschalis.tsilias@grafana.com> Signed-off-by: Marc Tuduri <marctc@protonmail.com> Signed-off-by: Paschalis Tsilias <tpaschalis@users.noreply.github.com> Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> Signed-off-by: Augustin Husson <augustin.husson@amadeus.com> Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com> Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> Signed-off-by: Kumar Kalpadiptya Roy <kalpadiptya.roy@outlook.com> Signed-off-by: Marco Pracucci <marco@pracucci.com> Signed-off-by: tyltr <tylitianrui@126.com> Signed-off-by: Ted Robertson 10043369+tredondo@users.noreply.github.com Signed-off-by: Ivan Babrou <github@ivan.computer> Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> Signed-off-by: Israel Blancas <iblancasa@gmail.com> Signed-off-by: Ziqi Zhao <zhaoziqi9146@gmail.com> Signed-off-by: Björn Rabenstein <github@rabenste.in> Signed-off-by: Goutham <gouthamve@gmail.com> Signed-off-by: Rewanth Tammana <22347290+rewanthtammana@users.noreply.github.com> Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com> Signed-off-by: Ben Ye <benye@amazon.com> Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com> Signed-off-by: SuperQ <superq@gmail.com> Signed-off-by: Ben Kochie <superq@gmail.com> Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com> Signed-off-by: Paulin Todev <paulin.todev@gmail.com> Signed-off-by: Filip Petkovski <filip.petkovsky@gmail.com> Signed-off-by: beorn7 <beorn@grafana.com> Signed-off-by: Augustin Husson <husson.augustin@gmail.com> Signed-off-by: Yury Moladau <yurymolodov@gmail.com> Signed-off-by: Danny Kopping <danny.kopping@grafana.com> Signed-off-by: Leegin <114397475+Leegin-darknight@users.noreply.github.com> Signed-off-by: Mikhail Fesenko <proggga@gmail.com> Signed-off-by: Jesus Vazquez <jesusvzpg@gmail.com> Signed-off-by: Alan Protasio <alanprot@gmail.com> Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> Co-authored-by: Julian Wiedmann <jwi@linux.ibm.com> Co-authored-by: Bryan Boreham <bjboreham@gmail.com> Co-authored-by: Erik Sommer <ersotech@posteo.de> Co-authored-by: Linas Medziunas <linas.medziunas@gmail.com> Co-authored-by: Bartlomiej Plotka <bwplotka@gmail.com> Co-authored-by: Arianna Vespri <arianna.vespri@yahoo.it> Co-authored-by: machine424 <ayoubmrini424@gmail.com> Co-authored-by: daniel-resdiary <109083091+daniel-resdiary@users.noreply.github.com> Co-authored-by: Daniel Kerbel <nmdanny@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jan Fajerski <jfajersk@redhat.com> Co-authored-by: Kevin Mingtarja <kevin.mingtarja@gmail.com> Co-authored-by: Paschalis Tsilias <tpaschalis@users.noreply.github.com> Co-authored-by: Marc Tudurí <marctc@protonmail.com> Co-authored-by: Paschalis Tsilias <paschalis.tsilias@grafana.com> Co-authored-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> Co-authored-by: Augustin Husson <husson.augustin@gmail.com> Co-authored-by: Björn Rabenstein <beorn@grafana.com> Co-authored-by: zenador <zenador@users.noreply.github.com> Co-authored-by: gotjosh <josue.abreu@gmail.com> Co-authored-by: Ben Kochie <superq@gmail.com> Co-authored-by: Kumar Kalpadiptya Roy <kalpadiptya.roy@outlook.com> Co-authored-by: Marco Pracucci <marco@pracucci.com> Co-authored-by: tyltr <tylitianrui@126.com> Co-authored-by: Ted Robertson <10043369+tredondo@users.noreply.github.com> Co-authored-by: Julien Pivotto <roidelapluie@o11y.eu> Co-authored-by: Matthias Loibl <mail@matthiasloibl.com> Co-authored-by: Ivan Babrou <github@ivan.computer> Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> Co-authored-by: Israel Blancas <iblancasa@gmail.com> Co-authored-by: Ziqi Zhao <zhaoziqi9146@gmail.com> Co-authored-by: George Krajcsovits <krajorama@users.noreply.github.com> Co-authored-by: Björn Rabenstein <github@rabenste.in> Co-authored-by: Goutham <gouthamve@gmail.com> Co-authored-by: Rewanth Tammana <22347290+rewanthtammana@users.noreply.github.com> Co-authored-by: Chris Marchbanks <csmarchbanks@gmail.com> Co-authored-by: Ben Ye <benye@amazon.com> Co-authored-by: Oleg Zaytsev <mail@olegzaytsev.com> Co-authored-by: Matthieu MOREL <matthieu.morel35@gmail.com> Co-authored-by: Paulin Todev <paulin.todev@gmail.com> Co-authored-by: Filip Petkovski <filip.petkovsky@gmail.com> Co-authored-by: Yury Molodov <yurymolodov@gmail.com> Co-authored-by: Danny Kopping <danny.kopping@grafana.com> Co-authored-by: Leegin <114397475+Leegin-darknight@users.noreply.github.com> Co-authored-by: Guillermo Sanchez Gavier <gsanchez@newrelic.com> Co-authored-by: Mikhail Fesenko <proggga@gmail.com> Co-authored-by: Alan Protasio <alanprot@gmail.com> * remote write 2.0 - follow up improvements (#13478) * move remote write proto version config from a remote storage config to a per remote write configuration option Signed-off-by: Callum Styan <callumstyan@gmail.com> * rename scrape config for metadata, fix 2.0 header var name/value (was 1.1), and more clean up Signed-off-by: Callum Styan <callumstyan@gmail.com> * address review comments, mostly lint fixes Signed-off-by: Callum Styan <callumstyan@gmail.com> * another lint fix Signed-off-by: Callum Styan <callumstyan@gmail.com> * lint imports Signed-off-by: Callum Styan <callumstyan@gmail.com> --------- Signed-off-by: Callum Styan <callumstyan@gmail.com> * go mod tidy Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * Added commmentary to RW 2.0 protocol for easier adoption and explicit semantics. (#13502) * Added commmentary to RW 2.0 protocol for easier adoption and explicit semantics. Signed-off-by: bwplotka <bwplotka@gmail.com> * Apply suggestions from code review Co-authored-by: Nico Pazos <32206519+npazosmendez@users.noreply.github.com> Signed-off-by: Callum Styan <callumstyan@gmail.com> --------- Signed-off-by: bwplotka <bwplotka@gmail.com> Signed-off-by: Callum Styan <callumstyan@gmail.com> Co-authored-by: Callum Styan <callumstyan@gmail.com> Co-authored-by: Nico Pazos <32206519+npazosmendez@users.noreply.github.com> * prw2.0: Added support for "custom" layouts for native histogram proto (#13558) * prw2.0: Added support for "custom" layouts for native histogram. Result of the discussions: * https://github.com/prometheus/prometheus/issues/13475#issuecomment-1931496924 * https://cloud-native.slack.com/archives/C02KR205UMU/p1707301006347199 Signed-off-by: bwplotka <bwplotka@gmail.com> * prw2.0: Added support for "custom" layouts for native histogram. Result of the discussions: * https://github.com/prometheus/prometheus/issues/13475#issuecomment-1931496924 * https://cloud-native.slack.com/archives/C02KR205UMU/p1707301006347199 Signed-off-by: bwplotka <bwplotka@gmail.com> # Conflicts: # prompb/write/v2/types.pb.go * Update prompb/write/v2/types.proto Co-authored-by: George Krajcsovits <krajorama@users.noreply.github.com> Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> * Addressed comments, fixed test. Signed-off-by: bwplotka <bwplotka@gmail.com> --------- Signed-off-by: bwplotka <bwplotka@gmail.com> Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> Co-authored-by: George Krajcsovits <krajorama@users.noreply.github.com> * first draft of content negotiation Signed-off-by: Alex Greenbank <alex.greenbank@grafana.com> * Lint Signed-off-by: Alex Greenbank <alex.greenbank@grafana.com> * Fix race in test Signed-off-by: Alex Greenbank <alex.greenbank@grafana.com> * Fix another test race Signed-off-by: Alex Greenbank <alex.greenbank@grafana.com> * Almost done with lint Signed-off-by: Alex Greenbank <alex.greenbank@grafana.com> * Fix todos around 405 HEAD handling Signed-off-by: Alex Greenbank <alex.greenbank@grafana.com> * Changes based on review comments Signed-off-by: Alex Greenbank <alex.greenbank@grafana.com> * Update storage/remote/client.go Co-authored-by: Bartlomiej Plotka <bwplotka@gmail.com> Signed-off-by: Alex Greenbank <alex.greenbank@grafana.com> * Latest updates to review comments Signed-off-by: Alex Greenbank <alex.greenbank@grafana.com> * latest tweaks Signed-off-by: Alex Greenbank <alex.greenbank@grafana.com> * remote write 2.0 - content negotiation remediation (#13921) * Consolidate renegotiation error into one, fix tests Signed-off-by: Alex Greenbank <alex.greenbank@grafana.com> * fix metric name and actuall increment counter Signed-off-by: Alex Greenbank <alex.greenbank@grafana.com> --------- Signed-off-by: Alex Greenbank <alex.greenbank@grafana.com> * Fixes after main sync. Signed-off-by: bwplotka <bwplotka@gmail.com> * [PRW 2.0] Moved rw2 proto to the full path (both package name and placement) (#13973) undefined * [PRW2.0] Remove benchmark scripts (#13949) See rationales on https://docs.google.com/document/d/1Bpf7mYjrHUhPHkie0qlnZFxzgqf_L32kM8ZOknSdJrU/edit Signed-off-by: bwplotka <bwplotka@gmail.com> * rw20: Update prw commentary after Callum spec review (#14136) * rw20: Update prw commentary after Callum spec review Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> * Update types.proto Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> --------- Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> * [PRW 2.0] Updated spec proto (2.0-rc.1); deterministic v1 interop; to be sympathetic with implementation. (#14330) * [PRW 2.0] Updated spec proto (2.0-rc.1); deterministic v1 interop; to be sympathetic with implementation. Signed-off-by: bwplotka <bwplotka@gmail.com> * update custom marshalling Signed-off-by: bwplotka <bwplotka@gmail.com> * Removed confusing comments. Signed-off-by: bwplotka <bwplotka@gmail.com> --------- Signed-off-by: bwplotka <bwplotka@gmail.com> * [PRW-2.0] (chain1) New Remote Write 2.0 Config options for 2.0-rc.1 spec. (#14335) NOTE: For simple review this change does not touch remote/ packages, only main and configs. Spec: https://prometheus.io/docs/specs/remote_write_spec_2_0 Supersedes https://github.com/prometheus/prometheus/pull/13968 Signed-off-by: bwplotka <bwplotka@gmail.com> * [PRW-2.0] (part 2) Removed automatic negotiation, updates for the latest spec semantics in remote pkg (#14329) * [PRW-2.0] (part2) Moved to latest basic negotiation & spec semantics. Spec: https://github.com/prometheus/docs/pull/2462 Supersedes https://github.com/prometheus/prometheus/pull/13968 Signed-off-by: bwplotka <bwplotka@gmail.com> # Conflicts: # config/config.go # docs/configuration/configuration.md # storage/remote/queue_manager_test.go # storage/remote/write.go # web/api/v1/api.go * Addressed comments. Signed-off-by: bwplotka <bwplotka@gmail.com> --------- Signed-off-by: bwplotka <bwplotka@gmail.com> * lint Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * storage/remote tests: refactor: extract function newTestQueueManager To reduce repetition. Signed-off-by: Bryan Boreham <bjboreham@gmail.com> Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * use newTestQueueManager for test Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * go mod tidy Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> * [PRW 2.0] (part3) moved type specific conversions to prompb and writev2 codecs. Signed-off-by: bwplotka <bwplotka@gmail.com> * Added test for rwProtoMsgFlagParser; fixed TODO comment. Signed-off-by: bwplotka <bwplotka@gmail.com> * Renamed DecodeV2WriteRequestStr to DecodeWriteV2Request (with tests). Signed-off-by: bwplotka <bwplotka@gmail.com> * Addressed comments on remote_storage example, updated it for 2.0 Signed-off-by: bwplotka <bwplotka@gmail.com> * Fixed `--enable-feature=metadata-wal-records` docs and error when using PRW 2.0 without it. Signed-off-by: bwplotka <bwplotka@gmail.com> * Addressed Callum comments on custom*.go Signed-off-by: bwplotka <bwplotka@gmail.com> * Added TODO to genproto. Signed-off-by: bwplotka <bwplotka@gmail.com> * Addressed Callum comments in remote pkg. Signed-off-by: bwplotka <bwplotka@gmail.com> * Added metadata validation to write handler test; fixed ToMetadata. Signed-off-by: bwplotka <bwplotka@gmail.com> * Addressed rest of Callum comments. Signed-off-by: bwplotka <bwplotka@gmail.com> * Fixed writev2.FromMetadataType (was wrongly using prompb). Signed-off-by: bwplotka <bwplotka@gmail.com> * fix a few import whitespaces Signed-off-by: Callum Styan <callumstyan@gmail.com> * add a default case with an error to the example RW receiver Signed-off-by: Callum Styan <callumstyan@gmail.com> * more minor import whitespace chagnes Signed-off-by: Callum Styan <callumstyan@gmail.com> * Apply suggestions from code review Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> * Update storage/remote/queue_manager_test.go Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> --------- Signed-off-by: Nicolás Pazos <npazosmendez@gmail.com> Signed-off-by: Callum Styan <callumstyan@gmail.com> Signed-off-by: bwplotka <bwplotka@gmail.com> Signed-off-by: Paschalis Tsilias <paschalist0@gmail.com> Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com> Signed-off-by: Bryan Boreham <bjboreham@gmail.com> Signed-off-by: Erik Sommer <ersotech@posteo.de> Signed-off-by: Linas Medziunas <linas.medziunas@gmail.com> Signed-off-by: Arianna Vespri <arianna.vespri@yahoo.it> Signed-off-by: machine424 <ayoubmrini424@gmail.com> Signed-off-by: Daniel Nicholls <daniel.nicholls@resdiary.com> Signed-off-by: Daniel Kerbel <nmdanny@gmail.com> Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Jan Fajerski <jfajersk@redhat.com> Signed-off-by: Kevin Mingtarja <kevin.mingtarja@gmail.com> Signed-off-by: Paschalis Tsilias <paschalis.tsilias@grafana.com> Signed-off-by: Marc Tuduri <marctc@protonmail.com> Signed-off-by: Paschalis Tsilias <tpaschalis@users.noreply.github.com> Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> Signed-off-by: Augustin Husson <augustin.husson@amadeus.com> Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com> Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> Signed-off-by: Kumar Kalpadiptya Roy <kalpadiptya.roy@outlook.com> Signed-off-by: Marco Pracucci <marco@pracucci.com> Signed-off-by: tyltr <tylitianrui@126.com> Signed-off-by: Ted Robertson 10043369+tredondo@users.noreply.github.com Signed-off-by: Ivan Babrou <github@ivan.computer> Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> Signed-off-by: Israel Blancas <iblancasa@gmail.com> Signed-off-by: Ziqi Zhao <zhaoziqi9146@gmail.com> Signed-off-by: Björn Rabenstein <github@rabenste.in> Signed-off-by: Goutham <gouthamve@gmail.com> Signed-off-by: Rewanth Tammana <22347290+rewanthtammana@users.noreply.github.com> Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com> Signed-off-by: Ben Ye <benye@amazon.com> Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com> Signed-off-by: SuperQ <superq@gmail.com> Signed-off-by: Ben Kochie <superq@gmail.com> Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com> Signed-off-by: Paulin Todev <paulin.todev@gmail.com> Signed-off-by: Filip Petkovski <filip.petkovsky@gmail.com> Signed-off-by: beorn7 <beorn@grafana.com> Signed-off-by: Augustin Husson <husson.augustin@gmail.com> Signed-off-by: Yury Moladau <yurymolodov@gmail.com> Signed-off-by: Danny Kopping <danny.kopping@grafana.com> Signed-off-by: Leegin <114397475+Leegin-darknight@users.noreply.github.com> Signed-off-by: Mikhail Fesenko <proggga@gmail.com> Signed-off-by: Jesus Vazquez <jesusvzpg@gmail.com> Signed-off-by: Alan Protasio <alanprot@gmail.com> Signed-off-by: Alex Greenbank <alex.greenbank@grafana.com> Co-authored-by: Nicolás Pazos <32206519+npazosmendez@users.noreply.github.com> Co-authored-by: Callum Styan <callumstyan@gmail.com> Co-authored-by: Nicolás Pazos <npazosmendez@gmail.com> Co-authored-by: alexgreenbank <alex.greenbank@grafana.com> Co-authored-by: Marco Pracucci <marco@pracucci.com> Co-authored-by: Paschalis Tsilias <paschalist0@gmail.com> Co-authored-by: Julian Wiedmann <jwi@linux.ibm.com> Co-authored-by: Bryan Boreham <bjboreham@gmail.com> Co-authored-by: Erik Sommer <ersotech@posteo.de> Co-authored-by: Linas Medziunas <linas.medziunas@gmail.com> Co-authored-by: Arianna Vespri <arianna.vespri@yahoo.it> Co-authored-by: machine424 <ayoubmrini424@gmail.com> Co-authored-by: daniel-resdiary <109083091+daniel-resdiary@users.noreply.github.com> Co-authored-by: Daniel Kerbel <nmdanny@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jan Fajerski <jfajersk@redhat.com> Co-authored-by: Kevin Mingtarja <kevin.mingtarja@gmail.com> Co-authored-by: Paschalis Tsilias <tpaschalis@users.noreply.github.com> Co-authored-by: Marc Tudurí <marctc@protonmail.com> Co-authored-by: Paschalis Tsilias <paschalis.tsilias@grafana.com> Co-authored-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> Co-authored-by: Augustin Husson <husson.augustin@gmail.com> Co-authored-by: Björn Rabenstein <beorn@grafana.com> Co-authored-by: zenador <zenador@users.noreply.github.com> Co-authored-by: gotjosh <josue.abreu@gmail.com> Co-authored-by: Ben Kochie <superq@gmail.com> Co-authored-by: Kumar Kalpadiptya Roy <kalpadiptya.roy@outlook.com> Co-authored-by: tyltr <tylitianrui@126.com> Co-authored-by: Ted Robertson <10043369+tredondo@users.noreply.github.com> Co-authored-by: Julien Pivotto <roidelapluie@o11y.eu> Co-authored-by: Matthias Loibl <mail@matthiasloibl.com> Co-authored-by: Ivan Babrou <github@ivan.computer> Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> Co-authored-by: Israel Blancas <iblancasa@gmail.com> Co-authored-by: Ziqi Zhao <zhaoziqi9146@gmail.com> Co-authored-by: George Krajcsovits <krajorama@users.noreply.github.com> Co-authored-by: Björn Rabenstein <github@rabenste.in> Co-authored-by: Goutham <gouthamve@gmail.com> Co-authored-by: Rewanth Tammana <22347290+rewanthtammana@users.noreply.github.com> Co-authored-by: Chris Marchbanks <csmarchbanks@gmail.com> Co-authored-by: Ben Ye <benye@amazon.com> Co-authored-by: Oleg Zaytsev <mail@olegzaytsev.com> Co-authored-by: Matthieu MOREL <matthieu.morel35@gmail.com> Co-authored-by: Paulin Todev <paulin.todev@gmail.com> Co-authored-by: Filip Petkovski <filip.petkovsky@gmail.com> Co-authored-by: Yury Molodov <yurymolodov@gmail.com> Co-authored-by: Danny Kopping <danny.kopping@grafana.com> Co-authored-by: Leegin <114397475+Leegin-darknight@users.noreply.github.com> Co-authored-by: Guillermo Sanchez Gavier <gsanchez@newrelic.com> Co-authored-by: Mikhail Fesenko <proggga@gmail.com> Co-authored-by: Alan Protasio <alanprot@gmail.com>
Bartlomiej Plotka
5 months ago
committed by
GitHub
51 changed files with 7280 additions and 1103 deletions
@ -0,0 +1,3 @@
|
||||
remote_write: |
||||
- url: localhost:9090 |
||||
protobuf_message: io.prometheus.writet.v2.Request # typo in 'write" |
||||
@ -0,0 +1,201 @@
|
||||
// Copyright 2024 Prometheus Team
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
package prompb |
||||
|
||||
import ( |
||||
"strings" |
||||
|
||||
"github.com/prometheus/common/model" |
||||
|
||||
"github.com/prometheus/prometheus/model/exemplar" |
||||
"github.com/prometheus/prometheus/model/histogram" |
||||
"github.com/prometheus/prometheus/model/labels" |
||||
) |
||||
|
||||
// NOTE(bwplotka): This file's code is tested in /prompb/rwcommon.
|
||||
|
||||
// ToLabels return model labels.Labels from timeseries' remote labels.
|
||||
func (m TimeSeries) ToLabels(b *labels.ScratchBuilder, _ []string) labels.Labels { |
||||
return labelProtosToLabels(b, m.GetLabels()) |
||||
} |
||||
|
||||
// ToLabels return model labels.Labels from timeseries' remote labels.
|
||||
func (m ChunkedSeries) ToLabels(b *labels.ScratchBuilder, _ []string) labels.Labels { |
||||
return labelProtosToLabels(b, m.GetLabels()) |
||||
} |
||||
|
||||
func labelProtosToLabels(b *labels.ScratchBuilder, labelPairs []Label) labels.Labels { |
||||
b.Reset() |
||||
for _, l := range labelPairs { |
||||
b.Add(l.Name, l.Value) |
||||
} |
||||
b.Sort() |
||||
return b.Labels() |
||||
} |
||||
|
||||
// FromLabels transforms labels into prompb labels. The buffer slice
|
||||
// will be used to avoid allocations if it is big enough to store the labels.
|
||||
func FromLabels(lbls labels.Labels, buf []Label) []Label { |
||||
result := buf[:0] |
||||
lbls.Range(func(l labels.Label) { |
||||
result = append(result, Label{ |
||||
Name: l.Name, |
||||
Value: l.Value, |
||||
}) |
||||
}) |
||||
return result |
||||
} |
||||
|
||||
// FromMetadataType transforms a Prometheus metricType into prompb metricType. Since the former is a string we need to transform it to an enum.
|
||||
func FromMetadataType(t model.MetricType) MetricMetadata_MetricType { |
||||
mt := strings.ToUpper(string(t)) |
||||
v, ok := MetricMetadata_MetricType_value[mt] |
||||
if !ok { |
||||
return MetricMetadata_UNKNOWN |
||||
} |
||||
return MetricMetadata_MetricType(v) |
||||
} |
||||
|
||||
// IsFloatHistogram returns true if the histogram is float.
|
||||
func (h Histogram) IsFloatHistogram() bool { |
||||
_, ok := h.GetCount().(*Histogram_CountFloat) |
||||
return ok |
||||
} |
||||
|
||||
// ToIntHistogram returns integer Prometheus histogram from the remote implementation
|
||||
// of integer histogram. If it's a float histogram, the method returns nil.
|
||||
func (h Histogram) ToIntHistogram() *histogram.Histogram { |
||||
if h.IsFloatHistogram() { |
||||
return nil |
||||
} |
||||
return &histogram.Histogram{ |
||||
CounterResetHint: histogram.CounterResetHint(h.ResetHint), |
||||
Schema: h.Schema, |
||||
ZeroThreshold: h.ZeroThreshold, |
||||
ZeroCount: h.GetZeroCountInt(), |
||||
Count: h.GetCountInt(), |
||||
Sum: h.Sum, |
||||
PositiveSpans: spansProtoToSpans(h.GetPositiveSpans()), |
||||
PositiveBuckets: h.GetPositiveDeltas(), |
||||
NegativeSpans: spansProtoToSpans(h.GetNegativeSpans()), |
||||
NegativeBuckets: h.GetNegativeDeltas(), |
||||
} |
||||
} |
||||
|
||||
// ToFloatHistogram returns float Prometheus histogram from the remote implementation
|
||||
// of float histogram. If the underlying implementation is an integer histogram, a
|
||||
// conversion is performed.
|
||||
func (h Histogram) ToFloatHistogram() *histogram.FloatHistogram { |
||||
if h.IsFloatHistogram() { |
||||
return &histogram.FloatHistogram{ |
||||
CounterResetHint: histogram.CounterResetHint(h.ResetHint), |
||||
Schema: h.Schema, |
||||
ZeroThreshold: h.ZeroThreshold, |
||||
ZeroCount: h.GetZeroCountFloat(), |
||||
Count: h.GetCountFloat(), |
||||
Sum: h.Sum, |
||||
PositiveSpans: spansProtoToSpans(h.GetPositiveSpans()), |
||||
PositiveBuckets: h.GetPositiveCounts(), |
||||
NegativeSpans: spansProtoToSpans(h.GetNegativeSpans()), |
||||
NegativeBuckets: h.GetNegativeCounts(), |
||||
} |
||||
} |
||||
// Conversion from integer histogram.
|
||||
return &histogram.FloatHistogram{ |
||||
CounterResetHint: histogram.CounterResetHint(h.ResetHint), |
||||
Schema: h.Schema, |
||||
ZeroThreshold: h.ZeroThreshold, |
||||
ZeroCount: float64(h.GetZeroCountInt()), |
||||
Count: float64(h.GetCountInt()), |
||||
Sum: h.Sum, |
||||
PositiveSpans: spansProtoToSpans(h.GetPositiveSpans()), |
||||
PositiveBuckets: deltasToCounts(h.GetPositiveDeltas()), |
||||
NegativeSpans: spansProtoToSpans(h.GetNegativeSpans()), |
||||
NegativeBuckets: deltasToCounts(h.GetNegativeDeltas()), |
||||
} |
||||
} |
||||
|
||||
func spansProtoToSpans(s []BucketSpan) []histogram.Span { |
||||
spans := make([]histogram.Span, len(s)) |
||||
for i := 0; i < len(s); i++ { |
||||
spans[i] = histogram.Span{Offset: s[i].Offset, Length: s[i].Length} |
||||
} |
||||
|
||||
return spans |
||||
} |
||||
|
||||
func deltasToCounts(deltas []int64) []float64 { |
||||
counts := make([]float64, len(deltas)) |
||||
var cur float64 |
||||
for i, d := range deltas { |
||||
cur += float64(d) |
||||
counts[i] = cur |
||||
} |
||||
return counts |
||||
} |
||||
|
||||
// FromIntHistogram returns remote Histogram from the integer Histogram.
|
||||
func FromIntHistogram(timestamp int64, h *histogram.Histogram) Histogram { |
||||
return Histogram{ |
||||
Count: &Histogram_CountInt{CountInt: h.Count}, |
||||
Sum: h.Sum, |
||||
Schema: h.Schema, |
||||
ZeroThreshold: h.ZeroThreshold, |
||||
ZeroCount: &Histogram_ZeroCountInt{ZeroCountInt: h.ZeroCount}, |
||||
NegativeSpans: spansToSpansProto(h.NegativeSpans), |
||||
NegativeDeltas: h.NegativeBuckets, |
||||
PositiveSpans: spansToSpansProto(h.PositiveSpans), |
||||
PositiveDeltas: h.PositiveBuckets, |
||||
ResetHint: Histogram_ResetHint(h.CounterResetHint), |
||||
Timestamp: timestamp, |
||||
} |
||||
} |
||||
|
||||
// FromFloatHistogram returns remote Histogram from the float Histogram.
|
||||
func FromFloatHistogram(timestamp int64, fh *histogram.FloatHistogram) Histogram { |
||||
return Histogram{ |
||||
Count: &Histogram_CountFloat{CountFloat: fh.Count}, |
||||
Sum: fh.Sum, |
||||
Schema: fh.Schema, |
||||
ZeroThreshold: fh.ZeroThreshold, |
||||
ZeroCount: &Histogram_ZeroCountFloat{ZeroCountFloat: fh.ZeroCount}, |
||||
NegativeSpans: spansToSpansProto(fh.NegativeSpans), |
||||
NegativeCounts: fh.NegativeBuckets, |
||||
PositiveSpans: spansToSpansProto(fh.PositiveSpans), |
||||
PositiveCounts: fh.PositiveBuckets, |
||||
ResetHint: Histogram_ResetHint(fh.CounterResetHint), |
||||
Timestamp: timestamp, |
||||
} |
||||
} |
||||
|
||||
func spansToSpansProto(s []histogram.Span) []BucketSpan { |
||||
spans := make([]BucketSpan, len(s)) |
||||
for i := 0; i < len(s); i++ { |
||||
spans[i] = BucketSpan{Offset: s[i].Offset, Length: s[i].Length} |
||||
} |
||||
|
||||
return spans |
||||
} |
||||
|
||||
// ToExemplar converts remote exemplar to model exemplar.
|
||||
func (m Exemplar) ToExemplar(b *labels.ScratchBuilder, _ []string) exemplar.Exemplar { |
||||
timestamp := m.Timestamp |
||||
|
||||
return exemplar.Exemplar{ |
||||
Labels: labelProtosToLabels(b, m.GetLabels()), |
||||
Value: m.Value, |
||||
Ts: timestamp, |
||||
HasTs: timestamp != 0, |
||||
} |
||||
} |
||||
@ -0,0 +1,213 @@
|
||||
// Copyright 2024 Prometheus Team
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
package writev2 |
||||
|
||||
import ( |
||||
"github.com/prometheus/common/model" |
||||
|
||||
"github.com/prometheus/prometheus/model/exemplar" |
||||
"github.com/prometheus/prometheus/model/histogram" |
||||
"github.com/prometheus/prometheus/model/labels" |
||||
"github.com/prometheus/prometheus/model/metadata" |
||||
) |
||||
|
||||
// NOTE(bwplotka): This file's code is tested in /prompb/rwcommon.
|
||||
|
||||
// ToLabels return model labels.Labels from timeseries' remote labels.
|
||||
func (m TimeSeries) ToLabels(b *labels.ScratchBuilder, symbols []string) labels.Labels { |
||||
return desymbolizeLabels(b, m.GetLabelsRefs(), symbols) |
||||
} |
||||
|
||||
// ToMetadata return model metadata from timeseries' remote metadata.
|
||||
func (m TimeSeries) ToMetadata(symbols []string) metadata.Metadata { |
||||
typ := model.MetricTypeUnknown |
||||
switch m.Metadata.Type { |
||||
case Metadata_METRIC_TYPE_COUNTER: |
||||
typ = model.MetricTypeCounter |
||||
case Metadata_METRIC_TYPE_GAUGE: |
||||
typ = model.MetricTypeGauge |
||||
case Metadata_METRIC_TYPE_HISTOGRAM: |
||||
typ = model.MetricTypeHistogram |
||||
case Metadata_METRIC_TYPE_GAUGEHISTOGRAM: |
||||
typ = model.MetricTypeGaugeHistogram |
||||
case Metadata_METRIC_TYPE_SUMMARY: |
||||
typ = model.MetricTypeSummary |
||||
case Metadata_METRIC_TYPE_INFO: |
||||
typ = model.MetricTypeInfo |
||||
case Metadata_METRIC_TYPE_STATESET: |
||||
typ = model.MetricTypeStateset |
||||
} |
||||
return metadata.Metadata{ |
||||
Type: typ, |
||||
Unit: symbols[m.Metadata.UnitRef], |
||||
Help: symbols[m.Metadata.HelpRef], |
||||
} |
||||
} |
||||
|
||||
// FromMetadataType transforms a Prometheus metricType into writev2 metricType.
|
||||
// Since the former is a string we need to transform it to an enum.
|
||||
func FromMetadataType(t model.MetricType) Metadata_MetricType { |
||||
switch t { |
||||
case model.MetricTypeCounter: |
||||
return Metadata_METRIC_TYPE_COUNTER |
||||
case model.MetricTypeGauge: |
||||
return Metadata_METRIC_TYPE_GAUGE |
||||
case model.MetricTypeHistogram: |
||||
return Metadata_METRIC_TYPE_HISTOGRAM |
||||
case model.MetricTypeGaugeHistogram: |
||||
return Metadata_METRIC_TYPE_GAUGEHISTOGRAM |
||||
case model.MetricTypeSummary: |
||||
return Metadata_METRIC_TYPE_SUMMARY |
||||
case model.MetricTypeInfo: |
||||
return Metadata_METRIC_TYPE_INFO |
||||
case model.MetricTypeStateset: |
||||
return Metadata_METRIC_TYPE_STATESET |
||||
default: |
||||
return Metadata_METRIC_TYPE_UNSPECIFIED |
||||
} |
||||
} |
||||
|
||||
// IsFloatHistogram returns true if the histogram is float.
|
||||
func (h Histogram) IsFloatHistogram() bool { |
||||
_, ok := h.GetCount().(*Histogram_CountFloat) |
||||
return ok |
||||
} |
||||
|
||||
// ToIntHistogram returns integer Prometheus histogram from the remote implementation
|
||||
// of integer histogram. If it's a float histogram, the method returns nil.
|
||||
// TODO(bwplotka): Add support for incoming NHCB.
|
||||
func (h Histogram) ToIntHistogram() *histogram.Histogram { |
||||
if h.IsFloatHistogram() { |
||||
return nil |
||||
} |
||||
return &histogram.Histogram{ |
||||
CounterResetHint: histogram.CounterResetHint(h.ResetHint), |
||||
Schema: h.Schema, |
||||
ZeroThreshold: h.ZeroThreshold, |
||||
ZeroCount: h.GetZeroCountInt(), |
||||
Count: h.GetCountInt(), |
||||
Sum: h.Sum, |
||||
PositiveSpans: spansProtoToSpans(h.GetPositiveSpans()), |
||||
PositiveBuckets: h.GetPositiveDeltas(), |
||||
NegativeSpans: spansProtoToSpans(h.GetNegativeSpans()), |
||||
NegativeBuckets: h.GetNegativeDeltas(), |
||||
} |
||||
} |
||||
|
||||
// ToFloatHistogram returns float Prometheus histogram from the remote implementation
|
||||
// of float histogram. If the underlying implementation is an integer histogram, a
|
||||
// conversion is performed.
|
||||
// TODO(bwplotka): Add support for incoming NHCB.
|
||||
func (h Histogram) ToFloatHistogram() *histogram.FloatHistogram { |
||||
if h.IsFloatHistogram() { |
||||
return &histogram.FloatHistogram{ |
||||
CounterResetHint: histogram.CounterResetHint(h.ResetHint), |
||||
Schema: h.Schema, |
||||
ZeroThreshold: h.ZeroThreshold, |
||||
ZeroCount: h.GetZeroCountFloat(), |
||||
Count: h.GetCountFloat(), |
||||
Sum: h.Sum, |
||||
PositiveSpans: spansProtoToSpans(h.GetPositiveSpans()), |
||||
PositiveBuckets: h.GetPositiveCounts(), |
||||
NegativeSpans: spansProtoToSpans(h.GetNegativeSpans()), |
||||
NegativeBuckets: h.GetNegativeCounts(), |
||||
} |
||||
} |
||||
// Conversion from integer histogram.
|
||||
return &histogram.FloatHistogram{ |
||||
CounterResetHint: histogram.CounterResetHint(h.ResetHint), |
||||
Schema: h.Schema, |
||||
ZeroThreshold: h.ZeroThreshold, |
||||
ZeroCount: float64(h.GetZeroCountInt()), |
||||
Count: float64(h.GetCountInt()), |
||||
Sum: h.Sum, |
||||
PositiveSpans: spansProtoToSpans(h.GetPositiveSpans()), |
||||
PositiveBuckets: deltasToCounts(h.GetPositiveDeltas()), |
||||
NegativeSpans: spansProtoToSpans(h.GetNegativeSpans()), |
||||
NegativeBuckets: deltasToCounts(h.GetNegativeDeltas()), |
||||
} |
||||
} |
||||
|
||||
func spansProtoToSpans(s []BucketSpan) []histogram.Span { |
||||
spans := make([]histogram.Span, len(s)) |
||||
for i := 0; i < len(s); i++ { |
||||
spans[i] = histogram.Span{Offset: s[i].Offset, Length: s[i].Length} |
||||
} |
||||
|
||||
return spans |
||||
} |
||||
|
||||
func deltasToCounts(deltas []int64) []float64 { |
||||
counts := make([]float64, len(deltas)) |
||||
var cur float64 |
||||
for i, d := range deltas { |
||||
cur += float64(d) |
||||
counts[i] = cur |
||||
} |
||||
return counts |
||||
} |
||||
|
||||
// FromIntHistogram returns remote Histogram from the integer Histogram.
|
||||
func FromIntHistogram(timestamp int64, h *histogram.Histogram) Histogram { |
||||
return Histogram{ |
||||
Count: &Histogram_CountInt{CountInt: h.Count}, |
||||
Sum: h.Sum, |
||||
Schema: h.Schema, |
||||
ZeroThreshold: h.ZeroThreshold, |
||||
ZeroCount: &Histogram_ZeroCountInt{ZeroCountInt: h.ZeroCount}, |
||||
NegativeSpans: spansToSpansProto(h.NegativeSpans), |
||||
NegativeDeltas: h.NegativeBuckets, |
||||
PositiveSpans: spansToSpansProto(h.PositiveSpans), |
||||
PositiveDeltas: h.PositiveBuckets, |
||||
ResetHint: Histogram_ResetHint(h.CounterResetHint), |
||||
Timestamp: timestamp, |
||||
} |
||||
} |
||||
|
||||
// FromFloatHistogram returns remote Histogram from the float Histogram.
|
||||
func FromFloatHistogram(timestamp int64, fh *histogram.FloatHistogram) Histogram { |
||||
return Histogram{ |
||||
Count: &Histogram_CountFloat{CountFloat: fh.Count}, |
||||
Sum: fh.Sum, |
||||
Schema: fh.Schema, |
||||
ZeroThreshold: fh.ZeroThreshold, |
||||
ZeroCount: &Histogram_ZeroCountFloat{ZeroCountFloat: fh.ZeroCount}, |
||||
NegativeSpans: spansToSpansProto(fh.NegativeSpans), |
||||
NegativeCounts: fh.NegativeBuckets, |
||||
PositiveSpans: spansToSpansProto(fh.PositiveSpans), |
||||
PositiveCounts: fh.PositiveBuckets, |
||||
ResetHint: Histogram_ResetHint(fh.CounterResetHint), |
||||
Timestamp: timestamp, |
||||
} |
||||
} |
||||
|
||||
func spansToSpansProto(s []histogram.Span) []BucketSpan { |
||||
spans := make([]BucketSpan, len(s)) |
||||
for i := 0; i < len(s); i++ { |
||||
spans[i] = BucketSpan{Offset: s[i].Offset, Length: s[i].Length} |
||||
} |
||||
|
||||
return spans |
||||
} |
||||
|
||||
func (m Exemplar) ToExemplar(b *labels.ScratchBuilder, symbols []string) exemplar.Exemplar { |
||||
timestamp := m.Timestamp |
||||
|
||||
return exemplar.Exemplar{ |
||||
Labels: desymbolizeLabels(b, m.LabelsRefs, symbols), |
||||
Value: m.Value, |
||||
Ts: timestamp, |
||||
HasTs: timestamp != 0, |
||||
} |
||||
} |
||||
@ -0,0 +1,165 @@
|
||||
// Copyright 2024 The Prometheus Authors
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
package writev2 |
||||
|
||||
import ( |
||||
"slices" |
||||
) |
||||
|
||||
func (m Sample) T() int64 { return m.Timestamp } |
||||
func (m Sample) V() float64 { return m.Value } |
||||
|
||||
func (m *Request) OptimizedMarshal(dst []byte) ([]byte, error) { |
||||
siz := m.Size() |
||||
if cap(dst) < siz { |
||||
dst = make([]byte, siz) |
||||
} |
||||
n, err := m.OptimizedMarshalToSizedBuffer(dst[:siz]) |
||||
if err != nil { |
||||
return nil, err |
||||
} |
||||
return dst[:n], nil |
||||
} |
||||
|
||||
// OptimizedMarshalToSizedBuffer is mostly a copy of the generated MarshalToSizedBuffer,
|
||||
// but calls OptimizedMarshalToSizedBuffer on the timeseries.
|
||||
func (m *Request) OptimizedMarshalToSizedBuffer(dAtA []byte) (int, error) { |
||||
i := len(dAtA) |
||||
_ = i |
||||
var l int |
||||
_ = l |
||||
if m.XXX_unrecognized != nil { |
||||
i -= len(m.XXX_unrecognized) |
||||
copy(dAtA[i:], m.XXX_unrecognized) |
||||
} |
||||
if len(m.Timeseries) > 0 { |
||||
for iNdEx := len(m.Timeseries) - 1; iNdEx >= 0; iNdEx-- { |
||||
{ |
||||
size, err := m.Timeseries[iNdEx].OptimizedMarshalToSizedBuffer(dAtA[:i]) |
||||
if err != nil { |
||||
return 0, err |
||||
} |
||||
i -= size |
||||
i = encodeVarintTypes(dAtA, i, uint64(size)) |
||||
} |
||||
i-- |
||||
dAtA[i] = 0x2a |
||||
} |
||||
} |
||||
if len(m.Symbols) > 0 { |
||||
for iNdEx := len(m.Symbols) - 1; iNdEx >= 0; iNdEx-- { |
||||
i -= len(m.Symbols[iNdEx]) |
||||
copy(dAtA[i:], m.Symbols[iNdEx]) |
||||
i = encodeVarintTypes(dAtA, i, uint64(len(m.Symbols[iNdEx]))) |
||||
i-- |
||||
dAtA[i] = 0x22 |
||||
} |
||||
} |
||||
return len(dAtA) - i, nil |
||||
} |
||||
|
||||
// OptimizedMarshalToSizedBuffer is mostly a copy of the generated MarshalToSizedBuffer,
|
||||
// but marshals m.LabelsRefs in place without extra allocations.
|
||||
func (m *TimeSeries) OptimizedMarshalToSizedBuffer(dAtA []byte) (int, error) { |
||||
i := len(dAtA) |
||||
_ = i |
||||
var l int |
||||
_ = l |
||||
if m.XXX_unrecognized != nil { |
||||
i -= len(m.XXX_unrecognized) |
||||
copy(dAtA[i:], m.XXX_unrecognized) |
||||
} |
||||
if m.CreatedTimestamp != 0 { |
||||
i = encodeVarintTypes(dAtA, i, uint64(m.CreatedTimestamp)) |
||||
i-- |
||||
dAtA[i] = 0x30 |
||||
} |
||||
{ |
||||
size, err := m.Metadata.MarshalToSizedBuffer(dAtA[:i]) |
||||
if err != nil { |
||||
return 0, err |
||||
} |
||||
i -= size |
||||
i = encodeVarintTypes(dAtA, i, uint64(size)) |
||||
} |
||||
i-- |
||||
dAtA[i] = 0x2a |
||||
if len(m.Histograms) > 0 { |
||||
for iNdEx := len(m.Histograms) - 1; iNdEx >= 0; iNdEx-- { |
||||
{ |
||||
size, err := m.Histograms[iNdEx].MarshalToSizedBuffer(dAtA[:i]) |
||||
if err != nil { |
||||
return 0, err |
||||
} |
||||
i -= size |
||||
i = encodeVarintTypes(dAtA, i, uint64(size)) |
||||
} |
||||
i-- |
||||
dAtA[i] = 0x1a |
||||
} |
||||
} |
||||
if len(m.Exemplars) > 0 { |
||||
for iNdEx := len(m.Exemplars) - 1; iNdEx >= 0; iNdEx-- { |
||||
{ |
||||
size, err := m.Exemplars[iNdEx].MarshalToSizedBuffer(dAtA[:i]) |
||||
if err != nil { |
||||
return 0, err |
||||
} |
||||
i -= size |
||||
i = encodeVarintTypes(dAtA, i, uint64(size)) |
||||
} |
||||
i-- |
||||
dAtA[i] = 0x22 |
||||
} |
||||
} |
||||
if len(m.Samples) > 0 { |
||||
for iNdEx := len(m.Samples) - 1; iNdEx >= 0; iNdEx-- { |
||||
{ |
||||
size, err := m.Samples[iNdEx].MarshalToSizedBuffer(dAtA[:i]) |
||||
if err != nil { |
||||
return 0, err |
||||
} |
||||
i -= size |
||||
i = encodeVarintTypes(dAtA, i, uint64(size)) |
||||
} |
||||
i-- |
||||
dAtA[i] = 0x12 |
||||
} |
||||
} |
||||
|
||||
if len(m.LabelsRefs) > 0 { |
||||
// This is the trick: encode the varints in reverse order to make it easier
|
||||
// to do it in place. Then reverse the whole thing.
|
||||
var j10 int |
||||
start := i |
||||
for _, num := range m.LabelsRefs { |
||||
for num >= 1<<7 { |
||||
dAtA[i-1] = uint8(uint64(num)&0x7f | 0x80) |
||||
num >>= 7 |
||||
i-- |
||||
j10++ |
||||
} |
||||
dAtA[i-1] = uint8(num) |
||||
i-- |
||||
j10++ |
||||
} |
||||
slices.Reverse(dAtA[i:start]) |
||||
// --- end of trick
|
||||
|
||||
i = encodeVarintTypes(dAtA, i, uint64(j10)) |
||||
i-- |
||||
dAtA[i] = 0xa |
||||
} |
||||
return len(dAtA) - i, nil |
||||
} |
||||
@ -0,0 +1,97 @@
|
||||
// Copyright 2023 The Prometheus Authors
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
package writev2 |
||||
|
||||
import ( |
||||
"testing" |
||||
|
||||
"github.com/stretchr/testify/require" |
||||
) |
||||
|
||||
func TestOptimizedMarshal(t *testing.T) { |
||||
for _, tt := range []struct { |
||||
name string |
||||
m *Request |
||||
}{ |
||||
{ |
||||
name: "empty", |
||||
m: &Request{}, |
||||
}, |
||||
{ |
||||
name: "simple", |
||||
m: &Request{ |
||||
Timeseries: []TimeSeries{ |
||||
{ |
||||
LabelsRefs: []uint32{ |
||||
0, 1, |
||||
2, 3, |
||||
4, 5, |
||||
6, 7, |
||||
8, 9, |
||||
10, 11, |
||||
12, 13, |
||||
14, 15, |
||||
}, |
||||
|
||||
Samples: []Sample{{Value: 1, Timestamp: 0}}, |
||||
Exemplars: []Exemplar{{LabelsRefs: []uint32{0, 1}, Value: 1, Timestamp: 0}}, |
||||
Histograms: nil, |
||||
}, |
||||
{ |
||||
LabelsRefs: []uint32{ |
||||
0, 1, |
||||
2, 3, |
||||
4, 5, |
||||
6, 7, |
||||
8, 9, |
||||
10, 11, |
||||
12, 13, |
||||
14, 15, |
||||
}, |
||||
Samples: []Sample{{Value: 2, Timestamp: 1}}, |
||||
Exemplars: []Exemplar{{LabelsRefs: []uint32{0, 1}, Value: 2, Timestamp: 1}}, |
||||
Histograms: nil, |
||||
}, |
||||
}, |
||||
Symbols: []string{ |
||||
"a", "b", |
||||
"c", "d", |
||||
"e", "f", |
||||
"g", "h", |
||||
"i", "j", |
||||
"k", "l", |
||||
"m", "n", |
||||
"o", "p", |
||||
}, |
||||
}, |
||||
}, |
||||
} { |
||||
t.Run(tt.name, func(t *testing.T) { |
||||
// Keep the slice allocated to mimic what std Marshal
|
||||
// would give to sized Marshal.
|
||||
got := make([]byte, 0) |
||||
|
||||
// Should be the same as the standard marshal.
|
||||
expected, err := tt.m.Marshal() |
||||
require.NoError(t, err) |
||||
got, err = tt.m.OptimizedMarshal(got) |
||||
require.NoError(t, err) |
||||
require.Equal(t, expected, got) |
||||
|
||||
// Unmarshal should work too.
|
||||
m := &Request{} |
||||
require.NoError(t, m.Unmarshal(got)) |
||||
require.Equal(t, tt.m, m) |
||||
}) |
||||
} |
||||
} |
||||
@ -0,0 +1,83 @@
|
||||
// Copyright 2024 Prometheus Team
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
package writev2 |
||||
|
||||
import "github.com/prometheus/prometheus/model/labels" |
||||
|
||||
// SymbolsTable implements table for easy symbol use.
|
||||
type SymbolsTable struct { |
||||
strings []string |
||||
symbolsMap map[string]uint32 |
||||
} |
||||
|
||||
// NewSymbolTable returns a symbol table.
|
||||
func NewSymbolTable() SymbolsTable { |
||||
return SymbolsTable{ |
||||
// Empty string is required as a first element.
|
||||
symbolsMap: map[string]uint32{"": 0}, |
||||
strings: []string{""}, |
||||
} |
||||
} |
||||
|
||||
// Symbolize adds (if not added before) a string to the symbols table,
|
||||
// while returning its reference number.
|
||||
func (t *SymbolsTable) Symbolize(str string) uint32 { |
||||
if ref, ok := t.symbolsMap[str]; ok { |
||||
return ref |
||||
} |
||||
ref := uint32(len(t.strings)) |
||||
t.strings = append(t.strings, str) |
||||
t.symbolsMap[str] = ref |
||||
return ref |
||||
} |
||||
|
||||
// SymbolizeLabels symbolize Prometheus labels.
|
||||
func (t *SymbolsTable) SymbolizeLabels(lbls labels.Labels, buf []uint32) []uint32 { |
||||
result := buf[:0] |
||||
lbls.Range(func(l labels.Label) { |
||||
off := t.Symbolize(l.Name) |
||||
result = append(result, off) |
||||
off = t.Symbolize(l.Value) |
||||
result = append(result, off) |
||||
}) |
||||
return result |
||||
} |
||||
|
||||
// Symbols returns computes symbols table to put in e.g. Request.Symbols.
|
||||
// As per spec, order does not matter.
|
||||
func (t *SymbolsTable) Symbols() []string { |
||||
return t.strings |
||||
} |
||||
|
||||
// Reset clears symbols table.
|
||||
func (t *SymbolsTable) Reset() { |
||||
// NOTE: Make sure to keep empty symbol.
|
||||
t.strings = t.strings[:1] |
||||
for k := range t.symbolsMap { |
||||
if k == "" { |
||||
continue |
||||
} |
||||
delete(t.symbolsMap, k) |
||||
} |
||||
} |
||||
|
||||
// desymbolizeLabels decodes label references, with given symbols to labels.
|
||||
func desymbolizeLabels(b *labels.ScratchBuilder, labelRefs []uint32, symbols []string) labels.Labels { |
||||
b.Reset() |
||||
for i := 0; i < len(labelRefs); i += 2 { |
||||
b.Add(symbols[labelRefs[i]], symbols[labelRefs[i+1]]) |
||||
} |
||||
b.Sort() |
||||
return b.Labels() |
||||
} |
||||
@ -0,0 +1,60 @@
|
||||
// Copyright 2024 Prometheus Team
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
package writev2 |
||||
|
||||
import ( |
||||
"testing" |
||||
|
||||
"github.com/stretchr/testify/require" |
||||
|
||||
"github.com/prometheus/prometheus/model/labels" |
||||
) |
||||
|
||||
func TestSymbolsTable(t *testing.T) { |
||||
s := NewSymbolTable() |
||||
require.Equal(t, []string{""}, s.Symbols(), "required empty reference does not exist") |
||||
require.Equal(t, uint32(0), s.Symbolize("")) |
||||
require.Equal(t, []string{""}, s.Symbols()) |
||||
|
||||
require.Equal(t, uint32(1), s.Symbolize("abc")) |
||||
require.Equal(t, []string{"", "abc"}, s.Symbols()) |
||||
|
||||
require.Equal(t, uint32(2), s.Symbolize("__name__")) |
||||
require.Equal(t, []string{"", "abc", "__name__"}, s.Symbols()) |
||||
|
||||
require.Equal(t, uint32(3), s.Symbolize("foo")) |
||||
require.Equal(t, []string{"", "abc", "__name__", "foo"}, s.Symbols()) |
||||
|
||||
s.Reset() |
||||
require.Equal(t, []string{""}, s.Symbols(), "required empty reference does not exist") |
||||
require.Equal(t, uint32(0), s.Symbolize("")) |
||||
|
||||
require.Equal(t, uint32(1), s.Symbolize("__name__")) |
||||
require.Equal(t, []string{"", "__name__"}, s.Symbols()) |
||||
|
||||
require.Equal(t, uint32(2), s.Symbolize("abc")) |
||||
require.Equal(t, []string{"", "__name__", "abc"}, s.Symbols()) |
||||
|
||||
ls := labels.FromStrings("__name__", "qwer", "zxcv", "1234") |
||||
encoded := s.SymbolizeLabels(ls, nil) |
||||
require.Equal(t, []uint32{1, 3, 4, 5}, encoded) |
||||
b := labels.NewScratchBuilder(len(encoded)) |
||||
decoded := desymbolizeLabels(&b, encoded, s.Symbols()) |
||||
require.Equal(t, ls, decoded) |
||||
|
||||
// Different buf.
|
||||
ls = labels.FromStrings("__name__", "qwer", "zxcv2222", "1234") |
||||
encoded = s.SymbolizeLabels(ls, []uint32{1, 3, 4, 5}) |
||||
require.Equal(t, []uint32{1, 3, 6, 5}, encoded) |
||||
} |
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,260 @@
|
||||
// Copyright 2024 Prometheus Team |
||||
// Licensed under the Apache License, Version 2.0 (the "License"); |
||||
// you may not use this file except in compliance with the License. |
||||
// You may obtain a copy of the License at |
||||
// |
||||
// http://www.apache.org/licenses/LICENSE-2.0 |
||||
// |
||||
// Unless required by applicable law or agreed to in writing, software |
||||
// distributed under the License is distributed on an "AS IS" BASIS, |
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
// See the License for the specific language governing permissions and |
||||
// limitations under the License. |
||||
|
||||
// NOTE: This file is also available on https://buf.build/prometheus/prometheus/docs/main:io.prometheus.write.v2 |
||||
|
||||
syntax = "proto3"; |
||||
package io.prometheus.write.v2; |
||||
|
||||
option go_package = "writev2"; |
||||
|
||||
import "gogoproto/gogo.proto"; |
||||
|
||||
// Request represents a request to write the given timeseries to a remote destination. |
||||
// This message was introduced in the Remote Write 2.0 specification: |
||||
// https://prometheus.io/docs/concepts/remote_write_spec_2_0/ |
||||
// |
||||
// The canonical Content-Type request header value for this message is |
||||
// "application/x-protobuf;proto=io.prometheus.write.v2.Request" |
||||
// |
||||
// NOTE: gogoproto options might change in future for this file, they |
||||
// are not part of the spec proto (they only modify the generated Go code, not |
||||
// the serialized message). See: https://github.com/prometheus/prometheus/issues/11908 |
||||
message Request { |
||||
// Since Request supersedes 1.0 spec's prometheus.WriteRequest, we reserve the top-down message |
||||
// for the deterministic interop between those two, see types_test.go for details. |
||||
// Generally it's not needed, because Receivers must use the Content-Type header, but we want to |
||||
// be sympathetic to adopters with mistaken implementations and have deterministic error (empty |
||||
// message if you use the wrong proto schema). |
||||
reserved 1 to 3; |
||||
|
||||
// symbols contains a de-duplicated array of string elements used for various |
||||
// items in a Request message, like labels and metadata items. For the sender's convenience |
||||
// around empty values for optional fields like unit_ref, symbols array MUST start with |
||||
// empty string. |
||||
// |
||||
// To decode each of the symbolized strings, referenced, by "ref(s)" suffix, you |
||||
// need to lookup the actual string by index from symbols array. The order of |
||||
// strings is up to the sender. The receiver should not assume any particular encoding. |
||||
repeated string symbols = 4; |
||||
// timeseries represents an array of distinct series with 0 or more samples. |
||||
repeated TimeSeries timeseries = 5 [(gogoproto.nullable) = false]; |
||||
} |
||||
|
||||
// TimeSeries represents a single series. |
||||
message TimeSeries { |
||||
// labels_refs is a list of label name-value pair references, encoded |
||||
// as indices to the Request.symbols array. This list's length is always |
||||
// a multiple of two, and the underlying labels should be sorted lexicographically. |
||||
// |
||||
// Note that there might be multiple TimeSeries objects in the same |
||||
// Requests with the same labels e.g. for different exemplars, metadata |
||||
// or created timestamp. |
||||
repeated uint32 labels_refs = 1; |
||||
|
||||
// Timeseries messages can either specify samples or (native) histogram samples |
||||
// (histogram field), but not both. For a typical sender (real-time metric |
||||
// streaming), in healthy cases, there will be only one sample or histogram. |
||||
// |
||||
// Samples and histograms are sorted by timestamp (older first). |
||||
repeated Sample samples = 2 [(gogoproto.nullable) = false]; |
||||
repeated Histogram histograms = 3 [(gogoproto.nullable) = false]; |
||||
|
||||
// exemplars represents an optional set of exemplars attached to this series' samples. |
||||
repeated Exemplar exemplars = 4 [(gogoproto.nullable) = false]; |
||||
|
||||
// metadata represents the metadata associated with the given series' samples. |
||||
Metadata metadata = 5 [(gogoproto.nullable) = false]; |
||||
|
||||
// created_timestamp represents an optional created timestamp associated with |
||||
// this series' samples in ms format, typically for counter or histogram type |
||||
// metrics. Created timestamp represents the time when the counter started |
||||
// counting (sometimes referred to as start timestamp), which can increase |
||||
// the accuracy of query results. |
||||
// |
||||
// Note that some receivers might require this and in return fail to |
||||
// ingest such samples within the Request. |
||||
// |
||||
// For Go, see github.com/prometheus/prometheus/model/timestamp/timestamp.go |
||||
// for conversion from/to time.Time to Prometheus timestamp. |
||||
// |
||||
// Note that the "optional" keyword is omitted due to |
||||
// https://cloud.google.com/apis/design/design_patterns.md#optional_primitive_fields |
||||
// Zero value means value not set. If you need to use exactly zero value for |
||||
// the timestamp, use 1 millisecond before or after. |
||||
int64 created_timestamp = 6; |
||||
} |
||||
|
||||
// Exemplar is an additional information attached to some series' samples. |
||||
// It is typically used to attach an example trace or request ID associated with |
||||
// the metric changes. |
||||
message Exemplar { |
||||
// labels_refs is an optional list of label name-value pair references, encoded |
||||
// as indices to the Request.symbols array. This list's len is always |
||||
// a multiple of 2, and the underlying labels should be sorted lexicographically. |
||||
// If the exemplar references a trace it should use the `trace_id` label name, as a best practice. |
||||
repeated uint32 labels_refs = 1; |
||||
// value represents an exact example value. This can be useful when the exemplar |
||||
// is attached to a histogram, which only gives an estimated value through buckets. |
||||
double value = 2; |
||||
// timestamp represents an optional timestamp of the sample in ms. |
||||
// |
||||
// For Go, see github.com/prometheus/prometheus/model/timestamp/timestamp.go |
||||
// for conversion from/to time.Time to Prometheus timestamp. |
||||
// |
||||
// Note that the "optional" keyword is omitted due to |
||||
// https://cloud.google.com/apis/design/design_patterns.md#optional_primitive_fields |
||||
// Zero value means value not set. If you need to use exactly zero value for |
||||
// the timestamp, use 1 millisecond before or after. |
||||
int64 timestamp = 3; |
||||
} |
||||
|
||||
// Sample represents series sample. |
||||
message Sample { |
||||
// value of the sample. |
||||
double value = 1; |
||||
// timestamp represents timestamp of the sample in ms. |
||||
// |
||||
// For Go, see github.com/prometheus/prometheus/model/timestamp/timestamp.go |
||||
// for conversion from/to time.Time to Prometheus timestamp. |
||||
int64 timestamp = 2; |
||||
} |
||||
|
||||
// Metadata represents the metadata associated with the given series' samples. |
||||
message Metadata { |
||||
enum MetricType { |
||||
METRIC_TYPE_UNSPECIFIED = 0; |
||||
METRIC_TYPE_COUNTER = 1; |
||||
METRIC_TYPE_GAUGE = 2; |
||||
METRIC_TYPE_HISTOGRAM = 3; |
||||
METRIC_TYPE_GAUGEHISTOGRAM = 4; |
||||
METRIC_TYPE_SUMMARY = 5; |
||||
METRIC_TYPE_INFO = 6; |
||||
METRIC_TYPE_STATESET = 7; |
||||
} |
||||
MetricType type = 1; |
||||
// help_ref is a reference to the Request.symbols array representing help |
||||
// text for the metric. Help is optional, reference should point to an empty string in |
||||
// such a case. |
||||
uint32 help_ref = 3; |
||||
// unit_ref is a reference to the Request.symbols array representing a unit |
||||
// for the metric. Unit is optional, reference should point to an empty string in |
||||
// such a case. |
||||
uint32 unit_ref = 4; |
||||
} |
||||
|
||||
// A native histogram, also known as a sparse histogram. |
||||
// Original design doc: |
||||
// https://docs.google.com/document/d/1cLNv3aufPZb3fNfaJgdaRBZsInZKKIHo9E6HinJVbpM/edit |
||||
// The appendix of this design doc also explains the concept of float |
||||
// histograms. This Histogram message can represent both, the usual |
||||
// integer histogram as well as a float histogram. |
||||
message Histogram { |
||||
enum ResetHint { |
||||
RESET_HINT_UNSPECIFIED = 0; // Need to test for a counter reset explicitly. |
||||
RESET_HINT_YES = 1; // This is the 1st histogram after a counter reset. |
||||
RESET_HINT_NO = 2; // There was no counter reset between this and the previous Histogram. |
||||
RESET_HINT_GAUGE = 3; // This is a gauge histogram where counter resets don't happen. |
||||
} |
||||
|
||||
oneof count { // Count of observations in the histogram. |
||||
uint64 count_int = 1; |
||||
double count_float = 2; |
||||
} |
||||
double sum = 3; // Sum of observations in the histogram. |
||||
|
||||
// The schema defines the bucket schema. Currently, valid numbers |
||||
// are -53 and numbers in range of -4 <= n <= 8. More valid numbers might be |
||||
// added in future for new bucketing layouts. |
||||
// |
||||
// The schema equal to -53 means custom buckets. See |
||||
// custom_values field description for more details. |
||||
// |
||||
// Values between -4 and 8 represent base-2 bucket schema, where 1 |
||||
// is a bucket boundary in each case, and then each power of two is |
||||
// divided into 2^n (n is schema value) logarithmic buckets. Or in other words, |
||||
// each bucket boundary is the previous boundary times 2^(2^-n). |
||||
sint32 schema = 4; |
||||
double zero_threshold = 5; // Breadth of the zero bucket. |
||||
oneof zero_count { // Count in zero bucket. |
||||
uint64 zero_count_int = 6; |
||||
double zero_count_float = 7; |
||||
} |
||||
|
||||
// Negative Buckets. |
||||
repeated BucketSpan negative_spans = 8 [(gogoproto.nullable) = false]; |
||||
// Use either "negative_deltas" or "negative_counts", the former for |
||||
// regular histograms with integer counts, the latter for |
||||
// float histograms. |
||||
repeated sint64 negative_deltas = 9; // Count delta of each bucket compared to previous one (or to zero for 1st bucket). |
||||
repeated double negative_counts = 10; // Absolute count of each bucket. |
||||
|
||||
// Positive Buckets. |
||||
// |
||||
// In case of custom buckets (-53 schema value) the positive buckets are interpreted as follows: |
||||
// * The span offset+length points to an the index of the custom_values array |
||||
// or +Inf if pointing to the len of the array. |
||||
// * The counts and deltas have the same meaning as for exponential histograms. |
||||
repeated BucketSpan positive_spans = 11 [(gogoproto.nullable) = false]; |
||||
// Use either "positive_deltas" or "positive_counts", the former for |
||||
// regular histograms with integer counts, the latter for |
||||
// float histograms. |
||||
repeated sint64 positive_deltas = 12; // Count delta of each bucket compared to previous one (or to zero for 1st bucket). |
||||
repeated double positive_counts = 13; // Absolute count of each bucket. |
||||
|
||||
ResetHint reset_hint = 14; |
||||
// timestamp represents timestamp of the sample in ms. |
||||
// |
||||
// For Go, see github.com/prometheus/prometheus/model/timestamp/timestamp.go |
||||
// for conversion from/to time.Time to Prometheus timestamp. |
||||
int64 timestamp = 15; |
||||
|
||||
// custom_values is an additional field used by non-exponential bucketing layouts. |
||||
// |
||||
// For custom buckets (-53 schema value) custom_values specify monotonically |
||||
// increasing upper inclusive boundaries for the bucket counts with arbitrary |
||||
// widths for this histogram. In other words, custom_values represents custom, |
||||
// explicit bucketing that could have been converted from the classic histograms. |
||||
// |
||||
// Those bounds are then referenced by spans in positive_spans with corresponding positive |
||||
// counts of deltas (refer to positive_spans for more details). This way we can |
||||
// have encode sparse histograms with custom bucketing (many buckets are often |
||||
// not used). |
||||
// |
||||
// Note that for custom bounds, even negative observations are placed in the positive |
||||
// counts to simplify the implementation and avoid ambiguity of where to place |
||||
// an underflow bucket, e.g. (-2, 1]. Therefore negative buckets and |
||||
// the zero bucket are unused, if the schema indicates custom bucketing. |
||||
// |
||||
// For each upper boundary the previous boundary represent the lower exclusive |
||||
// boundary for that bucket. The first element is the upper inclusive boundary |
||||
// for the first bucket, which implicitly has a lower inclusive bound of -Inf. |
||||
// This is similar to "le" label semantics on classic histograms. You may add a |
||||
// bucket with an upper bound of 0 to make sure that you really have no negative |
||||
// observations, but in practice, native histogram rendering will show both with |
||||
// or without first upper boundary 0 and no negative counts as the same case. |
||||
// |
||||
// The last element is not only the upper inclusive bound of the last regular |
||||
// bucket, but implicitly the lower exclusive bound of the +Inf bucket. |
||||
repeated double custom_values = 16; |
||||
} |
||||
|
||||
// A BucketSpan defines a number of consecutive buckets with their |
||||
// offset. Logically, it would be more straightforward to include the |
||||
// bucket counts in the Span. However, the protobuf representation is |
||||
// more compact in the way the data is structured here (with all the |
||||
// buckets in a single array separate from the Spans). |
||||
message BucketSpan { |
||||
sint32 offset = 1; // Gap to previous span, or starting point for 1st span (which can be negative). |
||||
uint32 length = 2; // Length of consecutive buckets. |
||||
} |
||||
@ -0,0 +1,97 @@
|
||||
// Copyright 2024 Prometheus Team
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
package writev2 |
||||
|
||||
import ( |
||||
"testing" |
||||
"time" |
||||
|
||||
"github.com/gogo/protobuf/proto" |
||||
"github.com/stretchr/testify/require" |
||||
|
||||
"github.com/prometheus/prometheus/prompb" |
||||
) |
||||
|
||||
func TestInteropV2UnmarshalWithV1_DeterministicEmpty(t *testing.T) { |
||||
expectedV1Empty := &prompb.WriteRequest{} |
||||
for _, tc := range []struct{ incoming *Request }{ |
||||
{ |
||||
incoming: &Request{}, // Technically wrong, should be at least empty string in symbol.
|
||||
}, |
||||
{ |
||||
incoming: &Request{ |
||||
Symbols: []string{""}, |
||||
}, // NOTE: Without reserved fields, failed with "corrupted" ghost TimeSeries element.
|
||||
}, |
||||
{ |
||||
incoming: &Request{ |
||||
Symbols: []string{"", "__name__", "metric1"}, |
||||
Timeseries: []TimeSeries{ |
||||
{LabelsRefs: []uint32{1, 2}}, |
||||
{Samples: []Sample{{Value: 21.4, Timestamp: time.Now().UnixMilli()}}}, |
||||
}, // NOTE: Without reserved fields, proto: illegal wireType 7
|
||||
}, |
||||
}, |
||||
} { |
||||
t.Run("", func(t *testing.T) { |
||||
in, err := proto.Marshal(tc.incoming) |
||||
require.NoError(t, err) |
||||
|
||||
// Test accidental unmarshal of v2 payload with v1 proto.
|
||||
out := &prompb.WriteRequest{} |
||||
require.NoError(t, proto.Unmarshal(in, out)) |
||||
|
||||
// Drop unknowns, we expect them when incoming payload had some fields.
|
||||
// This field & method will be likely gone after gogo removal.
|
||||
out.XXX_unrecognized = nil // NOTE: out.XXX_DiscardUnknown() does not work with nullables.
|
||||
|
||||
require.Equal(t, expectedV1Empty, out) |
||||
}) |
||||
} |
||||
} |
||||
|
||||
func TestInteropV1UnmarshalWithV2_DeterministicEmpty(t *testing.T) { |
||||
expectedV2Empty := &Request{} |
||||
for _, tc := range []struct{ incoming *prompb.WriteRequest }{ |
||||
{ |
||||
incoming: &prompb.WriteRequest{}, |
||||
}, |
||||
{ |
||||
incoming: &prompb.WriteRequest{ |
||||
Timeseries: []prompb.TimeSeries{ |
||||
{ |
||||
Labels: []prompb.Label{{Name: "__name__", Value: "metric1"}}, |
||||
Samples: []prompb.Sample{{Value: 21.4, Timestamp: time.Now().UnixMilli()}}, |
||||
}, |
||||
}, |
||||
}, |
||||
// NOTE: Without reserved fields, results in corrupted v2.Request.Symbols.
|
||||
}, |
||||
} { |
||||
t.Run("", func(t *testing.T) { |
||||
in, err := proto.Marshal(tc.incoming) |
||||
require.NoError(t, err) |
||||
|
||||
// Test accidental unmarshal of v1 payload with v2 proto.
|
||||
out := &Request{} |
||||
require.NoError(t, proto.Unmarshal(in, out)) |
||||
|
||||
// Drop unknowns, we expect them when incoming payload had some fields.
|
||||
// This field & method will be likely gone after gogo removal.
|
||||
out.XXX_unrecognized = nil // NOTE: out.XXX_DiscardUnknown() does not work with nullables.
|
||||
|
||||
require.Equal(t, expectedV2Empty, out) |
||||
}) |
||||
} |
||||
} |
||||
@ -0,0 +1,282 @@
|
||||
// Copyright 2024 Prometheus Team
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
package rwcommon |
||||
|
||||
import ( |
||||
"testing" |
||||
|
||||
"github.com/prometheus/common/model" |
||||
"github.com/stretchr/testify/require" |
||||
|
||||
"github.com/prometheus/prometheus/model/histogram" |
||||
"github.com/prometheus/prometheus/model/labels" |
||||
"github.com/prometheus/prometheus/model/metadata" |
||||
"github.com/prometheus/prometheus/prompb" |
||||
writev2 "github.com/prometheus/prometheus/prompb/io/prometheus/write/v2" |
||||
) |
||||
|
||||
func TestToLabels(t *testing.T) { |
||||
expected := labels.FromStrings("__name__", "metric1", "foo", "bar") |
||||
|
||||
t.Run("v1", func(t *testing.T) { |
||||
ts := prompb.TimeSeries{Labels: []prompb.Label{{Name: "__name__", Value: "metric1"}, {Name: "foo", Value: "bar"}}} |
||||
b := labels.NewScratchBuilder(2) |
||||
require.Equal(t, expected, ts.ToLabels(&b, nil)) |
||||
require.Equal(t, ts.Labels, prompb.FromLabels(expected, nil)) |
||||
require.Equal(t, ts.Labels, prompb.FromLabels(expected, ts.Labels)) |
||||
}) |
||||
t.Run("v2", func(t *testing.T) { |
||||
v2Symbols := []string{"", "__name__", "metric1", "foo", "bar"} |
||||
ts := writev2.TimeSeries{LabelsRefs: []uint32{1, 2, 3, 4}} |
||||
b := labels.NewScratchBuilder(2) |
||||
require.Equal(t, expected, ts.ToLabels(&b, v2Symbols)) |
||||
// No need for FromLabels in our prod code as we use symbol table to do so.
|
||||
}) |
||||
} |
||||
|
||||
func TestFromMetadataType(t *testing.T) { |
||||
for _, tc := range []struct { |
||||
desc string |
||||
input model.MetricType |
||||
expectedV1 prompb.MetricMetadata_MetricType |
||||
expectedV2 writev2.Metadata_MetricType |
||||
}{ |
||||
{ |
||||
desc: "with a single-word metric", |
||||
input: model.MetricTypeCounter, |
||||
expectedV1: prompb.MetricMetadata_COUNTER, |
||||
expectedV2: writev2.Metadata_METRIC_TYPE_COUNTER, |
||||
}, |
||||
{ |
||||
desc: "with a two-word metric", |
||||
input: model.MetricTypeStateset, |
||||
expectedV1: prompb.MetricMetadata_STATESET, |
||||
expectedV2: writev2.Metadata_METRIC_TYPE_STATESET, |
||||
}, |
||||
{ |
||||
desc: "with an unknown metric", |
||||
input: "not-known", |
||||
expectedV1: prompb.MetricMetadata_UNKNOWN, |
||||
expectedV2: writev2.Metadata_METRIC_TYPE_UNSPECIFIED, |
||||
}, |
||||
} { |
||||
t.Run(tc.desc, func(t *testing.T) { |
||||
t.Run("v1", func(t *testing.T) { |
||||
require.Equal(t, tc.expectedV1, prompb.FromMetadataType(tc.input)) |
||||
}) |
||||
t.Run("v2", func(t *testing.T) { |
||||
require.Equal(t, tc.expectedV2, writev2.FromMetadataType(tc.input)) |
||||
}) |
||||
}) |
||||
} |
||||
} |
||||
|
||||
func TestToMetadata(t *testing.T) { |
||||
sym := writev2.NewSymbolTable() |
||||
|
||||
for _, tc := range []struct { |
||||
input writev2.Metadata |
||||
expected metadata.Metadata |
||||
}{ |
||||
{ |
||||
input: writev2.Metadata{}, |
||||
expected: metadata.Metadata{ |
||||
Type: model.MetricTypeUnknown, |
||||
}, |
||||
}, |
||||
{ |
||||
input: writev2.Metadata{ |
||||
Type: 12414, // Unknown.
|
||||
}, |
||||
expected: metadata.Metadata{ |
||||
Type: model.MetricTypeUnknown, |
||||
}, |
||||
}, |
||||
{ |
||||
input: writev2.Metadata{ |
||||
Type: writev2.Metadata_METRIC_TYPE_COUNTER, |
||||
HelpRef: sym.Symbolize("help1"), |
||||
UnitRef: sym.Symbolize("unit1"), |
||||
}, |
||||
expected: metadata.Metadata{ |
||||
Type: model.MetricTypeCounter, |
||||
Help: "help1", |
||||
Unit: "unit1", |
||||
}, |
||||
}, |
||||
{ |
||||
input: writev2.Metadata{ |
||||
Type: writev2.Metadata_METRIC_TYPE_STATESET, |
||||
HelpRef: sym.Symbolize("help2"), |
||||
}, |
||||
expected: metadata.Metadata{ |
||||
Type: model.MetricTypeStateset, |
||||
Help: "help2", |
||||
}, |
||||
}, |
||||
} { |
||||
t.Run("", func(t *testing.T) { |
||||
ts := writev2.TimeSeries{Metadata: tc.input} |
||||
require.Equal(t, tc.expected, ts.ToMetadata(sym.Symbols())) |
||||
}) |
||||
} |
||||
} |
||||
|
||||
func TestToHistogram_Empty(t *testing.T) { |
||||
t.Run("v1", func(t *testing.T) { |
||||
require.NotNilf(t, prompb.Histogram{}.ToIntHistogram(), "") |
||||
require.NotNilf(t, prompb.Histogram{}.ToFloatHistogram(), "") |
||||
}) |
||||
t.Run("v2", func(t *testing.T) { |
||||
require.NotNilf(t, writev2.Histogram{}.ToIntHistogram(), "") |
||||
require.NotNilf(t, writev2.Histogram{}.ToFloatHistogram(), "") |
||||
}) |
||||
} |
||||
|
||||
func testIntHistogram() histogram.Histogram { |
||||
return histogram.Histogram{ |
||||
CounterResetHint: histogram.GaugeType, |
||||
Schema: 0, |
||||
Count: 19, |
||||
Sum: 2.7, |
||||
ZeroThreshold: 1e-128, |
||||
PositiveSpans: []histogram.Span{ |
||||
{Offset: 0, Length: 4}, |
||||
{Offset: 0, Length: 0}, |
||||
{Offset: 0, Length: 3}, |
||||
}, |
||||
PositiveBuckets: []int64{1, 2, -2, 1, -1, 0, 0}, |
||||
NegativeSpans: []histogram.Span{ |
||||
{Offset: 0, Length: 5}, |
||||
{Offset: 1, Length: 0}, |
||||
{Offset: 0, Length: 1}, |
||||
}, |
||||
NegativeBuckets: []int64{1, 2, -2, 1, -1, 0}, |
||||
} |
||||
} |
||||
|
||||
func testFloatHistogram() histogram.FloatHistogram { |
||||
return histogram.FloatHistogram{ |
||||
CounterResetHint: histogram.GaugeType, |
||||
Schema: 0, |
||||
Count: 19, |
||||
Sum: 2.7, |
||||
ZeroThreshold: 1e-128, |
||||
PositiveSpans: []histogram.Span{ |
||||
{Offset: 0, Length: 4}, |
||||
{Offset: 0, Length: 0}, |
||||
{Offset: 0, Length: 3}, |
||||
}, |
||||
PositiveBuckets: []float64{1, 3, 1, 2, 1, 1, 1}, |
||||
NegativeSpans: []histogram.Span{ |
||||
{Offset: 0, Length: 5}, |
||||
{Offset: 1, Length: 0}, |
||||
{Offset: 0, Length: 1}, |
||||
}, |
||||
NegativeBuckets: []float64{1, 3, 1, 2, 1, 1}, |
||||
} |
||||
} |
||||
|
||||
func TestFromIntToFloatOrIntHistogram(t *testing.T) { |
||||
testIntHist := testIntHistogram() |
||||
testFloatHist := testFloatHistogram() |
||||
|
||||
t.Run("v1", func(t *testing.T) { |
||||
h := prompb.FromIntHistogram(123, testIntHist.Copy()) |
||||
require.False(t, h.IsFloatHistogram()) |
||||
require.Equal(t, int64(123), h.Timestamp) |
||||
require.Equal(t, testIntHist, *h.ToIntHistogram()) |
||||
require.Equal(t, testFloatHist, *h.ToFloatHistogram()) |
||||
}) |
||||
t.Run("v2", func(t *testing.T) { |
||||
h := writev2.FromIntHistogram(123, testIntHist.Copy()) |
||||
require.False(t, h.IsFloatHistogram()) |
||||
require.Equal(t, int64(123), h.Timestamp) |
||||
require.Equal(t, testIntHist, *h.ToIntHistogram()) |
||||
require.Equal(t, testFloatHist, *h.ToFloatHistogram()) |
||||
}) |
||||
} |
||||
|
||||
func TestFromFloatToFloatHistogram(t *testing.T) { |
||||
testFloatHist := testFloatHistogram() |
||||
|
||||
t.Run("v1", func(t *testing.T) { |
||||
h := prompb.FromFloatHistogram(123, testFloatHist.Copy()) |
||||
require.True(t, h.IsFloatHistogram()) |
||||
require.Equal(t, int64(123), h.Timestamp) |
||||
require.Nil(t, h.ToIntHistogram()) |
||||
require.Equal(t, testFloatHist, *h.ToFloatHistogram()) |
||||
}) |
||||
t.Run("v2", func(t *testing.T) { |
||||
h := writev2.FromFloatHistogram(123, testFloatHist.Copy()) |
||||
require.True(t, h.IsFloatHistogram()) |
||||
require.Equal(t, int64(123), h.Timestamp) |
||||
require.Nil(t, h.ToIntHistogram()) |
||||
require.Equal(t, testFloatHist, *h.ToFloatHistogram()) |
||||
}) |
||||
} |
||||
|
||||
func TestFromIntOrFloatHistogram_ResetHint(t *testing.T) { |
||||
for _, tc := range []struct { |
||||
input histogram.CounterResetHint |
||||
expectedV1 prompb.Histogram_ResetHint |
||||
expectedV2 writev2.Histogram_ResetHint |
||||
}{ |
||||
{ |
||||
input: histogram.UnknownCounterReset, |
||||
expectedV1: prompb.Histogram_UNKNOWN, |
||||
expectedV2: writev2.Histogram_RESET_HINT_UNSPECIFIED, |
||||
}, |
||||
{ |
||||
input: histogram.CounterReset, |
||||
expectedV1: prompb.Histogram_YES, |
||||
expectedV2: writev2.Histogram_RESET_HINT_YES, |
||||
}, |
||||
{ |
||||
input: histogram.NotCounterReset, |
||||
expectedV1: prompb.Histogram_NO, |
||||
expectedV2: writev2.Histogram_RESET_HINT_NO, |
||||
}, |
||||
{ |
||||
input: histogram.GaugeType, |
||||
expectedV1: prompb.Histogram_GAUGE, |
||||
expectedV2: writev2.Histogram_RESET_HINT_GAUGE, |
||||
}, |
||||
} { |
||||
t.Run("", func(t *testing.T) { |
||||
t.Run("v1", func(t *testing.T) { |
||||
h := testIntHistogram() |
||||
h.CounterResetHint = tc.input |
||||
got := prompb.FromIntHistogram(1337, &h) |
||||
require.Equal(t, tc.expectedV1, got.GetResetHint()) |
||||
|
||||
fh := testFloatHistogram() |
||||
fh.CounterResetHint = tc.input |
||||
got2 := prompb.FromFloatHistogram(1337, &fh) |
||||
require.Equal(t, tc.expectedV1, got2.GetResetHint()) |
||||
}) |
||||
t.Run("v2", func(t *testing.T) { |
||||
h := testIntHistogram() |
||||
h.CounterResetHint = tc.input |
||||
got := writev2.FromIntHistogram(1337, &h) |
||||
require.Equal(t, tc.expectedV2, got.GetResetHint()) |
||||
|
||||
fh := testFloatHistogram() |
||||
fh.CounterResetHint = tc.input |
||||
got2 := writev2.FromFloatHistogram(1337, &fh) |
||||
require.Equal(t, tc.expectedV2, got2.GetResetHint()) |
||||
}) |
||||
}) |
||||
} |
||||
} |
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in new issue