diff --git a/pkg/controller/eapps/eappslog.go b/pkg/controller/eapps/eappslog.go index da53e4f94..fac43e69b 100644 --- a/pkg/controller/eapps/eappslog.go +++ b/pkg/controller/eapps/eappslog.go @@ -3,6 +3,7 @@ package eapps import ( + "encoding/json" "fmt" "reflect" "regexp" @@ -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) } diff --git a/pkg/controller/einfo/einfo.go b/pkg/controller/einfo/einfo.go index 096eb3b3b..1ce3dba0d 100644 --- a/pkg/controller/einfo/einfo.go +++ b/pkg/controller/einfo/einfo.go @@ -3,6 +3,7 @@ package einfo import ( + "encoding/json" "fmt" "reflect" "regexp" @@ -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" ) @@ -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) } diff --git a/pkg/controller/elog/elog.go b/pkg/controller/elog/elog.go index 3c3fb6df4..ed73832d0 100644 --- a/pkg/controller/elog/elog.go +++ b/pkg/controller/elog/elog.go @@ -3,6 +3,7 @@ package elog import ( + "encoding/json" "fmt" "reflect" "regexp" @@ -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) } diff --git a/pkg/controller/emetric/emetric.go b/pkg/controller/emetric/emetric.go index 40e7f21e6..8369a0137 100644 --- a/pkg/controller/emetric/emetric.go +++ b/pkg/controller/emetric/emetric.go @@ -3,6 +3,7 @@ package emetric import ( + "encoding/json" "fmt" "reflect" "regexp" @@ -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" ) @@ -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) }