-
Notifications
You must be signed in to change notification settings - Fork 320
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
fix(utf8): Fix multiple metric name inside braces validation #691
fix(utf8): Fix multiple metric name inside braces validation #691
Conversation
Signed-off-by: Federico Torres <federico.torres@grafana.com>
currentMetricIsInsideBraces bool | ||
currentIsSummaryCount, currentIsSummarySum bool | ||
currentIsHistogramCount, currentIsHistogramSum bool | ||
currentMetricIsInsideBraces, currentMetricInsideBracesIsPresent bool |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we get a comment explaining what these mean?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Addressed in acd0c00, thanks for the feedback
Signed-off-by: Federico Torres <federico.torres@grafana.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ah, good find!
…5789) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github.com/prometheus/common](https://redirect.github.com/prometheus/common) | `v0.58.0` -> `v0.59.1` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fprometheus%2fcommon/v0.59.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fprometheus%2fcommon/v0.59.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fprometheus%2fcommon/v0.58.0/v0.59.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fprometheus%2fcommon/v0.58.0/v0.59.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>prometheus/common (github.com/prometheus/common)</summary> ### [`v0.59.1`](https://redirect.github.com/prometheus/common/releases/tag/v0.59.1) [Compare Source](https://redirect.github.com/prometheus/common/compare/v0.59.0...v0.59.1) #### What's Changed - fix(utf8): Fix multiple metric name inside braces validation by [@​fedetorres93](https://redirect.github.com/fedetorres93) in [https://github.com/prometheus/common/pull/691](https://redirect.github.com/prometheus/common/pull/691) **Full Changelog**: prometheus/common@v0.59.0...v0.59.1 ### [`v0.59.0`](https://redirect.github.com/prometheus/common/releases/tag/v0.59.0) [Compare Source](https://redirect.github.com/prometheus/common/compare/v0.58.0...v0.59.0) #### What's Changed - expfmt: Add WithEscapingScheme to help construct Formats by [@​ywwg](https://redirect.github.com/ywwg) in [https://github.com/prometheus/common/pull/688](https://redirect.github.com/prometheus/common/pull/688) - Change the default escape method to UnderscoreEscaping by [@​ywwg](https://redirect.github.com/ywwg) in [https://github.com/prometheus/common/pull/690](https://redirect.github.com/prometheus/common/pull/690) **Full Changelog**: prometheus/common@v0.58.0...v0.59.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-go). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC41OS4yIiwidXBkYXRlZEluVmVyIjoiMzguNTkuMiIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiU2tpcCBDaGFuZ2Vsb2ciLCJkZXBlbmRlbmNpZXMiXX0=--> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github.com/prometheus/client_golang](https://redirect.github.com/prometheus/client_golang) | `v1.20.2` -> `v1.20.3` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fprometheus%2fclient_golang/v1.20.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fprometheus%2fclient_golang/v1.20.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fprometheus%2fclient_golang/v1.20.2/v1.20.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fprometheus%2fclient_golang/v1.20.2/v1.20.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [github.com/prometheus/common](https://redirect.github.com/prometheus/common) | `v0.58.0` -> `v0.59.1` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fprometheus%2fcommon/v0.59.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fprometheus%2fcommon/v0.59.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fprometheus%2fcommon/v0.58.0/v0.59.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fprometheus%2fcommon/v0.58.0/v0.59.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>prometheus/client_golang (github.com/prometheus/client_golang)</summary> ### [`v1.20.3`](https://redirect.github.com/prometheus/client_golang/releases/tag/v1.20.3) [Compare Source](https://redirect.github.com/prometheus/client_golang/compare/v1.20.2...v1.20.3) - \[BUGFIX] histograms: Fix possible data race when appending exemplars. [#​1608](https://redirect.github.com/prometheus/client_golang/issues/1608) </details> <details> <summary>prometheus/common (github.com/prometheus/common)</summary> ### [`v0.59.1`](https://redirect.github.com/prometheus/common/releases/tag/v0.59.1) [Compare Source](https://redirect.github.com/prometheus/common/compare/v0.59.0...v0.59.1) #### What's Changed - fix(utf8): Fix multiple metric name inside braces validation by [@​fedetorres93](https://redirect.github.com/fedetorres93) in [https://github.com/prometheus/common/pull/691](https://redirect.github.com/prometheus/common/pull/691) **Full Changelog**: prometheus/common@v0.59.0...v0.59.1 ### [`v0.59.0`](https://redirect.github.com/prometheus/common/releases/tag/v0.59.0) [Compare Source](https://redirect.github.com/prometheus/common/compare/v0.58.0...v0.59.0) #### What's Changed - expfmt: Add WithEscapingScheme to help construct Formats by [@​ywwg](https://redirect.github.com/ywwg) in [https://github.com/prometheus/common/pull/688](https://redirect.github.com/prometheus/common/pull/688) - Change the default escape method to UnderscoreEscaping by [@​ywwg](https://redirect.github.com/ywwg) in [https://github.com/prometheus/common/pull/690](https://redirect.github.com/prometheus/common/pull/690) **Full Changelog**: prometheus/common@v0.58.0...v0.59.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/jaegertracing/jaeger). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC41OS4yIiwidXBkYXRlZEluVmVyIjoiMzguNTkuMiIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiY2hhbmdlbG9nOmRlcGVuZGVuY2llcyJdfQ==--> Signed-off-by: Mend Renovate <bot@renovateapp.com>
This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github.com/prometheus/common](https://redirect.github.com/prometheus/common) | `v0.57.0` -> `v0.59.1` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fprometheus%2fcommon/v0.59.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fprometheus%2fcommon/v0.59.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fprometheus%2fcommon/v0.57.0/v0.59.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fprometheus%2fcommon/v0.57.0/v0.59.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>prometheus/common (github.com/prometheus/common)</summary> ### [`v0.59.1`](https://redirect.github.com/prometheus/common/releases/tag/v0.59.1) [Compare Source](https://redirect.github.com/prometheus/common/compare/v0.59.0...v0.59.1) #### What's Changed - fix(utf8): Fix multiple metric name inside braces validation by [@​fedetorres93](https://redirect.github.com/fedetorres93) in [https://github.com/prometheus/common/pull/691](https://redirect.github.com/prometheus/common/pull/691) **Full Changelog**: prometheus/common@v0.59.0...v0.59.1 ### [`v0.59.0`](https://redirect.github.com/prometheus/common/releases/tag/v0.59.0) [Compare Source](https://redirect.github.com/prometheus/common/compare/v0.58.0...v0.59.0) #### What's Changed - expfmt: Add WithEscapingScheme to help construct Formats by [@​ywwg](https://redirect.github.com/ywwg) in [https://github.com/prometheus/common/pull/688](https://redirect.github.com/prometheus/common/pull/688) - Change the default escape method to UnderscoreEscaping by [@​ywwg](https://redirect.github.com/ywwg) in [https://github.com/prometheus/common/pull/690](https://redirect.github.com/prometheus/common/pull/690) **Full Changelog**: prometheus/common@v0.58.0...v0.59.0 ### [`v0.58.0`](https://redirect.github.com/prometheus/common/releases/tag/v0.58.0) [Compare Source](https://redirect.github.com/prometheus/common/compare/v0.57.0...v0.58.0) #### What's Changed - docs: mention new promslog package in package list in README by [@​tjhop](https://redirect.github.com/tjhop) in [https://github.com/prometheus/common/pull/683](https://redirect.github.com/prometheus/common/pull/683) - Bump golang.org/x/oauth2 from 0.21.0 to 0.22.0 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/prometheus/common/pull/684](https://redirect.github.com/prometheus/common/pull/684) - Bump golang.org/x/net from 0.27.0 to 0.28.0 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/prometheus/common/pull/685](https://redirect.github.com/prometheus/common/pull/685) - Remove secret file existence check in Validate for headers by [@​roidelapluie](https://redirect.github.com/roidelapluie) in [https://github.com/prometheus/common/pull/687](https://redirect.github.com/prometheus/common/pull/687) **Full Changelog**: prometheus/common@v0.57.0...v0.58.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-collector). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC41OS4yIiwidXBkYXRlZEluVmVyIjoiMzguNTkuMiIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiZGVwZW5kZW5jaWVzIiwicmVub3ZhdGVib3QiXX0=--> --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com>
) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github.com/prometheus/common](https://redirect.github.com/prometheus/common) | `v0.57.0` -> `v0.59.1` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fprometheus%2fcommon/v0.59.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fprometheus%2fcommon/v0.59.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fprometheus%2fcommon/v0.57.0/v0.59.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fprometheus%2fcommon/v0.57.0/v0.59.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>prometheus/common (github.com/prometheus/common)</summary> ### [`v0.59.1`](https://redirect.github.com/prometheus/common/releases/tag/v0.59.1) [Compare Source](https://redirect.github.com/prometheus/common/compare/v0.59.0...v0.59.1) #### What's Changed - fix(utf8): Fix multiple metric name inside braces validation by [@​fedetorres93](https://redirect.github.com/fedetorres93) in [https://github.com/prometheus/common/pull/691](https://redirect.github.com/prometheus/common/pull/691) **Full Changelog**: prometheus/common@v0.59.0...v0.59.1 ### [`v0.59.0`](https://redirect.github.com/prometheus/common/releases/tag/v0.59.0) [Compare Source](https://redirect.github.com/prometheus/common/compare/v0.58.0...v0.59.0) #### What's Changed - expfmt: Add WithEscapingScheme to help construct Formats by [@​ywwg](https://redirect.github.com/ywwg) in [https://github.com/prometheus/common/pull/688](https://redirect.github.com/prometheus/common/pull/688) - Change the default escape method to UnderscoreEscaping by [@​ywwg](https://redirect.github.com/ywwg) in [https://github.com/prometheus/common/pull/690](https://redirect.github.com/prometheus/common/pull/690) **Full Changelog**: prometheus/common@v0.58.0...v0.59.0 ### [`v0.58.0`](https://redirect.github.com/prometheus/common/releases/tag/v0.58.0) [Compare Source](https://redirect.github.com/prometheus/common/compare/v0.57.0...v0.58.0) #### What's Changed - docs: mention new promslog package in package list in README by [@​tjhop](https://redirect.github.com/tjhop) in [https://github.com/prometheus/common/pull/683](https://redirect.github.com/prometheus/common/pull/683) - Bump golang.org/x/oauth2 from 0.21.0 to 0.22.0 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/prometheus/common/pull/684](https://redirect.github.com/prometheus/common/pull/684) - Bump golang.org/x/net from 0.27.0 to 0.28.0 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/prometheus/common/pull/685](https://redirect.github.com/prometheus/common/pull/685) - Remove secret file existence check in Validate for headers by [@​roidelapluie](https://redirect.github.com/roidelapluie) in [https://github.com/prometheus/common/pull/687](https://redirect.github.com/prometheus/common/pull/687) **Full Changelog**: prometheus/common@v0.57.0...v0.58.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-collector-contrib). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC41OS4yIiwidXBkYXRlZEluVmVyIjoiMzguNTkuMiIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiZGVwZW5kZW5jaWVzIiwicmVub3ZhdGVib3QiXX0=--> --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com>
There's a bug where metrics inside braces in different lines are mistakenly considered as multiple metric names in the same line when there's no TYPE or HELP line. This PR addresses the issue.
Related to #670