remove message when empty

Author: ArthurHlt

parser/filter_app.go

@@ -27,9 +27,9 @@ func (f *AppFilter) parseJsonMapValue(m map[string]interface{}) map[string]inter
 		m = utils.MergeMap(m, f.filterJson(fmt.Sprint(msgJson)))
 		delete(m, "@json")
 	}
-	if msg, ok := m["@message"]; ok && regexJson.MatchString(fmt.Sprint(msg)) {
+	if msg, ok := m[MessageKey]; ok && regexJson.MatchString(fmt.Sprint(msg)) {
 		m = utils.MergeMap(m, f.filterJson(fmt.Sprint(msg)))
-		delete(m, "@message")
+		delete(m, MessageKey)
 	}
 	return m
 }
@@ -62,7 +62,9 @@ func (f *AppFilter) FilterPatterns(pMes *rfc5424.SyslogMessage, patterns []strin
 
 func (f *AppFilter) filterPatternsMsg(message string, patterns []string) map[string]interface{} {
 	if regexJson.MatchString(message) {
-		return f.filterJson(message)
+		m := f.filterJson(message)
+		m[MessageKey] = ""
+		return m
 	}
 	resultMap := make(map[string]interface{})
 	for _, pattern := range patterns {
@@ -89,12 +91,12 @@ func (f *AppFilter) filterPatternsMsg(message string, patterns []string) map[str
 	if textValue != "" {
 		resultMap = utils.MergeMap(resultMap, f.filterPatternsMsg(textValue, patterns))
 	}
-	msg, hasMsg := resultMap["@message"]
+	msg, hasMsg := resultMap[MessageKey]
 	if hasMsg && !msgKey.Hide && msgKey.Name != "" {
 		resultMap = utils.MergeMap(resultMap, utils.CreateMapFromDelim(msgKey.Name, msg))
 	}
 	if !hasMsg {
-		resultMap["@message"] = ""
+		resultMap[MessageKey] = ""
 	}
 	return resultMap
 }
@@ -116,7 +118,7 @@ func (f *AppFilter) filterJson(message string) map[string]interface{} {
 	data := make(map[string]interface{})
 	err := json.Unmarshal([]byte(message), &data)
 	if err != nil {
-		data["@message"] = message
+		data[MessageKey] = message
 		data["@exception"] = err.Error()
 		return data
 	}

parser/filter_default.go

@@ -46,7 +46,7 @@ func (f DefaultFilter) Filter(pMes *rfc5424.SyslogMessage) map[string]interface{
 	data["@timestamp"] = *pMes.Timestamp
 	if pMes.Message != nil && strings.TrimSpace(*pMes.Message) != "" {
 		data["@level"] = "INFO"
-		data["@message"] = *pMes.Message
+		data[MessageKey] = *pMes.Message
 	}
 
 	pData := *pMes.StructuredData

parser/filter_metrics.go

@@ -31,6 +31,7 @@ func (f MetricsFilter) Filter(pMes *rfc5424.SyslogMessage) map[string]interface{
 	}
 	structDataPtr := pMes.StructuredData
 	*structDataPtr = structData
+	data[MessageKey] = ""
 	return data
 }
 

parser/filter_rtr.go

@@ -159,7 +159,7 @@ func (f RtrFilter) Filter(pMes *rfc5424.SyslogMessage) map[string]interface{} {
 		data[k] = v
 	}
 
-	data["@message"] = fmt.Sprintf(
+	data[MessageKey] = fmt.Sprintf(
 		"%d %s %s (%d ms)",
 		dataRtr["status"],
 		dataRtr["verb"],

parser/parser.go

@@ -14,7 +14,10 @@ import (
 	"github.com/orange-cloudfoundry/logs-service-broker/utils"
 )
 
-const defCompanyID = "logsbroker@1368"
+const (
+	defCompanyID = "logsbroker@1368"
+	MessageKey   = "@message"
+)
 
 // this is from https://github.com/cloudfoundry/cf-syslog-drain-release/blob/f13fd13ec6d08822f261cbb575aa5f357ab32f0d/src/adapter/internal/egress/tcp.go#L21-L24
 // gaugeStructuredDataID contains the registered enterprise ID for the Cloud
@@ -48,7 +51,7 @@ type MsgParam map[string]map[string]string
 
 var defaultParsingKeys = []model.ParsingKey{
 	{
-		Name: "@message",
+		Name: MessageKey,
 	},
 	{
 		Name: "@raw",
@@ -146,6 +149,14 @@ func (p Parser) Parse(
 		}
 		data = utils.MergeMap(data, values)
 	}
+
+	// clean empty message
+	if mess, ok := data[MessageKey]; ok {
+		if str, ok := mess.(string); ok && str == "" {
+			delete(data, MessageKey)
+		}
+	}
+
 	if len(logData.InstanceParam.SourceLabels) > 0 {
 		currentSource := make(map[string]interface{})
 		if _, ok := data["@source"]; ok {