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.

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

Avoid frequent logging of invalid-values (Inf, NaN, Negatives) #272

Merged
merged 7 commits into from
Sep 7, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,13 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
[host](https://github.com/open-telemetry/opentelemetry-go-contrib/tree/main/instrumentation/host)
metrics instrumentation will be reported automatically.
[#265](https://github.com/lightstep/otel-launcher-go/pull/265)
- Proposed replacement for go-contrib instrumentation/runtime added as lightstep/instrumentation/runtime.
- Proposed replacement for go-contrib instrumentation/runtime added as lightstep/instrumentation/runtime.
[#267](https://github.com/lightstep/otel-launcher-go/pull/267)
- Avoid repetitive calls to `otel.Handle()` with error conditions
caused by out-of-range metrics input values, including NaN, Inf, and
in some cases negative values. These will be handled no more than
once per 30 seconds per condition.
[#272](https://github.com/lightstep/otel-launcher-go/pull/272)

## [1.10.1](https://github.com/lightstep/otel-launcher-go/releases/tag/v1.10.1) - 2022-08-29

Expand Down
14 changes: 11 additions & 3 deletions lightstep/sdk/metric/aggregator/aggregator.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@ package aggregator // import "github.com/lightstep/otel-launcher-go/lightstep/sd

import (
"fmt"
"time"

"github.com/lightstep/otel-launcher-go/lightstep/sdk/metric/aggregator/aggregation"
histostruct "github.com/lightstep/otel-launcher-go/lightstep/sdk/metric/aggregator/histogram/structure"
"github.com/lightstep/otel-launcher-go/lightstep/sdk/metric/internal/doevery"
"github.com/lightstep/otel-launcher-go/lightstep/sdk/metric/number"
"github.com/lightstep/otel-launcher-go/lightstep/sdk/metric/sdkinstrument"
"go.opentelemetry.io/otel"
Expand All @@ -39,12 +41,16 @@ func RangeTest[N number.Any, Traits number.Traits[N]](num N, desc sdkinstrument.
var traits Traits

if traits.IsInf(num) {
otel.Handle(fmt.Errorf("%s: %w", desc.Name, ErrInfInput))
doevery.TimePeriod(30*time.Second, func() {
otel.Handle(fmt.Errorf("%s: %w", desc.Name, ErrInfInput))
})
return false
}

if traits.IsNaN(num) {
otel.Handle(fmt.Errorf("%s: %w", desc.Name, ErrNaNInput))
doevery.TimePeriod(30*time.Second, func() {
otel.Handle(fmt.Errorf("%s: %w", desc.Name, ErrNaNInput))
})
return false
}

Expand All @@ -53,7 +59,9 @@ func RangeTest[N number.Any, Traits number.Traits[N]](num N, desc sdkinstrument.
case sdkinstrument.SyncCounter,
sdkinstrument.SyncHistogram:
if num < 0 {
otel.Handle(fmt.Errorf("%s: %w", desc.Name, ErrNegativeInput))
doevery.TimePeriod(30*time.Second, func() {
otel.Handle(fmt.Errorf("%s: %w", desc.Name, ErrNegativeInput))
})
return false
}
}
Expand Down
19 changes: 12 additions & 7 deletions lightstep/sdk/metric/internal/asyncstate/async_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -362,13 +362,10 @@ func TestOutOfRangeValues(t *testing.T) {
}, tt, func(ctx context.Context) {
c.Observe(ctx, math.NaN())
c.Observe(ctx, math.Inf(+1))
c.Observe(ctx, math.Inf(-1))
u.Observe(ctx, math.NaN())
u.Observe(ctx, math.Inf(+1))
u.Observe(ctx, math.Inf(-1))
g.Observe(ctx, math.NaN())
g.Observe(ctx, math.Inf(+1))
g.Observe(ctx, math.Inf(-1))
})

runFor := func(num int) {
Expand Down Expand Up @@ -403,15 +400,23 @@ func TestOutOfRangeValues(t *testing.T) {
)
}

// 2 readers x 3 error conditions x 3 instruments
require.Equal(t, 2*3*3, len(*otelErrs))
// Errors are rate limited, but this is the only test in this
// package that uses invalid values. We should have at least
// one per class.
require.LessOrEqual(t, 2, len(*otelErrs))

haveNaN := false
haveInf := false
for _, err := range *otelErrs {
isNaN := errors.Is(err, aggregator.ErrNaNInput)
isInf := errors.Is(err, aggregator.ErrInfInput)
isNeg := errors.Is(err, aggregator.ErrNegativeInput)

require.True(t, isNaN || isInf || isNeg)
require.True(t, isNaN || isInf)
require.True(t, strings.HasPrefix(err.Error(), "testPattern"))

haveNaN = haveNaN || isNaN
haveInf = haveInf || isInf
}
require.True(t, haveNaN)
require.True(t, haveInf)
}
27 changes: 27 additions & 0 deletions lightstep/sdk/metric/internal/syncstate/sync_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@ package syncstate

import (
"context"
"errors"
"math"
"math/rand"
"sync"
"testing"
"time"

"github.com/lightstep/otel-launcher-go/lightstep/sdk/metric/aggregator"
"github.com/lightstep/otel-launcher-go/lightstep/sdk/metric/aggregator/aggregation"
"github.com/lightstep/otel-launcher-go/lightstep/sdk/metric/aggregator/gauge"
"github.com/lightstep/otel-launcher-go/lightstep/sdk/metric/aggregator/histogram"
Expand Down Expand Up @@ -329,6 +331,8 @@ func TestSyncStateFullNoopInstrument(t *testing.T) {
}

func TestOutOfRangeValues(t *testing.T) {
otelErrs := test.OTelErrors()

for _, desc := range []sdkinstrument.Descriptor{
test.Descriptor("cf", sdkinstrument.SyncCounter, number.Float64Kind),
test.Descriptor("uf", sdkinstrument.SyncUpDownCounter, number.Float64Kind),
Expand Down Expand Up @@ -392,6 +396,29 @@ func TestOutOfRangeValues(t *testing.T) {
),
)
}

// Errors are rate limited, but this is the only test in this
// package that uses invalid values. We should have at least
// one per class.
require.LessOrEqual(t, 3, len(*otelErrs))

haveNaN := false
haveInf := false
haveNeg := false
for _, err := range *otelErrs {
isNaN := errors.Is(err, aggregator.ErrNaNInput)
isInf := errors.Is(err, aggregator.ErrInfInput)
isNeg := errors.Is(err, aggregator.ErrNegativeInput)

require.True(t, isNaN || isInf || isNeg)

haveNaN = haveNaN || isNaN
haveInf = haveInf || isInf
haveNeg = haveNeg || isNeg
}
require.True(t, haveNaN)
require.True(t, haveInf)
require.True(t, haveNeg)
}

func TestSyncGaugeDeltaInstrument(t *testing.T) {
Expand Down