Convert hostmetrics to new Number metrics

Signed-off-by: Bogdan Drutu <[email protected]>
open-telemetry · Jul 25, 2021 · 716a5d1 · 716a5d1
1 parent 6ae558c
commit 716a5d1
Show file tree

Hide file tree

Showing 31 changed files with 272 additions and 350 deletions.
diff --git a/cmd/mdatagen/metricdata.go b/cmd/mdatagen/metricdata.go
@@ -19,8 +19,6 @@ import (
 )
 
 var (
-	_ MetricData = &intGauge{}
-	_ MetricData = &intSum{}
 	_ MetricData = &gauge{}
 	_ MetricData = &sum{}
 	_ MetricData = &histogram{}
@@ -43,10 +41,6 @@ func (e *ymlMetricData) UnmarshalYAML(unmarshal func(interface{}) error) error {
 	var md MetricData
 
 	switch m.Type {
-	case "int gauge":
-		md = &intGauge{}
-	case "int sum":
-		md = &intSum{}
 	case "gauge":
 		md = &gauge{}
 	case "sum":
@@ -98,21 +92,6 @@ type Mono struct {
 	Monotonic bool `yaml:"monotonic"`
 }
 
-type intGauge struct {
-}
-
-func (i intGauge) Type() string {
-	return "IntGauge"
-}
-
-func (i intGauge) HasMonotonic() bool {
-	return false
-}
-
-func (i intGauge) HasAggregated() bool {
-	return false
-}
-
 type gauge struct {
 }
 
@@ -128,23 +107,6 @@ func (d gauge) HasAggregated() bool {
 	return false
 }
 
-type intSum struct {
-	Aggregated `yaml:",inline"`
-	Mono       `yaml:",inline"`
-}
-
-func (i intSum) Type() string {
-	return "IntSum"
-}
-
-func (i intSum) HasMonotonic() bool {
-	return true
-}
-
-func (i intSum) HasAggregated() bool {
-	return true
-}
-
 type sum struct {
 	Aggregated `yaml:",inline"`
 	Mono       `yaml:",inline"`

diff --git a/cmd/mdatagen/metricdata_test.go b/cmd/mdatagen/metricdata_test.go
@@ -27,8 +27,6 @@ func TestMetricData(t *testing.T) {
 		hasAggregated bool
 		hasMonotonic  bool
 	}{
-		{&intGauge{}, "IntGauge", false, false},
-		{&intSum{}, "IntSum", true, true},
 		{&gauge{}, "Gauge", false, false},
 		{&sum{}, "Sum", true, true},
 		{&histogram{}, "Histogram", true, false},

diff --git a/receiver/hostmetricsreceiver/internal/metadata/generated_metrics.go b/receiver/hostmetricsreceiver/internal/metadata/generated_metrics.go
diff --git a/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper_test.go b/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper_test.go
@@ -112,16 +112,16 @@ func assertCPUMetricValid(t *testing.T, metric pdata.Metric, descriptor pdata.Me
 		internal.AssertSumMetricStartTimeEquals(t, metric, startTime)
 	}
 	assert.GreaterOrEqual(t, metric.Sum().DataPoints().Len(), 4*runtime.NumCPU())
-	internal.AssertSumMetricLabelExists(t, metric, 0, metadata.Labels.Cpu)
-	internal.AssertSumMetricLabelHasValue(t, metric, 0, metadata.Labels.CPUState, metadata.LabelCPUState.User)
-	internal.AssertSumMetricLabelHasValue(t, metric, 1, metadata.Labels.CPUState, metadata.LabelCPUState.System)
-	internal.AssertSumMetricLabelHasValue(t, metric, 2, metadata.Labels.CPUState, metadata.LabelCPUState.Idle)
-	internal.AssertSumMetricLabelHasValue(t, metric, 3, metadata.Labels.CPUState, metadata.LabelCPUState.Interrupt)
+	internal.AssertSumMetricHasLabel(t, metric, 0, metadata.Labels.Cpu)
+	internal.AssertSumMetricHasLabelValue(t, metric, 0, metadata.Labels.CPUState, metadata.LabelCPUState.User)
+	internal.AssertSumMetricHasLabelValue(t, metric, 1, metadata.Labels.CPUState, metadata.LabelCPUState.System)
+	internal.AssertSumMetricHasLabelValue(t, metric, 2, metadata.Labels.CPUState, metadata.LabelCPUState.Idle)
+	internal.AssertSumMetricHasLabelValue(t, metric, 3, metadata.Labels.CPUState, metadata.LabelCPUState.Interrupt)
 }
 
 func assertCPUMetricHasLinuxSpecificStateLabels(t *testing.T, metric pdata.Metric) {
-	internal.AssertSumMetricLabelHasValue(t, metric, 4, metadata.Labels.CPUState, metadata.LabelCPUState.Nice)
-	internal.AssertSumMetricLabelHasValue(t, metric, 5, metadata.Labels.CPUState, metadata.LabelCPUState.Softirq)
-	internal.AssertSumMetricLabelHasValue(t, metric, 6, metadata.Labels.CPUState, metadata.LabelCPUState.Steal)
-	internal.AssertSumMetricLabelHasValue(t, metric, 7, metadata.Labels.CPUState, metadata.LabelCPUState.Wait)
+	internal.AssertSumMetricHasLabelValue(t, metric, 4, metadata.Labels.CPUState, metadata.LabelCPUState.Nice)
+	internal.AssertSumMetricHasLabelValue(t, metric, 5, metadata.Labels.CPUState, metadata.LabelCPUState.Softirq)
+	internal.AssertSumMetricHasLabelValue(t, metric, 6, metadata.Labels.CPUState, metadata.LabelCPUState.Steal)
+	internal.AssertSumMetricHasLabelValue(t, metric, 7, metadata.Labels.CPUState, metadata.LabelCPUState.Wait)
 }