Skip to content

Commit

Permalink
Merge pull request #772 from newrelic/develop
Browse files Browse the repository at this point in the history
Release 3.24.1
  • Loading branch information
nr-swilloughby authored Aug 10, 2023
2 parents 046b4fc + f4aa806 commit d59f46c
Show file tree
Hide file tree
Showing 67 changed files with 421 additions and 237 deletions.
91 changes: 45 additions & 46 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,95 +17,95 @@ jobs:
fail-fast: false
matrix:
include:
- 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
- go-version: 1.21.x
dirs: v3/newrelic,v3/internal,v3/examples

# v3 integrations
- go-version: 1.19.x
dirs: v3/integrations/nrsarama
- go-version: 1.18.x
- go-version: 1.19.x
dirs: v3/integrations/logcontext/nrlogrusplugin
extratesting: go get -u github.com/sirupsen/logrus@master
- go-version: 1.18.x
# extratesting: go get -u github.com/sirupsen/logrus@master
- go-version: 1.19.x
dirs: v3/integrations/logcontext-v2/nrlogrus
extratesting: go get -u github.com/sirupsen/logrus@master
- go-version: 1.18.x
# extratesting: go get -u github.com/sirupsen/logrus@master
- go-version: 1.19.x
dirs: v3/integrations/logcontext-v2/nrzerolog
extratesting: go get -u github.com/rs/zerolog@master
- go-version: 1.18.x
- go-version: 1.19.x
dirs: v3/integrations/logcontext-v2/nrzap
- go-version: 1.18.x
- go-version: 1.19.x
dirs: v3/integrations/logcontext-v2/nrwriter
- go-version: 1.18.x
- go-version: 1.19.x
dirs: v3/integrations/logcontext-v2/zerologWriter
extratesting: go get -u github.com/rs/zerolog@master
- go-version: 1.18.x
- go-version: 1.19.x
dirs: v3/integrations/logcontext-v2/logWriter
- go-version: 1.18.x
- go-version: 1.19.x
dirs: v3/integrations/nrawssdk-v1
extratesting: go get -u github.com/aws/aws-sdk-go@main
- go-version: 1.18.x
- go-version: 1.19.x
dirs: v3/integrations/nrawssdk-v2
extratesting: go get -u github.com/aws/aws-sdk-go-v2@main
- go-version: 1.18.x
- go-version: 1.19.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.18.x
- go-version: 1.18.x
- go-version: 1.19.x
dirs: v3/integrations/nrecho-v4
extratesting: go get -u github.com/labstack/echo/v4@master
- go-version: 1.18.x
- go-version: 1.19.x
dirs: v3/integrations/nrelasticsearch-v7
extratesting: go get -u github.com/elastic/go-elasticsearch/v7@7.x
- go-version: 1.18.x
- go-version: 1.19.x
dirs: v3/integrations/nrgin
extratesting: go get -u github.com/gin-gonic/gin@master
- go-version: 1.18.x
- go-version: 1.19.x
dirs: v3/integrations/nrgorilla
extratesting: go get -u github.com/gorilla/mux@master
- go-version: 1.18.x
- go-version: 1.19.x
dirs: v3/integrations/nrgraphgophers
- go-version: 1.18.x
- go-version: 1.19.x
dirs: v3/integrations/nrlogrus
- go-version: 1.18.x
- go-version: 1.19.x
dirs: v3/integrations/nrlogxi
extratesting: go get -u github.com/mgutz/logxi@master
- go-version: 1.18.x
- go-version: 1.19.x
dirs: v3/integrations/nrpkgerrors
extratesting: go get -u github.com/pkg/errors@master
- go-version: 1.18.x
- go-version: 1.19.x
dirs: v3/integrations/nrlambda
extratesting: go get -u github.com/aws/aws-lambda-go@master
- go-version: 1.18.x
- go-version: 1.19.x
dirs: v3/integrations/nrmysql
extratesting: go get -u github.com/go-sql-driver/mysql@master
- go-version: 1.18.x
- go-version: 1.19.x
dirs: v3/integrations/nrpq
extratesting: go get -u github.com/lib/pq@master
- go-version: 1.18.x
- go-version: 1.19.x
dirs: v3/integrations/nrpgx5
- go-version: 1.18.x
- go-version: 1.19.x
dirs: v3/integrations/nrpq/example/sqlx
- go-version: 1.18.x
- go-version: 1.19.x
dirs: v3/integrations/nrredis-v7
extratesting: go get -u github.com/go-redis/redis/v7@master
- go-version: 1.18.x
- go-version: 1.19.x
dirs: v3/integrations/nrredis-v9
extratesting: go get -u github.com/redis/go-redis/v9@master
- go-version: 1.18.x
- go-version: 1.19.x
dirs: v3/integrations/nrsqlite3
extratesting: go get -u github.com/mattn/go-sqlite3@master
- go-version: 1.18.x
- go-version: 1.19.x
dirs: v3/integrations/nrsnowflake
- go-version: 1.18.x
- go-version: 1.19.x
dirs: v3/integrations/nrgrpc
extratesting: go get -u google.golang.org/grpc@master
- go-version: 1.18.x
- go-version: 1.19.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
Expand All @@ -114,34 +114,34 @@ 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.18.x
- go-version: 1.19.x
dirs: v3/integrations/nrnats
extratesting: go get -u github.com/nats-io/nats.go/@master
- go-version: 1.18.x
- go-version: 1.19.x
dirs: v3/integrations/nrstan
extratesting: go get -u github.com/nats-io/stan.go/@master
- go-version: 1.18.x
- go-version: 1.19.x
dirs: v3/integrations/nrstan/test
- go-version: 1.18.x
- go-version: 1.19.x
dirs: v3/integrations/nrstan/examples
- go-version: 1.18.x
- go-version: 1.19.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.18.x
- go-version: 1.19.x
dirs: v3/integrations/nrzap
- go-version: 1.18.x
- go-version: 1.19.x
dirs: v3/integrations/nrhttprouter
extratesting: go get -u github.com/julienschmidt/httprouter@master
- go-version: 1.18.x
- go-version: 1.19.x
dirs: v3/integrations/nrb3
- go-version: 1.18.x
- go-version: 1.19.x
dirs: v3/integrations/nrmongo
extratesting: go get -u go.mongodb.org/mongo-driver@master
- go-version: 1.18.x
- go-version: 1.19.x
dirs: v3/integrations/nrgraphqlgo,v3/integrations/nrgraphqlgo/example
extratesting: go get -u github.com/graphql-go/graphql@master
- go-version: 1.18.x
- go-version: 1.19.x
dirs: v3/integrations/nrmssql
extratesting: go get -u github.com/microsoft/go-mssqldb@main

Expand Down Expand Up @@ -180,8 +180,7 @@ jobs:
fail-fast: false
matrix:
include:
- go-version: 1.18.6
- go-version: 1.19.1
- go-version: 1.19.x
steps:
- uses: actions/checkout@v1
with:
Expand Down
28 changes: 28 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,31 @@
## 3.24.1
### Fixed
* Performance improvement around calls to security agent. In some cases, unnecessary setup operations were being performed even if there was no security agent present to use that. These are now conditional on the security agent being present in the application (note that this will enable the setup code if the security agent is *present* in the application, regardless of whether it's currently enabled to run). This affects:
* Base agent code (updated to v3.24.1)
* `nrmongo` integration (updated to v1.1.1)

* Fixed unit tests for integrations which were failing because code level metrics are enabled by default now:
* `nrawssdk-v1` (updated to v1.1.2)
* `nrawssdk-v2` (updated to v1.2.2)
* `nrecho-v3` (updated to v1.0.2)
* `nrecho-v4` (updated to v1.0.4)
* `nrhttprouter` (updated to
* `nrlambda` (updated to v1.2.2)
* `nrnats` (updated to v1.1.5)
* `nrredis-v8` (updated to v1.0.1)


### Changed
* Updated all integration `go.mod` files to reflect supported Go language versions.

### Support statement

We use the latest version of the Go language. At minimum, you should be using no version of Go older than what is supported by the Go team themselves (i.e., Go versions 1.19 and later are supported).

We recommend updating to the latest agent version as soon as it's available. If you can't upgrade to the latest version, update your agents to a version no more than 90 days old. Read more about keeping agents up to date. (https://docs.newrelic.com/docs/new-relic-solutions/new-relic-one/install-configure/update-new-relic-agent/)

See the [Go agent EOL Policy](/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.24.0

### Added
Expand Down
3 changes: 1 addition & 2 deletions v3/go.mod
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
module github.com/newrelic/go-agent/v3

go 1.18
go 1.19

require (
github.com/golang/protobuf v1.5.3
google.golang.org/grpc v1.54.0
)


retract v3.22.0 // release process error corrected in v3.22.1
6 changes: 4 additions & 2 deletions v3/integrations/logcontext-v2/logWriter/go.mod
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
module github.com/newrelic/go-agent/v3/integrations/logcontext-v2/logWriter

go 1.17
go 1.19

require (
github.com/newrelic/go-agent/v3 v3.19.1
github.com/newrelic/go-agent/v3 v3.24.1
github.com/newrelic/go-agent/v3/integrations/logcontext-v2/nrwriter v1.0.0
)


replace github.com/newrelic/go-agent/v3 => ../../..
6 changes: 4 additions & 2 deletions v3/integrations/logcontext-v2/nrlogrus/go.mod
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
module github.com/newrelic/go-agent/v3/integrations/logcontext-v2/nrlogrus

go 1.17
go 1.19

require (
github.com/newrelic/go-agent/v3 v3.18.0
github.com/newrelic/go-agent/v3 v3.24.1
github.com/sirupsen/logrus v1.8.1
)


replace github.com/newrelic/go-agent/v3 => ../../..
6 changes: 4 additions & 2 deletions v3/integrations/logcontext-v2/nrwriter/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
module github.com/newrelic/go-agent/v3/integrations/logcontext-v2/nrwriter

go 1.17
go 1.19

require github.com/newrelic/go-agent/v3 v3.19.1
require github.com/newrelic/go-agent/v3 v3.24.1


replace github.com/newrelic/go-agent/v3 => ../../..
6 changes: 4 additions & 2 deletions v3/integrations/logcontext-v2/nrzap/go.mod
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
module github.com/newrelic/go-agent/v3/integrations/logcontext-v2/nrzap

go 1.18
go 1.19

require (
github.com/newrelic/go-agent/v3 v3.21.1
github.com/newrelic/go-agent/v3 v3.24.1
go.uber.org/zap v1.24.0
)


replace github.com/newrelic/go-agent/v3 => ../../..
6 changes: 4 additions & 2 deletions v3/integrations/logcontext-v2/nrzerolog/go.mod
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
module github.com/newrelic/go-agent/v3/integrations/logcontext-v2/nrzerolog

go 1.17
go 1.19

require (
github.com/newrelic/go-agent/v3 v3.18.0
github.com/newrelic/go-agent/v3 v3.24.1
github.com/rs/zerolog v1.26.1
)


replace github.com/newrelic/go-agent/v3 => ../../..
6 changes: 4 additions & 2 deletions v3/integrations/logcontext-v2/zerologWriter/go.mod
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
module github.com/newrelic/go-agent/v3/integrations/logcontext-v2/zerologWriter

go 1.17
go 1.19

require (
github.com/newrelic/go-agent/v3 v3.19.1
github.com/newrelic/go-agent/v3 v3.24.1
github.com/newrelic/go-agent/v3/integrations/logcontext-v2/nrwriter v1.0.0
github.com/rs/zerolog v1.27.0
)


replace github.com/newrelic/go-agent/v3 => ../../..
7 changes: 5 additions & 2 deletions v3/integrations/logcontext/nrlogrusplugin/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@ 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.13
go 1.19

require (
github.com/newrelic/go-agent/v3 v3.17.0
github.com/newrelic/go-agent/v3 v3.24.1
// v1.4.0 is required for for the log.WithContext.
github.com/sirupsen/logrus v1.4.0
)


replace github.com/newrelic/go-agent/v3 => ../../..
7 changes: 5 additions & 2 deletions v3/integrations/nrawssdk-v1/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,13 @@ 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.7
go 1.19

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.24.0
github.com/newrelic/go-agent/v3 v3.24.1
)


replace github.com/newrelic/go-agent/v3 => ../..
2 changes: 1 addition & 1 deletion v3/integrations/nrawssdk-v1/nrawssdk_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
)

func testApp() integrationsupport.ExpectApp {
return integrationsupport.NewTestApp(integrationsupport.SampleEverythingReplyFn, integrationsupport.DTEnabledCfgFn)
return integrationsupport.NewTestApp(integrationsupport.SampleEverythingReplyFn, integrationsupport.DTEnabledCfgFn, newrelic.ConfigCodeLevelMetricsEnabled(false))
}

type fakeTransport struct{}
Expand Down
6 changes: 4 additions & 2 deletions v3/integrations/nrawssdk-v2/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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.17
go 1.19

require (
github.com/aws/aws-sdk-go-v2 v1.16.15
Expand All @@ -11,6 +11,8 @@ 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.24.0
github.com/newrelic/go-agent/v3 v3.24.1
)


replace github.com/newrelic/go-agent/v3 => ../..
2 changes: 1 addition & 1 deletion v3/integrations/nrawssdk-v2/nrawssdk_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
)

func testApp() integrationsupport.ExpectApp {
return integrationsupport.NewTestApp(integrationsupport.SampleEverythingReplyFn, integrationsupport.DTEnabledCfgFn)
return integrationsupport.NewTestApp(integrationsupport.SampleEverythingReplyFn, integrationsupport.DTEnabledCfgFn, newrelic.ConfigCodeLevelMetricsEnabled(false))
}

type fakeTransport struct{}
Expand Down
4 changes: 3 additions & 1 deletion v3/integrations/nrb3/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,7 @@ module github.com/newrelic/go-agent/v3/integrations/nrb3

go 1.19

require github.com/newrelic/go-agent/v3 v3.24.0
require github.com/newrelic/go-agent/v3 v3.24.1


replace github.com/newrelic/go-agent/v3 => ../..
Loading

0 comments on commit d59f46c

Please sign in to comment.