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.

Sign up for GitHub

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

Jump to bottom

fluent-bit: Attempt to unmarshal nested json. #5223

Merged
merged 2 commits into from
Jan 28, 2022
Merged

fluent-bit: Attempt to unmarshal nested json. #5223

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1669a97
fluent-bit: Attempt to unmarshal nested json.
cyriltovena Jan 24, 2022
30fa4ca
Also support nested json array.
cyriltovena Jan 26, 2022
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
17 changes: 15 additions & 2 deletions clients/cmd/fluent-bit/loki.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package main

import (
"bytes"
"encoding/json"
"errors"
"fmt"
"os"
Expand Down Expand Up @@ -78,7 +79,7 @@ func (l *loki) sendRecord(r map[interface{}]interface{}, ts time.Time) error {
return nil
}
}
line, err := createLine(records, l.cfg.lineFormat)
line, err := l.createLine(records, l.cfg.lineFormat)
if err != nil {
return fmt.Errorf("error creating line: %v", err)
}
Expand Down Expand Up @@ -220,9 +221,21 @@ func removeKeys(records map[string]interface{}, keys []string) {
}
}

func createLine(records map[string]interface{}, f format) (string, error) {
func (l *loki) createLine(records map[string]interface{}, f format) (string, error) {
switch f {
case jsonFormat:
for k, v := range records {
if s, ok := v.(string); ok && strings.Contains(s, "{") {
cyriltovena marked this conversation as resolved.
Show resolved Hide resolved
var data interface{}
err := json.Unmarshal([]byte(s), &data)
if err != nil {
// keep this debug as it can be very verbose
level.Debug(l.logger).Log("msg", "error unmarshalling json", "err", err)
continue
}
records[k] = data
}
}
js, err := jsoniter.ConfigCompatibleWithStandardLibrary.Marshal(records)
if err != nil {
return "", err
Expand Down
23 changes: 15 additions & 8 deletions clients/cmd/fluent-bit/loki_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ import (
var now = time.Now()

func Test_loki_sendRecord(t *testing.T) {
var simpleRecordFixture = map[interface{}]interface{}{
simpleRecordFixture := map[interface{}]interface{}{
"foo": "bar",
"bar": 500,
"error": make(chan struct{}),
}
var mapRecordFixture = map[interface{}]interface{}{
mapRecordFixture := map[interface{}]interface{}{
// lots of key/value pairs in map to increase chances of test hitting in case of unsorted map marshalling
"A": "A",
"B": "B",
Expand All @@ -34,14 +34,14 @@ func Test_loki_sendRecord(t *testing.T) {
"G": "G",
"H": "H",
}
var byteArrayRecordFixture = map[interface{}]interface{}{
byteArrayRecordFixture := map[interface{}]interface{}{
"label": "label",
"outer": []byte("foo"),
"map": map[interface{}]interface{}{
"inner": []byte("bar"),
},
}
var mixedTypesRecordFixture = map[interface{}]interface{}{
mixedTypesRecordFixture := map[interface{}]interface{}{
"label": "label",
"int": 42,
"float": 42.42,
Expand All @@ -53,7 +53,7 @@ func Test_loki_sendRecord(t *testing.T) {
},
},
}
var nestedJSONFixture = map[interface{}]interface{}{
nestedJSONFixture := map[interface{}]interface{}{
"kubernetes": map[interface{}]interface{}{
"annotations": map[interface{}]interface{}{
"kubernetes.io/psp": "test",
Expand Down Expand Up @@ -124,10 +124,14 @@ func Test_createLine(t *testing.T) {
{"kv with map", map[string]interface{}{"foo": "bar", "map": map[string]interface{}{"foo": "bar", "bar ": "foo "}}, kvPairFormat, `foo=bar map="map[bar :foo foo:bar]"`, false},
{"kv empty", map[string]interface{}{}, kvPairFormat, ``, false},
{"bad format", nil, format(3), "", true},
{"nested json", map[string]interface{}{"log": `{"level":"error"}`}, jsonFormat, `{"log":{"level":"error"}}`, false},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
got, err := createLine(tt.records, tt.f)
l := &loki{
logger: logger,
}
got, err := l.createLine(tt.records, tt.f)
if (err != nil) != tt.wantErr {
t.Errorf("createLine() error = %v, wantErr %v", err, tt.wantErr)
return
Expand Down Expand Up @@ -217,8 +221,11 @@ func Test_toStringMap(t *testing.T) {
}{
{"already string", map[interface{}]interface{}{"string": "foo", "bar": []byte("buzz")}, map[string]interface{}{"string": "foo", "bar": "buzz"}},
{"skip non string", map[interface{}]interface{}{"string": "foo", 1.0: []byte("buzz")}, map[string]interface{}{"string": "foo"}},
{"byteslice in array", map[interface{}]interface{}{"string": "foo", "bar": []interface{}{map[interface{}]interface{}{"baz": []byte("quux")}}},
map[string]interface{}{"string": "foo", "bar": []interface{}{map[string]interface{}{"baz": "quux"}}}},
{
"byteslice in array",
map[interface{}]interface{}{"string": "foo", "bar": []interface{}{map[interface{}]interface{}{"baz": []byte("quux")}}},
map[string]interface{}{"string": "foo", "bar": []interface{}{map[string]interface{}{"baz": "quux"}}},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
Expand Down