Commit Graph

1695 Commits

Author SHA1 Message Date
SuperQ 680d8edf61
Switch testutil to go-cmp
Remove a dependency by using go-cmp for `testutil.CollectAndCompare()`.
Note that the string output of `cmp.Diff()` is non-stable, so users
depending on stable `error` strings will nolonger work.

Signed-off-by: SuperQ <superq@gmail.com>
2024-06-19 22:55:50 +02:00
Ben Kochie 33697e636a
Cleanup NOTICE file (#1541)
The `github.com/matttproud/golang_protobuf_extensions` dependency was
removed in favor of upstream protobuf functions.

Signed-off-by: SuperQ <superq@gmail.com>
2024-06-19 21:05:49 +02:00
Arthur Silva Sens 7fe5d467da
Merge pull request #1531 from prometheus/repo_sync
Synchronize common files from prometheus/prometheus
2024-06-13 14:39:36 -03:00
Ben Kochie e06ccdbbab
Merge pull request #1529 from prometheus/dependabot/go_modules/tutorial/whatsup/github.com/prometheus/client_golang-1.19.1
build(deps): bump github.com/prometheus/client_golang from 1.19.0 to 1.19.1 in /tutorial/whatsup
2024-06-11 10:57:30 +02:00
Arthur Silva Sens b59c63b3f3
Merge pull request #1536 from prometheus/superq/lint_timeout
Fix golangci-lint config
2024-06-10 20:40:52 -03:00
SuperQ 60983224b9
Fix golangci-lint config
The deadline config key is now called timeout.

Signed-off-by: SuperQ <superq@gmail.com>
2024-06-10 10:49:42 +02:00
Manuel Rüger f08b10c5bc
feat: Support zstd compression (#1496)
* feat: Support zstd encoding

This allows endpoints to respond with zstd compressed metric data, if
the requester supports it.

I have imported a content-encoding parser from
https://github.com/golang/gddo which is an archived repository to
support different content-encoding headers.

Signed-off-by: Manuel Rüger <manuel@rueg.eu>

* Update prometheus/promhttp/http.go

Co-authored-by: Bartlomiej Plotka <bwplotka@gmail.com>
Signed-off-by: Manuel Rüger <manuel@rueg.eu>

* Update prometheus/promhttp/http.go

Co-authored-by: Bartlomiej Plotka <bwplotka@gmail.com>
Signed-off-by: Manuel Rüger <manuel@rueg.eu>

* Update prometheus/promhttp/http.go

Co-authored-by: Bartlomiej Plotka <bwplotka@gmail.com>
Signed-off-by: Manuel Rüger <manuel@rueg.eu>

* Integrate review comments

* String typed enum

Signed-off-by: Manuel Rüger <manuel@rueg.eu>

* Test with gzip compression

Signed-off-by: Manuel Rüger <manuel@rueg.eu>

* Update prometheus/promhttp/http.go

Co-authored-by: Bartlomiej Plotka <bwplotka@gmail.com>
Signed-off-by: Manuel Rüger <manuel@rueg.eu>

* Reorder error handling

Signed-off-by: Manuel Rüger <manuel@rueg.eu>

* Apply suggestions from code review

Co-authored-by: Bartlomiej Plotka <bwplotka@gmail.com>
Signed-off-by: Manuel Rüger <manuel@rueg.eu>

* Include review suggestions

Signed-off-by: Manuel Rüger <manuel@rueg.eu>

---------

Signed-off-by: Manuel Rüger <manuel@rueg.eu>
Co-authored-by: Bartlomiej Plotka <bwplotka@gmail.com>
2024-06-07 15:56:19 +01:00
Arthur Silva Sens 920e6f73cc
Merge pull request #1532 from SachinSahu431/sachin/fix-changelog-automation
Remove synchronize trigger from changelog workflow
2024-06-06 11:24:34 -03:00
Sachin Sahu e6da43aaeb Remove synchronize trigger from workflow
Signed-off-by: Sachin Sahu <sachinksahu.431@gmail.com>
2024-06-06 19:46:36 +05:30
prombot 9ab9603f69 Update common Prometheus files
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2024-06-05 17:47:58 +00:00
dependabot[bot] 9cd52e1e65
build(deps): bump github.com/prometheus/client_golang
Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.19.0 to 1.19.1.
- [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.19.0...v1.19.1)

---
updated-dependencies:
- dependency-name: github.com/prometheus/client_golang
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-06-05 11:25:01 +00:00
Ben Kochie 0751e19040
Merge pull request #1530 from prometheus/repo_sync
Synchronize common files from prometheus/prometheus
2024-06-05 13:23:41 +02:00
prombot f83013b219 Update common Prometheus files
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2024-06-03 17:47:46 +00:00
Arthur Silva Sens 8491260a42
Merge pull request #1526 from prometheus/changelog-automation
ci: Group all changelog-related CI jobs into single one
2024-06-03 10:44:29 -03:00
Arthur Silva Sens 57abe22c59
Merge pull request #1527 from prometheus/dependabot/go_modules/github.com/prometheus/procfs-0.15.1
build(deps): bump github.com/prometheus/procfs from 0.13.0 to 0.15.1
2024-06-03 10:26:19 -03:00
dependabot[bot] 3d0a11d34e
build(deps): bump github.com/prometheus/procfs from 0.13.0 to 0.15.1
Bumps [github.com/prometheus/procfs](https://github.com/prometheus/procfs) from 0.13.0 to 0.15.1.
- [Release notes](https://github.com/prometheus/procfs/releases)
- [Commits](https://github.com/prometheus/procfs/compare/v0.13.0...v0.15.1)

---
updated-dependencies:
- dependency-name: github.com/prometheus/procfs
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-06-01 09:14:25 +00:00
Arthur Silva Sens 0f23008245
ci: Group all changelog-related CI jobs into single one
Signed-off-by: Arthur Silva Sens <arthursens2005@gmail.com>
2024-05-31 11:11:36 -03:00
Arthur Silva Sens 4b158abea9
Merge pull request #1525 from SachinSahu431/sachin/update-pr-labeler
Fix: Auto label PRs #1518
2024-05-31 10:50:59 -03:00
Sachin Sahu 3ac5b77351 Remove redundant labels
Signed-off-by: Sachin Sahu <sachinksahu.431@gmail.com>
2024-05-31 19:07:10 +05:30
Sachin Sahu 105a3b72ab
Auto label PRs (#1518)
chore: Automatically add labels to PRs, based on description

Co-authored-by: Arthur Silva Sens <arthursens2005@gmail.com>
Signed-off-by: Sachin Sahu <75629410+SachinSahu431@users.noreply.github.com>

---------

Signed-off-by: Sachin Sahu <75629410+SachinSahu431@users.noreply.github.com>
Signed-off-by: Sachin Sahu <sachinksahu.431@gmail.com>
Signed-off-by: Kemal Akkoyun <kakkoyun@users.noreply.github.com>
Co-authored-by: Kemal Akkoyun <kakkoyun@users.noreply.github.com>
Co-authored-by: Arthur Silva Sens <arthursens2005@gmail.com>
2024-05-30 13:50:06 +00:00
Sachin Sahu 2f36f98197
Add PR template for changelog automation (#1517)
* Update CONTRIBUTING.md and PR template

Signed-off-by: Sachin Sahu <75629410+SachinSahu431@users.noreply.github.com>

* Add examples in PR template

Signed-off-by: Sachin Sahu <75629410+SachinSahu431@users.noreply.github.com>

* Add examples in CONTRIBUTING.md

Signed-off-by: Sachin Sahu <75629410+SachinSahu431@users.noreply.github.com>

---------

Signed-off-by: Sachin Sahu <75629410+SachinSahu431@users.noreply.github.com>
2024-05-30 15:37:22 +02:00
Arthur Silva Sens b9b2f62cca
Merge pull request #1524 from prometheus/repo_sync
Synchronize common files from prometheus/prometheus
2024-05-28 17:32:03 -03:00
prombot 9d0a248720 Update common Prometheus files
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2024-05-28 17:47:42 +00:00
github-actions[bot] c2d0cafdb3
Merge pull request #1522 from prometheus/dependabot/go_modules/google.golang.org/protobuf-1.34.1
build(deps): bump google.golang.org/protobuf from 1.34.0 to 1.34.1
2024-05-28 05:32:29 +00:00
dependabot[bot] 4816adea5d
build(deps): bump google.golang.org/protobuf from 1.34.0 to 1.34.1
Bumps google.golang.org/protobuf from 1.34.0 to 1.34.1.

---
updated-dependencies:
- dependency-name: google.golang.org/protobuf
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-05-28 05:28:52 +00:00
github-actions[bot] be1242883e
Merge pull request #1523 from prometheus/dependabot/go_modules/golang.org/x/sys-0.20.0
build(deps): bump golang.org/x/sys from 0.19.0 to 0.20.0
2024-05-28 05:28:13 +00:00
dependabot[bot] ce40ef5d28
build(deps): bump golang.org/x/sys from 0.19.0 to 0.20.0
Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.19.0 to 0.20.0.
- [Commits](https://github.com/golang/sys/compare/v0.19.0...v0.20.0)

---
updated-dependencies:
- dependency-name: golang.org/x/sys
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-05-28 05:24:40 +00:00
PrometheusBot 18b51345cd
Update common Prometheus files (#1514)
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2024-05-16 12:03:10 +01:00
Björn Rabenstein 542f7e6c6e
Merge pull request #1471 from fatsheep9146/native-histogram-exemplar
add native histogram exemplar support
2024-05-16 12:22:21 +02:00
Ziqi Zhao 2754a4c204 fix for comments
Signed-off-by: Ziqi Zhao <zhaoziqi9146@gmail.com>
2024-05-16 18:16:36 +08:00
Arthur Silva Sens cb57abb57d
Merge pull request #1515 from lilijreey/use_time_IsZero
improved code more clean use time.IsZero() replace t = time.Time{}
2024-05-15 11:17:22 -03:00
chuanshuo 47b807e0d7 clean code use time.IsZero() replace t = time.Time{}, make code more readable
Signed-off-by: chuanshuo <lilijreey@126.com>
2024-05-15 22:05:50 +08:00
leonnicolas c7c7509669
testutil compareMetricFamilies: make less error-prone (#1424)
* testutil compareMetricFamilies: make less error-prone

The functions `GatherAndCompare`, `ScrapeAndCompare` and others that use
`compareMetricFamilies` under the hood can return no error if
`metricNames` includes none of the names found in the scraped/gathered
results. To avoid false Positves (an error being the negative case), we
can return an error if there is is at least one name in `metricNames`
that is not in the filtered results.

Fixes: https://github.com/prometheus/client_golang/issues/1351

Signed-off-by: leonnicolas <leonloechner@gmx.de>

* Add missing metricNames to error

In to see which metric names are missing, we can add them to the error
message.

Signed-off-by: leonnicolas <leonloechner@gmx.de>

* Apply suggestions from code review

- remove if nil check
- use two nested loops instead of map
- use new function `hasMetricByName` for readability

Co-authored-by: Bartlomiej Plotka <bwplotka@gmail.com>
Signed-off-by: leonnicolas <60091705+leonnicolas@users.noreply.github.com>

* prometheus/testutil/testutil_test.go: compare complete error

Before we would only compare the error prefix in `TestScrapeAndCompare`.

Signed-off-by: leonnicolas <leonloechner@gmx.de>

---------

Signed-off-by: leonnicolas <leonloechner@gmx.de>
Signed-off-by: leonnicolas <60091705+leonnicolas@users.noreply.github.com>
Co-authored-by: Bartlomiej Plotka <bwplotka@gmail.com>
2024-05-15 10:50:24 +01:00
Jack Cassidy 36b9f46811
add: CollectAndFormat to testutil (#1503)
CollectAndFormat is a helper function that returns the formatted metrics
to the caller, allowing them to use it how they want. This is different
to CollectAndCompare where the comparison is done strictly on behalf of
the caller. Often it is more convenient to perform a simple substring
match on the formatted metric.

Signed-off-by: Jack Cassidy <j.cassidy45@gmail.com>
2024-05-09 15:08:21 +00:00
Ziqi Zhao d8c7074b1c refract the implementation
Signed-off-by: Ziqi Zhao <zhaoziqi9146@gmail.com>
2024-05-09 22:11:15 +08:00
Ishani Goyal 7d3be80a44
[CI]: Add Concurrency Grouping to GitHub Workflows (#1444)
* Update automerge-dependabot.yml

Signed-off-by: Ishani Goyal <111218213+Ishani217@users.noreply.github.com>

* Update codeql-analysis.yml

Signed-off-by: Ishani Goyal <111218213+Ishani217@users.noreply.github.com>

* Update go.yml

Signed-off-by: Ishani Goyal <111218213+Ishani217@users.noreply.github.com>

* Update golangci-lint.yml

Signed-off-by: Ishani Goyal <111218213+Ishani217@users.noreply.github.com>

---------

Signed-off-by: Ishani Goyal <111218213+Ishani217@users.noreply.github.com>
2024-05-09 12:52:37 +01:00
dependabot[bot] 9308329e89
build(deps): bump the github-actions group with 3 updates (#1510)
Bumps the github-actions group with 3 updates: [dependabot/fetch-metadata](https://github.com/dependabot/fetch-metadata), [github/codeql-action](https://github.com/github/codeql-action) and [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action).


Updates `dependabot/fetch-metadata` from 1.6.0 to 2.1.0
- [Release notes](https://github.com/dependabot/fetch-metadata/releases)
- [Commits](c9c4182bf1...5e5f99653a)

Updates `github/codeql-action` from 3.24.6 to 3.25.3
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](8a470fddaf...d39d31e687)

Updates `golangci/golangci-lint-action` from 4.0.0 to 5.1.0
- [Release notes](https://github.com/golangci/golangci-lint-action/releases)
- [Commits](3cfe3a4abb...9d1e0624a7)

---
updated-dependencies:
- dependency-name: dependabot/fetch-metadata
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-actions
- dependency-name: golangci/golangci-lint-action
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-05-09 10:34:35 +01:00
chuanshuo ccf82b1854
improved code more clean (#1511)
* improved code more clean

Signed-off-by: chuanshuo <lilijreey@126.com>

* improved code more clean

Signed-off-by: chuanshuo <lilijreey@126.com>

---------

Signed-off-by: chuanshuo <lilijreey@126.com>
2024-05-09 10:34:07 +01:00
Ziqi Zhao 494ccce4f1 add native histogram exemplar support
Signed-off-by: Ziqi Zhao <zhaoziqi9146@gmail.com>
2024-05-09 07:14:46 +08:00
github-actions[bot] 853c5de11e
Merge pull request #1509 from prometheus/dependabot/go_modules/tutorial/whatsup/github.com/prometheus/common-0.53.0
build(deps): bump github.com/prometheus/common from 0.48.0 to 0.53.0 in /tutorial/whatsup
2024-05-01 09:29:50 +00:00
github-actions[bot] 5c4ff38328
Merge pull request #1508 from prometheus/dependabot/go_modules/github.com/prometheus/client_model-0.6.1
build(deps): bump github.com/prometheus/client_model from 0.6.0 to 0.6.1
2024-05-01 09:26:56 +00:00
github-actions[bot] 6b169a1d46
Merge pull request #1507 from prometheus/dependabot/go_modules/golang.org/x/sys-0.19.0
build(deps): bump golang.org/x/sys from 0.18.0 to 0.19.0
2024-05-01 09:26:41 +00:00
dependabot[bot] 0075cb38ea
build(deps): bump github.com/prometheus/common in /tutorial/whatsup
Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.48.0 to 0.53.0.
- [Release notes](https://github.com/prometheus/common/releases)
- [Commits](https://github.com/prometheus/common/compare/v0.48.0...v0.53.0)

---
updated-dependencies:
- dependency-name: github.com/prometheus/common
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-05-01 09:26:15 +00:00
dependabot[bot] c4b6d5dbc9
build(deps): bump github.com/prometheus/client_model from 0.6.0 to 0.6.1
Bumps [github.com/prometheus/client_model](https://github.com/prometheus/client_model) from 0.6.0 to 0.6.1.
- [Release notes](https://github.com/prometheus/client_model/releases)
- [Commits](https://github.com/prometheus/client_model/compare/v0.6.0...v0.6.1)

---
updated-dependencies:
- dependency-name: github.com/prometheus/client_model
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-05-01 09:23:22 +00:00
dependabot[bot] 9e8b6413bd
build(deps): bump golang.org/x/sys from 0.18.0 to 0.19.0
Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.18.0 to 0.19.0.
- [Commits](https://github.com/golang/sys/compare/v0.18.0...v0.19.0)

---
updated-dependencies:
- dependency-name: golang.org/x/sys
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-05-01 09:23:20 +00:00
github-actions[bot] 4e21273af7
Merge pull request #1506 from prometheus/dependabot/go_modules/google.golang.org/protobuf-1.34.0
build(deps): bump google.golang.org/protobuf from 1.33.0 to 1.34.0
2024-05-01 09:22:45 +00:00
github-actions[bot] 5ad7da9260
Merge pull request #1505 from prometheus/dependabot/go_modules/github.com/cespare/xxhash/v2-2.3.0
build(deps): bump github.com/cespare/xxhash/v2 from 2.2.0 to 2.3.0
2024-05-01 09:22:38 +00:00
github-actions[bot] 3ade2e28b8
Merge pull request #1504 from prometheus/dependabot/go_modules/github.com/prometheus/common-0.53.0
build(deps): bump github.com/prometheus/common from 0.52.3 to 0.53.0
2024-05-01 09:22:29 +00:00
dependabot[bot] 2cb5120488
build(deps): bump google.golang.org/protobuf from 1.33.0 to 1.34.0
Bumps google.golang.org/protobuf from 1.33.0 to 1.34.0.

---
updated-dependencies:
- dependency-name: google.golang.org/protobuf
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-05-01 09:18:59 +00:00
dependabot[bot] 772f2a3426
build(deps): bump github.com/cespare/xxhash/v2 from 2.2.0 to 2.3.0
Bumps [github.com/cespare/xxhash/v2](https://github.com/cespare/xxhash) from 2.2.0 to 2.3.0.
- [Commits](https://github.com/cespare/xxhash/compare/v2.2.0...v2.3.0)

---
updated-dependencies:
- dependency-name: github.com/cespare/xxhash/v2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-05-01 09:18:58 +00:00