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

[extension/encoding/jsonlogencoding] add new extension for JSON codec #27484

Merged
merged 13 commits into from
Oct 19, 2023
Merged

[extension/encoding/jsonlogencoding] add new extension for JSON codec #27484

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
88989f4
chore: add json codec
Oct 9, 2023
a2870d6
chore: add changelog
Oct 9, 2023
90328eb
fix: add header
Oct 9, 2023
d610605
fix: lint
Oct 9, 2023
efacd14
chore: add go mod
Oct 9, 2023
12e1f19
Update extension/encoding/jsonencodingextension/metadata.yaml
VihasMakwana Oct 11, 2023
5258e36
chore: fix unmarshaling
Oct 11, 2023
494c739
fix: lint
Oct 11, 2023
7e45ef6
chore: add codeowners
Oct 14, 2023
537debc
Merge branch 'main' into json-encoding-extension
VihasMakwana Oct 15, 2023
0f8ca57
chore: add readme
Oct 18, 2023
a1c46e3
Merge branch 'main' into json-encoding-extension
VihasMakwana Oct 19, 2023
e34fcdf
chore: fix CI, run "update-otel"
Oct 19, 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
fix: lint
  • Loading branch information
Vihas Splunk committed Oct 11, 2023
commit 494c7399497d537fa3eb8f41ae36225e227f7fde
10 changes: 5 additions & 5 deletions extension/encoding/jsonlogencodingextension/extension.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ package jsonlogencodingextension // import "github.com/open-telemetry/openteleme

import (
"context"
"errors"
"fmt"
"time"

Expand All @@ -25,13 +24,14 @@ func (e *jsonExtension) MarshalLogs(ld plog.Logs) ([]byte, error) {
case pcommon.ValueTypeMap:
raw = logRecord.Map().AsRaw()
default:
return nil, errors.New(fmt.Sprintf("Marshal: Expected 'Map' found '%v'", logRecord.Type().String()))
return nil, fmt.Errorf("Marshal: Expected 'Map' found '%v'", logRecord.Type().String())
}
if buf, err := jsoniter.Marshal(raw); err != nil {
buf, err := jsoniter.Marshal(raw)
if err != nil {
return nil, err
} else {
return buf, nil
}
return buf, nil

}

func (e *jsonExtension) UnmarshalLogs(buf []byte) (plog.Logs, error) {
Expand Down
Loading