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

Update vendored Prometheus #5442

Merged
merged 1 commit into from
Jul 6, 2023
Merged

Update vendored Prometheus #5442

merged 1 commit into from
Jul 6, 2023

Conversation

pracucci
Copy link
Collaborator

@pracucci pracucci commented Jul 6, 2023

What this PR does

In this PR I'm updating the vendored mimir-prometheus, which has just been synced with upstream Prometheus, in order to get a couple of notable changes for us:

A part from this, the other most noteable change in Prometheus is the support for storing native histograms in the snapshot at shutdown, but snapshotting (-blocks-storage.tsdb.memory-snapshot-on-shutdown) is disabled by default in Mimir (and also not used at Grafana Labs).

Changes to other vendored libraries

Checked release notes, no breaking changes:

-       github.com/prometheus/client_golang v1.15.1
+       github.com/prometheus/client_golang v1.16.0

Checked release notes, no breaking changes:

-       go.uber.org/atomic v1.10.0
+       go.uber.org/atomic v1.11.0

No change affecting our vendored files:

-       github.com/prometheus/procfs v0.10.0
+       github.com/prometheus/procfs v0.10.1

Checked release notes and also the diff. Most changes are affecting packages we're not vendoring. Looking at the actual code diff for the packages we vendor, I can only see relatively minor changes:

-       go.opentelemetry.io/otel v1.14.0
-       go.opentelemetry.io/otel/trace v1.14.0
+       go.opentelemetry.io/otel v1.16.0
+       go.opentelemetry.io/otel/trace v1.16.0
-       go.opentelemetry.io/otel/metric v0.37.0 // indirect
+       go.opentelemetry.io/otel/metric v1.16.0 // indirect

Checked release notes and I can only see a fix affecting otelhttp:

-       go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.40.0 // indirect
+       go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect

Checked the CHANGELOGs for azcore, azidentity and auth library: I can't see any breaking change affecting us:

-       github.com/Azure/azure-sdk-for-go/sdk/azcore v1.3.1 // indirect
+       github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.0 // indirect

-       github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.2.1 // indirect
+       github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0 // indirect

-       github.com/Azure/azure-sdk-for-go/sdk/internal v1.1.2 // indirect
+       github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect

-       github.com/AzureAD/microsoft-authentication-library-for-go v0.8.1 // indirect
+       github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0 // indirect

No change affecting the packages we vendor:

-       github.com/hashicorp/consul/api v1.20.0 // indirect
+       github.com/hashicorp/consul/api v1.21.0 // indirect

Removed SingleInflight support, but it's not usde by Mimir or any vendored library:

-       github.com/miekg/dns v1.1.53 // indirect
+       github.com/miekg/dns v1.1.54 // indirect

Added ClientAllowedSans to TLSConfig. If we want to support it, we'll have to add it to weaveworks/common first:

-       github.com/prometheus/exporter-toolkit v0.9.1 // indirect
+       github.com/prometheus/exporter-toolkit v0.10.0 // indirect

Which issue(s) this PR fixes or relates to

N/A

Checklist

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

Signed-off-by: Marco Pracucci <[email protected]>
@pracucci pracucci marked this pull request as ready for review July 6, 2023 15:16
@pracucci pracucci requested a review from a team as a code owner July 6, 2023 15:16
@charleskorn charleskorn merged commit 3d56c66 into main Jul 6, 2023
28 checks passed
@charleskorn charleskorn deleted the update-mimir-prometheus branch July 6, 2023 23:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants