go/opentelemetry-go
go/opentelemetry-go
1
0
Fork 0
mirror of https://github.com/open-telemetry/opentelemetry-go.git synced 2025-06-04 23:07:40 +02:00
Code Issues Releases Activity

Remove NewZeroNumber in favor of Number(0) (#255)

Browse Source
This commit is contained in:
Joshua MacDonald 2019-10-30 11:22:14 -07:00 committed by GitHub
parent 320c62a780
commit 88dafbbb16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
api/core/number.go
View File

@ -42,19 +42,6 @@ type Number uint64
// - constructors // - constructors
// NewZeroNumber
func NewZeroNumber(kind NumberKind) Number {
switch kind {
case Int64NumberKind:
return NewInt64Number(0)
case Float64NumberKind:
return NewFloat64Number(0.)
case Uint64NumberKind:
return NewUint64Number(0)
}
return Number(0)
}
// NewNumberFromRaw creates a new Number from a raw value. // NewNumberFromRaw creates a new Number from a raw value.
func NewNumberFromRaw(r uint64) Number { func NewNumberFromRaw(r uint64) Number {
return Number(r) return Number(r)

11
api/core/number_test.go
View File

@ -146,3 +146,14 @@ func TestNumber(t *testing.T) {
} }
} }
} }
func TestNumberZero(t *testing.T) {
zero := Number(0)
zerof := NewFloat64Number(0)
zeroi := NewInt64Number(0)
zerou := NewUint64Number(0)
if zero != zerof || zero != zeroi || zero != zerou {
t.Errorf("Invalid zero representations")
}
}

5
sdk/metric/aggregator/counter/counter.go
View File

@ -45,10 +45,7 @@ func (c *Aggregator) AsNumber() core.Number {
// Collect checkpoints the current value (atomically) and exports it. // Collect checkpoints the current value (atomically) and exports it.
func (c *Aggregator) Collect(ctx context.Context, rec export.MetricRecord, exp export.MetricBatcher) { func (c *Aggregator) Collect(ctx context.Context, rec export.MetricRecord, exp export.MetricBatcher) {
desc := rec.Descriptor() c.checkpoint = c.current.SwapNumberAtomic(core.Number(0))
kind := desc.NumberKind()
zero := core.NewZeroNumber(kind)
c.checkpoint = c.current.SwapNumberAtomic(zero)
exp.Export(ctx, rec, c) exp.Export(ctx, rec, c)
} }

8
sdk/metric/aggregator/maxsumcount/msc.go
View File

@ -60,10 +60,6 @@ func (c *Aggregator) Max() core.Number {
// Collect saves the current value (atomically) and exports it. // Collect saves the current value (atomically) and exports it.
func (c *Aggregator) Collect(ctx context.Context, rec export.MetricRecord, exp export.MetricBatcher) { func (c *Aggregator) Collect(ctx context.Context, rec export.MetricRecord, exp export.MetricBatcher) {
desc := rec.Descriptor()
kind := desc.NumberKind()
zero := core.NewZeroNumber(kind)
// N.B. There is no atomic operation that can update all three // N.B. There is no atomic operation that can update all three
// values at once, so there are races between Update() and // values at once, so there are races between Update() and
// Collect(). Therefore, atomically swap fields independently, // Collect(). Therefore, atomically swap fields independently,
@ -71,8 +67,8 @@ func (c *Aggregator) Collect(ctx context.Context, rec export.MetricRecord, exp e
// could be spread across multiple collections in rare cases. // could be spread across multiple collections in rare cases.
c.save.count.SetUint64(c.live.count.SwapUint64Atomic(0)) c.save.count.SetUint64(c.live.count.SwapUint64Atomic(0))
c.save.sum = c.live.sum.SwapNumberAtomic(zero) c.save.sum = c.live.sum.SwapNumberAtomic(core.Number(0))
c.save.max = c.live.max.SwapNumberAtomic(zero) c.save.max = c.live.max.SwapNumberAtomic(core.Number(0))
exp.Export(ctx, rec, c) exp.Export(ctx, rec, c)
} }