Merge branch 'develop' into 0fe2dependabot/go_modules/v3/integrations…

…/nrgraphqlgo/example/golang.org/x/net-0.17.0
newrelic · Nov 16, 2023 · dbb8a4e · dbb8a4e
2 parents a64b9d5 + ecbc516
commit dbb8a4e
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 7 deletions.
diff --git a/v3/go.mod b/v3/go.mod
@@ -5,7 +5,18 @@ go 1.19
 require (
 	github.com/golang/protobuf v1.5.3
 	github.com/valyala/fasthttp v1.49.0
-	google.golang.org/grpc v1.54.0
+	google.golang.org/grpc v1.56.3
+)
+
+require (
+	github.com/andybalholm/brotli v1.0.5 // indirect
+	github.com/klauspost/compress v1.16.3 // indirect
+	github.com/valyala/bytebufferpool v1.0.0 // indirect
+	golang.org/x/net v0.9.0 // indirect
+	golang.org/x/sys v0.7.0 // indirect
+	golang.org/x/text v0.9.0 // indirect
+	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
+	google.golang.org/protobuf v1.30.0 // indirect
 )
 
 retract v3.22.0 // release process error corrected in v3.22.1

diff --git a/v3/integrations/nrgraphqlgo/example/go.mod b/v3/integrations/nrgraphqlgo/example/go.mod
@@ -19,9 +19,9 @@ require (
 	golang.org/x/net v0.17.0 // indirect
 	golang.org/x/sys v0.13.0 // indirect
 	golang.org/x/text v0.13.0 // indirect
-	google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
-	google.golang.org/grpc v1.54.0 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
+	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
+	google.golang.org/grpc v1.56.3 // indirect
+	google.golang.org/protobuf v1.30.0 // indirect
 )
 
 replace github.com/newrelic/go-agent/v3/integrations/nrgraphqlgo => ../

diff --git a/v3/integrations/nrgrpc/go.mod b/v3/integrations/nrgrpc/go.mod
@@ -9,9 +9,31 @@ require (
 	github.com/newrelic/go-agent/v3 v3.26.0
 	github.com/newrelic/go-agent/v3/integrations/nrsecurityagent v1.1.0
 	// v1.15.0 is the earliest version of grpc using modules.
-	google.golang.org/grpc v1.54.0
-	google.golang.org/protobuf v1.28.1
+	google.golang.org/grpc v1.56.3
+	google.golang.org/protobuf v1.30.0
 )
 
+require (
+	github.com/andybalholm/brotli v1.0.5 // indirect
+	github.com/dlclark/regexp2 v1.9.0 // indirect
+	github.com/gorilla/websocket v1.5.0 // indirect
+	github.com/juju/fslock v0.0.0-20160525022230-4d5c94c67b4b // indirect
+	github.com/k2io/hookingo v1.0.3 // indirect
+	github.com/klauspost/compress v1.16.3 // indirect
+	github.com/kr/pretty v0.3.1 // indirect
+	github.com/mackerelio/go-osstat v0.2.4 // indirect
+	github.com/newrelic/csec-go-agent v0.3.0 // indirect
+	github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
+	github.com/sirupsen/logrus v1.9.0 // indirect
+	github.com/struCoder/pidusage v0.2.1 // indirect
+	github.com/valyala/bytebufferpool v1.0.0 // indirect
+	github.com/valyala/fasthttp v1.49.0 // indirect
+	golang.org/x/arch v0.3.0 // indirect
+	golang.org/x/net v0.9.0 // indirect
+	golang.org/x/sys v0.7.0 // indirect
+	golang.org/x/text v0.9.0 // indirect
+	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+)
 
 replace github.com/newrelic/go-agent/v3 => ../..
diff --git a/v3/newrelic/error_events.go b/v3/newrelic/error_events.go
@@ -32,7 +32,7 @@ func (e *errorEvent) WriteJSON(buf *bytes.Buffer) {
 		w.stringField("spanId", e.SpanID)
 	}
 	if e.Expect {
-		w.stringField("error.expected", "true")
+		w.boolField(expectErrorAttr, true)
 	}
 
 	sharedTransactionIntrinsics(&e.txnEvent, &w)