fix: restore OM1/protobuf micrometer suffix compatibility - #2093
Closed
zeitlinger wants to merge 8 commits into
Closed
fix: restore OM1/protobuf micrometer suffix compatibility#2093zeitlinger wants to merge 8 commits into
zeitlinger wants to merge 8 commits into
Conversation
zeitlinger
force-pushed
the
feat/micrometer-compat-task
branch
from
May 4, 2026 11:33
6af46e5 to
ffaa66f
Compare
zeitlinger
commented
May 5, 2026
|
|
||
| [env] | ||
| FLINT_CONFIG_DIR = ".github/config" | ||
| MICROMETER_REPOSITORY = "zeitlinger/micrometer" |
Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>
Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>
Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>
Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>
Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>
Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>
Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>
Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>
zeitlinger
force-pushed
the
feat/micrometer-compat-task
branch
from
May 5, 2026 15:05
5bbab90 to
eb0af9a
Compare
This was referenced May 5, 2026
Member
Author
|
Superseded by a split PR stack so the prom-side fix can merge independently:
Closing this combined PR in favor of those two replacements. |
Member
Author
|
Closing in favor of #2100 plus the stacked Micrometer follow-up at zeitlinger#1. |
zeitlinger
added a commit
that referenced
this pull request
May 13, 2026
Fixes #2095 ## Summary Restores OM1/protobuf compatibility for dotted gauge names after `feat: move suffix handling to scrape time (#1955)`. The bug was that non-OpenMetrics exposition changed visible output for gauge names that merely ended in suffix-like dotted strings such as `.created` and `.total`. Examples: - `Gauge("test3.created")` regressed from `test3` to `test3_created` - `Gauge("test6.total")` regressed from `test6` to `test6_total` This PR restores the legacy OM1/protobuf behavior while keeping OpenMetrics on literal-name handling. This is the extracted prom-side fix from #2093. The Micrometer workflow and related downstream testing were split into a stacked follow-up PR so this can merge independently. ## What changed - Fix OM1 text exposition for dotted gauge names ending in `.created` and `.total` - Fix protobuf exposition for the same compatibility cases - Add regression tests that cover the restored OM1/protobuf behavior and the preserved OpenMetrics behavior - Clean up protobuf family-name resolution so legacy gauge handling lives in one path instead of pre-rewriting metadata objects ## Follow-up stacked PR - Micrometer workflow/task split: zeitlinger#1 ## Related - Replaces: #2093 - Issue: #2095 ## Testing - `mise run build` - `mise run lint` - `./mvnw test -pl prometheus-metrics-exposition-textformats,prometheus-metrics-exposition-formats -Dtest=ExpositionFormatsTest,ProtobufExpositionFormatsTest,DuplicateNamesProtobufTest -Dcoverage.skip=true -Dcheckstyle.skip=true`
jaydeluca
pushed a commit
that referenced
this pull request
Jun 4, 2026
Fixes #2095 ## Summary Restores OM1/protobuf compatibility for dotted gauge names after `feat: move suffix handling to scrape time (#1955)`. The bug was that non-OpenMetrics exposition changed visible output for gauge names that merely ended in suffix-like dotted strings such as `.created` and `.total`. Examples: - `Gauge("test3.created")` regressed from `test3` to `test3_created` - `Gauge("test6.total")` regressed from `test6` to `test6_total` This PR restores the legacy OM1/protobuf behavior while keeping OpenMetrics on literal-name handling. This is the extracted prom-side fix from #2093. The Micrometer workflow and related downstream testing were split into a stacked follow-up PR so this can merge independently. ## What changed - Fix OM1 text exposition for dotted gauge names ending in `.created` and `.total` - Fix protobuf exposition for the same compatibility cases - Add regression tests that cover the restored OM1/protobuf behavior and the preserved OpenMetrics behavior - Clean up protobuf family-name resolution so legacy gauge handling lives in one path instead of pre-rewriting metadata objects ## Follow-up stacked PR - Micrometer workflow/task split: zeitlinger#1 ## Related - Replaces: #2093 - Issue: #2095 ## Testing - `mise run build` - `mise run lint` - `./mvnw test -pl prometheus-metrics-exposition-textformats,prometheus-metrics-exposition-formats -Dtest=ExpositionFormatsTest,ProtobufExpositionFormatsTest,DuplicateNamesProtobufTest -Dcoverage.skip=true -Dcheckstyle.skip=true` Signed-off-by: Jay DeLuca <jaydeluca4@gmail.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Fixes #2095
Summary
Restores OM1/protobuf compatibility for dotted gauge names after
feat: move suffix handling to scrape time (#1955).The bug was that non-OpenMetrics exposition changed visible output for gauge
names that merely ended in suffix-like dotted strings such as
.createdand.total.Examples:
Gauge("test3.created")regressed fromtest3totest3_createdGauge("test6.total")regressed fromtest6totest6_totalThis PR restores the legacy OM1/protobuf behavior while keeping OpenMetrics on
literal-name handling.
What changed
.createdand.totalpreserved OpenMetrics behavior
regression is exercised automatically against Micrometer
deterministic
Related Micrometer work
While debugging this, we also found a separate Micrometer adapter bug:
registration-time collision detection needed snapshot-derived
MultiCollectormetadata.That fix lives on the downstream Micrometer branch used by the compatibility
job. The Micrometer coverage added here is regression protection; the prom-side
bug fix in this PR is the OM1/protobuf suffix compatibility restoration.
Related
Test plan
mise run buildmise run lint./mvnw test -pl prometheus-metrics-exposition-textformats,prometheus-metrics-exposition-formats -Dtest=ExpositionFormatsTest,ProtobufExpositionFormatsTest -Dcoverage.skip=true -Dcheckstyle.skip=trueGRADLE_USER_HOME=/tmp/gradle-micro ./gradlew --no-daemon -I /tmp/micrometer-prom-local.init.gradle :micrometer-registry-prometheus:test --tests io.micrometer.prometheusmetrics.PrometheusMeterRegistryTestGRADLE_USER_HOME=/tmp/gradle-micro ./gradlew --no-daemon -I /tmp/micrometer-prom-local.init.gradle :micrometer-registry-prometheus:test