Skip to content

marshal logs and metrics with json for print #1079

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

Open
europaul wants to merge 1 commit into
base: master
Choose a base branch
from
Open

marshal logs and metrics with json for print #1079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion pkg/controller/eapps/eappslog.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
package eapps

import (
"encoding/json"
"fmt"
"reflect"
"regexp"
Expand Down Expand Up @@ -83,7 +84,7 @@ func HandleFactory(format types.OutputFormat, once bool) HandlerFunc {
func LogPrn(le *logs.LogEntry, format types.OutputFormat) {
switch format {
case types.OutputFormatJSON:
b, err := protojson.Marshal(le)
b, err := json.Marshal(le)
if err != nil {
log.Fatal(err)
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/einfo/einfo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
package einfo

import (
"encoding/json"
"fmt"
"reflect"
"regexp"
Expand All @@ -17,7 +18,6 @@ import (
log "github.com/sirupsen/logrus"
"golang.org/x/text/cases"
"golang.org/x/text/language"
"google.golang.org/protobuf/encoding/protojson"
"google.golang.org/protobuf/proto"
)

Expand All @@ -40,7 +40,7 @@ func ParseZInfoMsg(data []byte) (ZInfoMsg *info.ZInfoMsg, err error) {
func ZInfoPrn(im *info.ZInfoMsg, format types.OutputFormat) {
switch format {
case types.OutputFormatJSON:
b, err := protojson.Marshal(im)
b, err := json.Marshal(im)
if err != nil {
log.Fatal(err)
}
Expand Down
3 changes: 2 additions & 1 deletion pkg/controller/elog/elog.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
package elog

import (
"encoding/json"
"fmt"
"reflect"
"regexp"
Expand Down Expand Up @@ -109,7 +110,7 @@ func HandleFactory(format types.OutputFormat, once bool) HandlerFunc {
func LogPrint(le *FullLogEntry, format types.OutputFormat) {
switch format {
case types.OutputFormatJSON:
b, err := protojson.Marshal(le)
b, err := json.Marshal(le)
if err != nil {
log.Fatal(err)
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/emetric/emetric.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
package emetric

import (
"encoding/json"
"fmt"
"reflect"
"regexp"
Expand All @@ -17,7 +18,6 @@ import (
log "github.com/sirupsen/logrus"
"golang.org/x/text/cases"
"golang.org/x/text/language"
"google.golang.org/protobuf/encoding/protojson"
"google.golang.org/protobuf/proto"
)

Expand Down Expand Up @@ -104,7 +104,7 @@ func MetricItemFind(mm *metrics.ZMetricMsg, query map[string]string) bool {
func MetricPrn(le *metrics.ZMetricMsg, format types.OutputFormat) {
switch format {
case types.OutputFormatJSON:
b, err := protojson.Marshal(le)
b, err := json.Marshal(le)
if err != nil {
log.Fatal(err)
}
Expand Down
Loading