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

Change the default escape method to UnderscoreEscaping #690

Merged
merged 1 commit into from
Sep 5, 2024

Conversation

ywwg
Copy link
Member

@ywwg ywwg commented Sep 4, 2024

fixes #689

@ywwg ywwg marked this pull request as ready for review September 4, 2024 17:24
// NameEscapingScheme defines the default way that names will be escaped when
// presented to systems that do not support UTF-8 names. If the Content-Type
// "escaping" term is specified, that will override this value.
// NameEscapingScheme should not be set to the NoEscaping value. That string
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dashpole Hopefully this is clearer than before

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, that is helpful. Thanks!

@ywwg ywwg merged commit bf4843e into prometheus:main Sep 5, 2024
7 checks passed
@ywwg ywwg deleted the owilliams/default-escaping branch September 5, 2024 12:42
dmathieu referenced this pull request in open-telemetry/opentelemetry-go Sep 6, 2024
…5789)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
|
[github.com/prometheus/common](https://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://github.com/prometheus/common/releases/tag/v0.59.1)

[Compare
Source](https://github.com/prometheus/common/compare/v0.59.0...v0.59.1)

#### What's Changed

- fix(utf8): Fix multiple metric name inside braces validation by
[@&#8203;fedetorres93](https://github.com/fedetorres93) in
[https://github.com/prometheus/common/pull/691](https://github.com/prometheus/common/pull/691)

**Full Changelog**:
prometheus/common@v0.59.0...v0.59.1

###
[`v0.59.0`](https://github.com/prometheus/common/releases/tag/v0.59.0)

[Compare
Source](https://github.com/prometheus/common/compare/v0.58.0...v0.59.0)

#### What's Changed

- expfmt: Add WithEscapingScheme to help construct Formats by
[@&#8203;ywwg](https://github.com/ywwg) in
[https://github.com/prometheus/common/pull/688](https://github.com/prometheus/common/pull/688)
- Change the default escape method to UnderscoreEscaping by
[@&#8203;ywwg](https://github.com/ywwg) in
[https://github.com/prometheus/common/pull/690](https://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>
yurishkuro referenced this pull request in jaegertracing/jaeger Sep 7, 2024
This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
|
[github.com/prometheus/client_golang](https://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://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://github.com/prometheus/client_golang/releases/tag/v1.20.3)

[Compare
Source](https://github.com/prometheus/client_golang/compare/v1.20.2...v1.20.3)

- \[BUGFIX] histograms: Fix possible data race when appending exemplars.
[#&#8203;1608](https://github.com/prometheus/client_golang/issues/1608)

</details>

<details>
<summary>prometheus/common (github.com/prometheus/common)</summary>

###
[`v0.59.1`](https://github.com/prometheus/common/releases/tag/v0.59.1)

[Compare
Source](https://github.com/prometheus/common/compare/v0.59.0...v0.59.1)

#### What's Changed

- fix(utf8): Fix multiple metric name inside braces validation by
[@&#8203;fedetorres93](https://github.com/fedetorres93) in
[https://github.com/prometheus/common/pull/691](https://github.com/prometheus/common/pull/691)

**Full Changelog**:
prometheus/common@v0.59.0...v0.59.1

###
[`v0.59.0`](https://github.com/prometheus/common/releases/tag/v0.59.0)

[Compare
Source](https://github.com/prometheus/common/compare/v0.58.0...v0.59.0)

#### What's Changed

- expfmt: Add WithEscapingScheme to help construct Formats by
[@&#8203;ywwg](https://github.com/ywwg) in
[https://github.com/prometheus/common/pull/688](https://github.com/prometheus/common/pull/688)
- Change the default escape method to UnderscoreEscaping by
[@&#8203;ywwg](https://github.com/ywwg) in
[https://github.com/prometheus/common/pull/690](https://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://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 <[email protected]>
codeboten referenced this pull request in open-telemetry/opentelemetry-collector Sep 10, 2024
This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
|
[github.com/prometheus/common](https://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://github.com/prometheus/common/releases/tag/v0.59.1)

[Compare
Source](https://github.com/prometheus/common/compare/v0.59.0...v0.59.1)

#### What's Changed

- fix(utf8): Fix multiple metric name inside braces validation by
[@&#8203;fedetorres93](https://github.com/fedetorres93) in
[https://github.com/prometheus/common/pull/691](https://github.com/prometheus/common/pull/691)

**Full Changelog**:
prometheus/common@v0.59.0...v0.59.1

###
[`v0.59.0`](https://github.com/prometheus/common/releases/tag/v0.59.0)

[Compare
Source](https://github.com/prometheus/common/compare/v0.58.0...v0.59.0)

#### What's Changed

- expfmt: Add WithEscapingScheme to help construct Formats by
[@&#8203;ywwg](https://github.com/ywwg) in
[https://github.com/prometheus/common/pull/688](https://github.com/prometheus/common/pull/688)
- Change the default escape method to UnderscoreEscaping by
[@&#8203;ywwg](https://github.com/ywwg) in
[https://github.com/prometheus/common/pull/690](https://github.com/prometheus/common/pull/690)

**Full Changelog**:
prometheus/common@v0.58.0...v0.59.0

###
[`v0.58.0`](https://github.com/prometheus/common/releases/tag/v0.58.0)

[Compare
Source](https://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
[@&#8203;tjhop](https://github.com/tjhop) in
[https://github.com/prometheus/common/pull/683](https://github.com/prometheus/common/pull/683)
- Bump golang.org/x/oauth2 from 0.21.0 to 0.22.0 by
[@&#8203;dependabot](https://github.com/dependabot) in
[https://github.com/prometheus/common/pull/684](https://github.com/prometheus/common/pull/684)
- Bump golang.org/x/net from 0.27.0 to 0.28.0 by
[@&#8203;dependabot](https://github.com/dependabot) in
[https://github.com/prometheus/common/pull/685](https://github.com/prometheus/common/pull/685)
- Remove secret file existence check in Validate for headers by
[@&#8203;roidelapluie](https://github.com/roidelapluie) in
[https://github.com/prometheus/common/pull/687](https://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 <[email protected]>
Co-authored-by: Alex Boten <[email protected]>
mx-psi referenced this pull request in open-telemetry/opentelemetry-collector-contrib Sep 11, 2024
)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
|
[github.com/prometheus/common](https://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://github.com/prometheus/common/releases/tag/v0.59.1)

[Compare
Source](https://github.com/prometheus/common/compare/v0.59.0...v0.59.1)

#### What's Changed

- fix(utf8): Fix multiple metric name inside braces validation by
[@&#8203;fedetorres93](https://github.com/fedetorres93) in
[https://github.com/prometheus/common/pull/691](https://github.com/prometheus/common/pull/691)

**Full Changelog**:
prometheus/common@v0.59.0...v0.59.1

###
[`v0.59.0`](https://github.com/prometheus/common/releases/tag/v0.59.0)

[Compare
Source](https://github.com/prometheus/common/compare/v0.58.0...v0.59.0)

#### What's Changed

- expfmt: Add WithEscapingScheme to help construct Formats by
[@&#8203;ywwg](https://github.com/ywwg) in
[https://github.com/prometheus/common/pull/688](https://github.com/prometheus/common/pull/688)
- Change the default escape method to UnderscoreEscaping by
[@&#8203;ywwg](https://github.com/ywwg) in
[https://github.com/prometheus/common/pull/690](https://github.com/prometheus/common/pull/690)

**Full Changelog**:
prometheus/common@v0.58.0...v0.59.0

###
[`v0.58.0`](https://github.com/prometheus/common/releases/tag/v0.58.0)

[Compare
Source](https://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
[@&#8203;tjhop](https://github.com/tjhop) in
[https://github.com/prometheus/common/pull/683](https://github.com/prometheus/common/pull/683)
- Bump golang.org/x/oauth2 from 0.21.0 to 0.22.0 by
[@&#8203;dependabot](https://github.com/dependabot) in
[https://github.com/prometheus/common/pull/684](https://github.com/prometheus/common/pull/684)
- Bump golang.org/x/net from 0.27.0 to 0.28.0 by
[@&#8203;dependabot](https://github.com/dependabot) in
[https://github.com/prometheus/common/pull/685](https://github.com/prometheus/common/pull/685)
- Remove secret file existence check in Validate for headers by
[@&#8203;roidelapluie](https://github.com/roidelapluie) in
[https://github.com/prometheus/common/pull/687](https://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 <[email protected]>
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.

Consider defaulting model.NameEscapingScheme to model.UnderscoreEscaping
3 participants