From ae8d88dc2b6f6e410c7e3fd7929731a0b0315de8 Mon Sep 17 00:00:00 2001 From: Steve Willoughby Date: Mon, 31 Jul 2023 11:52:53 -0700 Subject: [PATCH] enables clm by default, fixes numerous unit tests --- v3/go.mod | 11 +++++ .../logcontext-v2/logWriter/go.mod | 12 +++++ v3/integrations/logcontext-v2/nrlogrus/go.mod | 12 +++++ v3/integrations/logcontext-v2/nrwriter/go.mod | 12 +++++ v3/integrations/logcontext-v2/nrzap/go.mod | 14 ++++++ .../logcontext-v2/nrzerolog/go.mod | 12 +++++ .../logcontext-v2/zerologWriter/go.mod | 14 ++++++ .../logcontext/nrlogrusplugin/go.mod | 2 + v3/integrations/nrawssdk-v1/go.mod | 2 + v3/integrations/nrawssdk-v2/go.mod | 28 +++++++++++ v3/integrations/nrb3/go.mod | 12 +++++ v3/integrations/nrecho-v3/go.mod | 3 ++ v3/integrations/nrecho-v4/go.mod | 18 +++++++ v3/integrations/nrelasticsearch-v7/go.mod | 2 + v3/integrations/nrgin/go.mod | 32 +++++++++++++ v3/integrations/nrgin/nrgin_test.go | 8 ++++ v3/integrations/nrgorilla/go.mod | 2 + v3/integrations/nrgraphqlgo/go.mod | 2 + v3/integrations/nrgrpc/go.mod | 23 +++++++++ v3/integrations/nrgrpc/nrgrpc_client_test.go | 2 +- v3/integrations/nrhttprouter/go.mod | 2 + v3/integrations/nrlambda/go.mod | 12 +++++ v3/integrations/nrlogrus/go.mod | 14 ++++++ v3/integrations/nrlogxi/go.mod | 16 +++++++ v3/integrations/nrmicro/go.mod | 46 ++++++++++++++++++ v3/integrations/nrmicro/nrmicro_test.go | 2 +- v3/integrations/nrmongo/go.mod | 23 +++++++++ v3/integrations/nrmongo/nrmongo_test.go | 2 +- v3/integrations/nrmssql/go.mod | 15 ++++++ v3/integrations/nrmysql/go.mod | 12 +++++ v3/integrations/nrpgx/go.mod | 16 +++++++ v3/integrations/nrpgx5/go.mod | 27 +++++++++++ v3/integrations/nrpkgerrors/go.mod | 2 + v3/integrations/nrpq/go.mod | 4 ++ v3/integrations/nrredis-v7/go.mod | 2 + v3/integrations/nrredis-v8/go.mod | 2 + v3/integrations/nrredis-v9/go.mod | 14 ++++++ v3/integrations/nrsarama/go.mod | 34 +++++++++++++ v3/integrations/nrsecurityagent/go.mod | 20 ++++++++ v3/integrations/nrsnowflake/go.mod | 48 +++++++++++++++++++ v3/integrations/nrsqlite3/go.mod | 2 + v3/integrations/nrstan/go.mod | 20 ++++++++ v3/integrations/nrzap/go.mod | 2 + .../integrationsupport_test.go | 1 + v3/newrelic/config.go | 2 +- v3/newrelic/config_test.go | 4 +- v3/newrelic/examples_test.go | 1 + v3/newrelic/internal_app_test.go | 1 + v3/newrelic/internal_benchmark_test.go | 5 ++ v3/newrelic/internal_test.go | 2 + 50 files changed, 570 insertions(+), 6 deletions(-) diff --git a/v3/go.mod b/v3/go.mod index 01b5abf73..e2fdfa05f 100644 --- a/v3/go.mod +++ b/v3/go.mod @@ -1,7 +1,18 @@ module github.com/newrelic/go-agent/v3 + go 1.18 + require ( github.com/golang/protobuf v1.5.3 google.golang.org/grpc v1.54.0 ) + +require ( + golang.org/x/net v0.8.0 // indirect + golang.org/x/sys v0.6.0 // indirect + golang.org/x/text v0.8.0 // indirect + google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect + google.golang.org/protobuf v1.28.1 // indirect +) + retract v3.22.0 // release process error corrected in v3.22.1 diff --git a/v3/integrations/logcontext-v2/logWriter/go.mod b/v3/integrations/logcontext-v2/logWriter/go.mod index 2194dfac3..fe50643b6 100644 --- a/v3/integrations/logcontext-v2/logWriter/go.mod +++ b/v3/integrations/logcontext-v2/logWriter/go.mod @@ -1,6 +1,18 @@ module github.com/newrelic/go-agent/v3/integrations/logcontext-v2/logWriter + go 1.17 + require ( github.com/newrelic/go-agent/v3 v3.19.1 github.com/newrelic/go-agent/v3/integrations/logcontext-v2/nrwriter v1.0.0 ) + +require ( + github.com/golang/protobuf v1.4.3 // indirect + golang.org/x/net v0.0.0-20200822124328-c89045814202 // indirect + golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd // indirect + golang.org/x/text v0.3.0 // indirect + google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect + google.golang.org/grpc v1.39.0 // indirect + google.golang.org/protobuf v1.25.0 // indirect +) diff --git a/v3/integrations/logcontext-v2/nrlogrus/go.mod b/v3/integrations/logcontext-v2/nrlogrus/go.mod index 419fe8c19..e83a19c1e 100644 --- a/v3/integrations/logcontext-v2/nrlogrus/go.mod +++ b/v3/integrations/logcontext-v2/nrlogrus/go.mod @@ -1,6 +1,18 @@ module github.com/newrelic/go-agent/v3/integrations/logcontext-v2/nrlogrus + go 1.17 + require ( github.com/newrelic/go-agent/v3 v3.18.0 github.com/sirupsen/logrus v1.8.1 ) + +require ( + github.com/golang/protobuf v1.4.3 // indirect + golang.org/x/net v0.0.0-20200822124328-c89045814202 // indirect + golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd // indirect + golang.org/x/text v0.3.0 // indirect + google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect + google.golang.org/grpc v1.39.0 // indirect + google.golang.org/protobuf v1.25.0 // indirect +) diff --git a/v3/integrations/logcontext-v2/nrwriter/go.mod b/v3/integrations/logcontext-v2/nrwriter/go.mod index c0bfa5b8e..f146392c9 100644 --- a/v3/integrations/logcontext-v2/nrwriter/go.mod +++ b/v3/integrations/logcontext-v2/nrwriter/go.mod @@ -1,3 +1,15 @@ module github.com/newrelic/go-agent/v3/integrations/logcontext-v2/nrwriter + go 1.17 + require github.com/newrelic/go-agent/v3 v3.19.1 + +require ( + github.com/golang/protobuf v1.4.3 // indirect + golang.org/x/net v0.0.0-20200822124328-c89045814202 // indirect + golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd // indirect + golang.org/x/text v0.3.0 // indirect + google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect + google.golang.org/grpc v1.39.0 // indirect + google.golang.org/protobuf v1.25.0 // indirect +) diff --git a/v3/integrations/logcontext-v2/nrzap/go.mod b/v3/integrations/logcontext-v2/nrzap/go.mod index ae747fb70..344a3f2e7 100644 --- a/v3/integrations/logcontext-v2/nrzap/go.mod +++ b/v3/integrations/logcontext-v2/nrzap/go.mod @@ -1,6 +1,20 @@ module github.com/newrelic/go-agent/v3/integrations/logcontext-v2/nrzap + go 1.18 + require ( github.com/newrelic/go-agent/v3 v3.21.1 go.uber.org/zap v1.24.0 ) + +require ( + github.com/golang/protobuf v1.5.3 // indirect + go.uber.org/atomic v1.7.0 // indirect + go.uber.org/multierr v1.6.0 // indirect + golang.org/x/net v0.8.0 // indirect + golang.org/x/sys v0.6.0 // indirect + golang.org/x/text v0.8.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 +) diff --git a/v3/integrations/logcontext-v2/nrzerolog/go.mod b/v3/integrations/logcontext-v2/nrzerolog/go.mod index 1c63e378a..c803d3399 100644 --- a/v3/integrations/logcontext-v2/nrzerolog/go.mod +++ b/v3/integrations/logcontext-v2/nrzerolog/go.mod @@ -1,6 +1,18 @@ module github.com/newrelic/go-agent/v3/integrations/logcontext-v2/nrzerolog + go 1.17 + require ( github.com/newrelic/go-agent/v3 v3.18.0 github.com/rs/zerolog v1.26.1 ) + +require ( + github.com/golang/protobuf v1.4.3 // indirect + golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d // indirect + golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e // indirect + golang.org/x/text v0.3.6 // indirect + google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect + google.golang.org/grpc v1.39.0 // indirect + google.golang.org/protobuf v1.25.0 // indirect +) diff --git a/v3/integrations/logcontext-v2/zerologWriter/go.mod b/v3/integrations/logcontext-v2/zerologWriter/go.mod index 38dfb0071..ac3340aa8 100644 --- a/v3/integrations/logcontext-v2/zerologWriter/go.mod +++ b/v3/integrations/logcontext-v2/zerologWriter/go.mod @@ -1,7 +1,21 @@ module github.com/newrelic/go-agent/v3/integrations/logcontext-v2/zerologWriter + go 1.17 + require ( github.com/newrelic/go-agent/v3 v3.19.1 github.com/newrelic/go-agent/v3/integrations/logcontext-v2/nrwriter v1.0.0 github.com/rs/zerolog v1.27.0 ) + +require ( + github.com/golang/protobuf v1.4.3 // indirect + github.com/mattn/go-colorable v0.1.12 // indirect + github.com/mattn/go-isatty v0.0.14 // indirect + golang.org/x/net v0.0.0-20200822124328-c89045814202 // indirect + golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6 // indirect + golang.org/x/text v0.3.0 // indirect + google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect + google.golang.org/grpc v1.39.0 // indirect + google.golang.org/protobuf v1.25.0 // indirect +) diff --git a/v3/integrations/logcontext/nrlogrusplugin/go.mod b/v3/integrations/logcontext/nrlogrusplugin/go.mod index 756b6596a..88b24f5a1 100644 --- a/v3/integrations/logcontext/nrlogrusplugin/go.mod +++ b/v3/integrations/logcontext/nrlogrusplugin/go.mod @@ -1,7 +1,9 @@ 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 + require ( github.com/newrelic/go-agent/v3 v3.17.0 // v1.4.0 is required for for the log.WithContext. diff --git a/v3/integrations/nrawssdk-v1/go.mod b/v3/integrations/nrawssdk-v1/go.mod index c824264f2..f414c258c 100644 --- a/v3/integrations/nrawssdk-v1/go.mod +++ b/v3/integrations/nrawssdk-v1/go.mod @@ -1,8 +1,10 @@ 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 + require ( // v1.15.0 is the first aws-sdk-go version with module support. github.com/aws/aws-sdk-go v1.34.0 diff --git a/v3/integrations/nrawssdk-v2/go.mod b/v3/integrations/nrawssdk-v2/go.mod index bc3642769..65ff623e1 100644 --- a/v3/integrations/nrawssdk-v2/go.mod +++ b/v3/integrations/nrawssdk-v2/go.mod @@ -1,7 +1,9 @@ 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 + require ( github.com/aws/aws-sdk-go-v2 v1.16.15 github.com/aws/aws-sdk-go-v2/config v1.17.6 @@ -11,3 +13,29 @@ require ( github.com/aws/smithy-go v1.13.3 github.com/newrelic/go-agent/v3 v3.18.2 ) + +require ( + github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.8 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.12.19 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.16 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.22 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.16 // indirect + github.com/aws/aws-sdk-go-v2/internal/ini v1.3.23 // indirect + github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.13 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.9 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.17 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.16 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.16 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.16 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.11.22 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.4 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.16.18 // indirect + github.com/golang/protobuf v1.4.3 // indirect + github.com/jmespath/go-jmespath v0.4.0 // indirect + golang.org/x/net v0.0.0-20200822124328-c89045814202 // indirect + golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd // indirect + golang.org/x/text v0.3.0 // indirect + google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect + google.golang.org/grpc v1.39.0 // indirect + google.golang.org/protobuf v1.25.0 // indirect +) diff --git a/v3/integrations/nrb3/go.mod b/v3/integrations/nrb3/go.mod index b7ffdcbc9..c7799baf6 100644 --- a/v3/integrations/nrb3/go.mod +++ b/v3/integrations/nrb3/go.mod @@ -1,3 +1,15 @@ module github.com/newrelic/go-agent/v3/integrations/nrb3 + go 1.19 + require github.com/newrelic/go-agent/v3 v3.21.1 + +require ( + github.com/golang/protobuf v1.5.3 // indirect + golang.org/x/net v0.8.0 // indirect + golang.org/x/sys v0.6.0 // indirect + golang.org/x/text v0.8.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 +) diff --git a/v3/integrations/nrecho-v3/go.mod b/v3/integrations/nrecho-v3/go.mod index 2e557e54f..acdbedac4 100644 --- a/v3/integrations/nrecho-v3/go.mod +++ b/v3/integrations/nrecho-v3/go.mod @@ -1,10 +1,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.7 + 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/labstack/gommon v0.4.0 // indirect github.com/newrelic/go-agent/v3 v3.17.0 ) diff --git a/v3/integrations/nrecho-v4/go.mod b/v3/integrations/nrecho-v4/go.mod index e436ce6ea..f51557781 100644 --- a/v3/integrations/nrecho-v4/go.mod +++ b/v3/integrations/nrecho-v4/go.mod @@ -1,8 +1,26 @@ 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.17 + require ( github.com/labstack/echo/v4 v4.9.0 github.com/newrelic/go-agent/v3 v3.18.2 ) + +require ( + github.com/golang/protobuf v1.4.3 // indirect + github.com/labstack/gommon v0.3.1 // indirect + github.com/mattn/go-colorable v0.1.11 // indirect + github.com/mattn/go-isatty v0.0.14 // indirect + github.com/valyala/bytebufferpool v1.0.0 // indirect + github.com/valyala/fasttemplate v1.2.1 // indirect + golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect + golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f // indirect + golang.org/x/sys v0.0.0-20211103235746-7861aae1554b // indirect + golang.org/x/text v0.3.7 // indirect + google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect + google.golang.org/grpc v1.39.0 // indirect + google.golang.org/protobuf v1.25.0 // indirect +) diff --git a/v3/integrations/nrelasticsearch-v7/go.mod b/v3/integrations/nrelasticsearch-v7/go.mod index b5d3ca5a6..c01608e35 100644 --- a/v3/integrations/nrelasticsearch-v7/go.mod +++ b/v3/integrations/nrelasticsearch-v7/go.mod @@ -1,7 +1,9 @@ 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.11 + require ( github.com/elastic/go-elasticsearch/v7 v7.17.0 github.com/newrelic/go-agent/v3 v3.17.0 diff --git a/v3/integrations/nrgin/go.mod b/v3/integrations/nrgin/go.mod index 1255cd651..fe4d78269 100644 --- a/v3/integrations/nrgin/go.mod +++ b/v3/integrations/nrgin/go.mod @@ -1,9 +1,41 @@ 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 + require ( github.com/gin-gonic/gin v1.9.0 github.com/newrelic/go-agent/v3 v3.23.0 ) + +require ( + github.com/bytedance/sonic v1.8.0 // indirect + github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect + github.com/gin-contrib/sse v0.1.0 // indirect + github.com/go-playground/locales v0.14.1 // indirect + github.com/go-playground/universal-translator v0.18.1 // indirect + github.com/go-playground/validator/v10 v10.11.2 // indirect + github.com/goccy/go-json v0.10.0 // indirect + github.com/golang/protobuf v1.5.3 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/klauspost/cpuid/v2 v2.0.9 // indirect + github.com/leodido/go-urn v1.2.1 // indirect + github.com/mattn/go-isatty v0.0.17 // indirect + github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/pelletier/go-toml/v2 v2.0.6 // indirect + github.com/twitchyliquid64/golang-asm v0.15.1 // indirect + github.com/ugorji/go/codec v1.2.9 // indirect + golang.org/x/arch v0.0.0-20210923205945-b76863e36670 // indirect + golang.org/x/crypto v0.5.0 // indirect + golang.org/x/net v0.8.0 // indirect + golang.org/x/sys v0.6.0 // indirect + golang.org/x/text v0.8.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 + gopkg.in/yaml.v3 v3.0.1 // indirect +) + replace github.com/newrelic/go-agent/v3 => ../.. diff --git a/v3/integrations/nrgin/nrgin_test.go b/v3/integrations/nrgin/nrgin_test.go index 26cca960d..8249f592a 100644 --- a/v3/integrations/nrgin/nrgin_test.go +++ b/v3/integrations/nrgin/nrgin_test.go @@ -284,6 +284,10 @@ func TestStatusCodes(t *testing.T) { "request.method": "GET", "request.uri": "/err", "response.headers.contentType": "text/plain; charset=utf-8", + "code.function": internal.MatchAnything, + "code.namespace": internal.MatchAnything, + "code.filepath": internal.MatchAnything, + "code.lineno": internal.MatchAnything, }, }}) } @@ -338,6 +342,10 @@ func TestNoResponseBody(t *testing.T) { "http.statusCode": expectCode, "request.method": "GET", "request.uri": "/nobody", + "code.function": internal.MatchAnything, + "code.namespace": internal.MatchAnything, + "code.filepath": internal.MatchAnything, + "code.lineno": internal.MatchAnything, }, }}) } diff --git a/v3/integrations/nrgorilla/go.mod b/v3/integrations/nrgorilla/go.mod index c76531f7b..ac0c6c2e3 100644 --- a/v3/integrations/nrgorilla/go.mod +++ b/v3/integrations/nrgorilla/go.mod @@ -1,7 +1,9 @@ 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.12 + require ( // v1.7.0 is the earliest version of Gorilla using modules. github.com/gorilla/mux v1.7.0 diff --git a/v3/integrations/nrgraphqlgo/go.mod b/v3/integrations/nrgraphqlgo/go.mod index 07696032e..bb8eb0a3f 100644 --- a/v3/integrations/nrgraphqlgo/go.mod +++ b/v3/integrations/nrgraphqlgo/go.mod @@ -1,5 +1,7 @@ module github.com/newrelic/go-agent/v3/integrations/nrgraphqlgo + go 1.13 + require ( github.com/graphql-go/graphql v0.7.9 github.com/newrelic/go-agent/v3 v3.17.0 diff --git a/v3/integrations/nrgrpc/go.mod b/v3/integrations/nrgrpc/go.mod index ba36ced8a..4607af211 100644 --- a/v3/integrations/nrgrpc/go.mod +++ b/v3/integrations/nrgrpc/go.mod @@ -1,12 +1,35 @@ module github.com/newrelic/go-agent/v3/integrations/nrgrpc + go 1.19 + 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.23.0 + github.com/newrelic/go-agent/v3/integrations/nrsecurityagent v1.0.2 // 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 ) + +require ( + 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/kr/pretty v0.3.1 // indirect + github.com/mackerelio/go-osstat v0.2.4 // indirect + github.com/newrelic/csec-go-agent v0.2.1 // 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 + golang.org/x/arch v0.3.0 // indirect + golang.org/x/net v0.8.0 // indirect + golang.org/x/sys v0.7.0 // indirect + golang.org/x/text v0.8.0 // indirect + google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect +) + replace github.com/newrelic/go-agent/v3 => ../.. diff --git a/v3/integrations/nrgrpc/nrgrpc_client_test.go b/v3/integrations/nrgrpc/nrgrpc_client_test.go index 3f3e46fe8..e237296c9 100644 --- a/v3/integrations/nrgrpc/nrgrpc_client_test.go +++ b/v3/integrations/nrgrpc/nrgrpc_client_test.go @@ -76,7 +76,7 @@ func TestGetURL(t *testing.T) { } func testApp() integrationsupport.ExpectApp { - return integrationsupport.NewTestApp(replyFn, integrationsupport.ConfigFullTraces) + return integrationsupport.NewTestApp(replyFn, integrationsupport.ConfigFullTraces, newrelic.ConfigCodeLevelMetricsEnabled(false)) } var replyFn = func(reply *internal.ConnectReply) { diff --git a/v3/integrations/nrhttprouter/go.mod b/v3/integrations/nrhttprouter/go.mod index bf68f8136..6d841a5e8 100644 --- a/v3/integrations/nrhttprouter/go.mod +++ b/v3/integrations/nrhttprouter/go.mod @@ -1,7 +1,9 @@ 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.7 + require ( // v1.3.0 is the earliest version of httprouter using modules. github.com/julienschmidt/httprouter v1.3.0 diff --git a/v3/integrations/nrlambda/go.mod b/v3/integrations/nrlambda/go.mod index 762529d33..139ba8f5f 100644 --- a/v3/integrations/nrlambda/go.mod +++ b/v3/integrations/nrlambda/go.mod @@ -1,6 +1,18 @@ module github.com/newrelic/go-agent/v3/integrations/nrlambda + go 1.18 + require ( github.com/aws/aws-lambda-go v1.41.0 github.com/newrelic/go-agent/v3 v3.21.1 ) + +require ( + github.com/golang/protobuf v1.5.3 // indirect + golang.org/x/net v0.8.0 // indirect + golang.org/x/sys v0.6.0 // indirect + golang.org/x/text v0.8.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 +) diff --git a/v3/integrations/nrlogrus/go.mod b/v3/integrations/nrlogrus/go.mod index 226414374..bc7306d9f 100644 --- a/v3/integrations/nrlogrus/go.mod +++ b/v3/integrations/nrlogrus/go.mod @@ -1,10 +1,24 @@ module github.com/newrelic/go-agent/v3/integrations/nrlogrus + // As of Dec 2019, the logrus go.mod file uses 1.13: // https://github.com/sirupsen/logrus/blob/master/go.mod go 1.18 + require ( github.com/newrelic/go-agent/v3 v3.21.0 // v1.1.0 is required for the Logger.GetLevel method, and is the earliest // version of logrus using modules. github.com/sirupsen/logrus v1.1.0 ) + +require ( + github.com/golang/protobuf v1.5.2 // indirect + github.com/konsorten/go-windows-terminal-sequences v0.0.0-20180402223658-b729f2633dfe // indirect + golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect + golang.org/x/net v0.0.0-20201021035429-f5854403a974 // indirect + golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4 // indirect + golang.org/x/text v0.3.3 // indirect + google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect + google.golang.org/grpc v1.49.0 // indirect + google.golang.org/protobuf v1.27.1 // indirect +) diff --git a/v3/integrations/nrlogxi/go.mod b/v3/integrations/nrlogxi/go.mod index f70105fb5..1266aca91 100644 --- a/v3/integrations/nrlogxi/go.mod +++ b/v3/integrations/nrlogxi/go.mod @@ -1,9 +1,25 @@ module github.com/newrelic/go-agent/v3/integrations/nrlogxi + // As of Dec 2019, logxi requires 1.3+: // https://github.com/mgutz/logxi#requirements go 1.18 + require ( // 'v1', at commit aebf8a7d67ab, is the only logxi release. github.com/mgutz/logxi v0.0.0-20161027140823-aebf8a7d67ab github.com/newrelic/go-agent/v3 v3.21.1 ) + +require ( + github.com/golang/protobuf v1.5.3 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.19 // indirect + github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect + github.com/stretchr/testify v1.8.4 // indirect + golang.org/x/net v0.8.0 // indirect + golang.org/x/sys v0.6.0 // indirect + golang.org/x/text v0.8.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 +) diff --git a/v3/integrations/nrmicro/go.mod b/v3/integrations/nrmicro/go.mod index 804e5d845..5a12a7e11 100644 --- a/v3/integrations/nrmicro/go.mod +++ b/v3/integrations/nrmicro/go.mod @@ -1,10 +1,56 @@ module github.com/newrelic/go-agent/v3/integrations/nrmicro + // As of Dec 2019, the go-micro go.mod file uses 1.13: // https://github.com/micro/go-micro/blob/master/go.mod go 1.19 + require ( github.com/golang/protobuf v1.5.3 github.com/micro/go-micro v1.8.0 github.com/newrelic/go-agent/v3 v3.23.0 ) + +require ( + github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878 // indirect + github.com/go-log/log v0.1.0 // indirect + github.com/google/btree v1.0.0 // indirect + github.com/google/uuid v1.3.0 // indirect + github.com/hashicorp/consul/api v1.1.0 // indirect + github.com/hashicorp/errwrap v1.0.0 // indirect + github.com/hashicorp/go-cleanhttp v0.5.1 // indirect + github.com/hashicorp/go-immutable-radix v1.1.0 // indirect + github.com/hashicorp/go-msgpack v0.5.5 // indirect + github.com/hashicorp/go-multierror v1.0.0 // indirect + github.com/hashicorp/go-rootcerts v1.0.1 // indirect + github.com/hashicorp/go-sockaddr v1.0.2 // indirect + github.com/hashicorp/golang-lru v0.5.1 // indirect + github.com/hashicorp/memberlist v0.1.4 // indirect + github.com/hashicorp/serf v0.8.3 // indirect + github.com/json-iterator/go v1.1.6 // indirect + github.com/klauspost/compress v1.16.5 // indirect + github.com/micro/cli v0.2.0 // indirect + github.com/micro/mdns v0.1.1-0.20190729112526-ef68c9635478 // indirect + github.com/miekg/dns v1.1.15 // indirect + github.com/mitchellh/go-homedir v1.1.0 // indirect + github.com/mitchellh/hashstructure v1.0.0 // indirect + github.com/mitchellh/mapstructure v1.1.2 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.1 // indirect + github.com/nats-io/nats-server/v2 v2.9.20 // indirect + github.com/nats-io/nats.go v1.27.0 // indirect + github.com/nats-io/nkeys v0.4.4 // indirect + github.com/nats-io/nuid v1.0.1 // indirect + github.com/pkg/errors v0.8.1 // indirect + github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect + golang.org/x/crypto v0.11.0 // indirect + golang.org/x/net v0.12.0 // indirect + golang.org/x/sync v0.3.0 // indirect + golang.org/x/sys v0.10.0 // indirect + golang.org/x/text v0.11.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect + google.golang.org/grpc v1.56.2 // indirect + google.golang.org/grpc/examples v0.0.0-20230731164241-c6354049d4cf // indirect + google.golang.org/protobuf v1.31.0 // indirect +) + replace github.com/newrelic/go-agent/v3 => ../.. diff --git a/v3/integrations/nrmicro/nrmicro_test.go b/v3/integrations/nrmicro/nrmicro_test.go index af4485c3a..6e5b08234 100644 --- a/v3/integrations/nrmicro/nrmicro_test.go +++ b/v3/integrations/nrmicro/nrmicro_test.go @@ -87,7 +87,7 @@ func getDTRequestHeaderVal(ctx context.Context) string { } func createTestApp() integrationsupport.ExpectApp { - return integrationsupport.NewTestApp(replyFn, cfgFn, integrationsupport.ConfigFullTraces) + return integrationsupport.NewTestApp(replyFn, cfgFn, integrationsupport.ConfigFullTraces, newrelic.ConfigCodeLevelMetricsEnabled(false)) } var replyFn = func(reply *internal.ConnectReply) { diff --git a/v3/integrations/nrmongo/go.mod b/v3/integrations/nrmongo/go.mod index 29bb7f9b0..0c095a140 100644 --- a/v3/integrations/nrmongo/go.mod +++ b/v3/integrations/nrmongo/go.mod @@ -1,10 +1,33 @@ module github.com/newrelic/go-agent/v3/integrations/nrmongo + // As of Dec 2019, 1.10 is the mongo-driver requirement: // https://github.com/mongodb/mongo-go-driver#requirements go 1.19 + require ( github.com/newrelic/go-agent/v3 v3.23.0 // mongo-driver does not support modules as of Nov 2019. go.mongodb.org/mongo-driver v1.10.2 ) + +require ( + github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/snappy v0.0.1 // indirect + github.com/klauspost/compress v1.13.6 // indirect + github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/xdg-go/pbkdf2 v1.0.0 // indirect + github.com/xdg-go/scram v1.1.1 // indirect + github.com/xdg-go/stringprep v1.0.3 // indirect + github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect + golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect + golang.org/x/net v0.8.0 // indirect + golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect + golang.org/x/sys v0.6.0 // indirect + golang.org/x/text v0.8.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 +) + replace github.com/newrelic/go-agent/v3 => ../.. diff --git a/v3/integrations/nrmongo/nrmongo_test.go b/v3/integrations/nrmongo/nrmongo_test.go index 6bc758c52..b6297fb8e 100644 --- a/v3/integrations/nrmongo/nrmongo_test.go +++ b/v3/integrations/nrmongo/nrmongo_test.go @@ -235,7 +235,7 @@ func TestCollName(t *testing.T) { } func createTestApp() integrationsupport.ExpectApp { - return integrationsupport.NewTestApp(replyFn, integrationsupport.ConfigFullTraces) + return integrationsupport.NewTestApp(replyFn, integrationsupport.ConfigFullTraces, newrelic.ConfigCodeLevelMetricsEnabled(false)) } var replyFn = func(reply *internal.ConnectReply) { diff --git a/v3/integrations/nrmssql/go.mod b/v3/integrations/nrmssql/go.mod index 28a861c8a..c84de89b8 100644 --- a/v3/integrations/nrmssql/go.mod +++ b/v3/integrations/nrmssql/go.mod @@ -1,6 +1,21 @@ module github.com/newrelic/go-agent/v3/integrations/nrmssql + go 1.17 + require ( github.com/microsoft/go-mssqldb v0.19.0 github.com/newrelic/go-agent/v3 v3.16.1 ) + +require ( + github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe // indirect + github.com/golang-sql/sqlexp v0.1.0 // indirect + github.com/golang/protobuf v1.4.3 // indirect + golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect + golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4 // indirect + golang.org/x/sys v0.0.0-20220224120231-95c6836cb0e7 // indirect + golang.org/x/text v0.3.7 // indirect + google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect + google.golang.org/grpc v1.39.0 // indirect + google.golang.org/protobuf v1.25.0 // indirect +) diff --git a/v3/integrations/nrmysql/go.mod b/v3/integrations/nrmysql/go.mod index 8b4f9105e..ba4314dcf 100644 --- a/v3/integrations/nrmysql/go.mod +++ b/v3/integrations/nrmysql/go.mod @@ -1,9 +1,21 @@ module github.com/newrelic/go-agent/v3/integrations/nrmysql + // 1.10 is the Go version in mysql's go.mod go 1.17 + require ( // v1.5.0 is the first mysql version to support gomod github.com/go-sql-driver/mysql v1.6.0 // v3.3.0 includes the new location of ParseQuery github.com/newrelic/go-agent/v3 v3.18.2 ) + +require ( + github.com/golang/protobuf v1.4.3 // indirect + golang.org/x/net v0.0.0-20200822124328-c89045814202 // indirect + golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd // indirect + golang.org/x/text v0.3.0 // indirect + google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect + google.golang.org/grpc v1.39.0 // indirect + google.golang.org/protobuf v1.25.0 // indirect +) diff --git a/v3/integrations/nrpgx/go.mod b/v3/integrations/nrpgx/go.mod index 0cea1f3d0..9aec0a297 100644 --- a/v3/integrations/nrpgx/go.mod +++ b/v3/integrations/nrpgx/go.mod @@ -1,9 +1,25 @@ module github.com/newrelic/go-agent/v3/integrations/nrpgx + // As of Dec 2019, go 1.11 is the earliest version of Go tested by lib/pq: // https://github.com/lib/pq/blob/master/.travis.yml go 1.18 + require ( github.com/jackc/pgx v3.6.2+incompatible github.com/jackc/pgx/v4 v4.13.0 github.com/newrelic/go-agent/v3 v3.3.0 ) + +require ( + github.com/jackc/chunkreader/v2 v2.0.1 // indirect + github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 // indirect + github.com/jackc/pgconn v1.10.0 // indirect + github.com/jackc/pgio v1.0.0 // indirect + github.com/jackc/pgpassfile v1.0.0 // indirect + github.com/jackc/pgproto3/v2 v2.1.1 // indirect + github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect + github.com/jackc/pgtype v1.8.1 // indirect + github.com/pkg/errors v0.8.1 // indirect + golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 // indirect + golang.org/x/text v0.3.6 // indirect +) diff --git a/v3/integrations/nrpgx5/go.mod b/v3/integrations/nrpgx5/go.mod index d3bd5f334..322908794 100644 --- a/v3/integrations/nrpgx5/go.mod +++ b/v3/integrations/nrpgx5/go.mod @@ -1,8 +1,35 @@ module github.com/newrelic/go-agent/v3/integrations/nrpgx5 + go 1.18 + require ( github.com/egon12/pgsnap v0.0.0-20221022154027-2847f0124ed8 github.com/jackc/pgx/v5 v5.0.3 github.com/newrelic/go-agent/v3 v3.20.0 github.com/stretchr/testify v1.8.0 ) + +require ( + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/golang/protobuf v1.5.2 // indirect + github.com/jackc/chunkreader/v2 v2.0.1 // indirect + github.com/jackc/pgconn v1.10.0 // indirect + github.com/jackc/pgio v1.0.0 // indirect + github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65 // indirect + github.com/jackc/pgpassfile v1.0.0 // indirect + github.com/jackc/pgproto3/v2 v2.1.1 // indirect + github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect + github.com/jackc/pgtype v1.8.1 // indirect + github.com/jackc/pgx/v4 v4.13.0 // indirect + github.com/jackc/puddle/v2 v2.0.0 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/rogpeppe/go-internal v1.11.0 // indirect + golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 // indirect + golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect + golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect + golang.org/x/text v0.3.7 // indirect + google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect + google.golang.org/grpc v1.49.0 // indirect + google.golang.org/protobuf v1.27.1 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) diff --git a/v3/integrations/nrpkgerrors/go.mod b/v3/integrations/nrpkgerrors/go.mod index 49a8efbb9..d7165e387 100644 --- a/v3/integrations/nrpkgerrors/go.mod +++ b/v3/integrations/nrpkgerrors/go.mod @@ -1,7 +1,9 @@ module github.com/newrelic/go-agent/v3/integrations/nrpkgerrors + // As of Dec 2019, 1.11 is the earliest version of Go tested by pkg/errors: // https://github.com/pkg/errors/blob/master/.travis.yml go 1.11 + require ( github.com/newrelic/go-agent/v3 v3.0.0 // v0.8.0 was the last release in 2016, and when diff --git a/v3/integrations/nrpq/go.mod b/v3/integrations/nrpq/go.mod index 8cfa11e1b..6df247b83 100644 --- a/v3/integrations/nrpq/go.mod +++ b/v3/integrations/nrpq/go.mod @@ -1,10 +1,14 @@ module github.com/newrelic/go-agent/v3/integrations/nrpq + // As of Dec 2019, go 1.11 is the earliest version of Go tested by lib/pq: // https://github.com/lib/pq/blob/master/.travis.yml go 1.11 + require ( // NewConnector dsn parsing tests expect v1.1.0 error return behavior. github.com/lib/pq v1.1.0 // v3.3.0 includes the new location of ParseQuery github.com/newrelic/go-agent/v3 v3.3.0 ) + +replace github.com/newrelic/go-agent/v3 => ../.. diff --git a/v3/integrations/nrredis-v7/go.mod b/v3/integrations/nrredis-v7/go.mod index 898f069dc..16f15925f 100644 --- a/v3/integrations/nrredis-v7/go.mod +++ b/v3/integrations/nrredis-v7/go.mod @@ -1,7 +1,9 @@ module github.com/newrelic/go-agent/v3/integrations/nrredis-v7 + // As of Jan 2020, go 1.11 is in the go-redis go.mod file: // https://github.com/go-redis/redis/blob/master/go.mod go 1.11 + require ( github.com/go-redis/redis/v7 v7.0.0-beta.5 github.com/newrelic/go-agent/v3 v3.17.0 diff --git a/v3/integrations/nrredis-v8/go.mod b/v3/integrations/nrredis-v8/go.mod index e97685f7a..cfa36aa15 100644 --- a/v3/integrations/nrredis-v8/go.mod +++ b/v3/integrations/nrredis-v8/go.mod @@ -1,7 +1,9 @@ module github.com/newrelic/go-agent/v3/integrations/nrredis-v8 + // As of Jan 2020, go 1.11 is in the go-redis go.mod file: // https://github.com/go-redis/redis/blob/master/go.mod go 1.11 + require ( github.com/go-redis/redis/v8 v8.4.0 github.com/newrelic/go-agent/v3 v3.0.0 diff --git a/v3/integrations/nrredis-v9/go.mod b/v3/integrations/nrredis-v9/go.mod index 884074439..3fc120f78 100644 --- a/v3/integrations/nrredis-v9/go.mod +++ b/v3/integrations/nrredis-v9/go.mod @@ -1,8 +1,22 @@ module github.com/newrelic/go-agent/v3/integrations/nrredis-v9 + // As of Mar 2023, go 1.17 is in the go-redis go.mod file: // https://github.com/redis/go-redis/blob/a38f75b640398bd709ee46c778a23e80e09d48b5/go.mod#L3 go 1.17 + require ( github.com/newrelic/go-agent/v3 v3.20.4 github.com/redis/go-redis/v9 v9.0.2 ) + +require ( + github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect + github.com/golang/protobuf v1.5.2 // indirect + golang.org/x/net v0.0.0-20201021035429-f5854403a974 // indirect + golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4 // indirect + golang.org/x/text v0.3.3 // indirect + google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect + google.golang.org/grpc v1.49.0 // indirect + google.golang.org/protobuf v1.27.1 // indirect +) diff --git a/v3/integrations/nrsarama/go.mod b/v3/integrations/nrsarama/go.mod index 37e3394f4..8bb8fb2fc 100644 --- a/v3/integrations/nrsarama/go.mod +++ b/v3/integrations/nrsarama/go.mod @@ -1,7 +1,41 @@ module github.com/newrelic/go-agent/v3/integrations/nrsarama + go 1.19 + require ( github.com/Shopify/sarama v1.38.1 github.com/newrelic/go-agent/v3 v3.21.1 github.com/stretchr/testify v1.8.1 ) + +require ( + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/eapache/go-resiliency v1.3.0 // indirect + github.com/eapache/go-xerial-snappy v0.0.0-20230111030713-bf00bc1b83b6 // indirect + github.com/eapache/queue v1.1.0 // indirect + github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/snappy v0.0.4 // indirect + github.com/hashicorp/errwrap v1.0.0 // indirect + github.com/hashicorp/go-multierror v1.1.1 // indirect + github.com/hashicorp/go-uuid v1.0.3 // indirect + github.com/jcmturner/aescts/v2 v2.0.0 // indirect + github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect + github.com/jcmturner/gofork v1.7.6 // indirect + github.com/jcmturner/gokrb5/v8 v8.4.3 // indirect + github.com/jcmturner/rpc/v2 v2.0.3 // indirect + github.com/klauspost/compress v1.15.14 // indirect + github.com/kr/text v0.2.0 // indirect + github.com/pierrec/lz4/v4 v4.1.17 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect + github.com/rogpeppe/go-internal v1.11.0 // indirect + github.com/stretchr/objx v0.5.0 // indirect + golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect + golang.org/x/net v0.8.0 // indirect + golang.org/x/sys v0.6.0 // indirect + golang.org/x/text v0.8.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 + gopkg.in/yaml.v3 v3.0.1 // indirect +) diff --git a/v3/integrations/nrsecurityagent/go.mod b/v3/integrations/nrsecurityagent/go.mod index 7ee457aef..e6d93d606 100644 --- a/v3/integrations/nrsecurityagent/go.mod +++ b/v3/integrations/nrsecurityagent/go.mod @@ -9,4 +9,24 @@ require ( gopkg.in/yaml.v2 v2.4.0 ) +require ( + github.com/dlclark/regexp2 v1.9.0 // indirect + github.com/golang/protobuf v1.5.3 // 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/mackerelio/go-osstat v0.2.4 // indirect + github.com/mattn/go-sqlite3 v1.0.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 + golang.org/x/arch v0.3.0 // indirect + golang.org/x/net v0.8.0 // indirect + golang.org/x/sys v0.7.0 // indirect + golang.org/x/text v0.8.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 +) + replace github.com/newrelic/go-agent/v3 => ../.. diff --git a/v3/integrations/nrsnowflake/go.mod b/v3/integrations/nrsnowflake/go.mod index d910bb73f..b95613824 100644 --- a/v3/integrations/nrsnowflake/go.mod +++ b/v3/integrations/nrsnowflake/go.mod @@ -1,6 +1,54 @@ module github.com/newrelic/go-agent/v3/integrations/nrsnowflake + go 1.17 + require ( github.com/newrelic/go-agent/v3 v3.20.2 github.com/snowflakedb/gosnowflake v1.6.16 ) + +require ( + github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect + github.com/99designs/keyring v1.2.1 // indirect + github.com/Azure/azure-pipeline-go v0.2.3 // indirect + github.com/Azure/azure-storage-blob-go v0.15.0 // indirect + github.com/apache/arrow/go/arrow v0.0.0-20211112161151-bc219186db40 // indirect + github.com/aws/aws-sdk-go-v2 v1.16.16 // indirect + github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.8 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.12.20 // indirect + github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.33 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.23 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.17 // indirect + github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.14 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.9 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.18 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.17 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.17 // indirect + github.com/aws/aws-sdk-go-v2/service/s3 v1.27.11 // indirect + github.com/aws/smithy-go v1.13.3 // indirect + github.com/danieljoos/wincred v1.1.2 // indirect + github.com/dvsekhvalnov/jose2go v1.5.0 // indirect + github.com/form3tech-oss/jwt-go v3.2.5+incompatible // indirect + github.com/gabriel-vasile/mimetype v1.4.1 // indirect + github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect + github.com/golang/protobuf v1.5.2 // indirect + github.com/google/flatbuffers v2.0.8+incompatible // indirect + github.com/google/uuid v1.3.0 // indirect + github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect + github.com/jmespath/go-jmespath v0.4.0 // indirect + github.com/klauspost/compress v1.15.11 // indirect + github.com/mattn/go-ieproxy v0.0.1 // indirect + github.com/mtibben/percent v0.2.1 // indirect + github.com/pierrec/lz4/v4 v4.1.16 // indirect + github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect + github.com/sirupsen/logrus v1.9.0 // indirect + golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be // indirect + golang.org/x/net v0.0.0-20221002022538-bcab6841153b // indirect + golang.org/x/sys v0.0.0-20220926163933-8cfa568d3c25 // indirect + golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect + golang.org/x/text v0.3.7 // indirect + golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect + google.golang.org/genproto v0.0.0-20210630183607-d20f26d13c79 // indirect + google.golang.org/grpc v1.49.0 // indirect + google.golang.org/protobuf v1.27.1 // indirect +) diff --git a/v3/integrations/nrsqlite3/go.mod b/v3/integrations/nrsqlite3/go.mod index e391a40ab..3598eda33 100644 --- a/v3/integrations/nrsqlite3/go.mod +++ b/v3/integrations/nrsqlite3/go.mod @@ -1,7 +1,9 @@ module github.com/newrelic/go-agent/v3/integrations/nrsqlite3 + // As of Dec 2019, 1.9 is the oldest version of Go tested by go-sqlite3: // https://github.com/mattn/go-sqlite3/blob/master/.travis.yml go 1.9 + require ( github.com/mattn/go-sqlite3 v1.0.0 // v3.3.0 includes the new location of ParseQuery diff --git a/v3/integrations/nrstan/go.mod b/v3/integrations/nrstan/go.mod index 2dcf89041..4034ff5cb 100644 --- a/v3/integrations/nrstan/go.mod +++ b/v3/integrations/nrstan/go.mod @@ -1,8 +1,28 @@ module github.com/newrelic/go-agent/v3/integrations/nrstan + // As of Dec 2019, 1.11 is the earliest Go version tested by Stan: // https://github.com/nats-io/stan.go/blob/master/.travis.yml go 1.18 + require ( github.com/nats-io/stan.go v0.10.4 github.com/newrelic/go-agent/v3 v3.21.1 ) + +require ( + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/protobuf v1.5.3 // indirect + github.com/klauspost/compress v1.16.5 // indirect + github.com/nats-io/nats-server/v2 v2.9.20 // indirect + github.com/nats-io/nats-streaming-server v0.25.5 // indirect + github.com/nats-io/nats.go v1.27.0 // indirect + github.com/nats-io/nkeys v0.4.4 // indirect + github.com/nats-io/nuid v1.0.1 // indirect + golang.org/x/crypto v0.10.0 // indirect + golang.org/x/net v0.10.0 // indirect + golang.org/x/sys v0.9.0 // indirect + golang.org/x/text v0.10.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 +) diff --git a/v3/integrations/nrzap/go.mod b/v3/integrations/nrzap/go.mod index df4415978..5c25d57e3 100644 --- a/v3/integrations/nrzap/go.mod +++ b/v3/integrations/nrzap/go.mod @@ -1,7 +1,9 @@ module github.com/newrelic/go-agent/v3/integrations/nrzap + // As of Dec 2019, zap has 1.13 in their go.mod file: // https://github.com/uber-go/zap/blob/master/go.mod go 1.13 + require ( github.com/newrelic/go-agent/v3 v3.0.0 // v1.12.0 is the earliest version of zap using modules. diff --git a/v3/internal/integrationsupport/integrationsupport_test.go b/v3/internal/integrationsupport/integrationsupport_test.go index 7e6912cee..1b2561c5f 100644 --- a/v3/internal/integrationsupport/integrationsupport_test.go +++ b/v3/internal/integrationsupport/integrationsupport_test.go @@ -31,6 +31,7 @@ func testApp(t *testing.T) *newrelic.Application { newrelic.ConfigLicense("0123456789012345678901234567890123456789"), newrelic.ConfigEnabled(false), newrelic.ConfigDistributedTracerEnabled(true), + newrelic.ConfigCodeLevelMetricsEnabled(false), ) if nil != err { t.Fatal(err) diff --git a/v3/newrelic/config.go b/v3/newrelic/config.go index bb9fbaab7..69f324a4e 100644 --- a/v3/newrelic/config.go +++ b/v3/newrelic/config.go @@ -669,7 +669,7 @@ func defaultConfig() Config { c.InfiniteTracing.SpanEvents.QueueSize = 10000 // Code Level Metrics - c.CodeLevelMetrics.Enabled = false + c.CodeLevelMetrics.Enabled = true c.CodeLevelMetrics.RedactPathPrefixes = true c.CodeLevelMetrics.RedactIgnoredPrefixes = true c.CodeLevelMetrics.Scope = AllCLM diff --git a/v3/newrelic/config_test.go b/v3/newrelic/config_test.go index 3051ad19f..37eb88159 100644 --- a/v3/newrelic/config_test.go +++ b/v3/newrelic/config_test.go @@ -149,7 +149,7 @@ func TestCopyConfigReferenceFieldsPresent(t *testing.T) { "Attributes":{"Enabled":false,"Exclude":["10"],"Include":["9"]}, "Enabled":true }, - "CodeLevelMetrics":{"Enabled":false,"IgnoredPrefix":"","IgnoredPrefixes":null,"PathPrefix":"","PathPrefixes":null,"RedactIgnoredPrefixes":true,"RedactPathPrefixes":true,"Scope":"all"}, + "CodeLevelMetrics":{"Enabled":true,"IgnoredPrefix":"","IgnoredPrefixes":null,"PathPrefix":"","PathPrefixes":null,"RedactIgnoredPrefixes":true,"RedactPathPrefixes":true,"Scope":"all"}, "CrossApplicationTracer":{"Enabled":false}, "CustomInsightsEvents":{ "Enabled":true, @@ -349,7 +349,7 @@ func TestCopyConfigReferenceFieldsAbsent(t *testing.T) { }, "Enabled":true }, - "CodeLevelMetrics":{"Enabled":false,"IgnoredPrefix":"","IgnoredPrefixes":null,"PathPrefix":"","PathPrefixes":null,"RedactIgnoredPrefixes":true,"RedactPathPrefixes":true,"Scope":"all"}, + "CodeLevelMetrics":{"Enabled":true,"IgnoredPrefix":"","IgnoredPrefixes":null,"PathPrefix":"","PathPrefixes":null,"RedactIgnoredPrefixes":true,"RedactPathPrefixes":true,"Scope":"all"}, "CrossApplicationTracer":{"Enabled":false}, "CustomInsightsEvents":{ "Enabled":true, diff --git a/v3/newrelic/examples_test.go b/v3/newrelic/examples_test.go index 1fc800e56..f553eeea6 100644 --- a/v3/newrelic/examples_test.go +++ b/v3/newrelic/examples_test.go @@ -22,6 +22,7 @@ func Example() { app, err := newrelic.NewApplication( newrelic.ConfigAppName("Example Application"), newrelic.ConfigLicense("__YOUR_NEW_RELIC_LICENSE_KEY__"), + newrelic.ConfigCodeLevelMetricsEnabled(false), newrelic.ConfigDebugLogger(os.Stdout), ) if nil != err { diff --git a/v3/newrelic/internal_app_test.go b/v3/newrelic/internal_app_test.go index 5e1b342a3..9857596c3 100644 --- a/v3/newrelic/internal_app_test.go +++ b/v3/newrelic/internal_app_test.go @@ -95,6 +95,7 @@ func newTestApp(replyfn func(*internal.ConnectReply), cfgFn ...ConfigOption) exp }, ConfigAppName(sampleAppName), ConfigLicense(testLicenseKey), + ConfigCodeLevelMetricsEnabled(false), ) app, err := NewApplication(cfgFn...) diff --git a/v3/newrelic/internal_benchmark_test.go b/v3/newrelic/internal_benchmark_test.go index 22a5371cd..0d3019ea5 100644 --- a/v3/newrelic/internal_benchmark_test.go +++ b/v3/newrelic/internal_benchmark_test.go @@ -55,6 +55,7 @@ func BenchmarkTraceSegmentWithDefer(b *testing.B) { ConfigAppName("my app"), ConfigLicense(sampleLicense), ConfigEnabled(false), + ConfigCodeLevelMetricsEnabled(false), ) if nil != err { b.Fatal(err) @@ -75,6 +76,7 @@ func BenchmarkTraceSegmentNoDefer(b *testing.B) { ConfigAppName("my app"), ConfigLicense(sampleLicense), ConfigEnabled(false), + ConfigCodeLevelMetricsEnabled(false), ) if nil != err { b.Fatal(err) @@ -96,6 +98,7 @@ func BenchmarkTraceSegmentZeroSegmentThreshold(b *testing.B) { ConfigAppName("my app"), ConfigLicense(sampleLicense), ConfigEnabled(false), + ConfigCodeLevelMetricsEnabled(false), func(cfg *Config) { cfg.TransactionTracer.Segments.Threshold = 0 }, @@ -120,6 +123,7 @@ func BenchmarkDatastoreSegment(b *testing.B) { ConfigAppName("my app"), ConfigLicense(sampleLicense), ConfigEnabled(false), + ConfigCodeLevelMetricsEnabled(false), ) if nil != err { b.Fatal(err) @@ -146,6 +150,7 @@ func BenchmarkExternalSegment(b *testing.B) { ConfigAppName("my app"), ConfigLicense(sampleLicense), ConfigEnabled(false), + ConfigCodeLevelMetricsEnabled(false), ) if nil != err { b.Fatal(err) diff --git a/v3/newrelic/internal_test.go b/v3/newrelic/internal_test.go index 10561273e..994ce2c2b 100644 --- a/v3/newrelic/internal_test.go +++ b/v3/newrelic/internal_test.go @@ -207,6 +207,7 @@ func TestNewApplicationNil(t *testing.T) { ConfigAppName("appname"), ConfigLicense("wrong length"), ConfigEnabled(false), + ConfigCodeLevelMetricsEnabled(false), ) if nil == err { t.Error("error expected when license key is short") @@ -266,6 +267,7 @@ func testApp(replyfn func(*internal.ConnectReply), cfgfn func(*Config), t testin app, err := NewApplication( ConfigAppName("my app"), ConfigLicense(testLicenseKey), + ConfigCodeLevelMetricsEnabled(false), cfgfn, func(cfg *Config) { cfg.Logger = lg