From 794c4985425ffd3efd61196284a910207ee92102 Mon Sep 17 00:00:00 2001 From: ttyS3 Date: Wed, 24 May 2023 15:53:27 +0800 Subject: [PATCH 1/3] chore: remove unit suffix for unit 1 --- exporters/prometheus/exporter.go | 1 - exporters/prometheus/testdata/gauge.txt | 6 +++--- exporters/prometheus/testdata/without_scope_info.txt | 6 +++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/exporters/prometheus/exporter.go b/exporters/prometheus/exporter.go index 653d8c38136..d114133d870 100644 --- a/exporters/prometheus/exporter.go +++ b/exporters/prometheus/exporter.go @@ -313,7 +313,6 @@ func sanitizeRune(r rune) rune { } var unitSuffixes = map[string]string{ - "1": "_ratio", "By": "_bytes", "ms": "_milliseconds", } diff --git a/exporters/prometheus/testdata/gauge.txt b/exporters/prometheus/testdata/gauge.txt index 33d2b218b3f..4116a1cf607 100644 --- a/exporters/prometheus/testdata/gauge.txt +++ b/exporters/prometheus/testdata/gauge.txt @@ -1,6 +1,6 @@ -# HELP bar_ratio a fun little gauge -# TYPE bar_ratio gauge -bar_ratio{A="B",C="D",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} .75 +# HELP bar a fun little gauge +# TYPE bar gauge +bar{A="B",C="D",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} .75 # HELP otel_scope_info Instrumentation Scope metadata # TYPE otel_scope_info gauge otel_scope_info{otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 1 diff --git a/exporters/prometheus/testdata/without_scope_info.txt b/exporters/prometheus/testdata/without_scope_info.txt index 445743ac9a7..47231389c86 100644 --- a/exporters/prometheus/testdata/without_scope_info.txt +++ b/exporters/prometheus/testdata/without_scope_info.txt @@ -1,6 +1,6 @@ -# HELP bar_ratio a fun little gauge -# TYPE bar_ratio gauge -bar_ratio{A="B",C="D"} 1 +# HELP bar a fun little gauge +# TYPE bar gauge +bar{A="B",C="D"} 1 # HELP target_info Target metadata # TYPE target_info gauge target_info{service_name="prometheus_test",telemetry_sdk_language="go",telemetry_sdk_name="opentelemetry",telemetry_sdk_version="latest"} 1 From 3a39f8925155a0254604819280d87a54bb37266d Mon Sep 17 00:00:00 2001 From: ttyS3 Date: Wed, 24 May 2023 16:30:46 +0800 Subject: [PATCH 2/3] docs: update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d9f145f86d7..af6c02bfd45 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [Unreleased] +- The `go.opentelemetry.io/otel/exporters/prometheus` exporter do not add `_ratio` suffix for unit "1" anymore(when unit suffix feature is enabled). (#4131) + ## [1.16.0/0.39.0] 2023-05-18 This release contains the first stable release of the OpenTelemetry Go [metric API]. From 8e60fdeecc8c6bbb07ee6ce812219abc9c88337e Mon Sep 17 00:00:00 2001 From: ttys3 <41882455+ttys3@users.noreply.github.com> Date: Wed, 24 May 2023 18:48:35 +0800 Subject: [PATCH 3/3] Update CHANGELOG.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Robert Pająk --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index af6c02bfd45..cb272c1527a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [Unreleased] -- The `go.opentelemetry.io/otel/exporters/prometheus` exporter do not add `_ratio` suffix for unit "1" anymore(when unit suffix feature is enabled). (#4131) +- The `go.opentelemetry.io/otel/exporters/prometheus` exporter do not add `_ratio` suffix for unit "1" anymore when unit suffix feature is enabled. (#4131) ## [1.16.0/0.39.0] 2023-05-18