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

Skip samples that have a NaN value. #186

Merged
merged 4 commits into from
Oct 10, 2019
Merged

Skip samples that have a NaN value. #186

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c5bc4c6
Skip samples that have a NaN value.
jkschulz Oct 9, 2019
1fad825
Add test case for a sample having a value after being NaN.
jkschulz Oct 10, 2019
672ae06
Trim down tests and add comments.
jkschulz Oct 10, 2019
d3e99d2
Add test case comment.
jkschulz Oct 10, 2019
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
4 changes: 4 additions & 0 deletions retrieval/transform.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ func (b *sampleBuilder) next(ctx context.Context, samples []tsdb.RefSample) (*mo
sample := samples[0]
tailSamples := samples[1:]

if (math.IsNaN(sample.V)) {
return nil, 0, tailSamples, nil
}

entry, ok, err := b.series.get(ctx, sample.Ref)
if err != nil {
return nil, 0, samples, errors.Wrap(err, "get series information")
Expand Down
116 changes: 116 additions & 0 deletions retrieval/transform_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ package retrieval

import (
"context"
"math"
"reflect"
"testing"

Expand Down Expand Up @@ -760,6 +761,121 @@ func TestSampleBuilder(t *testing.T) {
},
},
},
// Samples with a NaN value should be dropped.
{
targets: targetMap{
"job1/instance1": &targets.Target{
Labels: promlabels.FromStrings("job", "job1", "instance", "instance1"),
DiscoveredLabels: promlabels.FromStrings("__resource_a", "resource2_a"),
},
},
series: seriesMap{
1: labels.FromStrings("job", "job1", "instance", "instance1", "__name__", "metric1_count"),
},
metadata: metadataMap{
"job1/instance1/metric1": &scrape.MetricMetadata{Type: textparse.MetricTypeSummary, Metric: "metric1_count"},
},
metricPrefix: "test.googleapis.com",
input: []tsdb.RefSample{
// Need multiple samples, since the first will always be nil due to reset timestamp handling
{Ref: 1, T: 2000, V: 5},
StevenYCChou marked this conversation as resolved.
Show resolved Hide resolved
{Ref: 1, T: 3000, V: 8},
{Ref: 1, T: 4000, V: math.NaN()},
jkschulz marked this conversation as resolved.
Show resolved Hide resolved
},
result: []*monitoring_pb.TimeSeries{
nil,
{
Resource: &monitoredres_pb.MonitoredResource{
Type: "resource2",
Labels: map[string]string{"resource_a": "resource2_a"},
},
Metric: &metric_pb.Metric{
Type: "test.googleapis.com/metric1_count",
Labels: map[string]string{},
},
MetricKind: metric_pb.MetricDescriptor_CUMULATIVE,
ValueType: metric_pb.MetricDescriptor_INT64,
Points: []*monitoring_pb.Point{{
Interval: &monitoring_pb.TimeInterval{
StartTime: &timestamp_pb.Timestamp{Seconds: 2},
EndTime: &timestamp_pb.Timestamp{Seconds: 3},
},
Value: &monitoring_pb.TypedValue{
Value: &monitoring_pb.TypedValue_Int64Value{3},
},
}},
},
nil,
StevenYCChou marked this conversation as resolved.
Show resolved Hide resolved
},
},
{
StevenYCChou marked this conversation as resolved.
Show resolved Hide resolved
targets: targetMap{
"job1/instance1": &targets.Target{
Labels: promlabels.FromStrings("job", "job1", "instance", "instance1"),
DiscoveredLabels: promlabels.FromStrings("__resource_a", "resource2_a"),
},
},
series: seriesMap{
1: labels.FromStrings("job", "job1", "instance", "instance1", "__name__", "metric1_count"),
},
metadata: metadataMap{
"job1/instance1/metric1": &scrape.MetricMetadata{Type: textparse.MetricTypeSummary, Metric: "metric1_count"},
},
metricPrefix: "test.googleapis.com",
input: []tsdb.RefSample{
// Need multiple samples, since the first will always be nil due to reset timestamp handling
{Ref: 1, T: 2000, V: 5},
{Ref: 1, T: 3000, V: 8},
{Ref: 1, T: 4000, V: math.NaN()},
{Ref: 1, T: 5000, V: 9},
},
result: []*monitoring_pb.TimeSeries{
nil,
{
Resource: &monitoredres_pb.MonitoredResource{
Type: "resource2",
Labels: map[string]string{"resource_a": "resource2_a"},
},
Metric: &metric_pb.Metric{
Type: "test.googleapis.com/metric1_count",
Labels: map[string]string{},
},
MetricKind: metric_pb.MetricDescriptor_CUMULATIVE,
ValueType: metric_pb.MetricDescriptor_INT64,
Points: []*monitoring_pb.Point{{
Interval: &monitoring_pb.TimeInterval{
StartTime: &timestamp_pb.Timestamp{Seconds: 2},
EndTime: &timestamp_pb.Timestamp{Seconds: 3},
},
Value: &monitoring_pb.TypedValue{
Value: &monitoring_pb.TypedValue_Int64Value{3},
},
}},
},
nil,
{
Resource: &monitoredres_pb.MonitoredResource{
Type: "resource2",
Labels: map[string]string{"resource_a": "resource2_a"},
},
Metric: &metric_pb.Metric{
Type: "test.googleapis.com/metric1_count",
Labels: map[string]string{},
},
MetricKind: metric_pb.MetricDescriptor_CUMULATIVE,
ValueType: metric_pb.MetricDescriptor_INT64,
Points: []*monitoring_pb.Point{{
Interval: &monitoring_pb.TimeInterval{
StartTime: &timestamp_pb.Timestamp{Seconds: 2},
EndTime: &timestamp_pb.Timestamp{Seconds: 5},
},
Value: &monitoring_pb.TypedValue{
Value: &monitoring_pb.TypedValue_Int64Value{4},
},
}},
},
},
},
}
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
Expand Down