Skip to content

chore: track upstream Micrometer main #2421

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

Merged
zeitlinger merged 1 commit into from
Aug 25, 2026
+7 −8
Merged

chore: track upstream Micrometer main #2421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/renovate-tracked-deps.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,7 @@
"ubuntu"
],
"regex": [
"micrometer-metrics/micrometer",
"zeitlinger/micrometer"
"micrometer-metrics/micrometer"
]
},
".github/workflows/multi-version-test.yml": {
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/micrometer-compatibility.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ jobs:
repository: micrometer-metrics/micrometer
# renovate: datasource=github-releases depName=micrometer-metrics/micrometer packageName=micrometer-metrics/micrometer
ref: v1.17.1
- name: typed-descriptor
# TODO: remove this temporary opt-in leg once Micrometer switches the
# Prometheus client integration to typed descriptors by default.
- name: upstream-main
# Track upstream main until the typed-descriptor change is included
# in a Micrometer release.
# Follow-up: https://github.com/prometheus/client_java/issues/2182
repository: zeitlinger/micrometer
# renovate: datasource=git-refs depName=zeitlinger/micrometer packageName=https://github.com/zeitlinger/micrometer currentValue=feat/prom-client-java-typed-family-descriptor
ref: f240f0978366378dae66ac005ea1d2ef65708ff3
repository: micrometer-metrics/micrometer
# renovate: datasource=git-refs depName=micrometer-metrics/micrometer packageName=https://github.com/micrometer-metrics/micrometer currentValue=main
ref: 912539f48a1873db3f9ad57111fe2daddab58ac5
steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
Expand Down