IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Loki: Fix scope of labels variable being wrong (#78417)

Browse Source 
fix scope of labels var
This commit is contained in:
Sven Grossmann 2023-11-21 10:14:21 +01:00 committed by GitHub
parent 9200e17b18
commit 44586df7bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 225 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
pkg/tsdb/loki/testdata/streams_structured_metadata.golden.jsonc vendored
View File

@ -120,18 +120,18 @@
// } // }
// Name: // Name:
// Dimensions: 6 Fields by 6 Rows // Dimensions: 6 Fields by 6 Rows
// +-------------------------+-----------------------------------------+------------------+---------------------+-------------------------+--------------------------------+ // +---------------------------------------+-----------------------------------------+------------------+---------------------+-----------------------------+--------------------------------+
// | Name: labels | Name: Time | Name: Line | Name: tsNs | Name: labelTypes | Name: id | // | Name: labels | Name: Time | Name: Line | Name: tsNs | Name: labelTypes | Name: id |
// | Labels: | Labels: | Labels: | Labels: | Labels: | Labels: | // | Labels: | Labels: | Labels: | Labels: | Labels: | Labels: |
// | Type: []json.RawMessage | Type: []time.Time | Type: []string | Type: []string | Type: []json.RawMessage | Type: []string | // | Type: []json.RawMessage | Type: []time.Time | Type: []string | Type: []string | Type: []json.RawMessage | Type: []string |
// +-------------------------+-----------------------------------------+------------------+---------------------+-------------------------+--------------------------------+ // +---------------------------------------+-----------------------------------------+------------------+---------------------+-----------------------------+--------------------------------+
// | {} | 2022-02-16 16:50:44.81075712 +0000 UTC | log line error 1 | 1645030244810757120 | {} | 1645030244810757120_7bc6af55 | // | {"code":"one\",","location":"moon🌙"} | 2022-02-16 16:50:44.81075712 +0000 UTC | log line error 1 | 1645030244810757120 | {"code":"I","location":"I"} | 1645030244810757120_1d8c2178 |
// | {} | 2022-02-16 16:50:47.02773504 +0000 UTC | log line info 1 | 1645030247027735040 | {} | 1645030247027735040_2c9e69b9 | // | {"code":"\",two","location":"moon🌙"} | 2022-02-16 16:50:47.02773504 +0000 UTC | log line info 1 | 1645030247027735040 | {"code":"I","location":"I"} | 1645030247027735040_87a7aed2 |
// | {} | 2022-02-16 16:50:46.277587968 +0000 UTC | log line info 2 | 1645030246277587968 | {} | 1645030246277587968_b7784d5c | // | {"code":"\",two","location":"moon🌙"} | 2022-02-16 16:50:46.277587968 +0000 UTC | log line info 2 | 1645030246277587968 | {"code":"I","location":"I"} | 1645030246277587968_318d05c9 |
// | {} | 2022-02-16 16:50:46.277587968 +0000 UTC | log line info 2 | 1645030246277587968 | {} | 1645030246277587968_b7784d5c_1 | // | {"code":"\",two","location":"moon🌙"} | 2022-02-16 16:50:46.277587968 +0000 UTC | log line info 2 | 1645030246277587968 | {"code":"I","location":"I"} | 1645030246277587968_318d05c9_1 |
// | {} | 2022-02-16 16:50:45.539423744 +0000 UTC | log line info 3 | 1645030245539423744 | {} | 1645030245539423744_4aee7aab | // | {"code":"\",two","location":"moon🌙"} | 2022-02-16 16:50:45.539423744 +0000 UTC | log line info 3 | 1645030245539423744 | {"code":"I","location":"I"} | 1645030245539423744_fd17f65c |
// | {} | 2022-02-16 16:50:44.091700992 +0000 UTC | log line info 4 | 1645030244091700992 | {} | 1645030244091700992_df059f36 | // | {"code":"\",two","location":"moon🌙"} | 2022-02-16 16:50:44.091700992 +0000 UTC | log line info 4 | 1645030244091700992 | {"code":"I","location":"I"} | 1645030244091700992_62ae07f3 |
// +-------------------------+-----------------------------------------+------------------+---------------------+-------------------------+--------------------------------+ // +---------------------------------------+-----------------------------------------+------------------+---------------------+-----------------------------+--------------------------------+
// //
// //
// 🌟 This was machine generated. Do not edit. 🌟 // 🌟 This was machine generated. Do not edit. 🌟
@ -311,12 +311,30 @@
"data": { "data": {
"values": [ "values": [
[ [
{}, {
{}, "code": "one\",",
{}, "location": "moon🌙"
{}, },
{}, {
{} "code": "\",two",
"location": "moon🌙"
},
{
"code": "\",two",
"location": "moon🌙"
},
{
"code": "\",two",
"location": "moon🌙"
},
{
"code": "\",two",
"location": "moon🌙"
},
{
"code": "\",two",
"location": "moon🌙"
}
], ],
[ [
1645030244810, 1645030244810,
@ -343,20 +361,38 @@
"1645030244091700992" "1645030244091700992"
], ],
[ [
{}, {
{}, "code": "I",
{}, "location": "I"
{}, },
{}, {
{} "code": "I",
"location": "I"
},
{
"code": "I",
"location": "I"
},
{
"code": "I",
"location": "I"
},
{
"code": "I",
"location": "I"
},
{
"code": "I",
"location": "I"
}
], ],
[ [
"1645030244810757120_7bc6af55", "1645030244810757120_1d8c2178",
"1645030247027735040_2c9e69b9", "1645030247027735040_87a7aed2",
"1645030246277587968_b7784d5c", "1645030246277587968_318d05c9",
"1645030246277587968_b7784d5c_1", "1645030246277587968_318d05c9_1",
"1645030245539423744_4aee7aab", "1645030245539423744_fd17f65c",
"1645030244091700992_df059f36" "1645030244091700992_62ae07f3"
] ]
], ],
"nanos": [ "nanos": [

96
pkg/tsdb/loki/testdata_dataplane/streams_structured_metadata.golden.jsonc
View File

@ -118,18 +118,18 @@
// } // }
// Name: // Name:
// Dimensions: 5 Fields by 6 Rows // Dimensions: 5 Fields by 6 Rows
// +-------------------------+-----------------------------------------+------------------+--------------------------------+-------------------------+ // +---------------------------------------+-----------------------------------------+------------------+--------------------------------+-----------------------------+
// | Name: labels | Name: timestamp | Name: body | Name: id | Name: labelTypes | // | Name: labels | Name: timestamp | Name: body | Name: id | Name: labelTypes |
// | Labels: | Labels: | Labels: | Labels: | Labels: | // | Labels: | Labels: | Labels: | Labels: | Labels: |
// | Type: []json.RawMessage | Type: []time.Time | Type: []string | Type: []string | Type: []json.RawMessage | // | Type: []json.RawMessage | Type: []time.Time | Type: []string | Type: []string | Type: []json.RawMessage |
// +-------------------------+-----------------------------------------+------------------+--------------------------------+-------------------------+ // +---------------------------------------+-----------------------------------------+------------------+--------------------------------+-----------------------------+
// | {} | 2022-02-16 16:50:44.81075712 +0000 UTC | log line error 1 | 1645030244810757120_7bc6af55 | {} | // | {"code":"one\",","location":"moon🌙"} | 2022-02-16 16:50:44.81075712 +0000 UTC | log line error 1 | 1645030244810757120_1d8c2178 | {"code":"I","location":"I"} |
// | {} | 2022-02-16 16:50:47.02773504 +0000 UTC | log line info 1 | 1645030247027735040_2c9e69b9 | {} | // | {"code":"\",two","location":"moon🌙"} | 2022-02-16 16:50:47.02773504 +0000 UTC | log line info 1 | 1645030247027735040_87a7aed2 | {"code":"I","location":"I"} |
// | {} | 2022-02-16 16:50:46.277587968 +0000 UTC | log line info 2 | 1645030246277587968_b7784d5c | {} | // | {"code":"\",two","location":"moon🌙"} | 2022-02-16 16:50:46.277587968 +0000 UTC | log line info 2 | 1645030246277587968_318d05c9 | {"code":"I","location":"I"} |
// | {} | 2022-02-16 16:50:46.277587968 +0000 UTC | log line info 2 | 1645030246277587968_b7784d5c_1 | {} | // | {"code":"\",two","location":"moon🌙"} | 2022-02-16 16:50:46.277587968 +0000 UTC | log line info 2 | 1645030246277587968_318d05c9_1 | {"code":"I","location":"I"} |
// | {} | 2022-02-16 16:50:45.539423744 +0000 UTC | log line info 3 | 1645030245539423744_4aee7aab | {} | // | {"code":"\",two","location":"moon🌙"} | 2022-02-16 16:50:45.539423744 +0000 UTC | log line info 3 | 1645030245539423744_fd17f65c | {"code":"I","location":"I"} |
// | {} | 2022-02-16 16:50:44.091700992 +0000 UTC | log line info 4 | 1645030244091700992_df059f36 | {} | // | {"code":"\",two","location":"moon🌙"} | 2022-02-16 16:50:44.091700992 +0000 UTC | log line info 4 | 1645030244091700992_62ae07f3 | {"code":"I","location":"I"} |
// +-------------------------+-----------------------------------------+------------------+--------------------------------+-------------------------+ // +---------------------------------------+-----------------------------------------+------------------+--------------------------------+-----------------------------+
// //
// //
// 🌟 This was machine generated. Do not edit. 🌟 // 🌟 This was machine generated. Do not edit. 🌟
@ -300,12 +300,30 @@
"data": { "data": {
"values": [ "values": [
[ [
{}, {
{}, "code": "one\",",
{}, "location": "moon🌙"
{}, },
{}, {
{} "code": "\",two",
"location": "moon🌙"
},
{
"code": "\",two",
"location": "moon🌙"
},
{
"code": "\",two",
"location": "moon🌙"
},
{
"code": "\",two",
"location": "moon🌙"
},
{
"code": "\",two",
"location": "moon🌙"
}
], ],
[ [
1645030244810, 1645030244810,
@ -324,20 +342,38 @@
"log line info 4" "log line info 4"
], ],
[ [
"1645030244810757120_7bc6af55", "1645030244810757120_1d8c2178",
"1645030247027735040_2c9e69b9", "1645030247027735040_87a7aed2",
"1645030246277587968_b7784d5c", "1645030246277587968_318d05c9",
"1645030246277587968_b7784d5c_1", "1645030246277587968_318d05c9_1",
"1645030245539423744_4aee7aab", "1645030245539423744_fd17f65c",
"1645030244091700992_df059f36" "1645030244091700992_62ae07f3"
], ],
[ [
{}, {
{}, "code": "I",
{}, "location": "I"
{}, },
{}, {
{} "code": "I",
"location": "I"
},
{
"code": "I",
"location": "I"
},
{
"code": "I",
"location": "I"
},
{
"code": "I",
"location": "I"
},
{
"code": "I",
"location": "I"
}
] ]
], ],
"nanos": [ "nanos": [

96
pkg/tsdb/loki/testdata_logs_dataplane/streams_structured_metadata.golden.jsonc
View File

@ -118,18 +118,18 @@
// } // }
// Name: // Name:
// Dimensions: 5 Fields by 6 Rows // Dimensions: 5 Fields by 6 Rows
// +-------------------------+-----------------------------------------+------------------+--------------------------------+-------------------------+ // +---------------------------------------+-----------------------------------------+------------------+--------------------------------+-----------------------------+
// | Name: labels | Name: timestamp | Name: body | Name: id | Name: labelTypes | // | Name: labels | Name: timestamp | Name: body | Name: id | Name: labelTypes |
// | Labels: | Labels: | Labels: | Labels: | Labels: | // | Labels: | Labels: | Labels: | Labels: | Labels: |
// | Type: []json.RawMessage | Type: []time.Time | Type: []string | Type: []string | Type: []json.RawMessage | // | Type: []json.RawMessage | Type: []time.Time | Type: []string | Type: []string | Type: []json.RawMessage |
// +-------------------------+-----------------------------------------+------------------+--------------------------------+-------------------------+ // +---------------------------------------+-----------------------------------------+------------------+--------------------------------+-----------------------------+
// | {} | 2022-02-16 16:50:44.81075712 +0000 UTC | log line error 1 | 1645030244810757120_7bc6af55 | {} | // | {"code":"one\",","location":"moon🌙"} | 2022-02-16 16:50:44.81075712 +0000 UTC | log line error 1 | 1645030244810757120_1d8c2178 | {"code":"I","location":"I"} |
// | {} | 2022-02-16 16:50:47.02773504 +0000 UTC | log line info 1 | 1645030247027735040_2c9e69b9 | {} | // | {"code":"\",two","location":"moon🌙"} | 2022-02-16 16:50:47.02773504 +0000 UTC | log line info 1 | 1645030247027735040_87a7aed2 | {"code":"I","location":"I"} |
// | {} | 2022-02-16 16:50:46.277587968 +0000 UTC | log line info 2 | 1645030246277587968_b7784d5c | {} | // | {"code":"\",two","location":"moon🌙"} | 2022-02-16 16:50:46.277587968 +0000 UTC | log line info 2 | 1645030246277587968_318d05c9 | {"code":"I","location":"I"} |
// | {} | 2022-02-16 16:50:46.277587968 +0000 UTC | log line info 2 | 1645030246277587968_b7784d5c_1 | {} | // | {"code":"\",two","location":"moon🌙"} | 2022-02-16 16:50:46.277587968 +0000 UTC | log line info 2 | 1645030246277587968_318d05c9_1 | {"code":"I","location":"I"} |
// | {} | 2022-02-16 16:50:45.539423744 +0000 UTC | log line info 3 | 1645030245539423744_4aee7aab | {} | // | {"code":"\",two","location":"moon🌙"} | 2022-02-16 16:50:45.539423744 +0000 UTC | log line info 3 | 1645030245539423744_fd17f65c | {"code":"I","location":"I"} |
// | {} | 2022-02-16 16:50:44.091700992 +0000 UTC | log line info 4 | 1645030244091700992_df059f36 | {} | // | {"code":"\",two","location":"moon🌙"} | 2022-02-16 16:50:44.091700992 +0000 UTC | log line info 4 | 1645030244091700992_62ae07f3 | {"code":"I","location":"I"} |
// +-------------------------+-----------------------------------------+------------------+--------------------------------+-------------------------+ // +---------------------------------------+-----------------------------------------+------------------+--------------------------------+-----------------------------+
// //
// //
// 🌟 This was machine generated. Do not edit. 🌟 // 🌟 This was machine generated. Do not edit. 🌟
@ -300,12 +300,30 @@
"data": { "data": {
"values": [ "values": [
[ [
{}, {
{}, "code": "one\",",
{}, "location": "moon🌙"
{}, },
{}, {
{} "code": "\",two",
"location": "moon🌙"
},
{
"code": "\",two",
"location": "moon🌙"
},
{
"code": "\",two",
"location": "moon🌙"
},
{
"code": "\",two",
"location": "moon🌙"
},
{
"code": "\",two",
"location": "moon🌙"
}
], ],
[ [
1645030244810, 1645030244810,
@ -324,20 +342,38 @@
"log line info 4" "log line info 4"
], ],
[ [
"1645030244810757120_7bc6af55", "1645030244810757120_1d8c2178",
"1645030247027735040_2c9e69b9", "1645030247027735040_87a7aed2",
"1645030246277587968_b7784d5c", "1645030246277587968_318d05c9",
"1645030246277587968_b7784d5c_1", "1645030246277587968_318d05c9_1",
"1645030245539423744_4aee7aab", "1645030245539423744_fd17f65c",
"1645030244091700992_df059f36" "1645030244091700992_62ae07f3"
], ],
[ [
{}, {
{}, "code": "I",
{}, "location": "I"
{}, },
{}, {
{} "code": "I",
"location": "I"
},
{
"code": "I",
"location": "I"
},
{
"code": "I",
"location": "I"
},
{
"code": "I",
"location": "I"
},
{
"code": "I",
"location": "I"
}
] ]
], ],
"nanos": [ "nanos": [

40
pkg/tsdb/loki/testdata_metric_dataplane/streams_structured_metadata.golden.jsonc
View File

@ -120,14 +120,14 @@
// } // }
// Name: // Name:
// Dimensions: 6 Fields by 2 Rows // Dimensions: 6 Fields by 2 Rows
// +-------------------------+----------------------------------------+------------------+---------------------+-------------------------+------------------------------+ // +---------------------------------------+----------------------------------------+------------------+---------------------+-----------------------------+------------------------------+
// | Name: labels | Name: Time | Name: Line | Name: tsNs | Name: labelTypes | Name: id | // | Name: labels | Name: Time | Name: Line | Name: tsNs | Name: labelTypes | Name: id |
// | Labels: | Labels: | Labels: | Labels: | Labels: | Labels: | // | Labels: | Labels: | Labels: | Labels: | Labels: | Labels: |
// | Type: []json.RawMessage | Type: []time.Time | Type: []string | Type: []string | Type: []json.RawMessage | Type: []string | // | Type: []json.RawMessage | Type: []time.Time | Type: []string | Type: []string | Type: []json.RawMessage | Type: []string |
// +-------------------------+----------------------------------------+------------------+---------------------+-------------------------+------------------------------+ // +---------------------------------------+----------------------------------------+------------------+---------------------+-----------------------------+------------------------------+
// | {} | 2022-02-16 16:50:44.81075712 +0000 UTC | log line error 1 | 1645030244810757120 | {} | 1645030244810757120_7bc6af55 | // | {"code":"one\",","location":"moon🌙"} | 2022-02-16 16:50:44.81075712 +0000 UTC | log line error 1 | 1645030244810757120 | {"code":"I","location":"I"} | 1645030244810757120_1d8c2178 |
// | {} | 2022-02-16 16:50:47.02773504 +0000 UTC | log line info 1 | 1645030247027735040 | {} | 1645030247027735040_2c9e69b9 | // | {"code":"\",two","location":"moon🌙"} | 2022-02-16 16:50:47.02773504 +0000 UTC | log line info 1 | 1645030247027735040 | {"code":"I","location":"I"} | 1645030247027735040_87a7aed2 |
// +-------------------------+----------------------------------------+------------------+---------------------+-------------------------+------------------------------+ // +---------------------------------------+----------------------------------------+------------------+---------------------+-----------------------------+------------------------------+
// //
// //
// 🌟 This was machine generated. Do not edit. 🌟 // 🌟 This was machine generated. Do not edit. 🌟
@ -307,8 +307,14 @@
"data": { "data": {
"values": [ "values": [
[ [
{}, {
{} "code": "one\",",
"location": "moon🌙"
},
{
"code": "\",two",
"location": "moon🌙"
}
], ],
[ [
1645030244810, 1645030244810,
@ -323,12 +329,18 @@
"1645030247027735040" "1645030247027735040"
], ],
[ [
{}, {
{} "code": "I",
"location": "I"
},
{
"code": "I",
"location": "I"
}
], ],
[ [
"1645030244810757120_7bc6af55", "1645030244810757120_1d8c2178",
"1645030247027735040_2c9e69b9" "1645030247027735040_87a7aed2"
] ]
], ],
"nanos": [ "nanos": [

2
pkg/util/converter/prom.go
View File

@ -981,7 +981,7 @@ func readCategorizedStream(iter *jsonitere.Iterator) backend.DataResponse {
case "stream": case "stream":
// we need to clear `labels`, because `iter.ReadVal` // we need to clear `labels`, because `iter.ReadVal`
// only appends to it // only appends to it
labels := data.Labels{} labels = data.Labels{}
if err = iter.ReadVal(&labels); err != nil { if err = iter.ReadVal(&labels); err != nil {
return rspErr(err) return rspErr(err)
} }