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.

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

Remove units from the prometheus conversion that aren't UCUM #24647

Merged
merged 2 commits into from
Aug 1, 2023
Merged

Remove units from the prometheus conversion that aren't UCUM #24647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c10afc
remove units from the prometheus conversion that aren't ucum
dashpole Jul 27, 2023
de370b0
fix test
dashpole Jul 27, 2023
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
20 changes: 20 additions & 0 deletions .chloggen/prometheus_translation_ucum.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Use this changelog template to create an entry for release notes.
# If your change doesn't affect end users, such as a test fix or a tooling change,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: 'breaking'

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: prometheusexporter

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Remove invalid unit translations from the prometheus exporters

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [24647]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:
6 changes: 0 additions & 6 deletions pkg/translator/prometheus/normalize_name.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,6 @@ var unitMap = map[string]string{
"MBy": "megabytes",
"GBy": "gigabytes",
"TBy": "terabytes",
"B": "bytes",
"KB": "kilobytes",
"MB": "megabytes",
"GB": "gigabytes",
"TB": "terabytes",

// SI
"m": "meters",
Expand All @@ -56,7 +51,6 @@ var unitMap = map[string]string{
"Hz": "hertz",
"1": "",
"%": "percent",
"$": "dollars",
}

// The map that translates the "per" unit
Expand Down
7 changes: 0 additions & 7 deletions pkg/translator/prometheus/normalize_name_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,6 @@ func TestPercent(t *testing.T) {

}

func TestDollar(t *testing.T) {

require.Equal(t, "crypto_bitcoin_value_dollars", normalizeName(createGauge("crypto.bitcoin.value", "$"), ""))
require.Equal(t, "crypto_bitcoin_value_dollars", normalizeName(createGauge("crypto.bitcoin.value.dollars", "$"), ""))

}

func TestEmpty(t *testing.T) {

require.Equal(t, "test_metric_no_unit", normalizeName(createGauge("test.metric.no_unit", ""), ""))
Expand Down