Merge pull request #894 from nr-swilloughby/fix-k2-nrecho-v3

correct struct field name
newrelic · Apr 4, 2024 · 9f6a90e · 9f6a90e
2 parents e5cab8d + 4c91dab
commit 9f6a90e
Show file tree

Hide file tree

Showing 56 changed files with 123 additions and 109 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,16 @@
+## 3.32.0
+### Added
+ * Updates to support for the New Relic security agent to report API endpoints.
+    * Adds new wrapper function for the `nrecho`, `nrgin`, and `nrgorilla` integrations.
+ * Handler to take New Relic transaction data from context automatically when using `nrslog` integration (thanks, @adomaskizogian!) 
+
+### Fixed
+ * Adds missing license file to the `nropenai` integration.
+ * Changes `*bedrockruntime.Client` parameters in `nrawsbedrock` integration to use a more general interface type, allowing the use of custom types which extend the bedrock client type.
+ * Fixes `pgx5` pool example
+ * Updated unit tests to check `Transaction.Ignore`
+ * Updated `nrzap` unit tests to add background logger sugared test case.
+
 ## 3.31.0
 ### Added
  * Integration packages to instrument AI model invocations (see below).

diff --git a/v3/go.mod b/v3/go.mod
@@ -1,10 +1,9 @@
 module github.com/newrelic/go-agent/v3
 
-go 1.19
+go 1.20
 
 require (
 	github.com/golang/protobuf v1.5.3
-	golang.org/x/exp v0.0.0-20240318143956-a85f2c67cd81
 	google.golang.org/grpc v1.56.3
 )
 

diff --git a/v3/integrations/logcontext-v2/logWriter/go.mod b/v3/integrations/logcontext-v2/logWriter/go.mod
@@ -1,9 +1,9 @@
 module github.com/newrelic/go-agent/v3/integrations/logcontext-v2/logWriter
 
-go 1.19
+go 1.20
 
 require (
-	github.com/newrelic/go-agent/v3 v3.31.0
+	github.com/newrelic/go-agent/v3 v3.32.0
 	github.com/newrelic/go-agent/v3/integrations/logcontext-v2/nrwriter v1.0.0
 )
 

diff --git a/v3/integrations/logcontext-v2/nrlogrus/go.mod b/v3/integrations/logcontext-v2/nrlogrus/go.mod
@@ -1,9 +1,9 @@
 module github.com/newrelic/go-agent/v3/integrations/logcontext-v2/nrlogrus
 
-go 1.19
+go 1.20
 
 require (
-	github.com/newrelic/go-agent/v3 v3.31.0
+	github.com/newrelic/go-agent/v3 v3.32.0
 	github.com/sirupsen/logrus v1.8.1
 )
 

diff --git a/v3/integrations/logcontext-v2/nrslog/go.mod b/v3/integrations/logcontext-v2/nrslog/go.mod
@@ -1,8 +1,8 @@
 module github.com/newrelic/go-agent/v3/integrations/logcontext-v2/nrslog
 
-go 1.19
+go 1.20
 
-require github.com/newrelic/go-agent/v3 v3.31.0
+require github.com/newrelic/go-agent/v3 v3.32.0
 
 
 replace github.com/newrelic/go-agent/v3 => ../../..
diff --git a/v3/integrations/logcontext-v2/nrwriter/go.mod b/v3/integrations/logcontext-v2/nrwriter/go.mod
@@ -1,8 +1,8 @@
 module github.com/newrelic/go-agent/v3/integrations/logcontext-v2/nrwriter
 
-go 1.19
+go 1.20
 
-require github.com/newrelic/go-agent/v3 v3.31.0
+require github.com/newrelic/go-agent/v3 v3.32.0
 
 
 replace github.com/newrelic/go-agent/v3 => ../../..
diff --git a/v3/integrations/logcontext-v2/nrzap/go.mod b/v3/integrations/logcontext-v2/nrzap/go.mod
@@ -1,9 +1,9 @@
 module github.com/newrelic/go-agent/v3/integrations/logcontext-v2/nrzap
 
-go 1.19
+go 1.20
 
 require (
-	github.com/newrelic/go-agent/v3 v3.31.0
+	github.com/newrelic/go-agent/v3 v3.32.0
 	go.uber.org/zap v1.24.0
 )
 

diff --git a/v3/integrations/logcontext-v2/nrzerolog/go.mod b/v3/integrations/logcontext-v2/nrzerolog/go.mod
@@ -1,9 +1,9 @@
 module github.com/newrelic/go-agent/v3/integrations/logcontext-v2/nrzerolog
 
-go 1.19
+go 1.20
 
 require (
-	github.com/newrelic/go-agent/v3 v3.31.0
+	github.com/newrelic/go-agent/v3 v3.32.0
 	github.com/rs/zerolog v1.26.1
 )
 

diff --git a/v3/integrations/logcontext-v2/zerologWriter/go.mod b/v3/integrations/logcontext-v2/zerologWriter/go.mod
@@ -1,9 +1,9 @@
 module github.com/newrelic/go-agent/v3/integrations/logcontext-v2/zerologWriter
 
-go 1.19
+go 1.20
 
 require (
-	github.com/newrelic/go-agent/v3 v3.31.0
+	github.com/newrelic/go-agent/v3 v3.32.0
 	github.com/newrelic/go-agent/v3/integrations/logcontext-v2/nrwriter v1.0.0
 	github.com/rs/zerolog v1.27.0
 )

diff --git a/v3/integrations/logcontext/nrlogrusplugin/go.mod b/v3/integrations/logcontext/nrlogrusplugin/go.mod
@@ -2,10 +2,10 @@ module github.com/newrelic/go-agent/v3/integrations/logcontext/nrlogrusplugin
 
 // As of Dec 2019, the logrus go.mod file uses 1.13:
 // https://github.com/sirupsen/logrus/blob/master/go.mod
-go 1.19
+go 1.20
 
 require (
-	github.com/newrelic/go-agent/v3 v3.31.0
+	github.com/newrelic/go-agent/v3 v3.32.0
 	// v1.4.0 is required for for the log.WithContext.
 	github.com/sirupsen/logrus v1.4.0
 )

diff --git a/v3/integrations/nramqp/go.mod b/v3/integrations/nramqp/go.mod
@@ -1,9 +1,9 @@
 module github.com/newrelic/go-agent/v3/integrations/nramqp
 
-go 1.19
+go 1.20
 
 require (
-	github.com/newrelic/go-agent/v3 v3.31.0
+	github.com/newrelic/go-agent/v3 v3.32.0
 	github.com/rabbitmq/amqp091-go v1.9.0
 )
 replace github.com/newrelic/go-agent/v3 => ../..
diff --git a/v3/integrations/nrawsbedrock/go.mod b/v3/integrations/nrawsbedrock/go.mod
@@ -1,14 +1,15 @@
 module github.com/newrelic/go-agent/v3/integrations/nrawsbedrock
 
-go 1.19
+go 1.20
 
 require (
 	github.com/aws/aws-sdk-go-v2 v1.26.0
 	github.com/aws/aws-sdk-go-v2/config v1.27.4
 	github.com/aws/aws-sdk-go-v2/service/bedrock v1.7.3
 	github.com/aws/aws-sdk-go-v2/service/bedrockruntime v1.7.1
 	github.com/google/uuid v1.3.0
-	github.com/newrelic/go-agent/v3 v3.31.0
+	github.com/newrelic/go-agent/v3 v3.32.0
 )
 
+
 replace github.com/newrelic/go-agent/v3 => ../..
diff --git a/v3/integrations/nrawssdk-v1/go.mod b/v3/integrations/nrawssdk-v1/go.mod
@@ -3,12 +3,12 @@ module github.com/newrelic/go-agent/v3/integrations/nrawssdk-v1
 // As of Dec 2019, aws-sdk-go's go.mod does not specify a Go version.  1.6 is
 // the earliest version of Go tested by aws-sdk-go's CI:
 // https://github.com/aws/aws-sdk-go/blob/master/.travis.yml
-go 1.19
+go 1.20
 
 require (
 	// v1.15.0 is the first aws-sdk-go version with module support.
 	github.com/aws/aws-sdk-go v1.34.0
-	github.com/newrelic/go-agent/v3 v3.31.0
+	github.com/newrelic/go-agent/v3 v3.32.0
 )
 
 

diff --git a/v3/integrations/nrawssdk-v2/go.mod b/v3/integrations/nrawssdk-v2/go.mod
@@ -2,7 +2,7 @@ module github.com/newrelic/go-agent/v3/integrations/nrawssdk-v2
 
 // As of May 2021, the aws-sdk-go-v2 go.mod file uses 1.15:
 // https://github.com/aws/aws-sdk-go-v2/blob/master/go.mod
-go 1.19
+go 1.20
 
 require (
 	github.com/aws/aws-sdk-go-v2 v1.16.15
@@ -11,7 +11,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/lambda v1.24.5
 	github.com/aws/aws-sdk-go-v2/service/s3 v1.27.10
 	github.com/aws/smithy-go v1.13.3
-	github.com/newrelic/go-agent/v3 v3.31.0
+	github.com/newrelic/go-agent/v3 v3.32.0
 )
 
 

diff --git a/v3/integrations/nrb3/go.mod b/v3/integrations/nrb3/go.mod
@@ -1,8 +1,8 @@
 module github.com/newrelic/go-agent/v3/integrations/nrb3
 
-go 1.19
+go 1.20
 
-require github.com/newrelic/go-agent/v3 v3.31.0
+require github.com/newrelic/go-agent/v3 v3.32.0
 
 
 replace github.com/newrelic/go-agent/v3 => ../..
diff --git a/v3/integrations/nrecho-v3/go.mod b/v3/integrations/nrecho-v3/go.mod
@@ -2,13 +2,13 @@ module github.com/newrelic/go-agent/v3/integrations/nrecho-v3
 
 // 1.7 is the earliest version of Go tested by v3.1.0:
 // https://github.com/labstack/echo/blob/v3.1.0/.travis.yml
-go 1.19
+go 1.20
 
 require (
 	// v3.1.0 is the earliest v3 version of Echo that works with modules due
 	// to the github.com/rsc/letsencrypt import of v3.0.0.
 	github.com/labstack/echo v3.1.0+incompatible
-	github.com/newrelic/go-agent/v3 v3.31.0
+	github.com/newrelic/go-agent/v3 v3.32.0
 )
 
 

diff --git a/v3/integrations/nrecho-v3/nrecho.go b/v3/integrations/nrecho-v3/nrecho.go
@@ -108,7 +108,7 @@ func WrapRouter(engine *echo.Echo) {
 	if engine != nil && newrelic.IsSecurityAgentPresent() {
 		router := engine.Routes()
 		for _, r := range router {
-			newrelic.GetSecurityAgentInterface().SendEvent("API_END_POINTS", r.Path, r.Method, r.Name)
+			newrelic.GetSecurityAgentInterface().SendEvent("API_END_POINTS", r.Path, r.Method, r.Handler)
 		}
 	}
 }
diff --git a/v3/integrations/nrecho-v4/go.mod b/v3/integrations/nrecho-v4/go.mod
@@ -2,11 +2,11 @@ module github.com/newrelic/go-agent/v3/integrations/nrecho-v4
 
 // As of Jun 2022, the echo go.mod file uses 1.17:
 // https://github.com/labstack/echo/blob/master/go.mod
-go 1.19
+go 1.20
 
 require (
 	github.com/labstack/echo/v4 v4.9.0
-	github.com/newrelic/go-agent/v3 v3.31.0
+	github.com/newrelic/go-agent/v3 v3.32.0
 )
 
 

diff --git a/v3/integrations/nrelasticsearch-v7/go.mod b/v3/integrations/nrelasticsearch-v7/go.mod
@@ -2,11 +2,11 @@ module github.com/newrelic/go-agent/v3/integrations/nrelasticsearch-v7
 
 // As of Jan 2020, the v7 elasticsearch go.mod uses 1.11:
 // https://github.com/elastic/go-elasticsearch/blob/7.x/go.mod
-go 1.19
+go 1.20
 
 require (
 	github.com/elastic/go-elasticsearch/v7 v7.17.0
-	github.com/newrelic/go-agent/v3 v3.31.0
+	github.com/newrelic/go-agent/v3 v3.32.0
 )
 
 

diff --git a/v3/integrations/nrfasthttp/examples/client-fasthttp/go.mod b/v3/integrations/nrfasthttp/examples/client-fasthttp/go.mod
@@ -1,9 +1,9 @@
 module client-example
 
-go 1.19
+go 1.20
 
 require (
-	github.com/newrelic/go-agent/v3 v3.31.0
+	github.com/newrelic/go-agent/v3 v3.32.0
 	github.com/newrelic/go-agent/v3/integrations/nrfasthttp v1.0.0
 	github.com/valyala/fasthttp v1.49.0
 )

diff --git a/v3/integrations/nrfasthttp/examples/server-fasthttp/go.mod b/v3/integrations/nrfasthttp/examples/server-fasthttp/go.mod
@@ -1,9 +1,9 @@
 module server-example
 
-go 1.19
+go 1.20
 
 require (
-	github.com/newrelic/go-agent/v3 v3.31.0
+	github.com/newrelic/go-agent/v3 v3.32.0
 	github.com/newrelic/go-agent/v3/integrations/nrfasthttp v1.0.0
 	github.com/valyala/fasthttp v1.49.0
 )

diff --git a/v3/integrations/nrfasthttp/go.mod b/v3/integrations/nrfasthttp/go.mod
@@ -1,9 +1,9 @@
 module github.com/newrelic/go-agent/v3/integrations/nrfasthttp
 
-go 1.19
+go 1.20
 
 require (
-	github.com/newrelic/go-agent/v3 v3.31.0
+	github.com/newrelic/go-agent/v3 v3.32.0
 	github.com/valyala/fasthttp v1.49.0
 )
 

diff --git a/v3/integrations/nrgin/go.mod b/v3/integrations/nrgin/go.mod
@@ -2,11 +2,11 @@ module github.com/newrelic/go-agent/v3/integrations/nrgin
 
 // As of Dec 2019, the gin go.mod file uses 1.12:
 // https://github.com/gin-gonic/gin/blob/master/go.mod
-go 1.19
+go 1.20
 
 require (
 	github.com/gin-gonic/gin v1.9.1
-	github.com/newrelic/go-agent/v3 v3.31.0
+	github.com/newrelic/go-agent/v3 v3.32.0
 )
 
 

diff --git a/v3/integrations/nrgorilla/go.mod b/v3/integrations/nrgorilla/go.mod
@@ -2,12 +2,12 @@ module github.com/newrelic/go-agent/v3/integrations/nrgorilla
 
 // As of Dec 2019, the gorilla/mux go.mod file uses 1.12:
 // https://github.com/gorilla/mux/blob/master/go.mod
-go 1.19
+go 1.20
 
 require (
 	// v1.7.0 is the earliest version of Gorilla using modules.
 	github.com/gorilla/mux v1.7.0
-	github.com/newrelic/go-agent/v3 v3.31.0
+	github.com/newrelic/go-agent/v3 v3.32.0
 )
 
 

diff --git a/v3/integrations/nrgraphgophers/go.mod b/v3/integrations/nrgraphgophers/go.mod
@@ -2,12 +2,12 @@ module github.com/newrelic/go-agent/v3/integrations/nrgraphgophers
 
 // As of Jan 2020, the graphql-go go.mod file uses 1.13:
 // https://github.com/graph-gophers/graphql-go/blob/master/go.mod
-go 1.19
+go 1.20
 
 require (
 	// graphql-go has no tagged releases as of Jan 2020.
 	github.com/graph-gophers/graphql-go v1.3.0
-	github.com/newrelic/go-agent/v3 v3.31.0
+	github.com/newrelic/go-agent/v3 v3.32.0
 )
 
 

diff --git a/v3/integrations/nrgraphqlgo/example/go.mod b/v3/integrations/nrgraphqlgo/example/go.mod
@@ -1,11 +1,11 @@
 module github.com/newrelic/go-agent/v3/integrations/nrgraphqlgo/example
 
-go 1.19
+go 1.20
 
 require (
 	github.com/graphql-go/graphql v0.8.1
 	github.com/graphql-go/graphql-go-handler v0.2.3
-	github.com/newrelic/go-agent/v3 v3.31.0
+	github.com/newrelic/go-agent/v3 v3.32.0
 	github.com/newrelic/go-agent/v3/integrations/nrgraphqlgo v1.0.0
 )
 

diff --git a/v3/integrations/nrgraphqlgo/go.mod b/v3/integrations/nrgraphqlgo/go.mod
@@ -1,10 +1,10 @@
 module github.com/newrelic/go-agent/v3/integrations/nrgraphqlgo
 
-go 1.19
+go 1.20
 
 require (
 	github.com/graphql-go/graphql v0.8.1
-	github.com/newrelic/go-agent/v3 v3.31.0
+	github.com/newrelic/go-agent/v3 v3.32.0
 )
 
 

diff --git a/v3/integrations/nrgrpc/go.mod b/v3/integrations/nrgrpc/go.mod
@@ -1,12 +1,12 @@
 module github.com/newrelic/go-agent/v3/integrations/nrgrpc
 
-go 1.19
+go 1.20
 
 require (
 	// protobuf v1.3.0 is the earliest version using modules, we use v1.3.1
 	// because all dependencies were removed in this version.
 	github.com/golang/protobuf v1.5.3
-	github.com/newrelic/go-agent/v3 v3.31.0
+	github.com/newrelic/go-agent/v3 v3.32.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.56.3

diff --git a/v3/integrations/nrhttprouter/go.mod b/v3/integrations/nrhttprouter/go.mod
@@ -2,12 +2,12 @@ module github.com/newrelic/go-agent/v3/integrations/nrhttprouter
 
 // As of Dec 2019, the httprouter go.mod file uses 1.7:
 // https://github.com/julienschmidt/httprouter/blob/master/go.mod
-go 1.19
+go 1.20
 
 require (
 	// v1.3.0 is the earliest version of httprouter using modules.
 	github.com/julienschmidt/httprouter v1.3.0
-	github.com/newrelic/go-agent/v3 v3.31.0
+	github.com/newrelic/go-agent/v3 v3.32.0
 )