From 6ec04009228630519bd13c8f439d496f3004e8d0 Mon Sep 17 00:00:00 2001 From: Steve Willoughby Date: Thu, 10 Aug 2023 14:20:32 -0700 Subject: [PATCH 1/2] fixed clm for unit test --- v3/integrations/nrstan/test/go.mod | 37 +++++++++++++++++++++- v3/integrations/nrstan/test/nrstan_test.go | 2 +- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/v3/integrations/nrstan/test/go.mod b/v3/integrations/nrstan/test/go.mod index 54839f195..405ecc39e 100644 --- a/v3/integrations/nrstan/test/go.mod +++ b/v3/integrations/nrstan/test/go.mod @@ -1,12 +1,47 @@ module github.com/newrelic/go-agent/v3/integrations/nrstan/test + // This module exists to avoid a dependency on // github.com/nats-io/nats-streaming-server in nrstan. go 1.19 + require ( github.com/nats-io/nats-streaming-server v0.24.3 - github.com/nats-io/stan.go v0.10.3 + github.com/nats-io/stan.go v0.10.4 github.com/newrelic/go-agent/v3 v3.24.1 github.com/newrelic/go-agent/v3/integrations/nrstan v0.0.0 ) + +require ( + github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878 // indirect + github.com/fatih/color v1.7.0 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/protobuf v1.5.3 // indirect + github.com/hashicorp/go-hclog v1.1.0 // indirect + github.com/hashicorp/go-immutable-radix v1.0.0 // indirect + github.com/hashicorp/go-msgpack v1.1.5 // indirect + github.com/hashicorp/golang-lru v0.5.0 // indirect + github.com/hashicorp/raft v1.3.6 // indirect + github.com/klauspost/compress v1.14.4 // indirect + github.com/mattn/go-colorable v0.1.4 // indirect + github.com/mattn/go-isatty v0.0.10 // indirect + github.com/minio/highwayhash v1.0.2 // indirect + github.com/nats-io/jwt/v2 v2.2.1-0.20220113022732-58e87895b296 // indirect + github.com/nats-io/nats-server/v2 v2.7.4 // indirect + github.com/nats-io/nats.go v1.22.1 // indirect + github.com/nats-io/nkeys v0.3.0 // indirect + github.com/nats-io/nuid v1.0.1 // indirect + github.com/prometheus/procfs v0.7.3 // indirect + go.etcd.io/bbolt v1.3.6 // 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 + golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 // 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/integrations/nrstan => ../ + replace github.com/newrelic/go-agent/v3 => ../../.. diff --git a/v3/integrations/nrstan/test/nrstan_test.go b/v3/integrations/nrstan/test/nrstan_test.go index a41ae44d7..1f77c5f1b 100644 --- a/v3/integrations/nrstan/test/nrstan_test.go +++ b/v3/integrations/nrstan/test/nrstan_test.go @@ -31,7 +31,7 @@ func TestMain(m *testing.M) { } func createTestApp() integrationsupport.ExpectApp { - return integrationsupport.NewTestApp(integrationsupport.SampleEverythingReplyFn, integrationsupport.ConfigFullTraces, cfgFn) + return integrationsupport.NewTestApp(integrationsupport.SampleEverythingReplyFn, integrationsupport.ConfigFullTraces, cfgFn, newrelic.ConfigCodeLevelMetricsEnabled(false)) } var cfgFn = func(cfg *newrelic.Config) { From c8f3fba90b44c739e06f4adabc908dd56d009c8f Mon Sep 17 00:00:00 2001 From: Steve Willoughby Date: Thu, 10 Aug 2023 14:21:26 -0700 Subject: [PATCH 2/2] removed indirects --- v3/integrations/nrstan/test/go.mod | 31 ------------------------------ 1 file changed, 31 deletions(-) diff --git a/v3/integrations/nrstan/test/go.mod b/v3/integrations/nrstan/test/go.mod index 405ecc39e..aabad5475 100644 --- a/v3/integrations/nrstan/test/go.mod +++ b/v3/integrations/nrstan/test/go.mod @@ -11,37 +11,6 @@ require ( github.com/newrelic/go-agent/v3/integrations/nrstan v0.0.0 ) -require ( - github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878 // indirect - github.com/fatih/color v1.7.0 // indirect - github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/protobuf v1.5.3 // indirect - github.com/hashicorp/go-hclog v1.1.0 // indirect - github.com/hashicorp/go-immutable-radix v1.0.0 // indirect - github.com/hashicorp/go-msgpack v1.1.5 // indirect - github.com/hashicorp/golang-lru v0.5.0 // indirect - github.com/hashicorp/raft v1.3.6 // indirect - github.com/klauspost/compress v1.14.4 // indirect - github.com/mattn/go-colorable v0.1.4 // indirect - github.com/mattn/go-isatty v0.0.10 // indirect - github.com/minio/highwayhash v1.0.2 // indirect - github.com/nats-io/jwt/v2 v2.2.1-0.20220113022732-58e87895b296 // indirect - github.com/nats-io/nats-server/v2 v2.7.4 // indirect - github.com/nats-io/nats.go v1.22.1 // indirect - github.com/nats-io/nkeys v0.3.0 // indirect - github.com/nats-io/nuid v1.0.1 // indirect - github.com/prometheus/procfs v0.7.3 // indirect - go.etcd.io/bbolt v1.3.6 // 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 - golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 // 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/integrations/nrstan => ../ replace github.com/newrelic/go-agent/v3 => ../../..