Upgrade Prometheus to v3.7.1 and resolve issues #4636
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Updated Prometheus to v1.8.2-0.20251020143145-59659a23710a (staleness_disabling_v3.7.1 branch) - Upgraded Loki to branch with otlptranslator v1.0.0 support and PreprocessExpr fixes - Pinned k8s.io/api, k8s.io/apimachinery, k8s.io/client-go, and k8s.io/kube-openapi to v0.32.6 versions to maintain networking/v1alpha1 API compatibility and fix structured-merge-diff v4/v6 conflicts - Fixed Mimir rulefmt.Validate to use model.UTF8Validation parameter - Removed otlptranslator replace directive (now using v1.0.0) Known issues requiring manual resolution: 1. yaml.v3 import path mismatch in k8s.io/kube-openapi (go.yaml.in vs gopkg.in) 2. OTel collector pprofile API breaking changes in debugexporter and ottl packages
4 tasks
kalleep
reviewed
Oct 23, 2025
| github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.134.0 | ||
| github.com/open-telemetry/opentelemetry-collector-contrib/processor/intervalprocessor v0.134.0 | ||
| github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.134.0 | ||
| github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.138.0 |
There was a problem hiding this comment.
Did we have to update the otel deps?
There was a problem hiding this comment.
Yes, some things were clashing and it was tough to resolve. In the case of k8sattributesprocessor we needed it to support k8s.io/client-go v0.34.1 which was pulled in by Prometheus.
There was a problem hiding this comment.
And we definitely don't want to couple the OTel upgrade with Prometheus upgrade, the change set size is already too large. So I think this is unfortunately the way forward, at least for now. In the future we can think of coordinating what versions we want to upgrade to better, so we choose versions that generate the least pain, even if they are a bit behind 🤔
blewis12
reviewed
Oct 23, 2025
blewis12
reviewed
Oct 23, 2025
internal/component/prometheus/operator/configgen/config_gen_probe_test.go
Outdated
Show resolved
Hide resolved
kalleep
approved these changes
Oct 23, 2025
erikbaranowski
added a commit
that referenced
this pull request
Oct 23, 2025
This reverts commit 8df30f6.
erikbaranowski
added a commit
that referenced
this pull request
Oct 23, 2025
thampiotr
added a commit
that referenced
this pull request
Oct 24, 2025
kgeckhart
pushed a commit
that referenced
this pull request
Oct 28, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR Description
Which issue(s) this PR fixes
Notes to the Reviewer
PR Checklist