Merge pull request #760 from nr-swilloughby/clm_on_default

Clm on by default

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

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
+)

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
+)

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
+)

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
+)

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
+)

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
+)

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.

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

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
+)

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
+)

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
 )

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
+)

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

v3/integrations/nrgin/go.mod

@@ -10,32 +10,31 @@ require (
 )
 
 require (
-	github.com/bytedance/sonic v1.9.1 // indirect
+	github.com/bytedance/sonic v1.8.0 // indirect
 	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.2 // 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.14.0 // indirect
-	github.com/goccy/go-json v0.10.2 // 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.2.4 // indirect
-	github.com/leodido/go-urn v1.2.4 // indirect
-	github.com/mattn/go-isatty v0.0.19 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // 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.8 // 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.11 // indirect
-	golang.org/x/arch v0.3.0 // indirect
-	golang.org/x/crypto v0.9.0 // indirect
-	golang.org/x/net v0.10.0 // indirect
-	golang.org/x/sys v0.8.0 // indirect
-	golang.org/x/text v0.9.0 // 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.30.0 // indirect
+	google.golang.org/protobuf v1.28.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 

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,
 		},
 	}})
 }

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

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

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 => ../..

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) {