Custom field names for json logger

Author: everesio

Makefile

@@ -8,7 +8,7 @@ VERSION       ?= $(shell git describe --tags --always --dirty)
 GOPKGS         = $(shell go list ./... | grep -v /vendor/)
 BUILD_FLAGS   ?=
 LDFLAGS       ?= -X github.com/grepplabs/kafka-proxy/config.Version=$(VERSION) -w -s
-TAG           ?= "v0.2.1"
+TAG           ?= "v0.2.2"
 GOARCH        ?= amd64
 GOOS          ?= linux
 

README.md

@@ -35,11 +35,11 @@ See:
 
    Linux
 
-        curl -Ls https://github.com/grepplabs/kafka-proxy/releases/download/v0.2.1/kafka-proxy-v0.2.1-linux-amd64.tar.gz | tar xz
+        curl -Ls https://github.com/grepplabs/kafka-proxy/releases/download/v0.2.2/kafka-proxy-v0.2.2-linux-amd64.tar.gz | tar xz
 
    macOS
 
-        curl -Ls https://github.com/grepplabs/kafka-proxy/releases/download/v0.2.1/kafka-proxy-v0.2.1-darwin-amd64.tar.gz | tar xz
+        curl -Ls https://github.com/grepplabs/kafka-proxy/releases/download/v0.2.2/kafka-proxy-v0.2.2-darwin-amd64.tar.gz | tar xz
 
 2. Move the binary in to your PATH.
 
@@ -105,6 +105,8 @@ See:
           --log-format string                              Log format text or json (default "text")
           --log-level string                               Log level debug, info, warning, error, fatal or panic (default "info")
           --log-level-fieldname string                     Log level fieldname for json format (default "@level")
+          --log-msg-fieldname string                       Message fieldname for json format (default "@message")
+          --log-time-fieldname string                      Time fieldname for json format (default "@timestamp")
           --proxy-listener-ca-chain-cert-file string       PEM encoded CA's certificate file. If provided, client certificate is required and verified
           --proxy-listener-cert-file string                PEM encoded file with server certificate
           --proxy-listener-cipher-suites stringSlice       List of supported cipher suites

cmd/kafka-proxy/server.go

@@ -178,6 +178,8 @@ func initFlags() {
 	Server.Flags().StringVar(&c.Log.Format, "log-format", "text", "Log format text or json")
 	Server.Flags().StringVar(&c.Log.Level, "log-level", "info", "Log level debug, info, warning, error, fatal or panic")
 	Server.Flags().StringVar(&c.Log.LevelFieldName, "log-level-fieldname", "@level", "Log level fieldname for json format")
+	Server.Flags().StringVar(&c.Log.TimeFiledName, "log-time-fieldname", "@timestamp", "Time fieldname for json format")
+	Server.Flags().StringVar(&c.Log.MsgFiledName, "log-msg-fieldname", "@message", "Message fieldname for json format")
 
 	// Connect through Socks5 or HTTP CONNECT to Kafka
 	Server.Flags().StringVar(&c.ForwardProxy.Url, "forward-proxy", "", "URL of the forward proxy. Supported schemas are socks5 and http")
@@ -439,9 +441,9 @@ func SetLogger() {
 	if c.Log.Format == "json" {
 		formatter := &logrus.JSONFormatter{
 			FieldMap: logrus.FieldMap{
-				logrus.FieldKeyTime:  "@timestamp",
+				logrus.FieldKeyTime:  c.Log.TimeFiledName,
 				logrus.FieldKeyLevel: c.Log.LevelFieldName,
-				logrus.FieldKeyMsg:   "@message",
+				logrus.FieldKeyMsg:   c.Log.MsgFiledName,
 			},
 			TimestampFormat: time.RFC3339,
 		}

config/config.go

@@ -45,6 +45,8 @@ type Config struct {
 		Format         string
 		Level          string
 		LevelFieldName string
+		TimeFiledName  string
+		MsgFiledName   string
 	}
 	Proxy struct {
 		DefaultListenerIP        string