Merge branch 'feat/dynamodb_instrumentation' of github.com:newrelic/newrelic-php-agent into feat/dynamodb_instrumentation

Author: zsistla

VERSION

@@ -1 +1 @@
-11.7.0
+11.8.0

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 */

axiom/nr_version.c

@@ -48,8 +48,9 @@
  *   diamond            09Dec2024 (11.4)
  *   emerald            13Jan2025 (11.5)
  *   fluorite           18Feb2025 (11.6)
+ *   gaspeite           19Mar2025 (11.7)
  */
-#define NR_CODENAME "gaspeite"
+#define NR_CODENAME "hiddenite"
 
 const char* nr_version(void) {
   return NR_STR2(NR_VERSION);

daemon/go.mod

@@ -1,19 +1,18 @@
 module github.com/newrelic/newrelic-php-agent/daemon
 
-go 1.21
-
+go 1.23.0
 toolchain go1.23.6
 
 require (
 	github.com/golang/protobuf v1.5.3
 	github.com/google/flatbuffers v23.5.26+incompatible
-	golang.org/x/net v0.33.0
+	golang.org/x/net v0.36.0
 	google.golang.org/grpc v1.61.0
 	google.golang.org/protobuf v1.33.0
 )
 
 require (
-	golang.org/x/sys v0.28.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
+	golang.org/x/sys v0.30.0 // indirect
+	golang.org/x/text v0.22.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect
 )

daemon/go.sum

@@ -6,12 +6,12 @@ github.com/google/flatbuffers v23.5.26+incompatible/go.mod h1:1AeVuKshWv4vARoZat
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
-golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
+golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA=
+golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I=
+golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
+golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
+golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 h1:Jyp0Hsi0bmHXG6k9eATXoYtjd6e2UzZ1SCn/wIupY14=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:oQ5rr10WTTMvP4A36n8JpR1OrO1BEiV4f78CneXZxkA=

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: `{}`},
 	}
 )