Add metadata to push payload #9694
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,14 +8,14 @@ import ( | |
| "time" | ||
| "unsafe" | ||
|
|
||
| "github.com/buger/jsonparser" | ||
| json "github.com/json-iterator/go" | ||
| "github.com/prometheus/common/model" | ||
| "github.com/prometheus/prometheus/model/labels" | ||
|
|
||
| "github.com/grafana/loki/pkg/logproto" | ||
| "github.com/grafana/loki/pkg/logqlmodel/stats" | ||
| "github.com/grafana/loki/pkg/storage/stores/index/seriesvolume" | ||
| ) | ||
|
|
||
| var ( | ||
|
|
@@ -57,9 +57,129 @@ func (q *QueryResponse) UnmarshalJSON(data []byte) error { | |
| }) | ||
| } | ||
|
|
||
| // PushRequest models a log stream push but is unmarshalled to proto push format. | ||
| type PushRequest struct { | ||
| Streams []LogProtoStream `json:"streams"` | ||
|
There was a problem hiding this comment. Previously this stored a pointer, now it stores a struct. Not sure we want this (would need to be tested independently for performance) There was a problem hiding this comment. This comes from this PR: The only reason why I think this is a pointer is so we don't make a copy of the stream when calling NewStream which receives a ptr to With Sandeep's changes, we no longer use that since now we decode from json to loki/pkg/util/unmarshal/unmarshal.go Line 22 in 44b0932 So having that as a ptr or not shouldn't make much difference. |
||
| } | ||
|
|
||
| // LogProtoStream helps with unmarshalling of each log stream for push request. | ||
| // This might look un-necessary but without it the CPU usage in benchmarks was increasing by ~25% :shrug: | ||
| type LogProtoStream logproto.Stream | ||
|
|
||
| func (s *LogProtoStream) UnmarshalJSON(data []byte) error { | ||
| err := jsonparser.ObjectEach(data, func(key, val []byte, ty jsonparser.ValueType, _ int) error { | ||
| switch string(key) { | ||
| case "stream": | ||
| labels := make(LabelSet) | ||
| err := jsonparser.ObjectEach(val, func(key, val []byte, dataType jsonparser.ValueType, _ int) error { | ||
| if dataType != jsonparser.String { | ||
| return jsonparser.MalformedStringError | ||
| } | ||
| labels[yoloString(key)] = yoloString(val) | ||
| return nil | ||
| }) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| s.Labels = labels.String() | ||
| case "values": | ||
| if ty == jsonparser.Null { | ||
| return nil | ||
| } | ||
| entries, err := unmarshalHTTPToLogProtoEntries(val) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| s.Entries = entries | ||
| } | ||
| return nil | ||
| }) | ||
| return err | ||
| } | ||
|
|
||
| func unmarshalHTTPToLogProtoEntries(data []byte) ([]logproto.Entry, error) { | ||
| var ( | ||
| entries []logproto.Entry | ||
| parseError error | ||
| ) | ||
| if _, err := jsonparser.ArrayEach(data, func(value []byte, ty jsonparser.ValueType, _ int, err error) { | ||
| if err != nil || parseError != nil { | ||
| return | ||
| } | ||
| if ty == jsonparser.Null { | ||
| return | ||
| } | ||
| e, err := unmarshalHTTPToLogProtoEntry(value) | ||
| if err != nil { | ||
| parseError = err | ||
| return | ||
| } | ||
| entries = append(entries, e) | ||
| }); err != nil { | ||
| parseError = err | ||
| } | ||
|
|
||
| if parseError != nil { | ||
| return nil, parseError | ||
| } | ||
|
|
||
| return entries, nil | ||
| } | ||
|
|
||
| func unmarshalHTTPToLogProtoEntry(data []byte) (logproto.Entry, error) { | ||
| var ( | ||
| i int | ||
| parseError error | ||
| e logproto.Entry | ||
| ) | ||
| _, err := jsonparser.ArrayEach(data, func(value []byte, t jsonparser.ValueType, _ int, _ error) { | ||
| // assert that both items in array are of type string | ||
| if (i == 0 || i == 1) && t != jsonparser.String { | ||
| parseError = jsonparser.MalformedStringError | ||
| return | ||
| } else if i == 2 && t != jsonparser.Object { | ||
| parseError = jsonparser.MalformedObjectError | ||
| return | ||
| } | ||
| switch i { | ||
| case 0: // timestamp | ||
| ts, err := jsonparser.ParseInt(value) | ||
| if err != nil { | ||
| parseError = err | ||
| return | ||
| } | ||
| e.Timestamp = time.Unix(0, ts) | ||
| case 1: // value | ||
| v, err := jsonparser.ParseString(value) | ||
| if err != nil { | ||
| parseError = err | ||
| return | ||
| } | ||
| e.Line = v | ||
| case 2: // nonIndexedLabels | ||
| var nonIndexedLabels labels.Labels | ||
| err := jsonparser.ObjectEach(value, func(key, val []byte, dataType jsonparser.ValueType, _ int) error { | ||
| if dataType != jsonparser.String { | ||
| return jsonparser.MalformedStringError | ||
| } | ||
| nonIndexedLabels = append(nonIndexedLabels, labels.Label{ | ||
| Name: yoloString(key), | ||
| Value: yoloString(val), | ||
salvacorts marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| }) | ||
| return nil | ||
| }) | ||
| if err != nil { | ||
| parseError = err | ||
| return | ||
| } | ||
| e.NonIndexedLabels = nonIndexedLabels | ||
| } | ||
| i++ | ||
| }) | ||
| if parseError != nil { | ||
| return e, parseError | ||
| } | ||
| return e, err | ||
| } | ||
|
|
||
| // ResultType holds the type of the result | ||
|
|
@@ -441,3 +561,7 @@ func labelVolumeLimit(r *http.Request) error { | |
|
|
||
| return nil | ||
| } | ||
|
|
||
| func yoloString(buf []byte) string { | ||
| return *((*string)(unsafe.Pointer(&buf))) | ||
| } | ||
|
There was a problem hiding this comment. the scariest thing in the PR ) we should use it only if we check that the buffer is not updated, however, a lot of functions in stack trace mean that somebody can do some optimization to reuse the slice and it will break all our implementation. Why do we need it here? There was a problem hiding this comment. As discussed in Slack, removed. |
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have doubts about using yoloString here.
if underlying array of
valueis reused , the values here will be also updatedThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we should remove
yoloStringhere. I had used it earlier because the labels were anyways converted to string immediately. The references to string are now being retained longer so it is not safe to useyoloStringhere.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As discussed in Slack, removed.