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

Jump to bottom

Convert hostmetrics to new Number metrics #3710

Merged
merged 1 commit into from
Jul 26, 2021
Merged

Convert hostmetrics to new Number metrics #3710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
38 changes: 0 additions & 38 deletions cmd/mdatagen/metricdata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ import (
)

var (
_ MetricData = &intGauge{}
_ MetricData = &intSum{}
_ MetricData = &gauge{}
_ MetricData = &sum{}
_ MetricData = &histogram{}
Expand All @@ -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":
Expand Down Expand Up @@ -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 {
}

Expand All @@ -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"`
Expand Down
2 changes: 0 additions & 2 deletions cmd/mdatagen/metricdata_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
120 changes: 60 additions & 60 deletions receiver/hostmetricsreceiver/internal/metadata/generated_metrics.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}