upstream/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2026-06-04 14:12:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Fix m name.

Browse source 
Signed-off-by: bwplotka <bwplotka@gmail.com>
This commit is contained in:
bwplotka 2025-03-27 15:41:23 +00:00
parent 0014dc425a
commit f344f7343f
5 changed files with 25 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
semconv/engine_test.go
View file

@ -18,13 +18,6 @@ func mustNewValueTransformerFromPromQL(p string) valueTransformer {
return ret
}
// clean removed fields not used in metricGroupChange for result
// transformations, so they are not updated.
func clean(m metricGroupChange) metricGroupChange {
m.ValuePromQL = ""
return m
}
// TODO(bwplotka): Test ambiguous matcher errors etc.
func TestEngine_FindMatcherVariants(t *testing.T) {
for _, tcase := range []struct {
@ -107,7 +100,7 @@ func TestEngine_FindMatcherVariants(t *testing.T) {
{
schemaURL: "./testdata/1.1.0", matchers: []*labels.Matcher{
labels.MustNewMatcher(labels.MatchEqual, schemaURLLabel, "./testdata/1.1.0"),
labels.MustNewMatcher(labels.MatchEqual, labels.MetricName, "my_app_custom_elements_changed_total"),
labels.MustNewMatcher(labels.MatchEqual, labels.MetricName, "my_app_custom_changed_elements_total"),
labels.MustNewMatcher(labels.MatchNotEqual, "number", "2"),
labels.MustNewMatcher(labels.MatchRegexp, "class", "FIRST|OTHER"),
labels.MustNewMatcher(labels.MatchEqual, "fraction", "1.2"),
@ -115,7 +108,7 @@ func TestEngine_FindMatcherVariants(t *testing.T) {
expectedVariants: [][]*labels.Matcher{
{
// Original matchers.
labels.MustNewMatcher(labels.MatchEqual, labels.MetricName, "my_app_custom_elements_changed_total"),
labels.MustNewMatcher(labels.MatchEqual, labels.MetricName, "my_app_custom_changed_elements_total"),
labels.MustNewMatcher(labels.MatchNotEqual, "number", "2"),
labels.MustNewMatcher(labels.MatchRegexp, "class", "FIRST|OTHER"),
labels.MustNewMatcher(labels.MatchEqual, "fraction", "1.2"),
@ -129,7 +122,7 @@ func TestEngine_FindMatcherVariants(t *testing.T) {
},
{
// Forward.
labels.MustNewMatcher(labels.MatchEqual, labels.MetricName, "my_app_custom_elements_changed_total"),
labels.MustNewMatcher(labels.MatchEqual, labels.MetricName, "my_app_custom_changed_elements_total"),
labels.MustNewMatcher(labels.MatchNotEqual, "my_number", "2"),
labels.MustNewMatcher(labels.MatchRegexp, "class", "FIRST|OTHER"),
labels.MustNewMatcher(labels.MatchEqual, "fraction", "1.2"),
@ -144,7 +137,7 @@ func TestEngine_FindMatcherVariants(t *testing.T) {
{
schemaURL: "./testdata/1.2.0", matchers: []*labels.Matcher{
labels.MustNewMatcher(labels.MatchEqual, schemaURLLabel, "./testdata/1.2.0"),
labels.MustNewMatcher(labels.MatchEqual, labels.MetricName, "my_app_custom_elements_changed_total"),
labels.MustNewMatcher(labels.MatchEqual, labels.MetricName, "my_app_custom_changed_elements_total"),
labels.MustNewMatcher(labels.MatchNotEqual, "my_number", "2"),
labels.MustNewMatcher(labels.MatchRegexp, "class", "FIRST|OTHER"),
labels.MustNewMatcher(labels.MatchEqual, "fraction", "1.2"),
@ -152,14 +145,14 @@ func TestEngine_FindMatcherVariants(t *testing.T) {
expectedVariants: [][]*labels.Matcher{
{
// Original matchers.
labels.MustNewMatcher(labels.MatchEqual, labels.MetricName, "my_app_custom_elements_changed_total"),
labels.MustNewMatcher(labels.MatchEqual, labels.MetricName, "my_app_custom_changed_elements_total"),
labels.MustNewMatcher(labels.MatchNotEqual, "my_number", "2"),
labels.MustNewMatcher(labels.MatchRegexp, "class", "FIRST|OTHER"),
labels.MustNewMatcher(labels.MatchEqual, "fraction", "1.2"),
},
{
// Backward 1.
labels.MustNewMatcher(labels.MatchEqual, labels.MetricName, "my_app_custom_elements_changed_total"),
labels.MustNewMatcher(labels.MatchEqual, labels.MetricName, "my_app_custom_changed_elements_total"),
labels.MustNewMatcher(labels.MatchNotEqual, "number", "2"),
labels.MustNewMatcher(labels.MatchRegexp, "class", "FIRST|OTHER"),
labels.MustNewMatcher(labels.MatchEqual, "fraction", "1.2"),
@ -196,14 +189,14 @@ func TestEngine_FindMatcherVariants(t *testing.T) {
},
{
// Forward 1.
labels.MustNewMatcher(labels.MatchEqual, labels.MetricName, "my_app_custom_elements_changed_total"),
labels.MustNewMatcher(labels.MatchEqual, labels.MetricName, "my_app_custom_changed_elements_total"),
labels.MustNewMatcher(labels.MatchNotEqual, "number", "2"),
labels.MustNewMatcher(labels.MatchRegexp, "class", "FIRST|OTHER"),
labels.MustNewMatcher(labels.MatchEqual, "fraction", "1.2"),
},
{
// Forward 2.
labels.MustNewMatcher(labels.MatchEqual, labels.MetricName, "my_app_custom_elements_changed_total"),
labels.MustNewMatcher(labels.MatchEqual, labels.MetricName, "my_app_custom_changed_elements_total"),
labels.MustNewMatcher(labels.MatchNotEqual, "my_number", "2"),
labels.MustNewMatcher(labels.MatchRegexp, "class", "FIRST|OTHER"),
labels.MustNewMatcher(labels.MatchEqual, "fraction", "1.2"),
@ -355,7 +348,7 @@ func TestEngine_TransformSeries(t *testing.T) {
},
lbls: testdataElementsSeriesNew,
expectedLabels: labels.FromStrings(
"__name__", "my_app_custom_elements_changed_total",
"__name__", "my_app_custom_changed_elements_total",
"__type__", "counter",
"number", "1",
"class", "FIRST",
@ -370,7 +363,7 @@ func TestEngine_TransformSeries(t *testing.T) {
},
lbls: testdataElementsSeriesOld,
expectedLabels: labels.FromStrings(
"__name__", "my_app_custom_elements_changed_total",
"__name__", "my_app_custom_changed_elements_total",
"__type__", "counter",
"number", "1",
"class", "FIRST",
@ -385,7 +378,7 @@ func TestEngine_TransformSeries(t *testing.T) {
},
lbls: testdataElementsSeriesOld,
expectedLabels: labels.FromStrings(
"__name__", "my_app_custom_elements_changed_total",
"__name__", "my_app_custom_changed_elements_total",
"__type__", "counter",
"my_number", "1",
"class", "FIRST",
@ -400,7 +393,7 @@ func TestEngine_TransformSeries(t *testing.T) {
},
lbls: testdataElementsSeriesNew,
expectedLabels: labels.FromStrings(
"__name__", "my_app_custom_elements_changed_total",
"__name__", "my_app_custom_changed_elements_total",
"__type__", "counter",
"my_number", "1",
"class", "FIRST",

14
semconv/gen_files_test.go
View file

@ -8,14 +8,14 @@ import (
var (
testdataElementsChanges = []change{
{
Forward: metricGroupChange{MetricName: "my_app_custom_elements_changed_total", Unit: "", ValuePromQL: "", Attributes: []attribute{{Tag: "number"}, {Tag: "class", Members: []attributeMember{{Value: "FIRST"}, {Value: "SECOND"}, {Value: "OTHER"}}}}},
Backward: metricGroupChange{MetricName: "my_app_custom_elements_total", Unit: "", ValuePromQL: "", Attributes: []attribute{{Tag: "integer"}, {Tag: "category", Members: []attributeMember{{Value: "first"}, {Value: "second"}, {Value: "other"}}}}},
},
{
Forward: metricGroupChange{MetricName: "", Unit: "", ValuePromQL: "", Attributes: []attribute{{Tag: "my_number"}}},
Backward: metricGroupChange{MetricName: "", Unit: "", ValuePromQL: "", Attributes: []attribute{{Tag: "number"}}},
},
{
Forward: metricGroupChange{MetricName: "my_app_custom_changed_elements_total", Unit: "", ValuePromQL: "", Attributes: []attribute{{Tag: "number"}, {Tag: "class", Members: []attributeMember{{Value: "FIRST"}, {Value: "SECOND"}, {Value: "OTHER"}}}}},
Backward: metricGroupChange{MetricName: "my_app_custom_elements_total", Unit: "", ValuePromQL: "", Attributes: []attribute{{Tag: "integer"}, {Tag: "category", Members: []attributeMember{{Value: "first"}, {Value: "second"}, {Value: "other"}}}}},
},
}
testdataLatencyChanges = []change{
{
@ -60,7 +60,7 @@ func TestFetchIDs(t *testing.T) {
{ID: "my_app_latency.2",
IntroVersion: "1.1.0"},
},
"my_app_custom_elements_changed_total~elements.counter": {
"my_app_custom_changed_elements_total~elements.counter": {
{
ID: "my_app_custom_elements.3",
IntroVersion: "1.2.0",
@ -90,14 +90,14 @@ func TestFetchIDs(t *testing.T) {
},
},
uniqueNameToIdentity: map[string]string{
"my_app_custom_elements_changed_total": "my_app_custom_elements_changed_total~elements.counter",
"my_app_custom_changed_elements_total": "my_app_custom_changed_elements_total~elements.counter",
"my_app_custom_elements_total": "my_app_custom_elements_total~elements.counter",
"my_app_latency_milliseconds": "my_app_latency_milliseconds~milliseconds.histogram",
"my_app_latency_seconds": "my_app_latency_seconds~seconds.histogram",
"my_app_some_elements": "my_app_some_elements~elements.gauge",
},
uniqueNameTypeToIdentity: map[string]string{
"my_app_custom_elements_changed_total.counter": "my_app_custom_elements_changed_total~elements.counter",
"my_app_custom_changed_elements_total.counter": "my_app_custom_changed_elements_total~elements.counter",
"my_app_custom_elements_total.counter": "my_app_custom_elements_total~elements.counter",
"my_app_latency_milliseconds.histogram": "my_app_latency_milliseconds~milliseconds.histogram",
"my_app_latency_seconds.histogram": "my_app_latency_seconds~seconds.histogram",

8
semconv/storage_test.go
View file

@ -36,7 +36,7 @@ var (
"test", "old",
)
testdataElementsSeriesNew = labels.FromStrings(
"__name__", "my_app_custom_elements_changed_total",
"__name__", "my_app_custom_changed_elements_total",
"__schema_url__", testSchemaURL("1.1.0"),
"__type__", "counter",
"number", "1",
@ -296,7 +296,7 @@ func TestAwareStorage(t *testing.T) {
labels.MustNewMatcher(labels.MatchEqual, "fraction", testdataElementsSeriesNew.Get("fraction")),
)
require.Equal(t, map[string][]chunks.Sample{
`{__name__="my_app_custom_elements_changed_total", __schema_url__="` + testSchemaURL("1.1.0") + `", __type__="counter", class="FIRST", fraction="1.243", number="1", test="new"}`: testFSamples,
`{__name__="my_app_custom_changed_elements_total", __schema_url__="` + testSchemaURL("1.1.0") + `", __type__="counter", class="FIRST", fraction="1.243", number="1", test="new"}`: testFSamples,
}, onlyNewResult)
got := selectSeries(t, aware,
// Without schema selector, semconv aware storage should have no effect.
@ -315,8 +315,8 @@ func TestAwareStorage(t *testing.T) {
labels.MustNewMatcher(labels.MatchEqual, "fraction", testdataElementsSeriesNew.Get("fraction")),
)
require.Equal(t, map[string][]chunks.Sample{
`{__name__="my_app_custom_elements_changed_total", __type__="counter", class="FIRST", fraction="1.243", number="1", test="new"}`: testFSamples,
`{__name__="my_app_custom_elements_changed_total", __type__="counter", class="FIRST", fraction="1.243", number="1", test="old"}`: testFSamples,
`{__name__="my_app_custom_changed_elements_total", __type__="counter", class="FIRST", fraction="1.243", number="1", test="new"}`: testFSamples,
`{__name__="my_app_custom_changed_elements_total", __type__="counter", class="FIRST", fraction="1.243", number="1", test="old"}`: testFSamples,
}, compatibleResult)
})
t.Run("forward", func(t *testing.T) {

2
semconv/testdata/changelog.yaml vendored
View file

@ -25,7 +25,7 @@ metrics_changelog:
- tag: "number"
# my_app_custom_elements vs my_app_custom_elements.2
- forward:
metric_name: my_app_custom_elements_changed_total
metric_name: my_app_custom_changed_elements_total
attributes:
- tag: "number"
- tag: "class"

2
semconv/testdata/ids.yaml vendored
View file

@ -6,7 +6,7 @@ metrics_ids:
my_app_latency_seconds~seconds.histogram:
- id: "my_app_latency.2"
intro_version: "1.1.0"
my_app_custom_elements_changed_total~elements.counter:
my_app_custom_changed_elements_total~elements.counter:
- id: "my_app_custom_elements.3"
intro_version: "1.2.0"
- id: "my_app_custom_elements.2"