fix: tests updated

SigNoz · Oct 16, 2023 · 4e43c2d · 4e43c2d
1 parent fefd27a
commit 4e43c2d
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 10 deletions.
diff --git a/receiver/httpreceiver/bodyparser/default.go b/receiver/httpreceiver/bodyparser/default.go
@@ -13,9 +13,12 @@ func (l *Default) Parse(body []byte) (plog.Logs, int) {
 	// split by newline and return
 	// TODO: add configuration for multiline
 	ld := plog.NewLogs()
+	data := string(body)
+	if data == "" {
+		return ld, 0
+	}
 	rl := ld.ResourceLogs().AppendEmpty()
 	sl := rl.ScopeLogs().AppendEmpty()
-	data := string(body)
 	loglines := strings.Split(data, "\n")
 	for _, log := range loglines {
 		sl.LogRecords().AppendEmpty().Body().SetStr(log)

diff --git a/receiver/httpreceiver/bodyparser/default_test.go b/receiver/httpreceiver/bodyparser/default_test.go
@@ -39,6 +39,14 @@ func TestDefaultParse(t *testing.T) {
 				return ld
 			},
 		},
+		{
+			name:    "Test 3 - empty",
+			PayLoad: "",
+			Logs: func() plog.Logs {
+				ld := plog.NewLogs()
+				return ld
+			},
+		},
 	}
 
 	for _, tt := range tests {

diff --git a/receiver/httpreceiver/bodyparser/heroku.go b/receiver/httpreceiver/bodyparser/heroku.go
@@ -75,20 +75,24 @@ func (l *Heroku) Parse(body []byte) (plog.Logs, int) {
 	ld := plog.NewLogs()
 	for resource, logbodies := range resdata {
 		rl := ld.ResourceLogs().AppendEmpty()
-		rl.Resource().Attributes().EnsureCapacity(5)
-		rl.Resource().Attributes().PutStr("priority", resource.priority)
-		rl.Resource().Attributes().PutStr("version", resource.version)
-		rl.Resource().Attributes().PutStr("hostname", resource.hostname)
-		rl.Resource().Attributes().PutStr("appname", resource.appname)
-		rl.Resource().Attributes().PutStr("procid", resource.procid)
+		if resource != (rAttrs{}) {
+			rl.Resource().Attributes().EnsureCapacity(5)
+			rl.Resource().Attributes().PutStr("priority", resource.priority)
+			rl.Resource().Attributes().PutStr("version", resource.version)
+			rl.Resource().Attributes().PutStr("hostname", resource.hostname)
+			rl.Resource().Attributes().PutStr("appname", resource.appname)
+			rl.Resource().Attributes().PutStr("procid", resource.procid)
+		}
 
 		sl := rl.ScopeLogs().AppendEmpty()
 		for _, log := range logbodies {
 			rec := sl.LogRecords().AppendEmpty()
 			rec.Body().SetStr(log.body)
-			rec.Attributes().EnsureCapacity(2)
-			rec.Attributes().PutStr("timestamp", log.timestamp)
-			rec.Attributes().PutStr("msgid", log.msgid)
+			if log.timestamp != "" {
+				rec.Attributes().EnsureCapacity(2)
+				rec.Attributes().PutStr("timestamp", log.timestamp)
+				rec.Attributes().PutStr("msgid", log.msgid)
+			}
 		}
 	}
 	return ld, len(loglines)

diff --git a/receiver/httpreceiver/bodyparser/heroku_test.go b/receiver/httpreceiver/bodyparser/heroku_test.go
@@ -122,6 +122,26 @@ func TestHerokuParse(t *testing.T) {
 				return ld
 			},
 		},
+		{
+			name:    "Test 3 - empty",
+			PayLoad: ``,
+			Logs: func() plog.Logs {
+				ld := plog.NewLogs()
+				return ld
+			},
+		},
+		{
+			name:    "Test 4 - wrong pattern",
+			PayLoad: `28 Setting up own telemetry...`,
+			Logs: func() plog.Logs {
+				ld := plog.NewLogs()
+				rl := ld.ResourceLogs().AppendEmpty()
+				sl := rl.ScopeLogs().AppendEmpty()
+				log := sl.LogRecords().AppendEmpty()
+				log.Body().SetStr("Setting up own telemetry...")
+				return ld
+			},
+		},
 	}
 
 	for _, tt := range tests {