Remove `prometheus/client_golang` replace #682

marctc · 2023-07-05T10:49:43Z

This PR removes the usage of the custom fork of prometheus/client_golang adding MeasureCollectTime.
The function is moved to the exporter itself that IMO makes more sense to exist here than the
the instrumentation library.

This would allow us to include last exporter changes with license issues fixed in grafana agent.

Fixes #574

Links to other linked pull requests (optional).

Tests passed.
Fix conflicts with target branch.
Update jira ticket description if needed.
Attach screenshots/console output to confirm new behavior to jira ticket, if applicable.

Once all checks pass and the code is ready for review, please add pmm-review-exporters team as the reviewer. That would assign people from the review team automatically. Report any issues on our Forum.

it-percona-cla · 2023-07-05T10:49:46Z

All committers have signed the CLA.

marctc · 2023-07-05T14:04:05Z

We use the lastest version of client_golang and exporter-toolkit in grafana/agent. This make some compability issues with the exporter. We can either try to upgrade and fix issues here or downgrade in grafana/agent.

ademidoff

@marctc Awesome, thanks for your contribution!

ademidoff · 2023-07-05T14:24:14Z

We use the lastest version of client_golang and exporter-toolkit in grafana/agent. This make some compability issues with the exporter. We can either try to upgrade and fix issues here or downgrade in grafana/agent.

We will have to discuss internally when we can upgrade to the latest version of client_golang , since that has to do with PMM dashboards, that still seem to consume the v1. If it wasn't for supporting v1, we could have gotten rid of it right now.

Thanks anyway!

marctc · 2023-07-05T15:09:32Z

We will have to discuss internally when we can upgrade to the latest version of client_golang , since that has to do with PMM dashboards, that still seem to consume the v1. If it wasn't for supporting v1, we could have gotten rid of it right now.

What does new versions of client_golang have that makes v1 not work?

marctc · 2023-07-05T16:12:44Z

I just bumped exporter-toolkit to v0.10.0 and client_golang to v1.14.0. Also, change these lines. With this I can make agent compile and tests here pass. Is this an acceptable solution for you?

marctc · 2023-07-06T08:24:37Z

Thanks again for the fast review @BupycHuk @atymchuk! I just fixed the conflicts in go.mod with main.

marctc · 2023-07-06T08:42:36Z

I believe the failing test is flaky. I tried locally and it worked.

* Remove prometheus/client_golang replace * Apply formater * Downgrade client_golang to previous version * Upgrade exporter-toolkit to v0.10.0

* added multi target feature * added connect timeout opts * added tests * fixed test * fixed dockerfile * Bump github.com/golangci/golangci-lint from 1.47.3 to 1.52.2 in /tools (#639) Bumps [github.com/golangci/golangci-lint](https://github.com/golangci/golangci-lint) from 1.47.3 to 1.52.2. - [Release notes](https://github.com/golangci/golangci-lint/releases) - [Changelog](https://github.com/golangci/golangci-lint/blob/master/CHANGELOG.md) - [Commits](golangci/golangci-lint@v1.47.3...v1.52.2) --- updated-dependencies: - dependency-name: github.com/golangci/golangci-lint dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump github.com/golangci/golangci-lint from 1.52.2 to 1.53.2 in /tools (#665) Bumps [github.com/golangci/golangci-lint](https://github.com/golangci/golangci-lint) from 1.52.2 to 1.53.2. - [Release notes](https://github.com/golangci/golangci-lint/releases) - [Changelog](https://github.com/golangci/golangci-lint/blob/master/CHANGELOG.md) - [Commits](golangci/golangci-lint@v1.52.2...v1.53.2) --- updated-dependencies: - dependency-name: github.com/golangci/golangci-lint dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Remove `prometheus/client_golang` replace (#682) * Remove prometheus/client_golang replace * Apply formater * Downgrade client_golang to previous version * Upgrade exporter-toolkit to v0.10.0 * added multi target feature * added connect timeout opts * fixed connect * formatted code * fixed linter warnings * Update README.md * Update README.md * updated license * Update exporter/server.go Co-authored-by: Nurlan Moldomurov <nurlan.moldomurov@percona.com> * fixed according to review * formatted the code * minor changes according to the linters --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Marc Tudurí <marctc@protonmail.com> Co-authored-by: Jiří Čtvrtka <62988319+JiriCtvrtka@users.noreply.github.com> Co-authored-by: Nurlan Moldomurov <nurlan.moldomurov@percona.com> Co-authored-by: Nurlan Moldomurov <bupychuk1989@gmail.com>

Aleksa-del · 2023-11-30T14:29:38Z

Hello, @marctc! Thank you for your contributions! We would like to send you a gift from Percona. Please, contact us at community-team@percona.com.

Remove prometheus/client_golang replace

eb9ae94

marctc requested a review from a team as a code owner July 5, 2023 10:49

marctc requested review from BupycHuk and JiriCtvrtka and removed request for a team July 5, 2023 10:49

marctc mentioned this pull request Jul 5, 2023

Re-enable mongodb exporter grafana/agent#4316

Merged

1 task

marctc changed the title ~~Remove prometheus/client_golang replace~~ Remove prometheus/client_golang replace Jul 5, 2023

BupycHuk approved these changes Jul 5, 2023

View reviewed changes

BupycHuk requested a review from ademidoff July 5, 2023 12:53

marctc added 2 commits July 5, 2023 15:18

Apply formater

37ab981

Downgrade client_golang to previous version

e49de80

ademidoff approved these changes Jul 5, 2023

View reviewed changes

Upgrade exporter-toolkit to v0.10.0

f1c1ce9

marctc force-pushed the remove_client_golang_fork branch from a9851d6 to f1c1ce9 Compare July 5, 2023 16:35

BupycHuk approved these changes Jul 5, 2023

View reviewed changes

Merge branch 'main' into remove_client_golang_fork

b6247ac

BupycHuk enabled auto-merge (squash) July 6, 2023 09:18

BupycHuk merged commit 2843270 into percona:main Jul 6, 2023
7 checks passed

marctc deleted the remove_client_golang_fork branch July 6, 2023 09:39

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove `prometheus/client_golang` replace #682

Remove `prometheus/client_golang` replace #682

marctc commented Jul 5, 2023 •

edited

Loading

it-percona-cla commented Jul 5, 2023 •

edited

Loading

marctc commented Jul 5, 2023 •

edited

Loading

ademidoff left a comment

ademidoff commented Jul 5, 2023

marctc commented Jul 5, 2023

marctc commented Jul 5, 2023 •

edited

Loading

marctc commented Jul 6, 2023

marctc commented Jul 6, 2023

Aleksa-del commented Nov 30, 2023

Remove prometheus/client_golang replace #682

Remove prometheus/client_golang replace #682

Conversation

marctc commented Jul 5, 2023 • edited Loading

it-percona-cla commented Jul 5, 2023 • edited Loading

marctc commented Jul 5, 2023 • edited Loading

ademidoff left a comment

Choose a reason for hiding this comment

ademidoff commented Jul 5, 2023

marctc commented Jul 5, 2023

marctc commented Jul 5, 2023 • edited Loading

marctc commented Jul 6, 2023

marctc commented Jul 6, 2023

Aleksa-del commented Nov 30, 2023

Remove `prometheus/client_golang` replace #682

Remove `prometheus/client_golang` replace #682

marctc commented Jul 5, 2023 •

edited

Loading

it-percona-cla commented Jul 5, 2023 •

edited

Loading

marctc commented Jul 5, 2023 •

edited

Loading

marctc commented Jul 5, 2023 •

edited

Loading