Merge pull request #684 from newrelic/develop

Release 3.21.1

Author: iamemilio

.github/dependabot.yml

@@ -0,0 +1,13 @@
+version: 2
+updates:
+  - package-ecosystem: "gomod"
+    # Disable version updates for gomod dependencies, security updates don't use this configuration
+    # See: https://docs.github.com/en/code-security/dependabot/dependabot-security-updates/configuring-dependabot-security-updates
+    open-pull-requests-limit: 0
+    directory: "../v3"
+    schedule:
+      interval: "daily"
+    commit-message:
+      prefix: "security"
+      prefix-development: "chore"
+      include: "scope"

.github/workflows/ci.yaml

@@ -17,89 +17,92 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - go-version: 1.17.x
-            dirs: v3/newrelic,v3/internal,v3/examples
           - go-version: 1.18.x
             dirs: v3/newrelic,v3/internal,v3/examples
           - go-version: 1.19.x
             dirs: v3/newrelic,v3/internal,v3/examples
+          - go-version: 1.20.x
+            dirs: v3/newrelic,v3/internal,v3/examples
 
           # v3 integrations
-          - go-version: 1.17.x
+          - go-version: 1.18.x
             dirs: v3/integrations/logcontext/nrlogrusplugin
             extratesting: go get -u github.com/sirupsen/logrus@master
-          - go-version: 1.17.x
+          - go-version: 1.18.x
             dirs: v3/integrations/logcontext-v2/nrlogrus
             extratesting: go get -u github.com/sirupsen/logrus@master
-          - go-version: 1.17.x
+          - go-version: 1.18.x
             dirs: v3/integrations/logcontext-v2/nrzerolog
             extratesting: go get -u github.com/rs/zerolog@master
-          - go-version: 1.17.x
+          - go-version: 1.18.x
             dirs: v3/integrations/logcontext-v2/nrwriter
-          - go-version: 1.17.x
+          - go-version: 1.18.x
             dirs: v3/integrations/logcontext-v2/zerologWriter
             extratesting: go get -u github.com/rs/zerolog@master
-          - go-version: 1.17.x
+          - go-version: 1.18.x
             dirs: v3/integrations/logcontext-v2/logWriter
-          - go-version: 1.17.x
+          - go-version: 1.18.x
             dirs: v3/integrations/nrawssdk-v1
             extratesting: go get -u github.com/aws/aws-sdk-go@main
-          - go-version: 1.17.x
+          - go-version: 1.18.x
             dirs: v3/integrations/nrawssdk-v2
             extratesting: go get -u github.com/aws/aws-sdk-go-v2@main
-          - go-version: 1.17.x
+          - go-version: 1.18.x
             dirs: v3/integrations/nrecho-v3
             # Test against the latest v3 Echo:
             extratesting: go get -u github.com/labstack/echo@v3
-            # go/new/http no longer stable under go 1.17.x
-          - go-version: 1.17.x
+            # go/new/http no longer stable under go 1.18.x
+          - go-version: 1.18.x
             dirs: v3/integrations/nrecho-v4
             extratesting: go get -u github.com/labstack/echo/v4@master
-          - go-version: 1.17.x
+          - go-version: 1.18.x
             dirs: v3/integrations/nrelasticsearch-v7
             extratesting: go get -u github.com/elastic/go-elasticsearch/[email protected]
           - go-version: 1.18.x
             dirs: v3/integrations/nrgin
             extratesting: go get -u github.com/gin-gonic/gin@master
-          - go-version: 1.17.x
+          - go-version: 1.18.x
             dirs: v3/integrations/nrgorilla
             extratesting: go get -u github.com/gorilla/mux@master
-          - go-version: 1.17.x
+          - go-version: 1.18.x
             dirs: v3/integrations/nrgraphgophers
-          - go-version: 1.17.x
+          - go-version: 1.18.x
             dirs: v3/integrations/nrlogrus
             extratesting: go get -u github.com/sirupsen/logrus@master
-          - go-version: 1.17.x
+          - go-version: 1.18.x
             dirs: v3/integrations/nrlogxi
             extratesting: go get -u github.com/mgutz/logxi@master
-          - go-version: 1.17.x
+          - go-version: 1.18.x
             dirs: v3/integrations/nrpkgerrors
             extratesting: go get -u github.com/pkg/errors@master
-          - go-version: 1.17.x
+          - go-version: 1.18.x
             dirs: v3/integrations/nrlambda
             extratesting: go get -u github.com/aws/aws-lambda-go@master
-          - go-version: 1.17.x
+          - go-version: 1.18.x
             dirs: v3/integrations/nrmysql
             extratesting: go get -u github.com/go-sql-driver/mysql@master
-          - go-version: 1.17.x
+          - go-version: 1.18.x
             dirs: v3/integrations/nrpq
             extratesting: go get -u github.com/lib/pq@master
           - go-version: 1.18.x
             dirs: v3/integrations/nrpgx5
-          - go-version: 1.17.x
+          - go-version: 1.18.x
             dirs: v3/integrations/nrpq/example/sqlx
-          - go-version: 1.17.x
+          - go-version: 1.18.x
             dirs: v3/integrations/nrredis-v7
             extratesting: go get -u github.com/go-redis/redis/v7@master
-          - go-version: 1.17.x
+          - go-version: 1.18.x
+            dirs: v3/integrations/nrredis-v9
+            extratesting: go get -u github.com/redis/go-redis/v9@master
+          - go-version: 1.18.x
             dirs: v3/integrations/nrsqlite3
             extratesting: go get -u github.com/mattn/go-sqlite3@master
-          - go-version: 1.17.x
+          - go-version: 1.18.x
             dirs: v3/integrations/nrsnowflake
-          - go-version: 1.17.x
+          - go-version: 1.18.x
             dirs: v3/integrations/nrgrpc
             extratesting: go get -u google.golang.org/grpc@master
-          - go-version: 1.17.x
+          - go-version: 1.18.x
             dirs: v3/integrations/nrmicro
             # As of Dec 2019, there is a race condition in when using go-micro@master
             # in their logging system.  Instead, we'll test against the latest
@@ -108,36 +111,36 @@ jobs:
             # As of June 2020, confirmed errors still result
             # extratesting: go get -u github.com/micro/go-micro@latest
             # If we are using the latest released version to test, we need to use a newer version of go
-          - go-version: 1.17.x
+          - go-version: 1.18.x
             dirs: v3/integrations/nrnats
             extratesting: go get -u github.com/nats-io/nats.go/@master
-          - go-version: 1.17.x
+          - go-version: 1.18.x
             dirs: v3/integrations/nrnats/test
-          - go-version: 1.17.x
+          - go-version: 1.18.x
             dirs: v3/integrations/nrstan
             extratesting: go get -u github.com/nats-io/stan.go/@master
-          - go-version: 1.17.x
+          - go-version: 1.18.x
             dirs: v3/integrations/nrstan/test
-          - go-version: 1.17.x
+          - go-version: 1.18.x
             dirs: v3/integrations/nrstan/examples
-          - go-version: 1.17.x
+          - go-version: 1.18.x
             dirs: v3/integrations/logcontext
             extratesting: go get -u github.com/sirupsen/logrus@master
             # nrzap only supports the two most recent minor go releases
-          - go-version: 1.17.x
+          - go-version: 1.18.x
             dirs: v3/integrations/nrzap
-          - go-version: 1.17.x
+          - go-version: 1.18.x
             dirs: v3/integrations/nrhttprouter
             extratesting: go get -u github.com/julienschmidt/httprouter@master
-          - go-version: 1.17.x
+          - go-version: 1.18.x
             dirs: v3/integrations/nrb3
-          - go-version: 1.17.x
+          - go-version: 1.18.x
             dirs: v3/integrations/nrmongo
             extratesting: go get -u go.mongodb.org/mongo-driver@master
-          - go-version: 1.17.x
+          - go-version: 1.18.x
             dirs: v3/integrations/nrgraphqlgo,v3/integrations/nrgraphqlgo/example
             extratesting: go get -u github.com/graphql-go/graphql@master
-          - go-version: 1.17.x
+          - go-version: 1.18.x
             dirs: v3/integrations/nrmssql
             extratesting: go get -u github.com/microsoft/go-mssqldb@main
 

.github/workflows/snyk.yml

@@ -1,3 +1,19 @@
+## 3.21.1
+
+### Added
+* nrredis-v9: automatic instrumentation for Go redis v9
+
+### Fixed
+* Agent now requires Go version 1.18 or higher.
+* Removed support for Go version 1.17. This version of Go is outside of the support window.
+
+### Support Statement
+New Relic recommends that you upgrade the agent regularly to ensure that you’re getting the latest features and performance benefits. Additionally, older releases will no longer be supported when they reach end-of-life.
+
+We also recommend using the latest version of the Go language. At minimum, you should at least be using no version of Go older than what is supported by the Go team themselves.
+
+See the [Go Agent EOL Policy](https://docs.newrelic.com/docs/apm/agents/go-agent/get-started/go-agent-eol-policy/) for details about supported versions of the Go Agent and third-party components.
+
 ## 3.21.0
 
 ### Added

CHANGELOG.md

@@ -97,6 +97,7 @@ package primitives can be found [here](GUIDE.md#datastore-segments).
 | [jmoiron/sqlx](https://github.com/jmoiron/sqlx) | Use a supported [database driver](https://godoc.org/github.com/newrelic/go-agent/v3/integrations/nrpq/example/sqlx) or [builtin instrumentation](https://godoc.org/github.com/newrelic/go-agent/v3/newrelic#InstrumentSQLConnector) | Instrument database calls with SQLx |
 | [go-redis/redis](https://github.com/go-redis/redis) | [v3/integrations/nrredis-v7](https://godoc.org/github.com/newrelic/go-agent/v3/integrations/nrredis-v7) | Instrument Redis 7 calls |
 | [go-redis/redis](https://github.com/go-redis/redis) | [v3/integrations/nrredis-v8](https://godoc.org/github.com/newrelic/go-agent/v3/integrations/nrredis-v8) | Instrument Redis 8 calls |
+| [redis/go-redis](https://github.com/redis/go-redis) | [v3/integrations/nrredis-v9](https://godoc.org/github.com/newrelic/go-agent/v3/integrations/nrredis-v9) | Instrument Redis 9 calls |
 | [mattn/go-sqlite3](https://github.com/mattn/go-sqlite3) | [v3/integrations/nrsqlite3](https://godoc.org/github.com/newrelic/go-agent/v3/integrations/nrsqlite3) | Instrument SQLite driver |
 | [snowflakedb/gosnowflake](https://github.com/snowflakedb/gosnowflake) | [v3/integrations/nrsnowflake](https://godoc.org/github.com/newrelic/go-agent/v3/integrations/nrsnowflake) | Instrument Snowflake driver |
 | [mongodb/mongo-go-driver](https://github.com/mongodb/mongo-go-driver) | [v3/integrations/nrmongo](https://godoc.org/github.com/newrelic/go-agent/v3/integrations/nrmongo) | Instrument MongoDB calls |

README.md

@@ -1,8 +1,8 @@
 module github.com/newrelic/go-agent/v3
 
-go 1.17
+go 1.18
 
 require (
-	github.com/golang/protobuf v1.5.2
-	google.golang.org/grpc v1.49.0
+	github.com/golang/protobuf v1.5.3
+	google.golang.org/grpc v1.54.0
 )