Skip to content
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.

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

Bump prometheus dependency #6403

Merged
merged 7 commits into from
Jun 15, 2022
Merged

Bump prometheus dependency #6403

merged 7 commits into from
Jun 15, 2022

Conversation

jesusvazquez
Copy link
Member

This PR updates prometheus dependency to its latest commit. It comes with quite a few changes so I've made a list of commits that make it easy to review them.

@jesusvazquez jesusvazquez self-assigned this Jun 15, 2022
We had to add a replace of prometheus in go mod because thanos is
importing an older version and then replacing it.
WithoutLabels and WithLabels methods have dissappeared. Now
labels.NewBuilder has to be used.
Update now accepts a new param called ruleGroupPostProcessFunc which is
an optional function to be executed after rule group processing.

In this case I've set it to nil in the usages i've found.
The NewQueryRange function now accepts QueryOptions so I had to update
all the calls.

I've set the opts to nil since we're not using them.
Copy link
Member

@pstibrany pstibrany left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great job! Thank you for doing this.

HTTPClientConfig: promConfig.HTTPClientConfig{
FollowRedirects: true,
},
HTTPClientConfig: promConfig.DefaultHTTPClientConfig,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

HTTP2Enabled now defaults to true, should this be documented as a [CHANGE]?

@grafanabot
Copy link
Collaborator

./tools/diff_coverage.sh ../loki-main/test_results.txt test_results.txt ingester,distributor,querier,querier/queryrange,iter,storage,chunkenc,logql,loki

Change in test coverage per package. Green indicates 0 or positive change, red indicates that test coverage for a package fell.

+           ingester	0%
+        distributor	0%
+            querier	0%
+ querier/queryrange	0%
+               iter	0%
+            storage	0%
+           chunkenc	0%
+              logql	0%
+               loki	0%

@jesusvazquez jesusvazquez marked this pull request as ready for review June 15, 2022 14:25
@jesusvazquez jesusvazquez requested a review from a team as a code owner June 15, 2022 14:25
@owen-d owen-d merged commit db9dbe8 into main Jun 15, 2022
@owen-d owen-d deleted the jvp/update-prometheus branch June 15, 2022 16:16
@jeschkies
Copy link
Contributor

Unfortunately this bump breaks GEL as it depends on an older Prometheus version through backend-enterprise-libs :/

dannykopping pushed a commit to dannykopping/loki that referenced this pull request Aug 23, 2022
These metrics were removed unintentionally in grafana#6403

Signed-off-by: Danny Kopping <danny.kopping@grafana.com>
dannykopping pushed a commit that referenced this pull request Aug 23, 2022
….*` metrics (#6957)

* Upgrading prometheus/client_golang to restore go_sched.* metrics

These metrics were removed unintentionally in #6403

Signed-off-by: Danny Kopping <danny.kopping@grafana.com>

* Fixing test to match interface correctly

Signed-off-by: Danny Kopping <danny.kopping@grafana.com>

Signed-off-by: Danny Kopping <danny.kopping@grafana.com>
dannykopping pushed a commit that referenced this pull request Aug 23, 2022
….*` metrics (#6957)

* Upgrading prometheus/client_golang to restore go_sched.* metrics

These metrics were removed unintentionally in #6403

Signed-off-by: Danny Kopping <danny.kopping@grafana.com>

* Fixing test to match interface correctly

Signed-off-by: Danny Kopping <danny.kopping@grafana.com>

Signed-off-by: Danny Kopping <danny.kopping@grafana.com>
lxwzy pushed a commit to lxwzy/loki that referenced this pull request Nov 7, 2022
….*` metrics (grafana#6957)

* Upgrading prometheus/client_golang to restore go_sched.* metrics

These metrics were removed unintentionally in grafana#6403

Signed-off-by: Danny Kopping <danny.kopping@grafana.com>

* Fixing test to match interface correctly

Signed-off-by: Danny Kopping <danny.kopping@grafana.com>

Signed-off-by: Danny Kopping <danny.kopping@grafana.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants