Skip to content

Bring the fork up to date. #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
tommyzli merged 41 commits into from
Mar 13, 2025
Merged

Bring the fork up to date. #4

tommyzli merged 41 commits into from
Mar 13, 2025

Conversation

@Garbett1
Copy link

@Garbett1 Garbett1 commented Mar 13, 2025

Been a fair amount of change in upstream, we should align.

sysedwinistrator and others added 30 commits August 30, 2024 15:06
@sysedwinistrator
Sanitize metric type prefixes (#319)
098cde0 
* Sanitize metric type prefixes

When more than one prefix matches the same metric descriptor, this will
throw the error "collected metric xxx was collected before with the
same name and label values".

For example, using the metric type prefixes
  foo.googleapis.com/bar (a prefix)
and
  foo.googleapis.com/bar/baz (a metric)
will result in an error because both match the metric
  foo.googleapis.com/bar/baz.

Further, using the metric type prefixes
  foo.googleapis.com/bar/baz (a metric)
and
  foo.googleapis.com/bar/baz_count (a metric)
will result in an error because both match the metric
  foo.googleapis.com/bar/baz_count.

While the first pitfall could be expected by the user, the latter will
come as a complete surprise to anyone who is not aware that
stackdriver-exporter internally uses an MQL query in the form of
  metric.type = starts_with("<prefix>")
to filter the metrics.

Avoid this by sanitizing the provided metric type prefixes in the
following way:
- Drop any duplicate prefixes
- Sort the prefixes (required by the next step)
- Drop any prefixes that start with another prefix present in the input

Signed-off-by: Edwin Mackenzie-Owen <[email protected]>

* Remove condition that will never be true

In alphanumerically sorted list of strings,
abcdef
will never come before
abc.

Signed-off-by: Edwin Mackenzie-Owen <[email protected]>

* Add test for metrics prefix sanitization

Signed-off-by: Edwin Mackenzie-Owen <[email protected]>

* Use slices.Compact() for initial deduplication

Signed-off-by: Edwin Mackenzie-Owen <[email protected]>

* Improve comments

Signed-off-by: Edwin Mackenzie-Owen <[email protected]>

* Always initialize return slice

Signed-off-by: Edwin Mackenzie-Owen <[email protected]>

* Improve if condition

Signed-off-by: Edwin Mackenzie-Owen <[email protected]>

---------

Signed-off-by: Edwin Mackenzie-Owen <[email protected]>
@stuart23
Update example in README.md (#358)
47f0744 
Running the example results in `stackdriver_exporter: error: flag 'monitoring.metrics-type-prefixes' cannot be repeated, try --help
`

Signed-off-by: Stuart Buckingham <[email protected]>
@prombot
Update common Prometheus files (#357)
a3a59f8 
Signed-off-by: prombot <[email protected]>
@dependabot
Bump github.com/onsi/gomega from 1.33.1 to 1.34.1 (#353)
6df0c9e 
Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.33.1 to 1.34.1.
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](onsi/gomega@v1.33.1...v1.34.1)

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

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump google.golang.org/api from 0.188.0 to 0.189.0 (#354)
a3570d6 
Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.188.0 to 0.189.0.
- [Release notes](https://github.com/googleapis/google-api-go-client/releases)
- [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md)
- [Commits](googleapis/google-api-go-client@v0.188.0...v0.189.0)

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

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@prombot
Update common Prometheus files (#363)
25498e6 
Signed-off-by: prombot <[email protected]>
@dependabot
Bump github.com/prometheus/client_golang from 1.19.1 to 1.20.2 (#368)
bae9112 
Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.19.1 to 1.20.2.
- [Release notes](https://github.com/prometheus/client_golang/releases)
- [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md)
- [Commits](prometheus/client_golang@v1.19.1...v1.20.2)

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

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump google.golang.org/api from 0.189.0 to 0.195.0 (#365)
9ce0b8a 
Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.189.0 to 0.195.0.
- [Release notes](https://github.com/googleapis/google-api-go-client/releases)
- [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md)
- [Commits](googleapis/google-api-go-client@v0.189.0...v0.195.0)

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

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@TylerLubeck
Add project ID to all logs from the collector (#362)
d8b48ad 
When exporting metrics from multiple projects at once, it's useful to
know which of the projects is generating metrics errors.

Signed-off-by: Tyler Lubeck <[email protected]>
@dependabot
Bump github.com/prometheus/common from 0.55.0 to 0.58.0 (#369)
05bcf94 
Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.55.0 to 0.58.0.
- [Release notes](https://github.com/prometheus/common/releases)
- [Changelog](https://github.com/prometheus/common/blob/main/RELEASE.md)
- [Commits](prometheus/common@v0.55.0...v0.58.0)

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

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@prombot
Update common Prometheus files
25bf0a4 
Signed-off-by: prombot <[email protected]>
@kgeckhart
Merge pull request #370 from prometheus-community/repo_sync
185325b 
Synchronize common files from prometheus/prometheus
@dependabot
Bump github.com/prometheus/common from 0.58.0 to 0.59.1 (#372)
7be5c7d 
Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.58.0 to 0.59.1.
- [Release notes](https://github.com/prometheus/common/releases)
- [Changelog](https://github.com/prometheus/common/blob/main/RELEASE.md)
- [Commits](prometheus/common@v0.58.0...v0.59.1)

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

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump golang.org/x/net from 0.28.0 to 0.29.0 (#373)
3f130ff 
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.28.0 to 0.29.0.
- [Commits](golang/net@v0.28.0...v0.29.0)

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

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump google.golang.org/api from 0.195.0 to 0.199.0 (#375)
166886a 
Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.195.0 to 0.199.0.
- [Release notes](https://github.com/googleapis/google-api-go-client/releases)
- [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md)
- [Commits](googleapis/google-api-go-client@v0.195.0...v0.199.0)

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

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@tommyzli
Replace comma-delimited string flags with repeatable flags (#355)
157cf40 
* Replace comma-delimited string flags with repeatable flags

Signed-off-by: Tommy Li <[email protected]>

* preserve old flags but mark them as deprecated
Signed-off-by: Tommy Li <[email protected]>

---------

Signed-off-by: Tommy Li <[email protected]>
@tjhop
chore!: adopt log/slog, drop go-kit/log (#378)
04b47fd 
* build(deps): bump prometheus/{client_golang,common,exporter-toolkit}

Also bumps the minimum go version in go.mod to 1.22 to support log/slog,
for exporter-toolkit support.

Signed-off-by: TJ Hoplock <[email protected]>

* chore!: adopt log/slog, drop go-kit/log

The bulk of this PR was automated by the following script which is being
used to aid in converting the various exporters/projects to use slog:

https://gist.github.com/tjhop/49f96fb7ebbe55b12deee0b0312d8434

Other changes include:
- removing unneeded linter settings for go-kit/log
- enabling sloglint linter

Signed-off-by: TJ Hoplock <[email protected]>

---------

Signed-off-by: TJ Hoplock <[email protected]>
@prombot
Update common Prometheus files (#377)
bbf1334 
Signed-off-by: prombot <[email protected]>
@dependabot
Bump github.com/prometheus/common from 0.59.1 to 0.60.1 (#379)
c0954e0 
Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.59.1 to 0.60.1.
- [Release notes](https://github.com/prometheus/common/releases)
- [Changelog](https://github.com/prometheus/common/blob/main/RELEASE.md)
- [Commits](prometheus/common@v0.59.1...v0.60.1)

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

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump google.golang.org/api from 0.199.0 to 0.204.0 (#380)
a26582f 
Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.199.0 to 0.204.0.
- [Release notes](https://github.com/googleapis/google-api-go-client/releases)
- [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md)
- [Commits](googleapis/google-api-go-client@v0.199.0...v0.204.0)

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

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@SuperQ
Update Go build (#384)
a00ba04 
* Update Go to 1.23.

Signed-off-by: SuperQ <[email protected]>
@dependabot
Bump github.com/onsi/gomega from 1.34.1 to 1.35.1 (#383)
8159320 
Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.34.1 to 1.35.1.
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](onsi/gomega@v1.34.1...v1.35.1)

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

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump github.com/prometheus/exporter-toolkit from 0.11.0 to 0.13.1 (#381)
5cb3be0 
Bumps [github.com/prometheus/exporter-toolkit](https://github.com/prometheus/exporter-toolkit) from 0.11.0 to 0.13.1.
- [Release notes](https://github.com/prometheus/exporter-toolkit/releases)
- [Changelog](https://github.com/prometheus/exporter-toolkit/blob/master/CHANGELOG.md)
- [Commits](prometheus/exporter-toolkit@v0.11.0...v0.13.1)

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

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@kgeckhart @SuperQ
Release 0.17.0 (#376)
15981bb 
* Release 0.17.0

Signed-off-by: Kyle Eckhart <[email protected]>

---------

Signed-off-by: Kyle Eckhart <[email protected]>
Signed-off-by: Ben Kochie <[email protected]>
Co-authored-by: Ben Kochie <[email protected]>
@prombot
Update common Prometheus files (#385)
118a5f3 
Signed-off-by: prombot <[email protected]>
@prombot
Update common Prometheus files (#388)
5f55f7b 
Signed-off-by: prombot <[email protected]>
@antoinedeschenes
feat: support more specific prefixes in ?collect parameter (#387)
231987c 
Signed-off-by: Antoine Deschênes <[email protected]>
@ananya-mallik-ps
Fix monitoring metrics for individual collectors (#389)
6a15a74 
* fix monitoring metrics for individual collectors

Signed-off-by: Ananya Kumar Mallik <[email protected]>

* add collector cache TTL

Signed-off-by: Ananya Kumar Mallik <[email protected]>

* reuse

Signed-off-by: Ananya Kumar Mallik <[email protected]>

* Add collector cache test

Signed-off-by: Ananya Kumar Mallik <[email protected]>

* Fix caching logic and TTL for cache

Signed-off-by: Ananya Kumar Mallik <[email protected]>

---------

Signed-off-by: Ananya Kumar Mallik <[email protected]>
@prombot
Update common Prometheus files (#391)
eb90059 
Signed-off-by: prombot <[email protected]>
@dependabot
Bump github.com/prometheus/exporter-toolkit from 0.13.1 to 0.13.2 (#398)
2e14ad1 
Bumps [github.com/prometheus/exporter-toolkit](https://github.com/prometheus/exporter-toolkit) from 0.13.1 to 0.13.2.
- [Release notes](https://github.com/prometheus/exporter-toolkit/releases)
- [Changelog](https://github.com/prometheus/exporter-toolkit/blob/master/CHANGELOG.md)
- [Commits](prometheus/exporter-toolkit@v0.13.1...v0.13.2)

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

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot bot and others added 11 commits January 15, 2025 17:07
@dependabot
Bump golang.org/x/net from 0.32.0 to 0.34.0 (#402)
cf13524 
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.32.0 to 0.34.0.
- [Commits](golang/net@v0.32.0...v0.34.0)

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

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump google.golang.org/api from 0.204.0 to 0.217.0 (#403)
c171930 
Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.204.0 to 0.217.0.
- [Release notes](https://github.com/googleapis/google-api-go-client/releases)
- [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md)
- [Commits](googleapis/google-api-go-client@v0.204.0...v0.217.0)

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

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot @SuperQ
Bump github.com/onsi/gomega from 1.35.1 to 1.36.2 (#399)
a98e977 
* Bump github.com/onsi/gomega from 1.35.1 to 1.36.2

Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.35.1 to 1.36.2.
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](onsi/gomega@v1.35.1...v1.36.2)

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

Signed-off-by: dependabot[bot] <[email protected]>

* Run go mod tidy.

Signed-off-by: SuperQ <[email protected]>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: SuperQ <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: SuperQ <[email protected]>
@SuperQ
Fixup linter warning (#406)
22448b1 
Fixup warning:
> S1005: unnecessary assignment to the blank identifier (gosimple)

Signed-off-by: SuperQ <[email protected]>
@kgeckhart
Release 0.18.0 (#404)
b525506 
Signed-off-by: Kyle Eckhart <[email protected]>
@prombot
Update common Prometheus files (#407)
3b1a6e9 
Signed-off-by: prombot <[email protected]>
@prombot
Update common Prometheus files (#410)
6b359b1 
Signed-off-by: prombot <[email protected]>
@SuperQ
Cleanup golangci-lint config (#418)
deacb43 
Remove obsolete confiugrations.

Signed-off-by: SuperQ <[email protected]>
@SuperQ
Update Go (#419)
4a111f6 
* Update Go build to 1.24.
* Update Go minimum version to 1.23.
* Bump Go modules.

Signed-off-by: SuperQ <[email protected]>
@dependabot
Bump google.golang.org/api from 0.217.0 to 0.224.0 (#420)
a607c62 
Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.217.0 to 0.224.0.
- [Release notes](https://github.com/googleapis/google-api-go-client/releases)
- [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md)
- [Commits](googleapis/google-api-go-client@v0.217.0...v0.224.0)

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

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@prombot
Update common Prometheus files (#421)
e9d0a1c 
Signed-off-by: prombot <[email protected]>
@CLAassistant
Copy link

CLAassistant commented Mar 13, 2025 •
edited
Loading

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 10 committers have signed the CLA.

✅ tommyzli
❌ stuart23
❌ sysedwinistrator
❌ kgeckhart
❌ prombot
❌ TylerLubeck
❌ tjhop
❌ ananya-mallik-ps
❌ antoinedeschenes
❌ SuperQ
You have signed the CLA already but the status is still pending? Let us recheck it.

@tommyzli tommyzli merged commit 6ea5892 into ClickHouse:master Mar 13, 2025
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.