Merge branch 'dev' into feat/dynamodb_instrumentation

Author: zsistla

agent/lib_aws_sdk_php.h

@@ -13,6 +13,7 @@
 #include "nr_segment_datastore.h"
 #include "nr_segment_datastore_private.h"
 
+
 #if ZEND_MODULE_API_NO >= ZEND_8_1_X_API_NO /* PHP8.1+ */
 /* Service instrumentation only supported above PHP 8.1+*/
 

agent/php_mshutdown.c

@@ -16,6 +16,7 @@
 #include "nr_agent.h"
 #include "util_logging.h"
 #include "fw_wordpress.h"
+#include "lib_aws_sdk_php.h"
 
 #ifdef TAGS
 void zm_shutdown_newrelic(void); /* ctags landing pad only */

daemon/internal/newrelic/log_events.go

@@ -76,21 +76,25 @@ func (events *LogEvents) CollectorJSON(id AgentRunID) ([]byte, error) {
 	estimate := len(es) * 128
 	buf.Grow(estimate)
 	buf.WriteString(`[{` +
-		`"common": {"attributes": {`)
+		`"common": {"attributes": `)
 	nwrit := 0
-	for _, value := range events.LogForwardingLabels {
-		if nwrit > 0 {
-			buf.WriteByte(',')
+	labelMap := make(map[string]string)
+	for _, label := range events.LogForwardingLabels {
+		// safegaurd against invalid labels
+		if len(label.LabelType) != 0 && len(label.LabelValue) != 0 {
+			labelMap["tags."+label.LabelType] = label.LabelValue
 		}
-		nwrit++
-		buf.WriteString(`"tags.`)
-		buf.WriteString(value.LabelType)
-		buf.WriteString(`":"`)
-		buf.WriteString(value.LabelValue)
-		buf.WriteString(`"`)
 	}
 
-	buf.WriteString(`}},` +
+	j, e := json.Marshal(labelMap)
+	if e != nil {
+		log.Errorf("failed to marshal log label: %s", e)
+		buf.WriteString("{}")
+	} else {
+		buf.Write(j)
+	}
+
+	buf.WriteString(`},` +
 		`"logs": [`)
 
 	nwrit = 0

daemon/internal/newrelic/log_events_test.go

@@ -27,6 +27,8 @@ var (
 		LogForwardingLabelsTestCase{name: "Invalid keys", labels: `[{"label_tipe":"type1","label_valyue":"value1"}]`, expected: `{}`},
 		LogForwardingLabelsTestCase{name: "Space in value", labels: `[{"label_type":"type1","label_value":"value 1"}]`, expected: `{"tags.type1":"value 1"}`},
 		LogForwardingLabelsTestCase{name: "Space in key", labels: `[{"label_type":"type 1","label_value":"value1"}]`, expected: `{"tags.type 1":"value1"}`},
+		LogForwardingLabelsTestCase{name: "Empty value", labels: `[{"label_type":"type1","label_value":""}]`, expected: `{}`},
+		LogForwardingLabelsTestCase{name: "Empty key", labels: `[{"label_type":"","label_value":"value1"}]`, expected: `{}`},
 	}
 )