re
/
client_golang
forked from mirror/client_golang
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #43 from prometheus/remove-extraction-result-type 

Remove extraction result type, simplify code.
This commit is contained in:
juliusv 2015-01-08 17:51:51 +01:00
parent d1beff1523 0bb9a56250
commit d7f000b100
9 changed files with 283 additions and 343 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
extraction/metricfamilyprocessor.go
View File

@ -101,7 +101,7 @@ func extractCounter(out Ingester, o *ProcessOptions, f *dto.MetricFamily) error
sample.Value = model.SampleValue(m.Counter.GetValue()) sample.Value = model.SampleValue(m.Counter.GetValue())
} }
return out.Ingest(&Result{Samples: samples}) return out.Ingest(samples)
} }
func extractGauge(out Ingester, o *ProcessOptions, f *dto.MetricFamily) error { func extractGauge(out Ingester, o *ProcessOptions, f *dto.MetricFamily) error {
@ -132,7 +132,7 @@ func extractGauge(out Ingester, o *ProcessOptions, f *dto.MetricFamily) error {
sample.Value = model.SampleValue(m.Gauge.GetValue()) sample.Value = model.SampleValue(m.Gauge.GetValue())
} }
return out.Ingest(&Result{Samples: samples}) return out.Ingest(samples)
} }
func extractSummary(out Ingester, o *ProcessOptions, f *dto.MetricFamily) error { func extractSummary(out Ingester, o *ProcessOptions, f *dto.MetricFamily) error {
@ -194,7 +194,7 @@ func extractSummary(out Ingester, o *ProcessOptions, f *dto.MetricFamily) error
} }
} }
return out.Ingest(&Result{Samples: samples}) return out.Ingest(samples)
} }
func extractUntyped(out Ingester, o *ProcessOptions, f *dto.MetricFamily) error { func extractUntyped(out Ingester, o *ProcessOptions, f *dto.MetricFamily) error {
@ -225,5 +225,5 @@ func extractUntyped(out Ingester, o *ProcessOptions, f *dto.MetricFamily) error
sample.Value = model.SampleValue(m.Untyped.GetValue()) sample.Value = model.SampleValue(m.Untyped.GetValue())
} }
return out.Ingest(&Result{Samples: samples}) return out.Ingest(samples)
} }

70
extraction/metricfamilyprocessor_test.go
View File

@ -25,11 +25,11 @@ var testTime = model.Now()
type metricFamilyProcessorScenario struct { type metricFamilyProcessorScenario struct {
in string in string
expected, actual []*Result expected, actual []model.Samples
} }
func (s *metricFamilyProcessorScenario) Ingest(r *Result) error { func (s *metricFamilyProcessorScenario) Ingest(samples model.Samples) error {
s.actual = append(s.actual, r) s.actual = append(s.actual, samples)
return nil return nil
} }
@ -50,10 +50,10 @@ func (s *metricFamilyProcessorScenario) test(t *testing.T, set int) {
} }
for i, expected := range s.expected { for i, expected := range s.expected {
sort.Sort(s.actual[i].Samples) sort.Sort(s.actual[i])
sort.Sort(expected.Samples) sort.Sort(expected)
if !expected.equal(s.actual[i]) { if !expected.Equal(s.actual[i]) {
t.Errorf("%d.%d. expected %s, got %s", set, i, expected, s.actual[i]) t.Errorf("%d.%d. expected %s, got %s", set, i, expected, s.actual[i])
} }
} }
@ -66,43 +66,39 @@ func TestMetricFamilyProcessor(t *testing.T) {
}, },
{ {
in: "\x8f\x01\n\rrequest_count\x12\x12Number of requests\x18\x00\"0\n#\n\x0fsome_label_name\x12\x10some_label_value\x1a\t\t\x00\x00\x00\x00\x00\x00E\xc0\"6\n)\n\x12another_label_name\x12\x13another_label_value\x1a\t\t\x00\x00\x00\x00\x00\x00U@", in: "\x8f\x01\n\rrequest_count\x12\x12Number of requests\x18\x00\"0\n#\n\x0fsome_label_name\x12\x10some_label_value\x1a\t\t\x00\x00\x00\x00\x00\x00E\xc0\"6\n)\n\x12another_label_name\x12\x13another_label_value\x1a\t\t\x00\x00\x00\x00\x00\x00U@",
expected: []*Result{ expected: []model.Samples{
{ model.Samples{
Samples: model.Samples{ &model.Sample{
&model.Sample{ Metric: model.Metric{model.MetricNameLabel: "request_count", "some_label_name": "some_label_value"},
Metric: model.Metric{model.MetricNameLabel: "request_count", "some_label_name": "some_label_value"}, Value: -42,
Value: -42, Timestamp: testTime,
Timestamp: testTime, },
}, &model.Sample{
&model.Sample{ Metric: model.Metric{model.MetricNameLabel: "request_count", "another_label_name": "another_label_value"},
Metric: model.Metric{model.MetricNameLabel: "request_count", "another_label_name": "another_label_value"}, Value: 84,
Value: 84, Timestamp: testTime,
Timestamp: testTime,
},
}, },
}, },
}, },
}, },
{ {
in: "\xb9\x01\n\rrequest_count\x12\x12Number of requests\x18\x02\"O\n#\n\x0fsome_label_name\x12\x10some_label_value\"(\x1a\x12\t\xaeG\xe1z\x14\xae\xef?\x11\x00\x00\x00\x00\x00\x00E\xc0\x1a\x12\t+\x87\x16\xd9\xce\xf7\xef?\x11\x00\x00\x00\x00\x00\x00U\xc0\"A\n)\n\x12another_label_name\x12\x13another_label_value\"\x14\x1a\x12\t\x00\x00\x00\x00\x00\x00\xe0?\x11\x00\x00\x00\x00\x00\x00$@", in: "\xb9\x01\n\rrequest_count\x12\x12Number of requests\x18\x02\"O\n#\n\x0fsome_label_name\x12\x10some_label_value\"(\x1a\x12\t\xaeG\xe1z\x14\xae\xef?\x11\x00\x00\x00\x00\x00\x00E\xc0\x1a\x12\t+\x87\x16\xd9\xce\xf7\xef?\x11\x00\x00\x00\x00\x00\x00U\xc0\"A\n)\n\x12another_label_name\x12\x13another_label_value\"\x14\x1a\x12\t\x00\x00\x00\x00\x00\x00\xe0?\x11\x00\x00\x00\x00\x00\x00$@",
expected: []*Result{ expected: []model.Samples{
{ model.Samples{
Samples: model.Samples{ &model.Sample{
&model.Sample{ Metric: model.Metric{model.MetricNameLabel: "request_count", "some_label_name": "some_label_value", "quantile": "0.99"},
Metric: model.Metric{model.MetricNameLabel: "request_count", "some_label_name": "some_label_value", "quantile": "0.99"}, Value: -42,
Value: -42, Timestamp: testTime,
Timestamp: testTime, },
}, &model.Sample{
&model.Sample{ Metric: model.Metric{model.MetricNameLabel: "request_count", "some_label_name": "some_label_value", "quantile": "0.999"},
Metric: model.Metric{model.MetricNameLabel: "request_count", "some_label_name": "some_label_value", "quantile": "0.999"}, Value: -84,
Value: -84, Timestamp: testTime,
Timestamp: testTime, },
}, &model.Sample{
&model.Sample{ Metric: model.Metric{model.MetricNameLabel: "request_count", "another_label_name": "another_label_value", "quantile": "0.5"},
Metric: model.Metric{model.MetricNameLabel: "request_count", "another_label_name": "another_label_value", "quantile": "0.5"}, Value: 10,
Value: 10, Timestamp: testTime,
Timestamp: testTime,
},
}, },
}, },
}, },

38
extraction/processor.go
View File

@ -30,7 +30,7 @@ type ProcessOptions struct {
// Ingester consumes result streams in whatever way is desired by the user. // Ingester consumes result streams in whatever way is desired by the user.
type Ingester interface { type Ingester interface {
Ingest(*Result) error Ingest(model.Samples) error
} }
// Processor is responsible for decoding the actual message responses from // Processor is responsible for decoding the actual message responses from
@ -56,42 +56,6 @@ func labelSet(labels map[string]string) model.LabelSet {
return labelset return labelset
} }
// Result encapsulates the outcome from processing samples from a source.
type Result struct {
Err error
Samples model.Samples
}
func (r *Result) equal(o *Result) bool {
if r == o {
return true
}
if r.Err != o.Err {
if r.Err == nil || o.Err == nil {
return false
}
if r.Err.Error() != o.Err.Error() {
return false
}
}
if len(r.Samples) != len(o.Samples) {
return false
}
for i, mine := range r.Samples {
other := o.Samples[i]
if !mine.Equal(other) {
return false
}
}
return true
}
// A basic interface only useful in testing contexts for dispensing the time // A basic interface only useful in testing contexts for dispensing the time
// in a controlled manner. // in a controlled manner.
type instantProvider interface { type instantProvider interface {

20
extraction/processor0_0_1.go
View File

@ -77,11 +77,7 @@ func (p *processor001) ProcessSingle(in io.Reader, out Ingester, o *ProcessOptio
case gauge001, counter001: case gauge001, counter001:
sampleValue, ok := value.Value.(float64) sampleValue, ok := value.Value.(float64)
if !ok { if !ok {
err = fmt.Errorf("could not convert value from %s %s to float64", entity, value) return fmt.Errorf("could not convert value from %s %s to float64", entity, value)
if err := out.Ingest(&Result{Err: err}); err != nil {
return err
}
continue
} }
pendingSamples = append(pendingSamples, &model.Sample{ pendingSamples = append(pendingSamples, &model.Sample{
@ -95,21 +91,13 @@ func (p *processor001) ProcessSingle(in io.Reader, out Ingester, o *ProcessOptio
case histogram001: case histogram001:
sampleValue, ok := value.Value.(map[string]interface{}) sampleValue, ok := value.Value.(map[string]interface{})
if !ok { if !ok {
err = fmt.Errorf("could not convert value from %q to a map[string]interface{}", value.Value) return fmt.Errorf("could not convert value from %q to a map[string]interface{}", value.Value)
if err := out.Ingest(&Result{Err: err}); err != nil {
return err
}
continue
} }
for percentile, percentileValue := range sampleValue { for percentile, percentileValue := range sampleValue {
individualValue, ok := percentileValue.(float64) individualValue, ok := percentileValue.(float64)
if !ok { if !ok {
err = fmt.Errorf("could not convert value from %q to a float64", percentileValue) return fmt.Errorf("could not convert value from %q to a float64", percentileValue)
if err := out.Ingest(&Result{Err: err}); err != nil {
return err
}
continue
} }
childMetric := make(map[model.LabelName]model.LabelValue, len(labels)+1) childMetric := make(map[model.LabelName]model.LabelValue, len(labels)+1)
@ -132,7 +120,7 @@ func (p *processor001) ProcessSingle(in io.Reader, out Ingester, o *ProcessOptio
} }
} }
if len(pendingSamples) > 0 { if len(pendingSamples) > 0 {
return out.Ingest(&Result{Samples: pendingSamples}) return out.Ingest(pendingSamples)
} }
return nil return nil

198
extraction/processor0_0_1_test.go
View File

@ -29,12 +29,12 @@ var test001Time = model.Now()
type testProcessor001ProcessScenario struct { type testProcessor001ProcessScenario struct {
in string in string
expected, actual []*Result expected, actual []model.Samples
err error err error
} }
func (s *testProcessor001ProcessScenario) Ingest(r *Result) error { func (s *testProcessor001ProcessScenario) Ingest(samples model.Samples) error {
s.actual = append(s.actual, r) s.actual = append(s.actual, samples)
return nil return nil
} }
@ -56,10 +56,10 @@ func (s *testProcessor001ProcessScenario) test(t testing.TB, set int) {
} }
for i, expected := range s.expected { for i, expected := range s.expected {
sort.Sort(s.actual[i].Samples) sort.Sort(s.actual[i])
sort.Sort(expected.Samples) sort.Sort(expected)
if !expected.equal(s.actual[i]) { if !expected.Equal(s.actual[i]) {
t.Errorf("%d.%d. expected %s, got %s", set, i, expected, s.actual[i]) t.Errorf("%d.%d. expected %s, got %s", set, i, expected, s.actual[i])
} }
} }
@ -73,101 +73,97 @@ func testProcessor001Process(t testing.TB) {
}, },
{ {
in: "test0_0_1-0_0_2.json", in: "test0_0_1-0_0_2.json",
expected: []*Result{ expected: []model.Samples{
{ model.Samples{
Samples: model.Samples{ &model.Sample{
&model.Sample{ Metric: model.Metric{"service": "zed", model.MetricNameLabel: "rpc_calls_total", "job": "batch_job"},
Metric: model.Metric{"service": "zed", model.MetricNameLabel: "rpc_calls_total", "job": "batch_job"}, Value: 25,
Value: 25, Timestamp: test001Time,
Timestamp: test001Time, },
}, &model.Sample{
&model.Sample{ Metric: model.Metric{"service": "bar", model.MetricNameLabel: "rpc_calls_total", "job": "batch_job"},
Metric: model.Metric{"service": "bar", model.MetricNameLabel: "rpc_calls_total", "job": "batch_job"}, Value: 25,
Value: 25, Timestamp: test001Time,
Timestamp: test001Time, },
}, &model.Sample{
&model.Sample{ Metric: model.Metric{"service": "foo", model.MetricNameLabel: "rpc_calls_total", "job": "batch_job"},
Metric: model.Metric{"service": "foo", model.MetricNameLabel: "rpc_calls_total", "job": "batch_job"}, Value: 25,
Value: 25, Timestamp: test001Time,
Timestamp: test001Time, },
}, &model.Sample{
&model.Sample{ Metric: model.Metric{"percentile": "0.010000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "zed"},
Metric: model.Metric{"percentile": "0.010000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "zed"}, Value: 0.0459814091918713,
Value: 0.0459814091918713, Timestamp: test001Time,
Timestamp: test001Time, },
}, &model.Sample{
&model.Sample{ Metric: model.Metric{"percentile": "0.010000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "bar"},
Metric: model.Metric{"percentile": "0.010000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "bar"}, Value: 78.48563317257356,
Value: 78.48563317257356, Timestamp: test001Time,
Timestamp: test001Time, },
}, &model.Sample{
&model.Sample{ Metric: model.Metric{"percentile": "0.010000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "foo"},
Metric: model.Metric{"percentile": "0.010000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "foo"}, Value: 15.890724674774395,
Value: 15.890724674774395, Timestamp: test001Time,
Timestamp: test001Time, },
}, &model.Sample{
&model.Sample{ Metric: model.Metric{"percentile": "0.050000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "zed"},
Value: 0.0459814091918713,
Metric: model.Metric{"percentile": "0.050000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "zed"}, Timestamp: test001Time,
Value: 0.0459814091918713, },
Timestamp: test001Time, &model.Sample{
}, Metric: model.Metric{"percentile": "0.050000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "bar"},
&model.Sample{ Value: 78.48563317257356,
Metric: model.Metric{"percentile": "0.050000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "bar"}, Timestamp: test001Time,
Value: 78.48563317257356, },
Timestamp: test001Time, &model.Sample{
}, Metric: model.Metric{"percentile": "0.050000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "foo"},
&model.Sample{ Value: 15.890724674774395,
Metric: model.Metric{"percentile": "0.050000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "foo"}, Timestamp: test001Time,
Value: 15.890724674774395, },
Timestamp: test001Time, &model.Sample{
}, Metric: model.Metric{"percentile": "0.500000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "zed"},
&model.Sample{ Value: 0.6120456642749681,
Metric: model.Metric{"percentile": "0.500000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "zed"}, Timestamp: test001Time,
Value: 0.6120456642749681, },
Timestamp: test001Time, &model.Sample{
}, Metric: model.Metric{"percentile": "0.500000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "bar"},
&model.Sample{ Value: 97.31798360385088,
Timestamp: test001Time,
Metric: model.Metric{"percentile": "0.500000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "bar"}, },
Value: 97.31798360385088, &model.Sample{
Timestamp: test001Time, Metric: model.Metric{"percentile": "0.500000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "foo"},
}, Value: 84.63044031436561,
&model.Sample{ Timestamp: test001Time,
Metric: model.Metric{"percentile": "0.500000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "foo"}, },
Value: 84.63044031436561, &model.Sample{
Timestamp: test001Time, Metric: model.Metric{"percentile": "0.900000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "zed"},
}, Value: 1.355915069887731,
&model.Sample{ Timestamp: test001Time,
Metric: model.Metric{"percentile": "0.900000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "zed"}, },
Value: 1.355915069887731, &model.Sample{
Timestamp: test001Time, Metric: model.Metric{"percentile": "0.900000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "bar"},
}, Value: 109.89202084295582,
&model.Sample{ Timestamp: test001Time,
Metric: model.Metric{"percentile": "0.900000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "bar"}, },
Value: 109.89202084295582, &model.Sample{
Timestamp: test001Time, Metric: model.Metric{"percentile": "0.900000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "foo"},
}, Value: 160.21100853053224,
&model.Sample{ Timestamp: test001Time,
Metric: model.Metric{"percentile": "0.900000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "foo"}, },
Value: 160.21100853053224, &model.Sample{
Timestamp: test001Time, Metric: model.Metric{"percentile": "0.990000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "zed"},
}, Value: 1.772733213161236,
&model.Sample{ Timestamp: test001Time,
Metric: model.Metric{"percentile": "0.990000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "zed"}, },
Value: 1.772733213161236, &model.Sample{
Timestamp: test001Time, Metric: model.Metric{"percentile": "0.990000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "bar"},
}, Value: 109.99626121011262,
&model.Sample{ Timestamp: test001Time,
Metric: model.Metric{"percentile": "0.990000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "bar"}, },
Value: 109.99626121011262, &model.Sample{
Timestamp: test001Time, Metric: model.Metric{"percentile": "0.990000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "foo"},
}, Value: 172.49828748957728,
&model.Sample{ Timestamp: test001Time,
Metric: model.Metric{"percentile": "0.990000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "foo"},
Value: 172.49828748957728,
Timestamp: test001Time,
},
}, },
}, },
}, },

19
extraction/processor0_0_2.go
View File

@ -60,11 +60,7 @@ func (p *processor002) ProcessSingle(in io.Reader, out Ingester, o *ProcessOptio
var values []counter002 var values []counter002
if err := json.Unmarshal(entity.Metric.Values, &values); err != nil { if err := json.Unmarshal(entity.Metric.Values, &values); err != nil {
err := fmt.Errorf("could not extract %s value: %s", entity.Metric.Type, err) return fmt.Errorf("could not extract %s value: %s", entity.Metric.Type, err)
if err := out.Ingest(&Result{Err: err}); err != nil {
return err
}
continue
} }
for _, counter := range values { for _, counter := range values {
@ -81,11 +77,7 @@ func (p *processor002) ProcessSingle(in io.Reader, out Ingester, o *ProcessOptio
var values []histogram002 var values []histogram002
if err := json.Unmarshal(entity.Metric.Values, &values); err != nil { if err := json.Unmarshal(entity.Metric.Values, &values); err != nil {
err := fmt.Errorf("could not extract %s value: %s", entity.Metric.Type, err) return fmt.Errorf("could not extract %s value: %s", entity.Metric.Type, err)
if err := out.Ingest(&Result{Err: err}); err != nil {
return err
}
continue
} }
for _, histogram := range values { for _, histogram := range values {
@ -102,15 +94,12 @@ func (p *processor002) ProcessSingle(in io.Reader, out Ingester, o *ProcessOptio
} }
default: default:
err := fmt.Errorf("unknown metric type %q", entity.Metric.Type) return fmt.Errorf("unknown metric type %q", entity.Metric.Type)
if err := out.Ingest(&Result{Err: err}); err != nil {
return err
}
} }
} }
if len(pendingSamples) > 0 { if len(pendingSamples) > 0 {
return out.Ingest(&Result{Samples: pendingSamples}) return out.Ingest(pendingSamples)
} }
return nil return nil

197
extraction/processor0_0_2_test.go
View File

@ -30,12 +30,12 @@ var test002Time = model.Now()
type testProcessor002ProcessScenario struct { type testProcessor002ProcessScenario struct {
in string in string
expected, actual []*Result expected, actual []model.Samples
err error err error
} }
func (s *testProcessor002ProcessScenario) Ingest(r *Result) error { func (s *testProcessor002ProcessScenario) Ingest(samples model.Samples) error {
s.actual = append(s.actual, r) s.actual = append(s.actual, samples)
return nil return nil
} }
@ -57,10 +57,10 @@ func (s *testProcessor002ProcessScenario) test(t testing.TB, set int) {
} }
for i, expected := range s.expected { for i, expected := range s.expected {
sort.Sort(s.actual[i].Samples) sort.Sort(s.actual[i])
sort.Sort(expected.Samples) sort.Sort(expected)
if !expected.equal(s.actual[i]) { if !expected.Equal(s.actual[i]) {
t.Fatalf("%d.%d. expected %s, got %s", set, i, expected, s.actual[i]) t.Fatalf("%d.%d. expected %s, got %s", set, i, expected, s.actual[i])
} }
} }
@ -74,101 +74,98 @@ func testProcessor002Process(t testing.TB) {
}, },
{ {
in: "test0_0_1-0_0_2.json", in: "test0_0_1-0_0_2.json",
expected: []*Result{ expected: []model.Samples{
{ model.Samples{
Samples: model.Samples{ &model.Sample{
&model.Sample{ Metric: model.Metric{"service": "zed", model.MetricNameLabel: "rpc_calls_total", "job": "batch_job"},
Metric: model.Metric{"service": "zed", model.MetricNameLabel: "rpc_calls_total", "job": "batch_job"}, Value: 25,
Value: 25, Timestamp: test002Time,
Timestamp: test002Time, },
}, &model.Sample{
&model.Sample{ Metric: model.Metric{"service": "bar", model.MetricNameLabel: "rpc_calls_total", "job": "batch_job"},
Metric: model.Metric{"service": "bar", model.MetricNameLabel: "rpc_calls_total", "job": "batch_job"}, Value: 25,
Value: 25, Timestamp: test002Time,
Timestamp: test002Time, },
}, &model.Sample{
&model.Sample{ Metric: model.Metric{"service": "foo", model.MetricNameLabel: "rpc_calls_total", "job": "batch_job"},
Metric: model.Metric{"service": "foo", model.MetricNameLabel: "rpc_calls_total", "job": "batch_job"}, Value: 25,
Value: 25, Timestamp: test002Time,
Timestamp: test002Time, },
}, &model.Sample{
&model.Sample{ Metric: model.Metric{"percentile": "0.010000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "zed"},
Metric: model.Metric{"percentile": "0.010000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "zed"}, Value: 0.0459814091918713,
Value: 0.0459814091918713, Timestamp: test002Time,
Timestamp: test002Time, },
}, &model.Sample{
&model.Sample{ Metric: model.Metric{"percentile": "0.010000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "bar"},
Metric: model.Metric{"percentile": "0.010000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "bar"}, Value: 78.48563317257356,
Value: 78.48563317257356, Timestamp: test002Time,
Timestamp: test002Time, },
}, &model.Sample{
&model.Sample{ Metric: model.Metric{"percentile": "0.010000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "foo"},
Metric: model.Metric{"percentile": "0.010000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "foo"}, Value: 15.890724674774395,
Value: 15.890724674774395, Timestamp: test002Time,
Timestamp: test002Time, },
}, &model.Sample{
&model.Sample{
Metric: model.Metric{"percentile": "0.050000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "zed"}, Metric: model.Metric{"percentile": "0.050000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "zed"},
Value: 0.0459814091918713, Value: 0.0459814091918713,
Timestamp: test002Time, Timestamp: test002Time,
}, },
&model.Sample{ &model.Sample{
Metric: model.Metric{"percentile": "0.050000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "bar"}, Metric: model.Metric{"percentile": "0.050000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "bar"},
Value: 78.48563317257356, Value: 78.48563317257356,
Timestamp: test002Time, Timestamp: test002Time,
}, },
&model.Sample{ &model.Sample{
Metric: model.Metric{"percentile": "0.050000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "foo"}, Metric: model.Metric{"percentile": "0.050000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "foo"},
Value: 15.890724674774395, Value: 15.890724674774395,
Timestamp: test002Time, Timestamp: test002Time,
}, },
&model.Sample{ &model.Sample{
Metric: model.Metric{"percentile": "0.500000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "zed"}, Metric: model.Metric{"percentile": "0.500000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "zed"},
Value: 0.6120456642749681, Value: 0.6120456642749681,
Timestamp: test002Time, Timestamp: test002Time,
}, },
&model.Sample{ &model.Sample{
Metric: model.Metric{"percentile": "0.500000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "bar"},
Metric: model.Metric{"percentile": "0.500000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "bar"}, Value: 97.31798360385088,
Value: 97.31798360385088, Timestamp: test002Time,
Timestamp: test002Time, },
}, &model.Sample{
&model.Sample{ Metric: model.Metric{"percentile": "0.500000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "foo"},
Metric: model.Metric{"percentile": "0.500000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "foo"}, Value: 84.63044031436561,
Value: 84.63044031436561, Timestamp: test002Time,
Timestamp: test002Time, },
}, &model.Sample{
&model.Sample{ Metric: model.Metric{"percentile": "0.900000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "zed"},
Metric: model.Metric{"percentile": "0.900000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "zed"}, Value: 1.355915069887731,
Value: 1.355915069887731, Timestamp: test002Time,
Timestamp: test002Time, },
}, &model.Sample{
&model.Sample{ Metric: model.Metric{"percentile": "0.900000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "bar"},
Metric: model.Metric{"percentile": "0.900000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "bar"}, Value: 109.89202084295582,
Value: 109.89202084295582, Timestamp: test002Time,
Timestamp: test002Time, },
}, &model.Sample{
&model.Sample{ Metric: model.Metric{"percentile": "0.900000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "foo"},
Metric: model.Metric{"percentile": "0.900000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "foo"}, Value: 160.21100853053224,
Value: 160.21100853053224, Timestamp: test002Time,
Timestamp: test002Time, },
}, &model.Sample{
&model.Sample{ Metric: model.Metric{"percentile": "0.990000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "zed"},
Metric: model.Metric{"percentile": "0.990000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "zed"}, Value: 1.772733213161236,
Value: 1.772733213161236, Timestamp: test002Time,
Timestamp: test002Time, },
}, &model.Sample{
&model.Sample{ Metric: model.Metric{"percentile": "0.990000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "bar"},
Metric: model.Metric{"percentile": "0.990000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "bar"}, Value: 109.99626121011262,
Value: 109.99626121011262, Timestamp: test002Time,
Timestamp: test002Time, },
}, &model.Sample{
&model.Sample{ Metric: model.Metric{"percentile": "0.990000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "foo"},
Metric: model.Metric{"percentile": "0.990000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "foo"}, Value: 172.49828748957728,
Value: 172.49828748957728, Timestamp: test002Time,
Timestamp: test002Time,
},
}, },
}, },
}, },

62
extraction/textprocessor_test.go
View File

@ -32,44 +32,40 @@ mf1{label="value1"} -3.14 123456
mf1{label="value2"} 42 mf1{label="value2"} 42
mf2 4 mf2 4
` `
out = map[model.LabelValue]*Result{ out = map[model.LabelValue]model.Samples{
"mf1": { "mf1": model.Samples{
Samples: model.Samples{ &model.Sample{
&model.Sample{ Metric: model.Metric{model.MetricNameLabel: "mf1", "label": "value1"},
Metric: model.Metric{model.MetricNameLabel: "mf1", "label": "value1"}, Value: -3.14,
Value: -3.14, Timestamp: 123456,
Timestamp: 123456, },
}, &model.Sample{
&model.Sample{ Metric: model.Metric{model.MetricNameLabel: "mf1", "label": "value2"},
Metric: model.Metric{model.MetricNameLabel: "mf1", "label": "value2"}, Value: 42,
Value: 42, Timestamp: ts,
Timestamp: ts,
},
}, },
}, },
"mf2": { "mf2": model.Samples{
Samples: model.Samples{ &model.Sample{
&model.Sample{ Metric: model.Metric{model.MetricNameLabel: "mf2"},
Metric: model.Metric{model.MetricNameLabel: "mf2"}, Value: 3,
Value: 3, Timestamp: ts,
Timestamp: ts, },
}, &model.Sample{
&model.Sample{ Metric: model.Metric{model.MetricNameLabel: "mf2"},
Metric: model.Metric{model.MetricNameLabel: "mf2"}, Value: 4,
Value: 4, Timestamp: ts,
Timestamp: ts,
},
}, },
}, },
} }
) )
type testIngester struct { type testIngester struct {
results []*Result results []model.Samples
} }
func (i *testIngester) Ingest(r *Result) error { func (i *testIngester) Ingest(s model.Samples) error {
i.results = append(i.results, r) i.results = append(i.results, s)
return nil return nil
} }
@ -88,16 +84,16 @@ func TestTextProcessor(t *testing.T) {
t.Fatalf("Expected length %d, got %d", expected, got) t.Fatalf("Expected length %d, got %d", expected, got)
} }
for _, r := range ingester.results { for _, r := range ingester.results {
expected, ok := out[r.Samples[0].Metric[model.MetricNameLabel]] expected, ok := out[r[0].Metric[model.MetricNameLabel]]
if !ok { if !ok {
t.Fatalf( t.Fatalf(
"Unexpected metric name %q", "Unexpected metric name %q",
r.Samples[0].Metric[model.MetricNameLabel], r[0].Metric[model.MetricNameLabel],
) )
} }
sort.Sort(expected.Samples) sort.Sort(expected)
sort.Sort(r.Samples) sort.Sort(r)
if !expected.equal(r) { if !expected.Equal(r) {
t.Errorf("expected %s, got %s", expected, r) t.Errorf("expected %s, got %s", expected, r)
} }
} }

14
model/sample.go
View File

@ -63,3 +63,17 @@ func (s Samples) Less(i, j int) bool {
func (s Samples) Swap(i, j int) { func (s Samples) Swap(i, j int) {
s[i], s[j] = s[j], s[i] s[i], s[j] = s[j], s[i]
} }
// Equal compares two sets of samples and returns true if they are equal.
func (s Samples) Equal(o Samples) bool {
if len(s) != len(o) {
return false
}
for i, sample := range s {
if !sample.Equal(o[i]) {
return false
}
}
return true
}