go/opentelemetry-go
1
0
Fork 0
mirror of https://github.com/open-telemetry/opentelemetry-go.git synced 2025-09-16 09:26:25 +02:00
Code Issues Releases Activity

Wrap Float64ObservableCounter with system.CPUTime (#7235)

Browse Source 
Fix #7234 

Addresses revert of [`cpu` to `system`
namespace](https://github.com/open-telemetry/semantic-conventions/pull/1896)
in semantic conventions.
This commit is contained in:
Tyler Yahn
2025-08-25 06:51:01 -07:00
committed by GitHub
parent 712e373ea5
commit be28c6bc8f
2 changed files with 9 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
semconv/templates/registry/go/weaver.yaml
View File

@@ -69,7 +69,7 @@ text_maps:
boolean: bool
boolean[]: "...bool"
instrument:
cpu.time: Float64ObservableCounter
system.cpu.time: Float64ObservableCounter
go.config.gogc: Int64ObservableUpDownCounter
go.goroutine.count: Int64ObservableUpDownCounter
go.memory.allocated: Int64ObservableCounter

40
semconv/v1.36.0/systemconv/metric.go
View File

@@ -472,35 +472,35 @@ func (m CPUPhysicalCount) Add(ctx context.Context, incr int64, attrs ...attribut
// "system.cpu.time" semantic conventions. It represents the seconds each logical
// CPU spent on each mode.
type CPUTime struct {
metric.Float64Counter
metric.Float64ObservableCounter
}
// NewCPUTime returns a new CPUTime instrument.
func NewCPUTime(
m metric.Meter,
opt ...metric.Float64CounterOption,
opt ...metric.Float64ObservableCounterOption,
) (CPUTime, error) {
// Check if the meter is nil.
if m == nil {
return CPUTime{noop.Float64Counter{}}, nil
return CPUTime{noop.Float64ObservableCounter{}}, nil
}
i, err := m.Float64Counter(
i, err := m.Float64ObservableCounter(
"system.cpu.time",
append([]metric.Float64CounterOption{
append([]metric.Float64ObservableCounterOption{
metric.WithDescription("Seconds each logical CPU spent on each mode"),
metric.WithUnit("s"),
}, opt...)...,
)
if err != nil {
return CPUTime{noop.Float64Counter{}}, err
return CPUTime{noop.Float64ObservableCounter{}}, err
}
return CPUTime{i}, nil
}
// Inst returns the underlying metric instrument.
func (m CPUTime) Inst() metric.Float64Counter {
return m.Float64Counter
func (m CPUTime) Inst() metric.Float64ObservableCounter {
return m.Float64ObservableCounter
}
// Name returns the semantic convention name of the instrument.
@@ -518,30 +518,6 @@ func (CPUTime) Description() string {
return "Seconds each logical CPU spent on each mode"
}
// Add adds incr to the existing count.
//
// All additional attrs passed are included in the recorded value.
func (m CPUTime) Add(
ctx context.Context,
incr float64,
attrs ...attribute.KeyValue,
) {
o := addOptPool.Get().(*[]metric.AddOption)
defer func() {
*o = (*o)[:0]
addOptPool.Put(o)
}()
*o = append(
*o,
metric.WithAttributes(
attrs...,
),
)
m.Float64Counter.Add(ctx, incr, *o...)
}
// AttrCPULogicalNumber returns an optional attribute for the
// "cpu.logical_number" semantic convention. It represents the logical CPU number
// [0..n-1].