Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add metadata to push payload #9694

Merged
merged 39 commits into from
Jul 13, 2023
Merged
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
b799556
Add metadata to push payload
salvacorts Jun 13, 2023
b0810c8
Add metadata to tests
salvacorts Jun 13, 2023
b7ae131
update vendor push pkg
salvacorts Jun 13, 2023
9bec73a
WIP fix tests
salvacorts Jun 13, 2023
d876c21
Fix more tests
salvacorts Jun 13, 2023
9c6fdef
Revent some unwanted changes
salvacorts Jun 13, 2023
b4ed160
Remove more unwanted changes
salvacorts Jun 13, 2023
8c6f22e
Update vendor files
salvacorts Jun 13, 2023
c854d06
use json format for metadata labels in v1 push api
sandeepsukhani Jun 16, 2023
95ba8a2
rename metadataLabels to labels
sandeepsukhani Jun 16, 2023
7db3e54
Merge branch 'main' into salvacorts/metadata-push-payload
sandeepsukhani Jun 16, 2023
ea8f3f6
lint and some test fixes
sandeepsukhani Jun 16, 2023
73cf5dc
lint
sandeepsukhani Jun 16, 2023
7b77c69
lint lint lin...
sandeepsukhani Jun 16, 2023
44b0932
use map object instead of string representation for log labels in jso…
sandeepsukhani Jun 19, 2023
617e864
revert some accidental chagnes
sandeepsukhani Jun 19, 2023
f43dfab
Make labels in loghttp.Entry of type LabelSet
salvacorts Jun 29, 2023
384d556
Apply CR feedback
salvacorts Jun 29, 2023
4088112
Avoid allocations for empty labels
salvacorts Jun 29, 2023
0b0af55
Fix json encoding and add tests
salvacorts Jun 29, 2023
d4e311c
Change error message
salvacorts Jun 29, 2023
10d404e
Add more labels to tests cases
salvacorts Jun 29, 2023
fcd1e66
Fix encode and add more tests
salvacorts Jun 29, 2023
64d3d6c
Do not use struct
salvacorts Jun 30, 2023
96c804d
Merge branch 'main' into salvacorts/metadata-push-payload
sandeepsukhani Jul 5, 2023
7f25bb8
remove a TODO
sandeepsukhani Jul 5, 2023
752ae6b
rename to NonIndexedLabels
salvacorts Jul 10, 2023
4b67145
Add missing protos updates
salvacorts Jul 10, 2023
aa58916
Update vendor
salvacorts Jul 10, 2023
4c60a9e
Update after mod vendor
salvacorts Jul 10, 2023
4028758
Use slice of labels for json and proto structures
salvacorts Jul 11, 2023
8c76150
Fix format
salvacorts Jul 11, 2023
fb505b4
Move LabelsAdapter to push pkg
salvacorts Jul 12, 2023
ccaf192
Use same prometheus version in push pkg
salvacorts Jul 12, 2023
fb42e9c
Merge branch 'main' into salvacorts/metadata-push-payload
salvacorts Jul 12, 2023
eaf235c
Update vendor/github.com/grafana/loki/pkg/push/types.go
salvacorts Jul 12, 2023
7438809
Fix tests
salvacorts Jul 12, 2023
f6e6918
Don't use yolostring when deserializing push request
salvacorts Jul 12, 2023
f8c33aa
Remove yolostring
salvacorts Jul 13, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove more unwanted changes
  • Loading branch information
salvacorts committed Jun 13, 2023
commit b4ed160468f49a0f796629a0d84b902bdc33765a
10 changes: 5 additions & 5 deletions pkg/push/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,12 @@ func (m *Entry) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i--
dAtA[i] = 0x12
}
n1, err1 := StdTimeMarshalTo(m.Timestamp, dAtA[i-SizeOfStdTime(m.Timestamp):])
if err1 != nil {
return 0, err1
n7, err7 := StdTimeMarshalTo(m.Timestamp, dAtA[i-SizeOfStdTime(m.Timestamp):])
if err7 != nil {
return 0, err7
}
i -= n1
i = encodeVarintPush(dAtA, i, uint64(n1))
i -= n7
i = encodeVarintPush(dAtA, i, uint64(n7))
i--
dAtA[i] = 0xa
return len(dAtA) - i, nil
Expand Down