From 3b67be8a51e03fa1cbbb15f4c89abef740b2702b Mon Sep 17 00:00:00 2001
From: Jonathan Fung <jonathan@dydx.exchange>
Date: Tue, 5 Dec 2023 22:34:28 -0800
Subject: [PATCH 1/2] error key value formatter for zerolog for dd error
 tracking

---
 server/util.go | 42 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/server/util.go b/server/util.go
index f74ec00d6c01..324d5898804d 100644
--- a/server/util.go
+++ b/server/util.go
@@ -18,6 +18,7 @@ import (
 	cmtcfg "github.com/cometbft/cometbft/config"
 	dbm "github.com/cosmos/cosmos-db"
 	"github.com/rs/zerolog"
+	"github.com/rs/zerolog/pkgerrors"
 	"github.com/spf13/cast"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
@@ -25,10 +26,19 @@ import (
 	"golang.org/x/sync/errgroup"
 
 	"cosmossdk.io/log"
+<<<<<<< HEAD
 	"cosmossdk.io/store"
 	"cosmossdk.io/store/snapshots"
 	snapshottypes "cosmossdk.io/store/snapshots/types"
 	storetypes "cosmossdk.io/store/types"
+=======
+	dbm "github.com/cometbft/cometbft-db"
+	tmcmd "github.com/cometbft/cometbft/cmd/cometbft/commands"
+	tmcfg "github.com/cometbft/cometbft/config"
+	tmlog "github.com/cometbft/cometbft/libs/log"
+	tmtypes "github.com/cometbft/cometbft/types"
+	errorspkg "github.com/pkg/errors"
+>>>>>>> ecbbc8a84 (error key value formatter for zerolog for dd error tracking)
 
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/client/flags"
@@ -110,7 +120,7 @@ func InterceptConfigsPreRunHandler(cmd *cobra.Command, customAppConfigTemplate s
 	if err != nil {
 		return err
 	}
-	serverCtx.Logger = logger.With(log.ModuleKey, "server")
+	serverCtx.Logger = logger.With(log.ModuleKey, "server").With("source", "go")
 
 	// set server context
 	return SetCmdServerContext(cmd, serverCtx)
@@ -197,9 +207,39 @@ func CreateSDKLogger(ctx *Context, out io.Writer) (log.Logger, error) {
 	// Check if the CometBFT flag for trace logging is set and enable stack traces if so.
 	opts = append(opts, log.TraceOption(ctx.Viper.GetBool("trace"))) // cmtcli.TraceFlag
 
+	// Error fields should be set under error object
+	zerolog.ErrorFieldName = "error"
+
+	// Add the kind and message field
+	zerolog.ErrorMarshalFunc = func(err error) interface{} {
+		stackArr, ok := pkgerrors.MarshalStack(errorspkg.WithStack(err)).([]map[string]string)
+		if !ok {
+			return struct{}{}
+		}
+		objectToReturn := DatadogErrorTrackingObject{
+			// Discard common prefix stack traces from zerolog call sites
+			Stack:   stackArr[5:],
+			Kind:    "Exception",
+			Message: err.Error(),
+		}
+		return objectToReturn
+	}
+
 	return log.NewLogger(out, opts...), nil
 }
 
+type DatadogErrorTrackingObject struct {
+	Stack   []map[string]string
+	Message string
+	Kind    string
+}
+
+func (obj DatadogErrorTrackingObject) MarshalZerologObject(e *zerolog.Event) {
+	e.Interface("stack", obj.Stack).
+		Str("message", obj.Message).
+		Str("kind", obj.Kind)
+}
+
 // GetServerContextFromCmd returns a Context from a command or an empty Context
 // if it has not been set.
 func GetServerContextFromCmd(cmd *cobra.Command) *Context {

From 422bc07f96a9aecf60db76fb6bcd829a8f27a38b Mon Sep 17 00:00:00 2001
From: Jonathan Fung <jonathan@dydx.exchange>
Date: Thu, 7 Dec 2023 00:32:24 -0800
Subject: [PATCH 2/2] import mergefix

---
 server/util.go | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/server/util.go b/server/util.go
index 324d5898804d..2c2895bbbec7 100644
--- a/server/util.go
+++ b/server/util.go
@@ -26,19 +26,11 @@ import (
 	"golang.org/x/sync/errgroup"
 
 	"cosmossdk.io/log"
-<<<<<<< HEAD
 	"cosmossdk.io/store"
 	"cosmossdk.io/store/snapshots"
 	snapshottypes "cosmossdk.io/store/snapshots/types"
 	storetypes "cosmossdk.io/store/types"
-=======
-	dbm "github.com/cometbft/cometbft-db"
-	tmcmd "github.com/cometbft/cometbft/cmd/cometbft/commands"
-	tmcfg "github.com/cometbft/cometbft/config"
-	tmlog "github.com/cometbft/cometbft/libs/log"
-	tmtypes "github.com/cometbft/cometbft/types"
 	errorspkg "github.com/pkg/errors"
->>>>>>> ecbbc8a84 (error key value formatter for zerolog for dd error tracking)
 
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/client/flags"