From 5aae9a53564a4d0630f35dae101a72dc6aa68b92 Mon Sep 17 00:00:00 2001
From: aaronbuchwald <aaron.buchwald56@gmail.com>
Date: Fri, 19 Aug 2022 16:51:18 -0400
Subject: [PATCH] Improve json logging (#219)

---
 plugin/evm/log.go | 64 ++++++++++++++++++++++++++++++++++++++++++-----
 plugin/evm/vm.go  |  7 +-----
 2 files changed, 59 insertions(+), 12 deletions(-)

diff --git a/plugin/evm/log.go b/plugin/evm/log.go
index c0b33db8e2..32f4d2969b 100644
--- a/plugin/evm/log.go
+++ b/plugin/evm/log.go
@@ -4,12 +4,20 @@
 package evm
 
 import (
+	"encoding/json"
 	"fmt"
 	"io"
+	"reflect"
+	"time"
 
 	"github.com/ethereum/go-ethereum/log"
 )
 
+const (
+	errorKey   = "LOG15_ERROR"
+	timeFormat = "2006-01-02T15:04:05-0700"
+)
+
 type SubnetEVMLogger struct {
 	log.Handler
 }
@@ -56,12 +64,56 @@ func SubnetEVMTermFormat(alias string) log.Format {
 func SubnetEVMJSONFormat(alias string) log.Format {
 	prefix := fmt.Sprintf("%s Chain", alias)
 	return log.FormatFunc(func(r *log.Record) []byte {
-		location := fmt.Sprintf("%+v", r.Call)
-		r.KeyNames.Lvl = "level"
-		r.KeyNames.Time = "timestamp"
-		r.Ctx = append(r.Ctx, "logger", prefix)
-		r.Ctx = append(r.Ctx, "caller", location)
+		props := make(map[string]interface{}, 5+len(r.Ctx)/2)
+		props["timestamp"] = r.Time
+		props["level"] = r.Lvl.String()
+		props[r.KeyNames.Msg] = r.Msg
+		props["logger"] = prefix
+		props["caller"] = fmt.Sprintf("%+v", r.Call)
+		for i := 0; i < len(r.Ctx); i += 2 {
+			k, ok := r.Ctx[i].(string)
+			if !ok {
+				props[errorKey] = fmt.Sprintf("%+v is not a string key", r.Ctx[i])
+			} else {
+				props[k] = formatJSONValue(r.Ctx[i+1])
+			}
+		}
 
-		return log.JSONFormat().Format(r)
+		b, err := json.Marshal(props)
+		if err != nil {
+			b, _ = json.Marshal(map[string]string{
+				errorKey: err.Error(),
+			})
+			return b
+		}
+
+		b = append(b, '\n')
+		return b
 	})
 }
+
+func formatJSONValue(value interface{}) (result interface{}) {
+	defer func() {
+		if err := recover(); err != nil {
+			if v := reflect.ValueOf(value); v.Kind() == reflect.Ptr && v.IsNil() {
+				result = "nil"
+			} else {
+				panic(err)
+			}
+		}
+	}()
+
+	switch v := value.(type) {
+	case time.Time:
+		return v.Format(timeFormat)
+
+	case error:
+		return v.Error()
+
+	case fmt.Stringer:
+		return v.String()
+
+	default:
+		return v
+	}
+}
diff --git a/plugin/evm/vm.go b/plugin/evm/vm.go
index bb09eb4ae8..8fb67fd091 100644
--- a/plugin/evm/vm.go
+++ b/plugin/evm/vm.go
@@ -224,12 +224,7 @@ func (vm *VM) Initialize(
 	}
 	vm.logger = subnetEVMLogger
 
-	if b, err := json.Marshal(vm.config); err == nil {
-		log.Info("Initializing Subnet EVM VM", "Version", Version, "Config", string(b))
-	} else {
-		// Log a warning message since we have already successfully unmarshalled into the struct
-		log.Warn("Problem initializing Subnet EVM VM", "Version", Version, "Config", string(b), "err", err)
-	}
+	log.Info("Initializing Subnet EVM VM", "Version", Version, "Config", vm.config)
 
 	if len(fxs) > 0 {
 		return errUnsupportedFXs