Skip to content

Make metrics reusable by other remappers #10

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

Merged
merged 2 commits into from
May 31, 2024
Merged

Make metrics reusable by other remappers #10

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
1c4f1a2
Make metrics reusable by other remappers
lahsivjar May 17, 2024
bc87e04
Merge branch 'main' into expose-metrics
lahsivjar May 20, 2024
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
242 changes: 122 additions & 120 deletions remappers/hostmetrics/cpu.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ import (

"go.opentelemetry.io/collector/pdata/pcommon"
"go.opentelemetry.io/collector/pdata/pmetric"

remappers "github.com/elastic/opentelemetry-lib/remappers/internal"
)

func remapCPUMetrics(
Expand Down Expand Up @@ -86,60 +88,60 @@ func remapCPUMetrics(
}

// Add all metrics that are independent of cpu logical count.
addMetrics(out, dataset, emptyMutator,
metric{
dataType: pmetric.MetricTypeGauge,
name: "system.cpu.total.pct",
timestamp: timestamp,
doubleValue: &totalPercent,
},
metric{
dataType: pmetric.MetricTypeGauge,
name: "system.cpu.idle.pct",
timestamp: timestamp,
doubleValue: &idlePercent,
},
metric{
dataType: pmetric.MetricTypeGauge,
name: "system.cpu.system.pct",
timestamp: timestamp,
doubleValue: &systemPercent,
},
metric{
dataType: pmetric.MetricTypeGauge,
name: "system.cpu.user.pct",
timestamp: timestamp,
doubleValue: &userPercent,
},
metric{
dataType: pmetric.MetricTypeGauge,
name: "system.cpu.steal.pct",
timestamp: timestamp,
doubleValue: &stealPercent,
},
metric{
dataType: pmetric.MetricTypeGauge,
name: "system.cpu.wait.pct",
timestamp: timestamp,
doubleValue: &iowaitPercent,
},
metric{
dataType: pmetric.MetricTypeGauge,
name: "system.cpu.nice.pct",
timestamp: timestamp,
doubleValue: &nicePercent,
},
metric{
dataType: pmetric.MetricTypeGauge,
name: "system.cpu.irq.pct",
timestamp: timestamp,
doubleValue: &irqPercent,
},
metric{
dataType: pmetric.MetricTypeGauge,
name: "system.cpu.softirq.pct",
timestamp: timestamp,
doubleValue: &softirqPercent,
remappers.AddMetrics(out, dataset, remappers.EmptyMutator,
remappers.Metric{
DataType: pmetric.MetricTypeGauge,
Name: "system.cpu.total.pct",
Timestamp: timestamp,
DoubleValue: &totalPercent,
},
remappers.Metric{
DataType: pmetric.MetricTypeGauge,
Name: "system.cpu.idle.pct",
Timestamp: timestamp,
DoubleValue: &idlePercent,
},
remappers.Metric{
DataType: pmetric.MetricTypeGauge,
Name: "system.cpu.system.pct",
Timestamp: timestamp,
DoubleValue: &systemPercent,
},
remappers.Metric{
DataType: pmetric.MetricTypeGauge,
Name: "system.cpu.user.pct",
Timestamp: timestamp,
DoubleValue: &userPercent,
},
remappers.Metric{
DataType: pmetric.MetricTypeGauge,
Name: "system.cpu.steal.pct",
Timestamp: timestamp,
DoubleValue: &stealPercent,
},
remappers.Metric{
DataType: pmetric.MetricTypeGauge,
Name: "system.cpu.wait.pct",
Timestamp: timestamp,
DoubleValue: &iowaitPercent,
},
remappers.Metric{
DataType: pmetric.MetricTypeGauge,
Name: "system.cpu.nice.pct",
Timestamp: timestamp,
DoubleValue: &nicePercent,
},
remappers.Metric{
DataType: pmetric.MetricTypeGauge,
Name: "system.cpu.irq.pct",
Timestamp: timestamp,
DoubleValue: &irqPercent,
},
remappers.Metric{
DataType: pmetric.MetricTypeGauge,
Name: "system.cpu.softirq.pct",
Timestamp: timestamp,
DoubleValue: &softirqPercent,
},
)

Expand All @@ -157,72 +159,72 @@ func remapCPUMetrics(
irqNorm := irqPercent / float64(numCores)
softirqNorm := softirqPercent / float64(numCores)

addMetrics(out, dataset, emptyMutator,
metric{
dataType: pmetric.MetricTypeSum,
name: "system.cpu.cores",
timestamp: timestamp,
intValue: &numCores,
},
metric{
dataType: pmetric.MetricTypeSum,
name: "system.load.cores",
timestamp: timestamp,
intValue: &numCores,
},
metric{
dataType: pmetric.MetricTypeGauge,
name: "system.cpu.total.norm.pct",
timestamp: timestamp,
doubleValue: &totalNorm,
},
metric{
dataType: pmetric.MetricTypeGauge,
name: "system.cpu.idle.norm.pct",
timestamp: timestamp,
doubleValue: &idleNorm,
},
metric{
dataType: pmetric.MetricTypeGauge,
name: "system.cpu.system.norm.pct",
timestamp: timestamp,
doubleValue: &systemNorm,
},
metric{
dataType: pmetric.MetricTypeGauge,
name: "system.cpu.user.norm.pct",
timestamp: timestamp,
doubleValue: &userNorm,
},
metric{
dataType: pmetric.MetricTypeGauge,
name: "system.cpu.steal.norm.pct",
timestamp: timestamp,
doubleValue: &stealNorm,
},
metric{
dataType: pmetric.MetricTypeGauge,
name: "system.cpu.wait.norm.pct",
timestamp: timestamp,
doubleValue: &iowaitNorm,
},
metric{
dataType: pmetric.MetricTypeGauge,
name: "system.cpu.nice.norm.pct",
timestamp: timestamp,
doubleValue: &niceNorm,
},
metric{
dataType: pmetric.MetricTypeGauge,
name: "system.cpu.irq.norm.pct",
timestamp: timestamp,
doubleValue: &irqNorm,
},
metric{
dataType: pmetric.MetricTypeGauge,
name: "system.cpu.softirq.norm.pct",
timestamp: timestamp,
doubleValue: &softirqNorm,
remappers.AddMetrics(out, dataset, remappers.EmptyMutator,
remappers.Metric{
DataType: pmetric.MetricTypeSum,
Name: "system.cpu.cores",
Timestamp: timestamp,
IntValue: &numCores,
},
remappers.Metric{
DataType: pmetric.MetricTypeSum,
Name: "system.load.cores",
Timestamp: timestamp,
IntValue: &numCores,
},
remappers.Metric{
DataType: pmetric.MetricTypeGauge,
Name: "system.cpu.total.norm.pct",
Timestamp: timestamp,
DoubleValue: &totalNorm,
},
remappers.Metric{
DataType: pmetric.MetricTypeGauge,
Name: "system.cpu.idle.norm.pct",
Timestamp: timestamp,
DoubleValue: &idleNorm,
},
remappers.Metric{
DataType: pmetric.MetricTypeGauge,
Name: "system.cpu.system.norm.pct",
Timestamp: timestamp,
DoubleValue: &systemNorm,
},
remappers.Metric{
DataType: pmetric.MetricTypeGauge,
Name: "system.cpu.user.norm.pct",
Timestamp: timestamp,
DoubleValue: &userNorm,
},
remappers.Metric{
DataType: pmetric.MetricTypeGauge,
Name: "system.cpu.steal.norm.pct",
Timestamp: timestamp,
DoubleValue: &stealNorm,
},
remappers.Metric{
DataType: pmetric.MetricTypeGauge,
Name: "system.cpu.wait.norm.pct",
Timestamp: timestamp,
DoubleValue: &iowaitNorm,
},
remappers.Metric{
DataType: pmetric.MetricTypeGauge,
Name: "system.cpu.nice.norm.pct",
Timestamp: timestamp,
DoubleValue: &niceNorm,
},
remappers.Metric{
DataType: pmetric.MetricTypeGauge,
Name: "system.cpu.irq.norm.pct",
Timestamp: timestamp,
DoubleValue: &irqNorm,
},
remappers.Metric{
DataType: pmetric.MetricTypeGauge,
Name: "system.cpu.softirq.norm.pct",
Timestamp: timestamp,
DoubleValue: &softirqNorm,
},
)

Expand Down
34 changes: 18 additions & 16 deletions remappers/hostmetrics/load.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ package hostmetrics
import (
"go.opentelemetry.io/collector/pdata/pcommon"
"go.opentelemetry.io/collector/pdata/pmetric"

remappers "github.com/elastic/opentelemetry-lib/remappers/internal"
)

// system.load.cores is calculated using the cpu remapper and if dataset
Expand Down Expand Up @@ -56,24 +58,24 @@ func remapLoadMetrics(
}
}

addMetrics(out, dataset, emptyMutator,
metric{
dataType: pmetric.MetricTypeGauge,
name: "system.load.1",
timestamp: timestamp,
doubleValue: &l1,
remappers.AddMetrics(out, dataset, remappers.EmptyMutator,
remappers.Metric{
DataType: pmetric.MetricTypeGauge,
Name: "system.load.1",
Timestamp: timestamp,
DoubleValue: &l1,
},
metric{
dataType: pmetric.MetricTypeGauge,
name: "system.load.5",
timestamp: timestamp,
doubleValue: &l5,
remappers.Metric{
DataType: pmetric.MetricTypeGauge,
Name: "system.load.5",
Timestamp: timestamp,
DoubleValue: &l5,
},
metric{
dataType: pmetric.MetricTypeGauge,
name: "system.load.15",
timestamp: timestamp,
doubleValue: &l15,
remappers.Metric{
DataType: pmetric.MetricTypeGauge,
Name: "system.load.15",
Timestamp: timestamp,
DoubleValue: &l15,
},
)

Expand Down
Loading