apitech
/
loki
mirror of https://github.com/grafana/loki
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

logql tests: use abstractions over Labels (#9533)

Browse Source 
**What this PR does / why we need it**:

Call functions like `FromStrings`, so we don't have to know how the data
structure is laid out.

**Special notes for your reviewer**:

This PR only touches tests. 

Upstream Prometheus is using a different implementation of
`labels.Labels`, so I plan to create a series of PRs which make Loki
compatible with that. #9532 was the first.

**Checklist**
- [x] Reviewed the
[`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
guide (**required**)
- NA Documentation added
- [x] Tests updated
- NA `CHANGELOG.md` updated
- NA Changes that require user attention or interaction to upgrade are
documented in `docs/sources/upgrading/_index.md`
- NA For Helm chart changes bump the Helm chart version.

---------

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
pull/9568/head^2
Bryan Boreham 3 years ago committed by GitHub
parent ee74fbdf3a
commit 0a2f58891c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 174 additions and 180 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 312
      pkg/logql/engine_test.go
  2. 24
      pkg/logql/matrix_test.go
  3. 2
      pkg/logql/syntax/ast_test.go
  4. 16
      pkg/logql/syntax/parser_test.go

312
pkg/logql/engine_test.go
Unescape View File

@ -69,7 +69,7 @@ func TestEngine_LogsRateUnwrap(t *testing.T) {
// there are 15 samples (from 47 to 61) matched from the generated series
// SUM(n=47, 61, 1) = 15
// 15 / 30 = 0.5
promql.Vector{promql.Sample{T: 60 * 1000, F: 0.5, Metric: labels.Labels{labels.Label{Name: "app", Value: "foo"}}}},
promql.Vector{promql.Sample{T: 60 * 1000, F: 0.5, Metric: labels.FromStrings("app", "foo")}},
},
{
`rate({app="foo"} | unwrap foo [30s])`,
@ -87,7 +87,7 @@ func TestEngine_LogsRateUnwrap(t *testing.T) {
// there are 15 samples (from 47 to 61) matched from the generated series
// SUM(n=47, 61, n) = (47+48+...+61) = 810
// 810 / 30 = 27
promql.Vector{promql.Sample{T: 60 * 1000, F: 27, Metric: labels.Labels{labels.Label{Name: "app", Value: "foo"}}}},
promql.Vector{promql.Sample{T: 60 * 1000, F: 27, Metric: labels.FromStrings("app", "foo")}},
},
{
`rate_counter({app="foo"} | unwrap foo [30s])`,
@ -104,7 +104,7 @@ func TestEngine_LogsRateUnwrap(t *testing.T) {
},
// there are 15 samples (from 47 to 61) matched from the generated series
// (1 - 1) / 30 = 0
promql.Vector{promql.Sample{T: 60 * 1000, F: 0, Metric: labels.Labels{labels.Label{Name: "app", Value: "foo"}}}},
promql.Vector{promql.Sample{T: 60 * 1000, F: 0, Metric: labels.FromStrings("app", "foo")}},
},
{
`rate_counter({app="foo"} | unwrap foo [30s])`,
@ -121,7 +121,7 @@ func TestEngine_LogsRateUnwrap(t *testing.T) {
},
// there are 15 samples (from 47 to 61) matched from the generated series
// (61 - 47) / 30 = 0.4666
promql.Vector{promql.Sample{T: 60 * 1000, F: 0.46666766666666665, Metric: labels.Labels{labels.Label{Name: "app", Value: "foo"}}}},
promql.Vector{promql.Sample{T: 60 * 1000, F: 0.46666766666666665, Metric: labels.FromStrings("app", "foo")}},
},
} {
test := test
@ -192,7 +192,7 @@ func TestEngine_LogsInstantQuery(t *testing.T) {
[]SelectSampleParams{
{&logproto.SampleQueryRequest{Start: time.Unix(0, 0), End: time.Unix(60, 0), Selector: `rate({app="foo"}|~".+bar"[1m])`}},
},
promql.Vector{promql.Sample{T: 60 * 1000, F: 1, Metric: labels.Labels{labels.Label{Name: "app", Value: "foo"}}}},
promql.Vector{promql.Sample{T: 60 * 1000, F: 1, Metric: labels.FromStrings("app", "foo")}},
},
{
`rate({app="foo"}[30s])`, time.Unix(60, 0), logproto.FORWARD, 10,
@ -203,7 +203,7 @@ func TestEngine_LogsInstantQuery(t *testing.T) {
[]SelectSampleParams{
{&logproto.SampleQueryRequest{Start: time.Unix(30, 0), End: time.Unix(60, 0), Selector: `rate({app="foo"}[30s])`}},
},
promql.Vector{promql.Sample{T: 60 * 1000, F: 0.5, Metric: labels.Labels{labels.Label{Name: "app", Value: "foo"}}}},
promql.Vector{promql.Sample{T: 60 * 1000, F: 0.5, Metric: labels.FromStrings("app", "foo")}},
},
{
`rate({app="foo"} | unwrap foo [30s])`, time.Unix(60, 0), logproto.FORWARD, 10,
@ -216,7 +216,7 @@ func TestEngine_LogsInstantQuery(t *testing.T) {
},
// SUM(n=46, 61, 2) = 30
// 30 / 30 = 1
promql.Vector{promql.Sample{T: 60 * 1000, F: 1.0, Metric: labels.Labels{labels.Label{Name: "app", Value: "foo"}}}},
promql.Vector{promql.Sample{T: 60 * 1000, F: 1.0, Metric: labels.FromStrings("app", "foo")}},
},
{
`count_over_time({app="foo"} |~".+bar" [1m])`, time.Unix(60, 0), logproto.BACKWARD, 10,
@ -226,7 +226,7 @@ func TestEngine_LogsInstantQuery(t *testing.T) {
[]SelectSampleParams{
{&logproto.SampleQueryRequest{Start: time.Unix(0, 0), End: time.Unix(60, 0), Selector: `count_over_time({app="foo"}|~".+bar"[1m])`}},
},
promql.Vector{promql.Sample{T: 60 * 1000, F: 6, Metric: labels.Labels{labels.Label{Name: "app", Value: "foo"}}}},
promql.Vector{promql.Sample{T: 60 * 1000, F: 6, Metric: labels.FromStrings("app", "foo")}},
},
{
`first_over_time({app="foo"} |~".+bar" | unwrap foo [1m])`, time.Unix(60, 0), logproto.BACKWARD, 10,
@ -236,7 +236,7 @@ func TestEngine_LogsInstantQuery(t *testing.T) {
[]SelectSampleParams{
{&logproto.SampleQueryRequest{Start: time.Unix(0, 0), End: time.Unix(60, 0), Selector: `first_over_time({app="foo"}|~".+bar"| unwrap foo [1m])`}},
},
promql.Vector{promql.Sample{T: 60 * 1000, F: 1, Metric: labels.Labels{labels.Label{Name: "app", Value: "foo"}}}},
promql.Vector{promql.Sample{T: 60 * 1000, F: 1, Metric: labels.FromStrings("app", "foo")}},
},
{
`count_over_time({app="foo"} |~".+bar" [1m] offset 30s)`, time.Unix(90, 0), logproto.BACKWARD, 10,
@ -246,7 +246,7 @@ func TestEngine_LogsInstantQuery(t *testing.T) {
[]SelectSampleParams{
{&logproto.SampleQueryRequest{Start: time.Unix(0, 0), End: time.Unix(60, 0), Selector: `count_over_time({app="foo"}|~".+bar"[1m] offset 30s)`}},
},
promql.Vector{promql.Sample{T: 90 * 1000, F: 6, Metric: labels.Labels{labels.Label{Name: "app", Value: "foo"}}}},
promql.Vector{promql.Sample{T: 90 * 1000, F: 6, Metric: labels.FromStrings("app", "foo")}},
},
{
`count_over_time(({app="foo"} |~".+bar")[5m])`, time.Unix(5*60, 0), logproto.BACKWARD, 10,
@ -256,7 +256,7 @@ func TestEngine_LogsInstantQuery(t *testing.T) {
[]SelectSampleParams{
{&logproto.SampleQueryRequest{Start: time.Unix(0, 0), End: time.Unix(5*60, 0), Selector: `count_over_time({app="foo"}|~".+bar"[5m])`}},
},
promql.Vector{promql.Sample{T: 5 * 60 * 1000, F: 30, Metric: labels.Labels{labels.Label{Name: "app", Value: "foo"}}}},
promql.Vector{promql.Sample{T: 5 * 60 * 1000, F: 30, Metric: labels.FromStrings("app", "foo")}},
},
{
`absent_over_time(({app="foo"} |~".+bar")[5m])`, time.Unix(5*60, 0), logproto.BACKWARD, 10,
@ -272,7 +272,7 @@ func TestEngine_LogsInstantQuery(t *testing.T) {
`absent_over_time(({app="foo"} |~".+bar")[5m])`, time.Unix(5*60, 0), logproto.BACKWARD, 10,
[][]logproto.Series{},
[]SelectSampleParams{},
promql.Vector{promql.Sample{T: 5 * 60 * 1000, F: 1, Metric: labels.Labels{labels.Label{Name: "app", Value: "foo"}}}},
promql.Vector{promql.Sample{T: 5 * 60 * 1000, F: 1, Metric: labels.FromStrings("app", "foo")}},
},
{
`avg(count_over_time({app=~"foo|bar"} |~".+bar" [1m]))`, time.Unix(60, 0), logproto.FORWARD, 100,
@ -286,7 +286,7 @@ func TestEngine_LogsInstantQuery(t *testing.T) {
{&logproto.SampleQueryRequest{Start: time.Unix(0, 0), End: time.Unix(60, 0), Selector: `count_over_time({app=~"foo|bar"}|~".+bar"[1m])`}},
},
promql.Vector{
promql.Sample{T: 60 * 1000, F: 6, Metric: labels.Labels{}},
promql.Sample{T: 60 * 1000, F: 6, Metric: labels.EmptyLabels()},
},
},
{
@ -298,7 +298,7 @@ func TestEngine_LogsInstantQuery(t *testing.T) {
{&logproto.SampleQueryRequest{Start: time.Unix(0, 0), End: time.Unix(60, 0), Selector: `rate({app=~"foo|bar"}|~".+bar"[1m])`}},
},
promql.Vector{
promql.Sample{T: 60 * 1000, F: 0.1, Metric: labels.Labels{}},
promql.Sample{T: 60 * 1000, F: 0.1, Metric: labels.EmptyLabels()},
},
},
{
@ -310,8 +310,8 @@ func TestEngine_LogsInstantQuery(t *testing.T) {
{&logproto.SampleQueryRequest{Start: time.Unix(0, 0), End: time.Unix(60, 0), Selector: `rate({app=~"foo|bar"}|~".+bar"[1m])`}},
},
promql.Vector{
promql.Sample{T: 60 * 1000, F: 0.2, Metric: labels.Labels{labels.Label{Name: "app", Value: "bar"}}},
promql.Sample{T: 60 * 1000, F: 0.1, Metric: labels.Labels{labels.Label{Name: "app", Value: "foo"}}},
promql.Sample{T: 60 * 1000, F: 0.2, Metric: labels.FromStrings("app", "bar")},
promql.Sample{T: 60 * 1000, F: 0.1, Metric: labels.FromStrings("app", "foo")},
},
},
{
@ -323,7 +323,7 @@ func TestEngine_LogsInstantQuery(t *testing.T) {
{&logproto.SampleQueryRequest{Start: time.Unix(0, 0), End: time.Unix(60, 0), Selector: `rate({app=~"foo|bar"}|~".+bar"[1m])`}},
},
promql.Vector{
promql.Sample{T: 60 * 1000, F: 0.2, Metric: labels.Labels{}},
promql.Sample{T: 60 * 1000, F: 0.2, Metric: labels.EmptyLabels()},
},
},
{
@ -335,7 +335,7 @@ func TestEngine_LogsInstantQuery(t *testing.T) {
{&logproto.SampleQueryRequest{Start: time.Unix(0, 0), End: time.Unix(60, 0), Selector: `sum(rate({app=~"foo|bar"} |~".+bar" [1m]))`}},
},
promql.Vector{
promql.Sample{T: 60 * 1000, F: 0.4, Metric: labels.Labels{}},
promql.Sample{T: 60 * 1000, F: 0.4, Metric: labels.EmptyLabels()},
},
},
{
@ -347,8 +347,8 @@ func TestEngine_LogsInstantQuery(t *testing.T) {
{&logproto.SampleQueryRequest{Start: time.Unix(0, 0), End: time.Unix(60, 0), Selector: `sum by (app)(count_over_time({app=~"foo|bar"} |~".+bar" [1m]))`}},
},
promql.Vector{
promql.Sample{T: 60 * 1000, F: 6, Metric: labels.Labels{labels.Label{Name: "app", Value: "bar"}}},
promql.Sample{T: 60 * 1000, F: 6, Metric: labels.Labels{labels.Label{Name: "app", Value: "foo"}}},
promql.Sample{T: 60 * 1000, F: 6, Metric: labels.FromStrings("app", "bar")},
promql.Sample{T: 60 * 1000, F: 6, Metric: labels.FromStrings("app", "foo")},
},
},
{
@ -366,18 +366,16 @@ func TestEngine_LogsInstantQuery(t *testing.T) {
promql.Sample{
T: 60 * 1000,
F: 6,
Metric: labels.Labels{
labels.Label{Name: "app", Value: "bar"},
labels.Label{Name: "namespace", Value: "b"},
},
Metric: labels.FromStrings("app", "bar",
"namespace", "b",
),
},
promql.Sample{
T: 60 * 1000,
F: 6,
Metric: labels.Labels{
labels.Label{Name: "app", Value: "foo"},
labels.Label{Name: "namespace", Value: "a"},
},
Metric: labels.FromStrings("app", "foo",
"namespace", "a",
),
},
},
},
@ -395,17 +393,15 @@ func TestEngine_LogsInstantQuery(t *testing.T) {
promql.Vector{
promql.Sample{
T: 90 * 1000, F: 6,
Metric: labels.Labels{
labels.Label{Name: "app", Value: "bar"},
labels.Label{Name: "namespace", Value: "b"},
},
Metric: labels.FromStrings("app", "bar",
"namespace", "b",
),
},
promql.Sample{
T: 90 * 1000, F: 6,
Metric: labels.Labels{
labels.Label{Name: "app", Value: "foo"},
labels.Label{Name: "namespace", Value: "a"},
},
Metric: labels.FromStrings("app", "foo",
"namespace", "a",
),
},
},
},
@ -429,18 +425,16 @@ func TestEngine_LogsInstantQuery(t *testing.T) {
promql.Vector{
promql.Sample{
T: 60 * 1000, F: 6,
Metric: labels.Labels{
labels.Label{Name: "app", Value: "bar"},
labels.Label{Name: "namespace", Value: "b"},
},
Metric: labels.FromStrings("app", "bar",
"namespace", "b",
),
},
promql.Sample{
T: 60 * 1000, F: 6,
Metric: labels.Labels{
labels.Label{Name: "app", Value: "foo"},
labels.Label{Name: "namespace", Value: "a"},
labels.Label{Name: "new", Value: "oo"},
},
Metric: labels.FromStrings("app", "foo",
"namespace", "a",
"new", "oo",
),
},
},
},
@ -453,7 +447,7 @@ func TestEngine_LogsInstantQuery(t *testing.T) {
{&logproto.SampleQueryRequest{Start: time.Unix(0, 0), End: time.Unix(60, 0), Selector: `count_over_time({app=~"foo|bar"}|~".+bar"[1m])`}},
},
promql.Vector{
{T: 60 * 1000, F: 2, Metric: labels.Labels{}},
{T: 60 * 1000, F: 2, Metric: labels.EmptyLabels()},
},
},
{
@ -465,7 +459,7 @@ func TestEngine_LogsInstantQuery(t *testing.T) {
{&logproto.SampleQueryRequest{Start: time.Unix(0, 0), End: time.Unix(60, 0), Selector: `count_over_time({app=~"foo|bar"}|~".+bar"[1m])`}},
},
promql.Vector{
{T: 60 * 1000, F: 9, Metric: labels.Labels{}},
{T: 60 * 1000, F: 9, Metric: labels.EmptyLabels()},
},
},
{
@ -477,7 +471,7 @@ func TestEngine_LogsInstantQuery(t *testing.T) {
{&logproto.SampleQueryRequest{Start: time.Unix(0, 0), End: time.Unix(60, 0), Selector: `count_over_time({app=~"foo|bar"}|~".+bar"[1m])`}},
},
promql.Vector{
{T: 60 * 1000, F: 12, Metric: labels.Labels{}},
{T: 60 * 1000, F: 12, Metric: labels.EmptyLabels()},
},
},
{
@ -489,8 +483,8 @@ func TestEngine_LogsInstantQuery(t *testing.T) {
{&logproto.SampleQueryRequest{Start: time.Unix(0, 0), End: time.Unix(60, 0), Selector: `rate({app=~"foo|bar"}|~".+bar"[1m])`}},
},
promql.Vector{
{T: 60 * 1000, F: 0.25, Metric: labels.Labels{labels.Label{Name: "app", Value: "bar"}}},
{T: 60 * 1000, F: 0.1, Metric: labels.Labels{labels.Label{Name: "app", Value: "foo"}}},
{T: 60 * 1000, F: 0.25, Metric: labels.FromStrings("app", "bar")},
{T: 60 * 1000, F: 0.1, Metric: labels.FromStrings("app", "foo")},
},
},
{
@ -502,8 +496,8 @@ func TestEngine_LogsInstantQuery(t *testing.T) {
{&logproto.SampleQueryRequest{Start: time.Unix(0, 0), End: time.Unix(60, 0), Selector: `rate({app=~"foo|bar"}|~".+bar"[1m])`}},
},
promql.Vector{
{T: 60 * 1000, F: 0.25, Metric: labels.Labels{labels.Label{Name: "app", Value: "bar"}}},
{T: 60 * 1000, F: 0.1, Metric: labels.Labels{labels.Label{Name: "app", Value: "foo"}}},
{T: 60 * 1000, F: 0.25, Metric: labels.FromStrings("app", "bar")},
{T: 60 * 1000, F: 0.1, Metric: labels.FromStrings("app", "foo")},
},
},
{
@ -515,7 +509,7 @@ func TestEngine_LogsInstantQuery(t *testing.T) {
{&logproto.SampleQueryRequest{Start: time.Unix(0, 0), End: time.Unix(60, 0), Selector: `rate({app=~"foo|bar"}|~".+bar"[1m])`}},
},
promql.Vector{
{T: 60 * 1000, F: 0.25, Metric: labels.Labels{labels.Label{Name: "app", Value: "bar"}}},
{T: 60 * 1000, F: 0.25, Metric: labels.FromStrings("app", "bar")},
},
},
@ -531,10 +525,10 @@ func TestEngine_LogsInstantQuery(t *testing.T) {
{&logproto.SampleQueryRequest{Start: time.Unix(0, 0), End: time.Unix(60, 0), Selector: `rate({app=~"foo|bar"}|~".+bar"[1m])`}},
},
promql.Vector{
{T: 60 * 1000, F: 0.25, Metric: labels.Labels{labels.Label{Name: "app", Value: "bar"}}},
{T: 60 * 1000, F: 1, Metric: labels.Labels{labels.Label{Name: "app", Value: "buzz"}}},
{T: 60 * 1000, F: 0.1, Metric: labels.Labels{labels.Label{Name: "app", Value: "foo"}}},
{T: 60 * 1000, F: 0.2, Metric: labels.Labels{labels.Label{Name: "app", Value: "fuzz"}}},
{T: 60 * 1000, F: 0.25, Metric: labels.FromStrings("app", "bar")},
{T: 60 * 1000, F: 1, Metric: labels.FromStrings("app", "buzz")},
{T: 60 * 1000, F: 0.1, Metric: labels.FromStrings("app", "foo")},
{T: 60 * 1000, F: 0.2, Metric: labels.FromStrings("app", "fuzz")},
},
},
{
@ -549,8 +543,8 @@ func TestEngine_LogsInstantQuery(t *testing.T) {
{&logproto.SampleQueryRequest{Start: time.Unix(0, 0), End: time.Unix(60, 0), Selector: `rate({app=~"foo|bar"}|~".+bar"[1m])`}},
},
promql.Vector{
{T: 60 * 1000, F: 0.1, Metric: labels.Labels{labels.Label{Name: "app", Value: "foo"}}},
{T: 60 * 1000, F: 0.2, Metric: labels.Labels{labels.Label{Name: "app", Value: "fuzz"}}},
{T: 60 * 1000, F: 0.1, Metric: labels.FromStrings("app", "foo")},
{T: 60 * 1000, F: 0.2, Metric: labels.FromStrings("app", "fuzz")},
},
},
{
@ -565,9 +559,9 @@ func TestEngine_LogsInstantQuery(t *testing.T) {
{&logproto.SampleQueryRequest{Start: time.Unix(0, 0), End: time.Unix(60, 0), Selector: `rate({app=~"foo|bar"}|~".+bar"[1m])`}},
},
promql.Vector{
{T: 60 * 1000, F: 0.25, Metric: labels.Labels{labels.Label{Name: "app", Value: "bar"}}},
{T: 60 * 1000, F: 0.1, Metric: labels.Labels{labels.Label{Name: "app", Value: "foo"}}},
{T: 60 * 1000, F: 0.2, Metric: labels.Labels{labels.Label{Name: "app", Value: "fuzz"}}},
{T: 60 * 1000, F: 0.25, Metric: labels.FromStrings("app", "bar")},
{T: 60 * 1000, F: 0.1, Metric: labels.FromStrings("app", "foo")},
{T: 60 * 1000, F: 0.2, Metric: labels.FromStrings("app", "fuzz")},
},
},
{
@ -582,9 +576,9 @@ func TestEngine_LogsInstantQuery(t *testing.T) {
{&logproto.SampleQueryRequest{Start: time.Unix(0, 0), End: time.Unix(60, 0), Selector: `rate({app=~"foo|bar"}|~".+bar"[1m])`}},
},
promql.Vector{
{T: 60 * 1000, F: 1.25, Metric: labels.Labels{labels.Label{Name: "app", Value: "bar"}}},
{T: 60 * 1000, F: 1.1, Metric: labels.Labels{labels.Label{Name: "app", Value: "foo"}}},
{T: 60 * 1000, F: 1.2, Metric: labels.Labels{labels.Label{Name: "app", Value: "fuzz"}}},
{T: 60 * 1000, F: 1.25, Metric: labels.FromStrings("app", "bar")},
{T: 60 * 1000, F: 1.1, Metric: labels.FromStrings("app", "foo")},
{T: 60 * 1000, F: 1.2, Metric: labels.FromStrings("app", "fuzz")},
},
},
//sort and sort_desc
@ -600,10 +594,10 @@ func TestEngine_LogsInstantQuery(t *testing.T) {
{&logproto.SampleQueryRequest{Start: time.Unix(0, 0), End: time.Unix(60, 0), Selector: `rate({app=~"foo|bar"}|~".+bar"[1m])`}},
},
promql.Vector{
{T: 60 * 1000, F: 1.1, Metric: labels.Labels{labels.Label{Name: "app", Value: "foo"}}},
{T: 60 * 1000, F: 1.2, Metric: labels.Labels{labels.Label{Name: "app", Value: "fuzz"}}},
{T: 60 * 1000, F: 1.25, Metric: labels.Labels{labels.Label{Name: "app", Value: "bar"}}},
{T: 60 * 1000, F: 2, Metric: labels.Labels{labels.Label{Name: "app", Value: "buzz"}}},
{T: 60 * 1000, F: 1.1, Metric: labels.FromStrings("app", "foo")},
{T: 60 * 1000, F: 1.2, Metric: labels.FromStrings("app", "fuzz")},
{T: 60 * 1000, F: 1.25, Metric: labels.FromStrings("app", "bar")},
{T: 60 * 1000, F: 2, Metric: labels.FromStrings("app", "buzz")},
},
},
{
@ -618,10 +612,10 @@ func TestEngine_LogsInstantQuery(t *testing.T) {
{&logproto.SampleQueryRequest{Start: time.Unix(0, 0), End: time.Unix(60, 0), Selector: `rate({app=~"foo|bar"}|~".+bar"[1m])`}},
},
promql.Vector{
{T: 60 * 1000, F: 2, Metric: labels.Labels{labels.Label{Name: "app", Value: "buzz"}}},
{T: 60 * 1000, F: 1.25, Metric: labels.Labels{labels.Label{Name: "app", Value: "bar"}}},
{T: 60 * 1000, F: 1.2, Metric: labels.Labels{labels.Label{Name: "app", Value: "fuzz"}}},
{T: 60 * 1000, F: 1.1, Metric: labels.Labels{labels.Label{Name: "app", Value: "foo"}}},
{T: 60 * 1000, F: 2, Metric: labels.FromStrings("app", "buzz")},
{T: 60 * 1000, F: 1.25, Metric: labels.FromStrings("app", "bar")},
{T: 60 * 1000, F: 1.2, Metric: labels.FromStrings("app", "fuzz")},
{T: 60 * 1000, F: 1.1, Metric: labels.FromStrings("app", "foo")},
},
},
{
@ -647,7 +641,7 @@ func TestEngine_LogsInstantQuery(t *testing.T) {
nil,
promql.Vector{promql.Sample{
T: 60 * 1000, F: 2,
Metric: labels.Labels{},
Metric: labels.EmptyLabels(),
}},
},
{
@ -678,7 +672,7 @@ func TestEngine_LogsInstantQuery(t *testing.T) {
{&logproto.SampleQueryRequest{Start: time.Unix(0, 0), End: time.Unix(60, 0), Selector: `count_over_time({app="foo"}[1m])`}},
},
promql.Vector{
{T: 60 * 1000, F: 60, Metric: labels.Labels{labels.Label{Name: "app", Value: "foo"}}},
{T: 60 * 1000, F: 60, Metric: labels.FromStrings("app", "foo")},
},
},
{
@ -740,7 +734,7 @@ func TestEngine_LogsInstantQuery(t *testing.T) {
{&logproto.SampleQueryRequest{Start: time.Unix(0, 0), End: time.Unix(60, 0), Selector: `sum without(app) (count_over_time({app="bar"}[1m]))`}},
},
promql.Vector{
{T: 60 * 1000, F: 60, Metric: labels.Labels{}},
{T: 60 * 1000, F: 60, Metric: labels.EmptyLabels()},
},
},
{
@ -769,7 +763,7 @@ func TestEngine_LogsInstantQuery(t *testing.T) {
[]SelectSampleParams{
{&logproto.SampleQueryRequest{Start: time.Unix(0, 0), End: time.Unix(60, 0), Selector: `rate({app="foo"}|~".+bar"[1m])`}},
},
promql.Vector{{T: 60 * 1000, F: 50, Metric: labels.Labels{labels.Label{Name: "app", Value: "foo"}}}},
promql.Vector{{T: 60 * 1000, F: 50, Metric: labels.FromStrings("app", "foo")}},
},
{
`sum by (app) (count_over_time({app="foo"}[1m])) + sum by (app) (count_over_time({app="bar"}[1m]))`,
@ -800,7 +794,7 @@ func TestEngine_LogsInstantQuery(t *testing.T) {
{&logproto.SampleQueryRequest{Start: time.Unix(0, 0), End: time.Unix(60, 0), Selector: `sum by (app) (count_over_time({app="foo"}[1m]))`}},
},
promql.Vector{
{T: 60 * 1000, F: 120, Metric: labels.Labels{labels.Label{Name: "app", Value: "foo"}}},
{T: 60 * 1000, F: 120, Metric: labels.FromStrings("app", "foo")},
},
},
{
@ -817,7 +811,7 @@ func TestEngine_LogsInstantQuery(t *testing.T) {
{&logproto.SampleQueryRequest{Start: time.Unix(0, 0), End: time.Unix(60, 0), Selector: `sum by (app) (count_over_time({app="foo"}[1m]))`}},
},
promql.Vector{
{T: 60 * 1000, F: 120, Metric: labels.Labels{}},
{T: 60 * 1000, F: 120, Metric: labels.EmptyLabels()},
},
},
{
@ -834,7 +828,7 @@ func TestEngine_LogsInstantQuery(t *testing.T) {
{&logproto.SampleQueryRequest{Start: time.Unix(0, 0), End: time.Unix(60, 0), Selector: `sum by (app) (count_over_time({app="foo"}[1m]))`}},
},
promql.Vector{
{T: 60 * 1000, F: 120, Metric: labels.Labels{labels.Label{Name: "app", Value: "foo"}}},
{T: 60 * 1000, F: 120, Metric: labels.FromStrings("app", "foo")},
},
},
{
@ -851,7 +845,7 @@ func TestEngine_LogsInstantQuery(t *testing.T) {
{&logproto.SampleQueryRequest{Start: time.Unix(0, 0), End: time.Unix(60, 0), Selector: `sum by (app) (count_over_time({app="foo"}[1m]))`}},
},
promql.Vector{
{T: 60 * 1000, F: 0, Metric: labels.Labels{labels.Label{Name: "app", Value: "foo"}}},
{T: 60 * 1000, F: 0, Metric: labels.FromStrings("app", "foo")},
},
},
{
@ -883,8 +877,8 @@ func TestEngine_LogsInstantQuery(t *testing.T) {
{&logproto.SampleQueryRequest{Start: time.Unix(0, 0), End: time.Unix(60, 0), Selector: `sum by (app) (count_over_time({app="foo"}[1m]))`}},
},
promql.Vector{
{T: 60 * 1000, F: 0, Metric: labels.Labels{labels.Label{Name: "app", Value: "foo"}, labels.Label{Name: "machine", Value: "buzz"}}},
{T: 60 * 1000, F: 0, Metric: labels.Labels{labels.Label{Name: "app", Value: "foo"}, labels.Label{Name: "machine", Value: "fuzz"}}},
{T: 60 * 1000, F: 0, Metric: labels.FromStrings("app", "foo", "machine", "buzz")},
{T: 60 * 1000, F: 0, Metric: labels.FromStrings("app", "foo", "machine", "fuzz")},
},
},
{
@ -901,8 +895,8 @@ func TestEngine_LogsInstantQuery(t *testing.T) {
{&logproto.SampleQueryRequest{Start: time.Unix(0, 0), End: time.Unix(60, 0), Selector: `sum by (app) (count_over_time({app="foo"}[1m]))`}},
},
promql.Vector{
{T: 60 * 1000, F: 0, Metric: labels.Labels{labels.Label{Name: "app", Value: "foo"}, labels.Label{Name: "machine", Value: "buzz"}}},
{T: 60 * 1000, F: 0, Metric: labels.Labels{labels.Label{Name: "app", Value: "foo"}, labels.Label{Name: "machine", Value: "fuzz"}}},
{T: 60 * 1000, F: 0, Metric: labels.FromStrings("app", "foo", "machine", "buzz")},
{T: 60 * 1000, F: 0, Metric: labels.FromStrings("app", "foo", "machine", "fuzz")},
},
},
{
@ -919,8 +913,8 @@ func TestEngine_LogsInstantQuery(t *testing.T) {
{&logproto.SampleQueryRequest{Start: time.Unix(0, 0), End: time.Unix(60, 0), Selector: `sum by (app,pool) (count_over_time({app="foo"}[1m]))`}},
},
promql.Vector{
{T: 60 * 1000, F: 0, Metric: labels.Labels{labels.Label{Name: "app", Value: "foo"}, labels.Label{Name: "machine", Value: "buzz"}, labels.Label{Name: "pool", Value: "foo"}}},
{T: 60 * 1000, F: 0, Metric: labels.Labels{labels.Label{Name: "app", Value: "foo"}, labels.Label{Name: "machine", Value: "fuzz"}, labels.Label{Name: "pool", Value: "foo"}}},
{T: 60 * 1000, F: 0, Metric: labels.FromStrings("app", "foo", "machine", "buzz", "pool", "foo")},
{T: 60 * 1000, F: 0, Metric: labels.FromStrings("app", "foo", "machine", "fuzz", "pool", "foo")},
},
},
{
@ -937,8 +931,8 @@ func TestEngine_LogsInstantQuery(t *testing.T) {
{&logproto.SampleQueryRequest{Start: time.Unix(0, 0), End: time.Unix(60, 0), Selector: `sum by (app,machine) (count_over_time({app="foo"}[1m]))`}},
},
promql.Vector{
{T: 60 * 1000, F: 0, Metric: labels.Labels{labels.Label{Name: "app", Value: "foo"}, labels.Label{Name: "machine", Value: "buzz"}, labels.Label{Name: "pool", Value: "foo"}}},
{T: 60 * 1000, F: 0, Metric: labels.Labels{labels.Label{Name: "app", Value: "foo"}, labels.Label{Name: "machine", Value: "fuzz"}, labels.Label{Name: "pool", Value: "foo"}}},
{T: 60 * 1000, F: 0, Metric: labels.FromStrings("app", "foo", "machine", "buzz", "pool", "foo")},
{T: 60 * 1000, F: 0, Metric: labels.FromStrings("app", "foo", "machine", "fuzz", "pool", "foo")},
},
},
} {
@ -1045,7 +1039,7 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "foo"}},
Metric: labels.FromStrings("app", "foo"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 1}, {T: 120 * 1000, F: 1}},
},
},
@ -1060,7 +1054,7 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "foo"}},
Metric: labels.FromStrings("app", "foo"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 0.5}, {T: 75 * 1000, F: 0.5}, {T: 90 * 1000, F: 0.5}, {T: 105 * 1000, F: 0.5}, {T: 120 * 1000, F: 0.5}},
},
},
@ -1075,7 +1069,7 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "foo"}},
Metric: labels.FromStrings("app", "foo"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 6}, {T: 90 * 1000, F: 6}, {T: 120 * 1000, F: 6}},
},
},
@ -1090,7 +1084,7 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "foo"}},
Metric: labels.FromStrings("app", "foo"),
Floats: []promql.FPoint{
{T: 300 * 1000, F: 30},
{T: 330 * 1000, F: 30},
@ -1117,7 +1111,7 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "foo"}},
Metric: labels.FromStrings("app", "foo"),
Floats: []promql.FPoint{
{T: 300 * 1000, F: 1},
{T: 330 * 1000, F: 1},
@ -1144,7 +1138,7 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{},
Metric: labels.EmptyLabels(),
Floats: []promql.FPoint{{T: 60 * 1000, F: 6}, {T: 90 * 1000, F: 6}, {T: 120 * 1000, F: 6}, {T: 150 * 1000, F: 6}, {T: 180 * 1000, F: 6}},
},
},
@ -1159,7 +1153,7 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{},
Metric: labels.EmptyLabels(),
Floats: []promql.FPoint{{T: 60 * 1000, F: 0.1}, {T: 90 * 1000, F: 0.1}, {T: 120 * 1000, F: 0.1}, {T: 150 * 1000, F: 0.1}, {T: 180 * 1000, F: 0.1}},
},
},
@ -1174,11 +1168,11 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "bar"}},
Metric: labels.FromStrings("app", "bar"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 0.2}, {T: 90 * 1000, F: 0.2}, {T: 120 * 1000, F: 0.2}, {T: 150 * 1000, F: 0.2}, {T: 180 * 1000, F: 0.2}},
},
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "foo"}},
Metric: labels.FromStrings("app", "foo"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 0.1}, {T: 90 * 1000, F: 0.1}, {T: 120 * 1000, F: 0.1}, {T: 150 * 1000, F: 0.1}, {T: 180 * 1000, F: 0.1}},
},
},
@ -1193,7 +1187,7 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{},
Metric: labels.EmptyLabels(),
Floats: []promql.FPoint{{T: 60 * 1000, F: 0.2}, {T: 90 * 1000, F: 0.2}, {T: 120 * 1000, F: 0.2}, {T: 150 * 1000, F: 0.2}, {T: 180 * 1000, F: 0.2}},
},
},
@ -1208,7 +1202,7 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{},
Metric: labels.EmptyLabels(),
Floats: []promql.FPoint{{T: 60 * 1000, F: 0.4}, {T: 90 * 1000, F: 0.4}, {T: 120 * 1000, F: 0.4}, {T: 150 * 1000, F: 0.4}, {T: 180 * 1000, F: 0.4}},
},
},
@ -1223,11 +1217,11 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "bar"}},
Metric: labels.FromStrings("app", "bar"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 12}, {T: 90 * 1000, F: 12}, {T: 120 * 1000, F: 12}, {T: 150 * 1000, F: 12}, {T: 180 * 1000, F: 12}},
},
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "foo"}},
Metric: labels.FromStrings("app", "foo"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 6}, {T: 90 * 1000, F: 6}, {T: 120 * 1000, F: 6}, {T: 150 * 1000, F: 6}, {T: 180 * 1000, F: 6}},
},
},
@ -1247,19 +1241,19 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "bar"}, {Name: "cluster", Value: "a"}, {Name: "namespace", Value: "b"}},
Metric: labels.FromStrings("app", "bar", "cluster", "a", "namespace", "b"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 12}, {T: 90 * 1000, F: 12}, {T: 120 * 1000, F: 12}, {T: 150 * 1000, F: 12}, {T: 180 * 1000, F: 12}},
},
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "bar"}, {Name: "cluster", Value: "b"}, {Name: "namespace", Value: "b"}},
Metric: labels.FromStrings("app", "bar", "cluster", "b", "namespace", "b"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 6}, {T: 90 * 1000, F: 6}, {T: 120 * 1000, F: 6}, {T: 150 * 1000, F: 6}, {T: 180 * 1000, F: 6}},
},
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "foo"}, {Name: "cluster", Value: "a"}, {Name: "namespace", Value: "a"}},
Metric: labels.FromStrings("app", "foo", "cluster", "a", "namespace", "a"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 12}, {T: 90 * 1000, F: 12}, {T: 120 * 1000, F: 12}, {T: 150 * 1000, F: 12}, {T: 180 * 1000, F: 12}},
},
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "foo"}, {Name: "cluster", Value: "b"}, {Name: "namespace", Value: "a"}},
Metric: labels.FromStrings("app", "foo", "cluster", "b", "namespace", "a"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 6}, {T: 90 * 1000, F: 6}, {T: 120 * 1000, F: 6}, {T: 150 * 1000, F: 6}, {T: 180 * 1000, F: 6}},
},
},
@ -1279,19 +1273,19 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "bar"}, {Name: "cluster", Value: "a"}, {Name: "namespace", Value: "b"}},
Metric: labels.FromStrings("app", "bar", "cluster", "a", "namespace", "b"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 12}, {T: 90 * 1000, F: 12}, {T: 120 * 1000, F: 12}, {T: 150 * 1000, F: 12}, {T: 180 * 1000, F: 12}},
},
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "bar"}, {Name: "cluster", Value: "b"}, {Name: "namespace", Value: "b"}},
Metric: labels.FromStrings("app", "bar", "cluster", "b", "namespace", "b"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 6}, {T: 90 * 1000, F: 6}, {T: 120 * 1000, F: 6}, {T: 150 * 1000, F: 6}, {T: 180 * 1000, F: 6}},
},
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "foo"}, {Name: "cluster", Value: "a"}, {Name: "namespace", Value: "a"}},
Metric: labels.FromStrings("app", "foo", "cluster", "a", "namespace", "a"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 12}, {T: 90 * 1000, F: 12}, {T: 120 * 1000, F: 12}, {T: 150 * 1000, F: 12}, {T: 180 * 1000, F: 12}},
},
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "foo"}, {Name: "cluster", Value: "b"}, {Name: "namespace", Value: "a"}},
Metric: labels.FromStrings("app", "foo", "cluster", "b", "namespace", "a"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 6}, {T: 90 * 1000, F: 6}, {T: 120 * 1000, F: 6}, {T: 150 * 1000, F: 6}, {T: 180 * 1000, F: 6}},
},
},
@ -1311,11 +1305,11 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "bar"}, {Name: "namespace", Value: "b"}},
Metric: labels.FromStrings("app", "bar", "namespace", "b"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 18}, {T: 90 * 1000, F: 18}, {T: 120 * 1000, F: 18}, {T: 150 * 1000, F: 18}, {T: 180 * 1000, F: 18}},
},
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "foo"}, {Name: "namespace", Value: "a"}},
Metric: labels.FromStrings("app", "foo", "namespace", "a"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 18}, {T: 90 * 1000, F: 18}, {T: 120 * 1000, F: 18}, {T: 150 * 1000, F: 18}, {T: 180 * 1000, F: 18}},
},
},
@ -1330,7 +1324,7 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{},
Metric: labels.EmptyLabels(),
Floats: []promql.FPoint{{T: 60 * 1000, F: 2}, {T: 90 * 1000, F: 2}, {T: 120 * 1000, F: 2}, {T: 150 * 1000, F: 2}, {T: 180 * 1000, F: 2}},
},
},
@ -1345,7 +1339,7 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{},
Metric: labels.EmptyLabels(),
Floats: []promql.FPoint{{T: 60 * 1000, F: 9}, {T: 90 * 1000, F: 9}, {T: 120 * 1000, F: 9}, {T: 150 * 1000, F: 9}, {T: 180 * 1000, F: 9}},
},
},
@ -1360,7 +1354,7 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{},
Metric: labels.EmptyLabels(),
Floats: []promql.FPoint{{T: 60 * 1000, F: 12}, {T: 90 * 1000, F: 12}, {T: 120 * 1000, F: 12}, {T: 150 * 1000, F: 12}, {T: 180 * 1000, F: 12}},
},
},
@ -1375,11 +1369,11 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "bar"}},
Metric: labels.FromStrings("app", "bar"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 0.2}, {T: 90 * 1000, F: 0.2}, {T: 120 * 1000, F: 0.2}, {T: 150 * 1000, F: 0.2}, {T: 180 * 1000, F: 0.2}},
},
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "foo"}},
Metric: labels.FromStrings("app", "foo"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 0.1}, {T: 90 * 1000, F: 0.1}, {T: 120 * 1000, F: 0.1}, {T: 150 * 1000, F: 0.1}, {T: 180 * 1000, F: 0.1}},
},
},
@ -1394,7 +1388,7 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "foo"}},
Metric: labels.FromStrings("app", "foo"),
Floats: []promql.FPoint{
{T: 120000, F: 1}, {T: 150000, F: 1}, {T: 180000, F: 1},
},
@ -1414,11 +1408,11 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "bar"}},
Metric: labels.FromStrings("app", "bar"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 0.4}, {T: 90 * 1000, F: 0.4}, {T: 120 * 1000, F: 0.4}, {T: 150 * 1000, F: 0.4}, {T: 180 * 1000, F: 0.4}},
},
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "foo"}},
Metric: labels.FromStrings("app", "foo"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 0.2}, {T: 90 * 1000, F: 0.2}, {T: 120 * 1000, F: 0.2}, {T: 150 * 1000, F: 0.2}, {T: 180 * 1000, F: 0.2}},
},
},
@ -1433,11 +1427,11 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "bar"}},
Metric: labels.FromStrings("app", "bar"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 0.2}, {T: 90 * 1000, F: 0.2}, {T: 120 * 1000, F: 0.2}, {T: 150 * 1000, F: 0.2}, {T: 180 * 1000, F: 0.2}},
},
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "foo"}},
Metric: labels.FromStrings("app", "foo"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 0.1}, {T: 90 * 1000, F: 0.1}, {T: 120 * 1000, F: 0.1}, {T: 150 * 1000, F: 0.1}, {T: 180 * 1000, F: 0.1}},
},
},
@ -1452,7 +1446,7 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "bar"}},
Metric: labels.FromStrings("app", "bar"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 0.2}, {T: 90 * 1000, F: 0.2}, {T: 120 * 1000, F: 0.2}, {T: 150 * 1000, F: 0.2}, {T: 180 * 1000, F: 0.2}},
},
},
@ -1470,15 +1464,15 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "buzz"}},
Metric: labels.FromStrings("app", "buzz"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 1}, {T: 90 * 1000, F: 1}, {T: 120 * 1000, F: 1}, {T: 150 * 1000, F: 1}, {T: 180 * 1000, F: 1}},
},
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "foo"}},
Metric: labels.FromStrings("app", "foo"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 0.1}, {T: 90 * 1000, F: 0.1}, {T: 120 * 1000, F: 0.1}, {T: 150 * 1000, F: 0.1}, {T: 180 * 1000, F: 0.1}},
},
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "fuzz"}},
Metric: labels.FromStrings("app", "fuzz"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 0.2}, {T: 90 * 1000, F: 0.2}, {T: 120 * 1000, F: 0.2}, {T: 150 * 1000, F: 0.2}, {T: 180 * 1000, F: 0.2}},
},
},
@ -1496,11 +1490,11 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "bar"}},
Metric: labels.FromStrings("app", "bar"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 0.05}, {T: 90 * 1000, F: 0.05}, {T: 120 * 1000, F: 0.05}, {T: 150 * 1000, F: 0.05}, {T: 180 * 1000, F: 0.05}},
},
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "foo"}},
Metric: labels.FromStrings("app", "foo"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 0.1}, {T: 90 * 1000, F: 0.1}, {T: 120 * 1000, F: 0.1}, {T: 150 * 1000, F: 0.1}, {T: 180 * 1000, F: 0.1}},
},
},
@ -1520,15 +1514,15 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "bar"}},
Metric: labels.FromStrings("app", "bar"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 0.05}, {T: 90 * 1000, F: 0.05}, {T: 120 * 1000, F: 0.05}, {T: 150 * 1000, F: 0.05}, {T: 180 * 1000, F: 0.05}},
},
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "foo"}},
Metric: labels.FromStrings("app", "foo"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 0.1}, {T: 90 * 1000, F: 0.1}, {T: 120 * 1000, F: 0.1}, {T: 150 * 1000, F: 0.1}, {T: 180 * 1000, F: 0.1}},
},
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "fuzz"}},
Metric: labels.FromStrings("app", "fuzz"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 0.2}, {T: 90 * 1000, F: 0.2}, {T: 120 * 1000, F: 0.2}, {T: 150 * 1000, F: 0.2}, {T: 180 * 1000, F: 0.2}},
},
},
@ -1551,11 +1545,11 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "bar"}},
Metric: labels.FromStrings("app", "bar"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 0.2}, {T: 90 * 1000, F: 0.2}, {T: 120 * 1000, F: 0.2}, {T: 150 * 1000, F: 0.2}, {T: 180 * 1000, F: 0.2}},
},
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "foo"}},
Metric: labels.FromStrings("app", "foo"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 0.2}, {T: 90 * 1000, F: 0.2}, {T: 120 * 1000, F: 0.2}, {T: 150 * 1000, F: 0.2}, {T: 180 * 1000, F: 0.2}},
},
},
@ -1585,7 +1579,7 @@ func TestEngine_RangeQuery(t *testing.T) {
Metric: labels.Labels(nil),
Floats: []promql.FPoint{{T: 60000, F: 0}, {T: 80000, F: 0}, {T: 100000, F: 0}, {T: 120000, F: 0}, {T: 140000, F: 0}, {T: 160000, F: 0}, {T: 180000, F: 0}}},
promql.Series{
Metric: labels.Labels{labels.Label{Name: "app", Value: "foo"}},
Metric: labels.FromStrings("app", "foo"),
Floats: []promql.FPoint{{T: 60000, F: 0.03333333333333333}, {T: 80000, F: 0.06666666666666667}, {T: 100000, F: 0.06666666666666667}, {T: 120000, F: 0.03333333333333333}, {T: 180000, F: 0.03333333333333333}}},
},
},
@ -1610,7 +1604,7 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "bar"}},
Metric: labels.FromStrings("app", "bar"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 0.2}, {T: 90 * 1000, F: 0.2}, {T: 120 * 1000, F: 0.2}, {T: 150 * 1000, F: 0.2}, {T: 180 * 1000, F: 0.2}},
},
},
@ -1636,7 +1630,7 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "foo"}},
Metric: labels.FromStrings("app", "foo"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 0.2}, {T: 90 * 1000, F: 0.2}, {T: 120 * 1000, F: 0.2}, {T: 150 * 1000, F: 0.2}, {T: 180 * 1000, F: 0.2}},
},
},
@ -1662,7 +1656,7 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "bar"}},
Metric: labels.FromStrings("app", "bar"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 0.4}, {T: 90 * 1000, F: 0.4}, {T: 120 * 1000, F: 0.4}, {T: 150 * 1000, F: 0.4}, {T: 180 * 1000, F: 0.4}},
},
},
@ -1688,7 +1682,7 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "bar"}},
Metric: labels.FromStrings("app", "bar"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 0}, {T: 90 * 1000, F: 0}, {T: 120 * 1000, F: 0}, {T: 150 * 1000, F: 0}, {T: 180 * 1000, F: 0}},
},
},
@ -1714,7 +1708,7 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "bar"}},
Metric: labels.FromStrings("app", "bar"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 144}, {T: 90 * 1000, F: 144}, {T: 120 * 1000, F: 144}, {T: 150 * 1000, F: 144}, {T: 180 * 1000, F: 144}},
},
},
@ -1740,7 +1734,7 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "bar"}},
Metric: labels.FromStrings("app", "bar"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 144}, {T: 90 * 1000, F: 144}, {T: 120 * 1000, F: 144}, {T: 150 * 1000, F: 144}, {T: 180 * 1000, F: 144}},
},
},
@ -1766,7 +1760,7 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "bar"}},
Metric: labels.FromStrings("app", "bar"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 1}, {T: 90 * 1000, F: 1}, {T: 120 * 1000, F: 1}, {T: 150 * 1000, F: 1}, {T: 180 * 1000, F: 1}},
},
},
@ -1792,7 +1786,7 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "bar"}},
Metric: labels.FromStrings("app", "bar"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 0}, {T: 90 * 1000, F: 0}, {T: 120 * 1000, F: 0}, {T: 150 * 1000, F: 0}, {T: 180 * 1000, F: 0}},
},
},
@ -1816,11 +1810,11 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "bar"}},
Metric: labels.FromStrings("app", "bar"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 1.2}, {T: 90 * 1000, F: 1.2}, {T: 120 * 1000, F: 1.2}, {T: 150 * 1000, F: 1.2}, {T: 180 * 1000, F: 1.2}},
},
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "foo"}},
Metric: labels.FromStrings("app", "foo"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 1.2}, {T: 90 * 1000, F: 1.2}, {T: 120 * 1000, F: 1.2}, {T: 150 * 1000, F: 1.2}, {T: 180 * 1000, F: 1.2}},
},
},
@ -1844,11 +1838,11 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "bar"}},
Metric: labels.FromStrings("app", "bar"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 2.4}, {T: 90 * 1000, F: 2.4}, {T: 120 * 1000, F: 2.4}, {T: 150 * 1000, F: 2.4}, {T: 180 * 1000, F: 2.4}},
},
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "foo"}},
Metric: labels.FromStrings("app", "foo"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 2.4}, {T: 90 * 1000, F: 2.4}, {T: 120 * 1000, F: 2.4}, {T: 150 * 1000, F: 2.4}, {T: 180 * 1000, F: 2.4}},
},
},
@ -1878,11 +1872,11 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "bar"}},
Metric: labels.FromStrings("app", "bar"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 2.4}, {T: 90 * 1000, F: 2.4}, {T: 120 * 1000, F: 2.4}, {T: 150 * 1000, F: 2.4}, {T: 180 * 1000, F: 2.4}},
},
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "foo"}, {Name: "new", Value: "oo"}},
Metric: labels.FromStrings("app", "foo", "new", "oo"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 2.4}, {T: 90 * 1000, F: 2.4}, {T: 120 * 1000, F: 2.4}, {T: 150 * 1000, F: 2.4}, {T: 180 * 1000, F: 2.4}},
},
},
@ -1906,7 +1900,7 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{},
Metric: labels.EmptyLabels(),
Floats: []promql.FPoint{{T: 60 * 1000, F: 3.4}, {T: 90 * 1000, F: 3.4}, {T: 120 * 1000, F: 3.4}, {T: 150 * 1000, F: 3.4}, {T: 180 * 1000, F: 3.4}},
},
},
@ -1935,7 +1929,7 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "bar"}},
Metric: labels.FromStrings("app", "bar"),
Floats: []promql.FPoint{{T: 60 * 1000, F: -0.8}, {T: 90 * 1000, F: -0.8}, {T: 120 * 1000, F: -0.8}, {T: 150 * 1000, F: -0.8}, {T: 180 * 1000, F: -0.8}},
},
},
@ -1953,7 +1947,7 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "bar"}},
Metric: labels.FromStrings("app", "bar"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 0.8}, {T: 90 * 1000, F: 0.8}, {T: 120 * 1000, F: 0.8}, {T: 150 * 1000, F: 0.8}, {T: 180 * 1000, F: 0.8}},
},
},
@ -1971,7 +1965,7 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "bar"}},
Metric: labels.FromStrings("app", "bar"),
Floats: []promql.FPoint{{T: 60 * 1000, F: -0.3}, {T: 90 * 1000, F: -0.3}, {T: 120 * 1000, F: -0.3}, {T: 150 * 1000, F: -0.3}, {T: 180 * 1000, F: -0.3}},
},
},
@ -1989,7 +1983,7 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "bar"}},
Metric: labels.FromStrings("app", "bar"),
Floats: []promql.FPoint{{T: 60 * 1000, F: math.Pow(12, 12)}, {T: 90 * 1000, F: math.Pow(12, 12)}, {T: 120 * 1000, F: math.Pow(12, 12)}, {T: 150 * 1000, F: math.Pow(12, 12)}, {T: 180 * 1000, F: math.Pow(12, 12)}},
},
},
@ -2036,7 +2030,7 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "foo"}},
Metric: labels.FromStrings("app", "foo"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 10. / 30.}, {T: 75 * 1000, F: 0}, {T: 90 * 1000, F: 0}, {T: 105 * 1000, F: 0}, {T: 120 * 1000, F: 0}},
},
},
@ -2060,7 +2054,7 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "foo"}},
Metric: labels.FromStrings("app", "foo"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 5.}, {T: 75 * 1000, F: 0}, {T: 90 * 1000, F: 0}, {T: 105 * 1000, F: 4.}, {T: 120 * 1000, F: 4.}},
},
},
@ -2084,7 +2078,7 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "foo"}},
Metric: labels.FromStrings("app", "foo"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 1.}, {T: 75 * 1000, F: 0}, {T: 90 * 1000, F: 0}, {T: 105 * 1000, F: 1.}, {T: 120 * 1000, F: 1.}},
},
},
@ -2108,7 +2102,7 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{{Name: "app", Value: "foo"}},
Metric: labels.FromStrings("app", "foo"),
Floats: []promql.FPoint{{T: 60 * 1000, F: 5.}, {T: 105 * 1000, F: 4.}, {T: 120 * 1000, F: 4.}},
},
},
@ -2132,7 +2126,7 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{labels.Label{Name: "app", Value: "foo"}},
Metric: labels.FromStrings("app", "foo"),
Floats: []promql.FPoint{
{T: 60000, F: 1},
{T: 75000, F: 0},
@ -2175,7 +2169,7 @@ func TestEngine_RangeQuery(t *testing.T) {
},
promql.Matrix{
promql.Series{
Metric: labels.Labels{},
Metric: labels.EmptyLabels(),
Floats: []promql.FPoint{
{T: 60000, F: 20. / 30.},
{T: 90000, F: 0},

24
pkg/logql/matrix_test.go
Unescape View File

@ -18,7 +18,7 @@ func TestMatrixStepper(t *testing.T) {
m := promql.Matrix{
promql.Series{
Metric: labels.Labels{{Name: "foo", Value: "bar"}},
Metric: labels.FromStrings("foo", "bar"),
Floats: []promql.FPoint{
{T: start.UnixNano(), F: 0},
{T: start.Add(step).UnixNano() / int64(time.Millisecond), F: 1},
@ -29,7 +29,7 @@ func TestMatrixStepper(t *testing.T) {
},
},
promql.Series{
Metric: labels.Labels{{Name: "bazz", Value: "buzz"}},
Metric: labels.FromStrings("bazz", "buzz"),
Floats: []promql.FPoint{
{T: start.Add(2*step).UnixNano() / int64(time.Millisecond), F: 2},
{T: start.Add(4*step).UnixNano() / int64(time.Millisecond), F: 4},
@ -43,45 +43,45 @@ func TestMatrixStepper(t *testing.T) {
{
promql.Sample{
T: start.UnixNano(), F: 0,
Metric: labels.Labels{{Name: "foo", Value: "bar"}},
Metric: labels.FromStrings("foo", "bar"),
},
},
{
promql.Sample{
T: start.Add(step).UnixNano() / int64(time.Millisecond), F: 1,
Metric: labels.Labels{{Name: "foo", Value: "bar"}},
Metric: labels.FromStrings("foo", "bar"),
},
},
{
promql.Sample{
T: start.Add(2*step).UnixNano() / int64(time.Millisecond), F: 2,
Metric: labels.Labels{{Name: "foo", Value: "bar"}},
Metric: labels.FromStrings("foo", "bar"),
},
promql.Sample{
T: start.Add(2*step).UnixNano() / int64(time.Millisecond), F: 2,
Metric: labels.Labels{{Name: "bazz", Value: "buzz"}},
Metric: labels.FromStrings("bazz", "buzz"),
},
},
{
promql.Sample{
T: start.Add(3*step).UnixNano() / int64(time.Millisecond), F: 3,
Metric: labels.Labels{{Name: "foo", Value: "bar"}},
Metric: labels.FromStrings("foo", "bar"),
},
},
{
promql.Sample{
T: start.Add(4*step).UnixNano() / int64(time.Millisecond), F: 4,
Metric: labels.Labels{{Name: "foo", Value: "bar"}},
Metric: labels.FromStrings("foo", "bar"),
},
promql.Sample{
T: start.Add(4*step).UnixNano() / int64(time.Millisecond), F: 4,
Metric: labels.Labels{{Name: "bazz", Value: "buzz"}},
Metric: labels.FromStrings("bazz", "buzz"),
},
},
{
promql.Sample{
T: start.Add(5*step).UnixNano() / int64(time.Millisecond), F: 5,
Metric: labels.Labels{{Name: "foo", Value: "bar"}},
Metric: labels.FromStrings("foo", "bar"),
},
},
{},
@ -108,7 +108,7 @@ func Test_SingleStepMatrix(t *testing.T) {
m := promql.Matrix{
promql.Series{
Metric: labels.Labels{},
Metric: labels.EmptyLabels(),
Floats: []promql.FPoint{
{T: start.UnixNano(), F: 10},
},
@ -122,7 +122,7 @@ func Test_SingleStepMatrix(t *testing.T) {
require.Equal(t, start.UnixNano(), ts)
require.Equal(t, promql.Vector{promql.Sample{
T: start.UnixNano(), F: 10,
Metric: labels.Labels{},
Metric: labels.EmptyLabels(),
}}, vec)
ok, _, _ = s.Next()

2
pkg/logql/syntax/ast_test.go
Unescape View File

@ -664,7 +664,7 @@ func BenchmarkReorderedPipeline(b *testing.B) {
p, err := l.Pipeline()
require.NoError(b, err)
sp := p.ForStream(labels.Labels{})
sp := p.ForStream(labels.EmptyLabels())
b.ResetTimer()
for n := 0; n < b.N; n++ {

16
pkg/logql/syntax/parser_test.go
Unescape View File

@ -3205,12 +3205,12 @@ func Test_PipelineCombined(t *testing.T) {
p, err := expr.Pipeline()
require.Nil(t, err)
sp := p.ForStream(labels.Labels{})
sp := p.ForStream(labels.EmptyLabels())
line, lbs, matches := sp.Process(0, []byte(`level=debug ts=2020-10-02T10:10:42.092268913Z caller=logging.go:66 traceID=a9d4d8a928d8db1 msg="POST /api/prom/api/v1/query_range (200) 1.5s"`))
require.True(t, matches)
require.Equal(
t,
labels.Labels{labels.Label{Name: "caller", Value: "logging.go:66"}, labels.Label{Name: "duration", Value: "1.5s"}, labels.Label{Name: "level", Value: "debug"}, labels.Label{Name: "method", Value: "POST"}, labels.Label{Name: "msg", Value: "POST /api/prom/api/v1/query_range (200) 1.5s"}, labels.Label{Name: "path", Value: "/api/prom/api/v1/query_range"}, labels.Label{Name: "status", Value: "200"}, labels.Label{Name: "traceID", Value: "a9d4d8a928d8db1"}, labels.Label{Name: "ts", Value: "2020-10-02T10:10:42.092268913Z"}},
labels.FromStrings("caller", "logging.go:66", "duration", "1.5s", "level", "debug", "method", "POST", "msg", "POST /api/prom/api/v1/query_range (200) 1.5s", "path", "/api/prom/api/v1/query_range", "status", "200", "traceID", "a9d4d8a928d8db1", "ts", "2020-10-02T10:10:42.092268913Z"),
lbs.Labels(),
)
require.Equal(t, string([]byte(`1.5s|POST|200`)), string(line))
@ -3224,7 +3224,7 @@ func Benchmark_PipelineCombined(b *testing.B) {
p, err := expr.Pipeline()
require.Nil(b, err)
sp := p.ForStream(labels.Labels{})
sp := p.ForStream(labels.EmptyLabels())
var (
line []byte
lbs log.LabelsResult
@ -3240,7 +3240,7 @@ func Benchmark_PipelineCombined(b *testing.B) {
require.True(b, matches)
require.Equal(
b,
labels.Labels{labels.Label{Name: "caller", Value: "logging.go:66"}, labels.Label{Name: "duration", Value: "1.5s"}, labels.Label{Name: "level", Value: "debug"}, labels.Label{Name: "method", Value: "POST"}, labels.Label{Name: "msg", Value: "POST /api/prom/api/v1/query_range (200) 1.5s"}, labels.Label{Name: "path", Value: "/api/prom/api/v1/query_range"}, labels.Label{Name: "status", Value: "200"}, labels.Label{Name: "traceID", Value: "a9d4d8a928d8db1"}, labels.Label{Name: "ts", Value: "2020-10-02T10:10:42.092268913Z"}},
labels.FromStrings("caller", "logging.go:66", "duration", "1.5s", "level", "debug", "method", "POST", "msg", "POST /api/prom/api/v1/query_range (200) 1.5s", "path", "/api/prom/api/v1/query_range", "status", "200", "traceID", "a9d4d8a928d8db1", "ts", "2020-10-02T10:10:42.092268913Z"),
lbs.Labels(),
)
require.Equal(b, string([]byte(`1.5s|POST|200`)), string(line))
@ -3254,7 +3254,7 @@ func Benchmark_MetricPipelineCombined(b *testing.B) {
p, err := expr.Extractor()
require.Nil(b, err)
sp := p.ForStream(labels.Labels{})
sp := p.ForStream(labels.EmptyLabels())
var (
v float64
lbs log.LabelsResult
@ -3269,7 +3269,7 @@ func Benchmark_MetricPipelineCombined(b *testing.B) {
require.True(b, matches)
require.Equal(
b,
labels.Labels{labels.Label{Name: "caller", Value: "logging.go:66"}, labels.Label{Name: "duration", Value: "1.5s"}, labels.Label{Name: "level", Value: "debug"}, labels.Label{Name: "method", Value: "POST"}, labels.Label{Name: "msg", Value: "POST /api/prom/api/v1/query_range (200) 1.5s"}, labels.Label{Name: "path", Value: "/api/prom/api/v1/query_range"}, labels.Label{Name: "status", Value: "200"}, labels.Label{Name: "traceID", Value: "a9d4d8a928d8db1"}, labels.Label{Name: "ts", Value: "2020-10-02T10:10:42.092268913Z"}},
labels.FromStrings("caller", "logging.go:66", "duration", "1.5s", "level", "debug", "method", "POST", "msg", "POST /api/prom/api/v1/query_range (200) 1.5s", "path", "/api/prom/api/v1/query_range", "status", "200", "traceID", "a9d4d8a928d8db1", "ts", "2020-10-02T10:10:42.092268913Z"),
lbs.Labels(),
)
require.Equal(b, 1.0, v)
@ -3410,12 +3410,12 @@ func TestParseLabels(t *testing.T) {
{
desc: "basic",
input: `{job="foo"}`,
output: []labels.Label{{Name: "job", Value: "foo"}},
output: labels.FromStrings("job", "foo"),
},
{
desc: "strip empty label value",
input: `{job="foo", bar=""}`,
output: []labels.Label{{Name: "job", Value: "foo"}},
output: labels.FromStrings("job", "foo"),
},
} {
t.Run(tc.desc, func(t *testing.T) {

Write Preview
Loading…
Cancel
Save