From 1428ebd90b2f18bfff15b0d8c54f922d98eebaad Mon Sep 17 00:00:00 2001 From: mirackara Date: Mon, 10 Jul 2023 15:02:03 -0500 Subject: [PATCH 01/19] patch for expected errors --- v3/newrelic/error_events.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/v3/newrelic/error_events.go b/v3/newrelic/error_events.go index 46e95b609..07aca4f35 100644 --- a/v3/newrelic/error_events.go +++ b/v3/newrelic/error_events.go @@ -31,6 +31,9 @@ func (e *errorEvent) WriteJSON(buf *bytes.Buffer) { if e.SpanID != "" { w.stringField("spanId", e.SpanID) } + if e.Expect { + w.stringField("error.expected", "true") + } sharedTransactionIntrinsics(&e.txnEvent, &w) sharedBetterCATIntrinsics(&e.txnEvent, &w) From eaf1ae6e89853b1bbb96079fb8b47f1e61dc98c2 Mon Sep 17 00:00:00 2001 From: aayush-ap Date: Tue, 11 Jul 2023 11:28:24 +0000 Subject: [PATCH 02/19] added fix for data race with NewGoroutine --- v3/newrelic/internal_txn.go | 14 ++++++++++++++ v3/newrelic/transaction.go | 6 +++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/v3/newrelic/internal_txn.go b/v3/newrelic/internal_txn.go index 37e1f7709..8751c8f34 100644 --- a/v3/newrelic/internal_txn.go +++ b/v3/newrelic/internal_txn.go @@ -1363,3 +1363,17 @@ func (txn *txn) IsSampled() bool { return txn.lazilyCalculateSampled() } + +func (txn *txn) getCsecData() any { + txn.Lock() + defer txn.Unlock() + return txn.csecData +} + +func (txn *txn) setCsecData() { + txn.Lock() + defer txn.Unlock() + if txn.csecData == nil { + txn.csecData = secureAgent.SendEvent("NEW_GOROUTINE", "") + } +} diff --git a/v3/newrelic/transaction.go b/v3/newrelic/transaction.go index c2b5d995e..bfa194d0f 100644 --- a/v3/newrelic/transaction.go +++ b/v3/newrelic/transaction.go @@ -314,7 +314,7 @@ func (txn *Transaction) startSegmentAt(at time.Time) SegmentStartTime { func (txn *Transaction) StartSegment(name string) *Segment { if txn != nil && txn.thread != nil && txn.thread.thread != nil && txn.thread.thread.threadID > 0 { // async segment start - secureAgent.SendEvent("NEW_GOROUTINE_LINKER", txn.thread.csecData) + secureAgent.SendEvent("NEW_GOROUTINE_LINKER", txn.thread.getCsecData()) } return &Segment{ StartTime: txn.StartSegmentNow(), @@ -498,8 +498,8 @@ func (txn *Transaction) NewGoroutine() *Transaction { return nil } newTxn := txn.thread.NewGoroutine() - if newTxn.thread != nil && newTxn.thread.csecData == nil { - newTxn.thread.csecData = secureAgent.SendEvent("NEW_GOROUTINE", "") + if newTxn.thread != nil { + newTxn.thread.setCsecData() } return newTxn } From 39a6a030c76d0e71c80a7d69d11494b713eea2a4 Mon Sep 17 00:00:00 2001 From: aayush-ap Date: Wed, 19 Jul 2023 04:50:53 +0000 Subject: [PATCH 03/19] Added fix for security agent Initialisation --- v3/newrelic/secure_agent.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/v3/newrelic/secure_agent.go b/v3/newrelic/secure_agent.go index 0b6225185..1b9114ace 100644 --- a/v3/newrelic/secure_agent.go +++ b/v3/newrelic/secure_agent.go @@ -44,6 +44,9 @@ func (app *Application) RegisterSecurityAgent(s securityAgent) { if app != nil && app.app != nil && s != nil { secureAgent = s } + if app.app.run != nil { + secureAgent.RefreshState(getLinkedMetaData(app.app)) + } } func getLinkedMetaData(app *app) map[string]string { From e35b5edba95c839e160222dfcf5dabfca76d8b63 Mon Sep 17 00:00:00 2001 From: Steve Willoughby Date: Wed, 19 Jul 2023 12:46:55 -0700 Subject: [PATCH 04/19] added Name() transaction name getter function --- v3/newrelic/internal_txn.go | 6 ++++++ v3/newrelic/internal_txn_test.go | 20 ++++++++++++++++++++ v3/newrelic/transaction.go | 13 +++++++++++++ 3 files changed, 39 insertions(+) diff --git a/v3/newrelic/internal_txn.go b/v3/newrelic/internal_txn.go index 5c3043f94..b20cc4116 100644 --- a/v3/newrelic/internal_txn.go +++ b/v3/newrelic/internal_txn.go @@ -771,6 +771,12 @@ func (txn *txn) SetName(name string) error { return nil } +func (txn *txn) GetName() string { + txn.Lock() + defer txn.Unlock() + return txn.Name +} + func (txn *txn) Ignore() error { txn.Lock() defer txn.Unlock() diff --git a/v3/newrelic/internal_txn_test.go b/v3/newrelic/internal_txn_test.go index 09cf7770c..c9ef3a298 100644 --- a/v3/newrelic/internal_txn_test.go +++ b/v3/newrelic/internal_txn_test.go @@ -567,6 +567,26 @@ func TestNilTransaction(t *testing.T) { } } +func TestGetName(t *testing.T) { + replyfn := func(reply *internal.ConnectReply) { + reply.SetSampleEverything() + reply.EntityGUID = "entities-are-guid" + reply.TraceIDGenerator = internal.NewTraceIDGenerator(12345) + } + cfgfn := func(cfg *Config) { + cfg.AppName = "app-name" + cfg.DistributedTracer.Enabled = true + } + app := testApp(replyfn, cfgfn, t) + txn := app.StartTransaction("hello") + defer txn.End() + txn.Ignore() + txn.SetName("hello世界") + if theName := txn.Name(); theName != "hello世界" { + t.Error(theName) + } +} + func TestEmptyTransaction(t *testing.T) { txn := &Transaction{} diff --git a/v3/newrelic/transaction.go b/v3/newrelic/transaction.go index c2b5d995e..a2e9d8520 100644 --- a/v3/newrelic/transaction.go +++ b/v3/newrelic/transaction.go @@ -75,6 +75,19 @@ func (txn *Transaction) SetName(name string) { txn.thread.logAPIError(txn.thread.SetName(name), "set transaction name", nil) } +// Name returns the name currently set for the transaction, as, e.g. by a call to SetName. +// If unable to do so (such as due to a nil transaction pointer), the empty string is returned. +func (txn *Transaction) Name() string { + // This is called Name rather than GetName to be consistent with the prevailing naming + // conventions for the Go language, even though the underlying internal call must be called + // something else (like GetName) because there's already a Name struct member. + + if txn == nil || txn.thread == nil { + return "" + } + return txn.thread.GetName() +} + // NoticeError records an error. The Transaction saves the first five // errors. For more control over the recorded error fields, see the // newrelic.Error type. From a30451ff429f97d28249f95bbf29066b87fef6b8 Mon Sep 17 00:00:00 2001 From: Steve Willoughby Date: Wed, 19 Jul 2023 16:07:44 -0700 Subject: [PATCH 05/19] added checks for the presence of the security agent before calling security methods --- v3/newrelic/transaction.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/v3/newrelic/transaction.go b/v3/newrelic/transaction.go index bfa194d0f..6da0f5445 100644 --- a/v3/newrelic/transaction.go +++ b/v3/newrelic/transaction.go @@ -312,7 +312,7 @@ func (txn *Transaction) startSegmentAt(at time.Time) SegmentStartTime { // // ... code you want to time here ... // segment.End() func (txn *Transaction) StartSegment(name string) *Segment { - if txn != nil && txn.thread != nil && txn.thread.thread != nil && txn.thread.thread.threadID > 0 { + if IsSecurityAgentPresent() && txn != nil && txn.thread != nil && txn.thread.thread != nil && txn.thread.thread.threadID > 0 { // async segment start secureAgent.SendEvent("NEW_GOROUTINE_LINKER", txn.thread.getCsecData()) } @@ -498,7 +498,7 @@ func (txn *Transaction) NewGoroutine() *Transaction { return nil } newTxn := txn.thread.NewGoroutine() - if newTxn.thread != nil { + if IsSecurityAgentPresent() && newTxn.thread != nil { newTxn.thread.setCsecData() } return newTxn From da7371c62f635edb94e1b66fff6248ff58b1d827 Mon Sep 17 00:00:00 2001 From: aayush-ap Date: Thu, 20 Jul 2023 05:20:04 +0000 Subject: [PATCH 06/19] Update security agent api call for grpc --- v3/integrations/nrgrpc/go.mod | 1 + v3/integrations/nrgrpc/nrgrpc_server.go | 19 ++++++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/v3/integrations/nrgrpc/go.mod b/v3/integrations/nrgrpc/go.mod index 3edfa9155..ba36ced8a 100644 --- a/v3/integrations/nrgrpc/go.mod +++ b/v3/integrations/nrgrpc/go.mod @@ -7,5 +7,6 @@ require ( github.com/newrelic/go-agent/v3 v3.23.0 // 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 ) replace github.com/newrelic/go-agent/v3 => ../.. diff --git a/v3/integrations/nrgrpc/nrgrpc_server.go b/v3/integrations/nrgrpc/nrgrpc_server.go index bdf25be0f..a9af70af6 100644 --- a/v3/integrations/nrgrpc/nrgrpc_server.go +++ b/v3/integrations/nrgrpc/nrgrpc_server.go @@ -43,6 +43,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" + "google.golang.org/protobuf/proto" ) func startTransaction(ctx context.Context, app *newrelic.Application, fullMethod string) *newrelic.Transaction { @@ -309,7 +310,13 @@ func UnaryServerInterceptor(app *newrelic.Application, options ...HandlerOption) return func(ctx context.Context, req any, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (resp any, err error) { txn := startTransaction(ctx, app, info.FullMethod) - newrelic.GetSecurityAgentInterface().SendEvent("GRPC", req) + + message, ok := req.(proto.Message) + messageType := "" + if ok { + messageType = string(message.ProtoReflect().Descriptor().FullName()) + } + newrelic.GetSecurityAgentInterface().SendEvent("GRPC", req, messageType) defer txn.End() ctx = newrelic.NewContext(ctx, txn) @@ -330,7 +337,13 @@ func (s wrappedServerStream) Context() context.Context { } func (s wrappedServerStream) RecvMsg(msg any) error { - newrelic.GetSecurityAgentInterface().SendEvent("GRPC", msg) + message, ok := msg.(proto.Message) + messageType := "" + if ok { + messageType = string(message.ProtoReflect().Descriptor().FullName()) + } + + newrelic.GetSecurityAgentInterface().SendEvent("GRPC", msg, messageType) return s.ServerStream.RecvMsg(msg) } @@ -369,7 +382,7 @@ func StreamServerInterceptor(app *newrelic.Application, options ...HandlerOption return func(srv any, ss grpc.ServerStream, info *grpc.StreamServerInfo, handler grpc.StreamHandler) error { txn := startTransaction(ss.Context(), app, info.FullMethod) defer txn.End() - + newrelic.GetSecurityAgentInterface().SendEvent("GRPC_INFO", info.IsClientStream, info.IsServerStream) err := handler(srv, newWrappedServerStream(ss, txn)) reportInterceptorStatus(ss.Context(), txn, localHandlerMap, err) return err From 78fb083dfc57c4de899c84733d42d6296b0926a0 Mon Sep 17 00:00:00 2001 From: aayush-ap Date: Thu, 20 Jul 2023 12:00:43 +0000 Subject: [PATCH 07/19] Added fix for MessageV1 --- v3/integrations/nrgrpc/nrgrpc_server.go | 32 +++++++++++++++---------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/v3/integrations/nrgrpc/nrgrpc_server.go b/v3/integrations/nrgrpc/nrgrpc_server.go index a9af70af6..dc8469bd2 100644 --- a/v3/integrations/nrgrpc/nrgrpc_server.go +++ b/v3/integrations/nrgrpc/nrgrpc_server.go @@ -38,12 +38,13 @@ import ( "net/http" "strings" + protoV1 "github.com/golang/protobuf/proto" "github.com/newrelic/go-agent/v3/newrelic" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" - "google.golang.org/protobuf/proto" + protoV2 "google.golang.org/protobuf/proto" ) func startTransaction(ctx context.Context, app *newrelic.Application, fullMethod string) *newrelic.Transaction { @@ -310,12 +311,7 @@ func UnaryServerInterceptor(app *newrelic.Application, options ...HandlerOption) return func(ctx context.Context, req any, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (resp any, err error) { txn := startTransaction(ctx, app, info.FullMethod) - - message, ok := req.(proto.Message) - messageType := "" - if ok { - messageType = string(message.ProtoReflect().Descriptor().FullName()) - } + messageType := getMessageType(req) newrelic.GetSecurityAgentInterface().SendEvent("GRPC", req, messageType) defer txn.End() @@ -337,12 +333,8 @@ func (s wrappedServerStream) Context() context.Context { } func (s wrappedServerStream) RecvMsg(msg any) error { - message, ok := msg.(proto.Message) - messageType := "" - if ok { - messageType = string(message.ProtoReflect().Descriptor().FullName()) - } + messageType := getMessageType(msg) newrelic.GetSecurityAgentInterface().SendEvent("GRPC", msg, messageType) return s.ServerStream.RecvMsg(msg) } @@ -363,7 +355,6 @@ func newWrappedServerStream(stream grpc.ServerStream, txn *newrelic.Transaction) // streaming calls. // // See the notes and examples for the UnaryServerInterceptor function. -// func StreamServerInterceptor(app *newrelic.Application, options ...HandlerOption) grpc.StreamServerInterceptor { if app == nil { return func(srv any, ss grpc.ServerStream, info *grpc.StreamServerInfo, handler grpc.StreamHandler) error { @@ -388,3 +379,18 @@ func StreamServerInterceptor(app *newrelic.Application, options ...HandlerOption return err } } + +func getMessageType(req any) string { + messageType := "" + messagev2, ok := req.(protoV2.Message) + if ok { + messageType = string(messagev2.ProtoReflect().Descriptor().FullName()) + } else { + messagev1, ok := req.(protoV1.Message) + if ok { + messageType = string(protoV1.MessageReflect(messagev1).Descriptor().FullName()) + return messageType + } + } + return messageType +} From 6b9bd267c41c49220771ff5a7c5a963586d8787d Mon Sep 17 00:00:00 2001 From: aayush-ap Date: Thu, 20 Jul 2023 12:55:52 +0000 Subject: [PATCH 08/19] Send message version with message Type --- v3/integrations/nrgrpc/nrgrpc_server.go | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/v3/integrations/nrgrpc/nrgrpc_server.go b/v3/integrations/nrgrpc/nrgrpc_server.go index dc8469bd2..057975707 100644 --- a/v3/integrations/nrgrpc/nrgrpc_server.go +++ b/v3/integrations/nrgrpc/nrgrpc_server.go @@ -311,8 +311,11 @@ func UnaryServerInterceptor(app *newrelic.Application, options ...HandlerOption) return func(ctx context.Context, req any, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (resp any, err error) { txn := startTransaction(ctx, app, info.FullMethod) - messageType := getMessageType(req) - newrelic.GetSecurityAgentInterface().SendEvent("GRPC", req, messageType) + + if newrelic.IsSecurityAgentPresent() { + messageType, version := getMessageType(req) + newrelic.GetSecurityAgentInterface().SendEvent("GRPC", req, messageType, version) + } defer txn.End() ctx = newrelic.NewContext(ctx, txn) @@ -333,9 +336,10 @@ func (s wrappedServerStream) Context() context.Context { } func (s wrappedServerStream) RecvMsg(msg any) error { - - messageType := getMessageType(msg) - newrelic.GetSecurityAgentInterface().SendEvent("GRPC", msg, messageType) + if newrelic.IsSecurityAgentPresent() { + messageType, version := getMessageType(msg) + newrelic.GetSecurityAgentInterface().SendEvent("GRPC", msg, messageType, version) + } return s.ServerStream.RecvMsg(msg) } @@ -380,8 +384,9 @@ func StreamServerInterceptor(app *newrelic.Application, options ...HandlerOption } } -func getMessageType(req any) string { +func getMessageType(req any) (string, string) { messageType := "" + version := "v2" messagev2, ok := req.(protoV2.Message) if ok { messageType = string(messagev2.ProtoReflect().Descriptor().FullName()) @@ -389,8 +394,8 @@ func getMessageType(req any) string { messagev1, ok := req.(protoV1.Message) if ok { messageType = string(protoV1.MessageReflect(messagev1).Descriptor().FullName()) - return messageType + version = "v1" } } - return messageType + return messageType, version } From 396f39a3218bc508a175153d510516a72579dcde Mon Sep 17 00:00:00 2001 From: aayush-ap Date: Mon, 24 Jul 2023 09:15:17 +0000 Subject: [PATCH 09/19] Update csec-go-agent version to latest --- v3/integrations/nrsecurityagent/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v3/integrations/nrsecurityagent/go.mod b/v3/integrations/nrsecurityagent/go.mod index e0cba1451..7ee457aef 100644 --- a/v3/integrations/nrsecurityagent/go.mod +++ b/v3/integrations/nrsecurityagent/go.mod @@ -3,7 +3,7 @@ module github.com/newrelic/go-agent/v3/integrations/nrsecurityagent go 1.19 require ( - github.com/newrelic/csec-go-agent v0.2.1 + github.com/newrelic/csec-go-agent v0.3.0 github.com/newrelic/go-agent/v3 v3.23.0 github.com/newrelic/go-agent/v3/integrations/nrsqlite3 v1.2.0 gopkg.in/yaml.v2 v2.4.0 From 59d458f442f9c01bddf67fa7936cbeab258ad149 Mon Sep 17 00:00:00 2001 From: mirackara Date: Mon, 24 Jul 2023 13:08:43 -0500 Subject: [PATCH 10/19] Add test for InfoInterceptorStatusHandler function --- v3/integrations/nrgrpc/nrgrpc_server_test.go | 100 +++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/v3/integrations/nrgrpc/nrgrpc_server_test.go b/v3/integrations/nrgrpc/nrgrpc_server_test.go index 470fb5f57..ea14f1343 100644 --- a/v3/integrations/nrgrpc/nrgrpc_server_test.go +++ b/v3/integrations/nrgrpc/nrgrpc_server_test.go @@ -155,6 +155,106 @@ func TestWithCustomStatusHandler(t *testing.T) { Configure(WithStatusHandler(codes.OK, OKInterceptorStatusHandler)) } +func TestWithInfoStatusHandler(t *testing.T) { + app := testApp() + Configure(WithStatusHandler(codes.OK, InfoInterceptorStatusHandler)) + + s, conn := newTestServerAndConn(t, app.Application) + defer s.Stop() + defer conn.Close() + + client := testapp.NewTestApplicationClient(conn) + txn := app.StartTransaction("client") + ctx := newrelic.NewContext(context.Background(), txn) + _, err := client.DoUnaryUnary(ctx, &testapp.Message{}) + if err != nil { + t.Fatal("unable to call client DoUnaryUnary", err) + } + + app.ExpectMetrics(t, []internal.WantMetric{ + {Name: "Apdex", Scope: "", Forced: true, Data: nil}, + {Name: "Apdex/Go/TestApplication/DoUnaryUnary", Scope: "", Forced: false, Data: nil}, + {Name: "Custom/DoUnaryUnary", Scope: "", Forced: false, Data: nil}, + {Name: "Custom/DoUnaryUnary", Scope: "WebTransaction/Go/TestApplication/DoUnaryUnary", Forced: false, Data: nil}, + {Name: "DurationByCaller/App/123/456/HTTP/all", Scope: "", Forced: false, Data: nil}, + {Name: "DurationByCaller/App/123/456/HTTP/allWeb", Scope: "", Forced: false, Data: nil}, + {Name: "HttpDispatcher", Scope: "", Forced: true, Data: nil}, + {Name: "Supportability/TraceContext/Accept/Success", Scope: "", Forced: true, Data: nil}, + {Name: "TransportDuration/App/123/456/HTTP/all", Scope: "", Forced: false, Data: nil}, + {Name: "TransportDuration/App/123/456/HTTP/allWeb", Scope: "", Forced: false, Data: nil}, + {Name: "WebTransaction", Scope: "", Forced: true, Data: nil}, + {Name: "WebTransaction/Go/TestApplication/DoUnaryUnary", Scope: "", Forced: true, Data: nil}, + {Name: "WebTransactionTotalTime", Scope: "", Forced: true, Data: nil}, + {Name: "WebTransactionTotalTime/Go/TestApplication/DoUnaryUnary", Scope: "", Forced: false, Data: nil}, + }) + app.ExpectTxnEvents(t, []internal.WantEvent{{ + Intrinsics: map[string]interface{}{ + "guid": internal.MatchAnything, + "name": "WebTransaction/Go/TestApplication/DoUnaryUnary", + "nr.apdexPerfZone": internal.MatchAnything, + "parent.account": 123, + "parent.app": 456, + "parent.transportDuration": internal.MatchAnything, + "parent.transportType": "HTTP", + "parent.type": "App", + "parentId": internal.MatchAnything, + "parentSpanId": internal.MatchAnything, + "priority": internal.MatchAnything, + "sampled": internal.MatchAnything, + "traceId": internal.MatchAnything, + }, + UserAttributes: map[string]interface{}{ + "grpcStatusLevel": "info", + "grpcStatusCode": "OK", + "grpcStatusMessage": internal.MatchAnything, + }, + AgentAttributes: map[string]interface{}{ + "httpResponseCode": 0, + "http.statusCode": 0, + "request.headers.contentType": "application/grpc", + "request.method": "TestApplication/DoUnaryUnary", + "request.uri": "grpc://bufnet/TestApplication/DoUnaryUnary", + }, + }}) + app.ExpectSpanEvents(t, []internal.WantEvent{ + { + Intrinsics: map[string]interface{}{ + "category": "generic", + "name": "Custom/DoUnaryUnary", + "parentId": internal.MatchAnything, + }, + UserAttributes: map[string]interface{}{}, + AgentAttributes: map[string]interface{}{}, + }, + { + Intrinsics: map[string]interface{}{ + "category": "generic", + "name": "WebTransaction/Go/TestApplication/DoUnaryUnary", + "transaction.name": "WebTransaction/Go/TestApplication/DoUnaryUnary", + "nr.entryPoint": true, + "parentId": internal.MatchAnything, + "trustedParentId": internal.MatchAnything, + }, + UserAttributes: map[string]interface{}{ + "grpcStatusLevel": "info", + "grpcStatusCode": "OK", + }, + AgentAttributes: map[string]interface{}{ + "httpResponseCode": 0, + "http.statusCode": 0, + "parent.account": "123", + "parent.app": "456", + "parent.transportDuration": internal.MatchAnything, + "parent.transportType": "HTTP", + "parent.type": "App", + "request.headers.contentType": "application/grpc", + "request.method": "TestApplication/DoUnaryUnary", + "request.uri": "grpc://bufnet/TestApplication/DoUnaryUnary", + }, + }, + }) + Configure(WithStatusHandler(codes.OK, OKInterceptorStatusHandler)) +} func TestUnaryServerInterceptor(t *testing.T) { app := testApp() From 696b24ccd4347ad974a5cc888a243ccbc4ae5b08 Mon Sep 17 00:00:00 2001 From: mirackara Date: Mon, 24 Jul 2023 13:49:43 -0500 Subject: [PATCH 11/19] Added tests for security agent checks --- v3/integrations/nrgrpc/nrgrpc_client_test.go | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/v3/integrations/nrgrpc/nrgrpc_client_test.go b/v3/integrations/nrgrpc/nrgrpc_client_test.go index e81356dd5..a878d6a42 100644 --- a/v3/integrations/nrgrpc/nrgrpc_client_test.go +++ b/v3/integrations/nrgrpc/nrgrpc_client_test.go @@ -11,6 +11,7 @@ import ( "testing" "github.com/newrelic/go-agent/v3/integrations/nrgrpc/testapp" + "github.com/newrelic/go-agent/v3/integrations/nrsecurityagent" "github.com/newrelic/go-agent/v3/internal" "github.com/newrelic/go-agent/v3/internal/integrationsupport" newrelic "github.com/newrelic/go-agent/v3/newrelic" @@ -609,3 +610,15 @@ func TestClientStreamingError(t *testing.T) { }, }}) } + +func TestClientSecurityAgentEnabled(t *testing.T) { + app := testApp() + err := nrsecurityagent.InitSecurityAgent(app.Application, + nrsecurityagent.ConfigSecurityMode("IAST"), + nrsecurityagent.ConfigSecurityValidatorServiceEndPointUrl("wss://csec.nr-data.net"), + nrsecurityagent.ConfigSecurityEnable(true), + ) + if err != nil { + t.Fatal("Could not setup the nrsecurityagent") + } +} From 65c8cbb6690b11712a5eef58a3e20a1249b7edd9 Mon Sep 17 00:00:00 2001 From: mirackara Date: Mon, 24 Jul 2023 13:51:28 -0500 Subject: [PATCH 12/19] added err variable to error message --- v3/integrations/nrgrpc/nrgrpc_client_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v3/integrations/nrgrpc/nrgrpc_client_test.go b/v3/integrations/nrgrpc/nrgrpc_client_test.go index a878d6a42..3f3e46fe8 100644 --- a/v3/integrations/nrgrpc/nrgrpc_client_test.go +++ b/v3/integrations/nrgrpc/nrgrpc_client_test.go @@ -619,6 +619,6 @@ func TestClientSecurityAgentEnabled(t *testing.T) { nrsecurityagent.ConfigSecurityEnable(true), ) if err != nil { - t.Fatal("Could not setup the nrsecurityagent") + t.Fatal("Could not setup the nrsecurityagent", err) } } From ac837d21612ef8aab9ad71d3ff72faedfab47536 Mon Sep 17 00:00:00 2001 From: Steve Willoughby Date: Mon, 31 Jul 2023 10:51:46 -0700 Subject: [PATCH 13/19] corrections to recent securityagent updates --- v3/integrations/nrgrpc/nrgrpc_server.go | 4 +++- v3/newrelic/secure_agent.go | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/v3/integrations/nrgrpc/nrgrpc_server.go b/v3/integrations/nrgrpc/nrgrpc_server.go index 057975707..a0fab1866 100644 --- a/v3/integrations/nrgrpc/nrgrpc_server.go +++ b/v3/integrations/nrgrpc/nrgrpc_server.go @@ -377,7 +377,9 @@ func StreamServerInterceptor(app *newrelic.Application, options ...HandlerOption return func(srv any, ss grpc.ServerStream, info *grpc.StreamServerInfo, handler grpc.StreamHandler) error { txn := startTransaction(ss.Context(), app, info.FullMethod) defer txn.End() - newrelic.GetSecurityAgentInterface().SendEvent("GRPC_INFO", info.IsClientStream, info.IsServerStream) + if newrelic.IsSecurityAgentPresent() { + newrelic.GetSecurityAgentInterface().SendEvent("GRPC_INFO", info.IsClientStream, info.IsServerStream) + } err := handler(srv, newWrappedServerStream(ss, txn)) reportInterceptorStatus(ss.Context(), txn, localHandlerMap, err) return err diff --git a/v3/newrelic/secure_agent.go b/v3/newrelic/secure_agent.go index 1b9114ace..5011a3e7d 100644 --- a/v3/newrelic/secure_agent.go +++ b/v3/newrelic/secure_agent.go @@ -43,9 +43,9 @@ type securityAgent interface { func (app *Application) RegisterSecurityAgent(s securityAgent) { if app != nil && app.app != nil && s != nil { secureAgent = s - } - if app.app.run != nil { - secureAgent.RefreshState(getLinkedMetaData(app.app)) + if app.app.run != nil { + secureAgent.RefreshState(getLinkedMetaData(app.app)) + } } } From 17cf30f467771561df3a59adbe0b7d472570b2eb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Jul 2023 13:50:59 -0500 Subject: [PATCH 14/19] Bump github.com/snowflakedb/gosnowflake in /v3/integrations/nrsnowflake (#728) Bumps [github.com/snowflakedb/gosnowflake](https://github.com/snowflakedb/gosnowflake) from 1.6.16 to 1.6.19. - [Release notes](https://github.com/snowflakedb/gosnowflake/releases) - [Changelog](https://github.com/snowflakedb/gosnowflake/blob/master/release.go) - [Commits](https://github.com/snowflakedb/gosnowflake/compare/v1.6.16...v1.6.19) --- updated-dependencies: - dependency-name: github.com/snowflakedb/gosnowflake dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- v3/integrations/nrsnowflake/go.mod | 60 +++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) diff --git a/v3/integrations/nrsnowflake/go.mod b/v3/integrations/nrsnowflake/go.mod index d910bb73f..5d7fa89c9 100644 --- a/v3/integrations/nrsnowflake/go.mod +++ b/v3/integrations/nrsnowflake/go.mod @@ -1,6 +1,64 @@ 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 + github.com/snowflakedb/gosnowflake v1.6.19 +) + +require ( + github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect + github.com/99designs/keyring v1.2.1 // indirect + github.com/Azure/azure-sdk-for-go/sdk/azcore v1.4.0 // indirect + github.com/Azure/azure-sdk-for-go/sdk/internal v1.1.2 // indirect + github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.0.0 // indirect + github.com/andybalholm/brotli v1.0.4 // indirect + github.com/apache/arrow/go/v10 v10.0.1 // indirect + github.com/apache/thrift v0.16.0 // 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/goccy/go-json v0.9.11 // indirect + github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect + github.com/golang/protobuf v1.5.2 // indirect + github.com/golang/snappy v0.0.4 // indirect + github.com/google/flatbuffers v2.0.8+incompatible // indirect + github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect + github.com/jmespath/go-jmespath v0.4.0 // indirect + github.com/klauspost/asmfmt v1.3.2 // indirect + github.com/klauspost/compress v1.15.11 // indirect + github.com/klauspost/cpuid/v2 v2.0.9 // indirect + github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect + github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // 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 + github.com/zeebo/xxh3 v1.0.2 // indirect + golang.org/x/crypto v0.7.0 // indirect + golang.org/x/mod v0.8.0 // indirect + golang.org/x/net v0.8.0 // indirect + golang.org/x/sys v0.6.0 // indirect + golang.org/x/term v0.6.0 // indirect + golang.org/x/text v0.8.0 // indirect + golang.org/x/tools v0.6.0 // indirect + golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect + google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect + google.golang.org/grpc v1.49.0 // indirect + google.golang.org/protobuf v1.28.1 // indirect ) From ff4322cb5f2bab0f4b25005f6f8b84d8f14e829e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Jul 2023 13:51:24 -0500 Subject: [PATCH 15/19] Bump github.com/gin-gonic/gin in /v3/integrations/nrgin (#723) Bumps [github.com/gin-gonic/gin](https://github.com/gin-gonic/gin) from 1.9.0 to 1.9.1. - [Release notes](https://github.com/gin-gonic/gin/releases) - [Changelog](https://github.com/gin-gonic/gin/blob/master/CHANGELOG.md) - [Commits](https://github.com/gin-gonic/gin/compare/v1.9.0...v1.9.1) --- updated-dependencies: - dependency-name: github.com/gin-gonic/gin dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- v3/integrations/nrgin/go.mod | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/v3/integrations/nrgin/go.mod b/v3/integrations/nrgin/go.mod index 1255cd651..5c137b501 100644 --- a/v3/integrations/nrgin/go.mod +++ b/v3/integrations/nrgin/go.mod @@ -1,9 +1,42 @@ 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/gin-gonic/gin v1.9.1 github.com/newrelic/go-agent/v3 v3.23.0 ) + +require ( + github.com/bytedance/sonic v1.9.1 // 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/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/modern-go/reflect2 v1.0.2 // indirect + github.com/pelletier/go-toml/v2 v2.0.8 // 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 + 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 + gopkg.in/yaml.v3 v3.0.1 // indirect +) + replace github.com/newrelic/go-agent/v3 => ../.. From ae8d88dc2b6f6e410c7e3fd7929731a0b0315de8 Mon Sep 17 00:00:00 2001 From: Steve Willoughby Date: Mon, 31 Jul 2023 11:52:53 -0700 Subject: [PATCH 16/19] 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 From aa5f791b78e12908505b6535c47fd5f14f12d523 Mon Sep 17 00:00:00 2001 From: Mirac Kara <55501260+mirackara@users.noreply.github.com> Date: Mon, 31 Jul 2023 16:11:42 -0500 Subject: [PATCH 17/19] update readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6288d3471..c5d5347d8 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Go is a compiled language, and doesn’t use a virtual machine. This means that ### Compatibility and Requirements -For the latest version of the agent, Go 1.17+ is required. +For the latest version of the agent, Go 1.18+ is required. Linux, OS X, and Windows (Vista, Server 2008 and later) are supported. From f2753e7120075560dec80993a0bebd75980c7397 Mon Sep 17 00:00:00 2001 From: Steve Willoughby Date: Mon, 31 Jul 2023 14:21:59 -0700 Subject: [PATCH 18/19] release 3.24.0 --- v3/go.mod | 7 -- .../logcontext-v2/logWriter/go.mod | 9 -- v3/integrations/logcontext-v2/nrlogrus/go.mod | 9 -- v3/integrations/logcontext-v2/nrwriter/go.mod | 9 -- v3/integrations/logcontext-v2/nrzap/go.mod | 11 -- .../logcontext-v2/nrzerolog/go.mod | 9 -- .../logcontext-v2/zerologWriter/go.mod | 11 -- v3/integrations/nrawssdk-v1/go.mod | 2 +- v3/integrations/nrawssdk-v2/go.mod | 27 +---- v3/integrations/nrb3/go.mod | 11 +- v3/integrations/nrecho-v3/go.mod | 3 +- v3/integrations/nrecho-v4/go.mod | 17 +-- v3/integrations/nrelasticsearch-v7/go.mod | 2 +- v3/integrations/nrgin/go.mod | 30 +---- v3/integrations/nrgorilla/go.mod | 2 +- v3/integrations/nrgraphgophers/go.mod | 2 +- v3/integrations/nrgraphqlgo/go.mod | 2 +- v3/integrations/nrgrpc/go.mod | 22 +--- v3/integrations/nrhttprouter/go.mod | 2 +- v3/integrations/nrlambda/go.mod | 11 +- v3/integrations/nrlogrus/go.mod | 13 +-- v3/integrations/nrlogxi/go.mod | 15 +-- v3/integrations/nrmicro/go.mod | 44 +------- v3/integrations/nrmongo/go.mod | 21 +--- v3/integrations/nrmssql/go.mod | 14 +-- v3/integrations/nrmysql/go.mod | 11 +- v3/integrations/nrnats/go.mod | 17 +-- v3/integrations/nrpgx/go.mod | 13 --- v3/integrations/nrpgx5/go.mod | 26 +---- v3/integrations/nrpkgerrors/go.mod | 2 +- v3/integrations/nrredis-v7/go.mod | 2 +- v3/integrations/nrredis-v8/go.mod | 2 +- v3/integrations/nrredis-v9/go.mod | 13 +-- v3/integrations/nrsarama/go.mod | 33 +----- v3/integrations/nrsecurityagent/go.mod | 21 +--- v3/integrations/nrsnowflake/go.mod | 105 +----------------- v3/integrations/nrsqlite3/go.mod | 2 +- v3/integrations/nrstan/go.mod | 19 +--- v3/integrations/nrzap/go.mod | 2 +- v3/newrelic/version.go | 2 +- 40 files changed, 34 insertions(+), 541 deletions(-) diff --git a/v3/go.mod b/v3/go.mod index e2fdfa05f..4e184838d 100644 --- a/v3/go.mod +++ b/v3/go.mod @@ -7,12 +7,5 @@ require ( 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 fe50643b6..709202b5a 100644 --- a/v3/integrations/logcontext-v2/logWriter/go.mod +++ b/v3/integrations/logcontext-v2/logWriter/go.mod @@ -7,12 +7,3 @@ require ( 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 e83a19c1e..b2096a6d4 100644 --- a/v3/integrations/logcontext-v2/nrlogrus/go.mod +++ b/v3/integrations/logcontext-v2/nrlogrus/go.mod @@ -7,12 +7,3 @@ require ( 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 f146392c9..2b86ff2ed 100644 --- a/v3/integrations/logcontext-v2/nrwriter/go.mod +++ b/v3/integrations/logcontext-v2/nrwriter/go.mod @@ -4,12 +4,3 @@ 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 344a3f2e7..11e14551c 100644 --- a/v3/integrations/logcontext-v2/nrzap/go.mod +++ b/v3/integrations/logcontext-v2/nrzap/go.mod @@ -7,14 +7,3 @@ require ( 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 c803d3399..27630a598 100644 --- a/v3/integrations/logcontext-v2/nrzerolog/go.mod +++ b/v3/integrations/logcontext-v2/nrzerolog/go.mod @@ -7,12 +7,3 @@ require ( 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 ac3340aa8..6117eca38 100644 --- a/v3/integrations/logcontext-v2/zerologWriter/go.mod +++ b/v3/integrations/logcontext-v2/zerologWriter/go.mod @@ -8,14 +8,3 @@ require ( 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/nrawssdk-v1/go.mod b/v3/integrations/nrawssdk-v1/go.mod index f414c258c..f8a7c2f13 100644 --- a/v3/integrations/nrawssdk-v1/go.mod +++ b/v3/integrations/nrawssdk-v1/go.mod @@ -8,5 +8,5 @@ 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 - github.com/newrelic/go-agent/v3 v3.16.0 + github.com/newrelic/go-agent/v3 v3.24.0 ) diff --git a/v3/integrations/nrawssdk-v2/go.mod b/v3/integrations/nrawssdk-v2/go.mod index 65ff623e1..a402d9fbf 100644 --- a/v3/integrations/nrawssdk-v2/go.mod +++ b/v3/integrations/nrawssdk-v2/go.mod @@ -11,31 +11,6 @@ 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.18.2 + github.com/newrelic/go-agent/v3 v3.24.0 ) -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 c7799baf6..73c540d4e 100644 --- a/v3/integrations/nrb3/go.mod +++ b/v3/integrations/nrb3/go.mod @@ -2,14 +2,5 @@ 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/newrelic/go-agent/v3 v3.24.0 -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 acdbedac4..5b0d18f5d 100644 --- a/v3/integrations/nrecho-v3/go.mod +++ b/v3/integrations/nrecho-v3/go.mod @@ -8,6 +8,5 @@ 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 + github.com/newrelic/go-agent/v3 v3.24.0 ) diff --git a/v3/integrations/nrecho-v4/go.mod b/v3/integrations/nrecho-v4/go.mod index f51557781..c109c0738 100644 --- a/v3/integrations/nrecho-v4/go.mod +++ b/v3/integrations/nrecho-v4/go.mod @@ -6,21 +6,6 @@ go 1.17 require ( github.com/labstack/echo/v4 v4.9.0 - github.com/newrelic/go-agent/v3 v3.18.2 + github.com/newrelic/go-agent/v3 v3.24.0 ) -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 c01608e35..08ed46193 100644 --- a/v3/integrations/nrelasticsearch-v7/go.mod +++ b/v3/integrations/nrelasticsearch-v7/go.mod @@ -6,5 +6,5 @@ go 1.11 require ( github.com/elastic/go-elasticsearch/v7 v7.17.0 - github.com/newrelic/go-agent/v3 v3.17.0 + github.com/newrelic/go-agent/v3 v3.24.0 ) diff --git a/v3/integrations/nrgin/go.mod b/v3/integrations/nrgin/go.mod index 77e8e9100..ceb2fdb46 100644 --- a/v3/integrations/nrgin/go.mod +++ b/v3/integrations/nrgin/go.mod @@ -6,36 +6,8 @@ go 1.19 require ( github.com/gin-gonic/gin v1.9.1 - github.com/newrelic/go-agent/v3 v3.23.0 + github.com/newrelic/go-agent/v3 v3.24.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/nrgorilla/go.mod b/v3/integrations/nrgorilla/go.mod index ac0c6c2e3..9ecc2efd2 100644 --- a/v3/integrations/nrgorilla/go.mod +++ b/v3/integrations/nrgorilla/go.mod @@ -7,5 +7,5 @@ go 1.12 require ( // v1.7.0 is the earliest version of Gorilla using modules. github.com/gorilla/mux v1.7.0 - github.com/newrelic/go-agent/v3 v3.17.0 + github.com/newrelic/go-agent/v3 v3.24.0 ) diff --git a/v3/integrations/nrgraphgophers/go.mod b/v3/integrations/nrgraphgophers/go.mod index c6aea2014..b9e6ede4e 100644 --- a/v3/integrations/nrgraphgophers/go.mod +++ b/v3/integrations/nrgraphgophers/go.mod @@ -7,5 +7,5 @@ go 1.13 require ( // graphql-go has no tagged releases as of Jan 2020. github.com/graph-gophers/graphql-go v1.3.0 - github.com/newrelic/go-agent/v3 v3.17.0 + github.com/newrelic/go-agent/v3 v3.24.0 ) diff --git a/v3/integrations/nrgraphqlgo/go.mod b/v3/integrations/nrgraphqlgo/go.mod index bb8eb0a3f..a6fa0aff4 100644 --- a/v3/integrations/nrgraphqlgo/go.mod +++ b/v3/integrations/nrgraphqlgo/go.mod @@ -4,5 +4,5 @@ go 1.13 require ( github.com/graphql-go/graphql v0.7.9 - github.com/newrelic/go-agent/v3 v3.17.0 + github.com/newrelic/go-agent/v3 v3.24.0 ) diff --git a/v3/integrations/nrgrpc/go.mod b/v3/integrations/nrgrpc/go.mod index 4607af211..a6f19bf5b 100644 --- a/v3/integrations/nrgrpc/go.mod +++ b/v3/integrations/nrgrpc/go.mod @@ -6,30 +6,12 @@ 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 + github.com/newrelic/go-agent/v3 v3.24.0 + github.com/newrelic/go-agent/v3/integrations/nrsecurityagent v1.1.0 // 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/nrhttprouter/go.mod b/v3/integrations/nrhttprouter/go.mod index 6d841a5e8..0824ceea2 100644 --- a/v3/integrations/nrhttprouter/go.mod +++ b/v3/integrations/nrhttprouter/go.mod @@ -7,5 +7,5 @@ go 1.7 require ( // v1.3.0 is the earliest version of httprouter using modules. github.com/julienschmidt/httprouter v1.3.0 - github.com/newrelic/go-agent/v3 v3.17.0 + github.com/newrelic/go-agent/v3 v3.24.0 ) diff --git a/v3/integrations/nrlambda/go.mod b/v3/integrations/nrlambda/go.mod index 139ba8f5f..e16beae91 100644 --- a/v3/integrations/nrlambda/go.mod +++ b/v3/integrations/nrlambda/go.mod @@ -4,15 +4,6 @@ go 1.18 require ( github.com/aws/aws-lambda-go v1.41.0 - github.com/newrelic/go-agent/v3 v3.21.1 + github.com/newrelic/go-agent/v3 v3.24.0 ) -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 bc7306d9f..b7af83629 100644 --- a/v3/integrations/nrlogrus/go.mod +++ b/v3/integrations/nrlogrus/go.mod @@ -5,20 +5,9 @@ module github.com/newrelic/go-agent/v3/integrations/nrlogrus go 1.18 require ( - github.com/newrelic/go-agent/v3 v3.21.0 + github.com/newrelic/go-agent/v3 v3.24.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 1266aca91..ded8f5d5f 100644 --- a/v3/integrations/nrlogxi/go.mod +++ b/v3/integrations/nrlogxi/go.mod @@ -7,19 +7,6 @@ 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 + github.com/newrelic/go-agent/v3 v3.24.0 ) -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 5a12a7e11..ca64a4b25 100644 --- a/v3/integrations/nrmicro/go.mod +++ b/v3/integrations/nrmicro/go.mod @@ -7,50 +7,8 @@ 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 + github.com/newrelic/go-agent/v3 v3.24.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/nrmongo/go.mod b/v3/integrations/nrmongo/go.mod index 0c095a140..a4418c430 100644 --- a/v3/integrations/nrmongo/go.mod +++ b/v3/integrations/nrmongo/go.mod @@ -5,29 +5,10 @@ module github.com/newrelic/go-agent/v3/integrations/nrmongo go 1.19 require ( - github.com/newrelic/go-agent/v3 v3.23.0 + github.com/newrelic/go-agent/v3 v3.24.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/nrmssql/go.mod b/v3/integrations/nrmssql/go.mod index c84de89b8..0430a7b7f 100644 --- a/v3/integrations/nrmssql/go.mod +++ b/v3/integrations/nrmssql/go.mod @@ -4,18 +4,6 @@ go 1.17 require ( github.com/microsoft/go-mssqldb v0.19.0 - github.com/newrelic/go-agent/v3 v3.16.1 + github.com/newrelic/go-agent/v3 v3.24.0 ) -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 ba4314dcf..703f5fa74 100644 --- a/v3/integrations/nrmysql/go.mod +++ b/v3/integrations/nrmysql/go.mod @@ -7,15 +7,6 @@ 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 + github.com/newrelic/go-agent/v3 v3.24.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/nrnats/go.mod b/v3/integrations/nrnats/go.mod index 4589ff280..79d3f9d4e 100644 --- a/v3/integrations/nrnats/go.mod +++ b/v3/integrations/nrnats/go.mod @@ -7,21 +7,6 @@ go 1.19 require ( github.com/nats-io/nats-server v1.4.1 github.com/nats-io/nats.go v1.25.0 - github.com/newrelic/go-agent/v3 v3.23.0 + github.com/newrelic/go-agent/v3 v3.24.0 ) -require ( - github.com/golang/protobuf v1.5.3 // indirect - github.com/nats-io/gnatsd v1.4.1 // indirect - github.com/nats-io/go-nats v1.7.2 // indirect - github.com/nats-io/nats-server/v2 v2.9.17 // indirect - github.com/nats-io/nkeys v0.4.4 // indirect - github.com/nats-io/nuid v1.0.1 // indirect - golang.org/x/crypto v0.8.0 // indirect - golang.org/x/net v0.9.0 // indirect - golang.org/x/sys v0.7.0 // indirect - golang.org/x/text v0.9.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/nrpgx/go.mod b/v3/integrations/nrpgx/go.mod index 9aec0a297..8cd35d84f 100644 --- a/v3/integrations/nrpgx/go.mod +++ b/v3/integrations/nrpgx/go.mod @@ -10,16 +10,3 @@ require ( 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 322908794..cd31aa936 100644 --- a/v3/integrations/nrpgx5/go.mod +++ b/v3/integrations/nrpgx5/go.mod @@ -5,31 +5,7 @@ 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/newrelic/go-agent/v3 v3.24.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 d7165e387..f4fde7818 100644 --- a/v3/integrations/nrpkgerrors/go.mod +++ b/v3/integrations/nrpkgerrors/go.mod @@ -5,7 +5,7 @@ module github.com/newrelic/go-agent/v3/integrations/nrpkgerrors go 1.11 require ( - github.com/newrelic/go-agent/v3 v3.0.0 + github.com/newrelic/go-agent/v3 v3.24.0 // v0.8.0 was the last release in 2016, and when // major development on pkg/errors stopped. github.com/pkg/errors v0.8.0 diff --git a/v3/integrations/nrredis-v7/go.mod b/v3/integrations/nrredis-v7/go.mod index 16f15925f..92cc140ff 100644 --- a/v3/integrations/nrredis-v7/go.mod +++ b/v3/integrations/nrredis-v7/go.mod @@ -6,5 +6,5 @@ go 1.11 require ( github.com/go-redis/redis/v7 v7.0.0-beta.5 - github.com/newrelic/go-agent/v3 v3.17.0 + github.com/newrelic/go-agent/v3 v3.24.0 ) diff --git a/v3/integrations/nrredis-v8/go.mod b/v3/integrations/nrredis-v8/go.mod index cfa36aa15..c3f45b3b4 100644 --- a/v3/integrations/nrredis-v8/go.mod +++ b/v3/integrations/nrredis-v8/go.mod @@ -6,5 +6,5 @@ go 1.11 require ( github.com/go-redis/redis/v8 v8.4.0 - github.com/newrelic/go-agent/v3 v3.0.0 + github.com/newrelic/go-agent/v3 v3.24.0 ) diff --git a/v3/integrations/nrredis-v9/go.mod b/v3/integrations/nrredis-v9/go.mod index 3fc120f78..3f3e87800 100644 --- a/v3/integrations/nrredis-v9/go.mod +++ b/v3/integrations/nrredis-v9/go.mod @@ -5,18 +5,7 @@ module github.com/newrelic/go-agent/v3/integrations/nrredis-v9 go 1.17 require ( - github.com/newrelic/go-agent/v3 v3.20.4 + github.com/newrelic/go-agent/v3 v3.24.0 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 8bb8fb2fc..be15a07de 100644 --- a/v3/integrations/nrsarama/go.mod +++ b/v3/integrations/nrsarama/go.mod @@ -4,38 +4,7 @@ go 1.19 require ( github.com/Shopify/sarama v1.38.1 - github.com/newrelic/go-agent/v3 v3.21.1 + github.com/newrelic/go-agent/v3 v3.24.0 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 e6d93d606..5f6d461ea 100644 --- a/v3/integrations/nrsecurityagent/go.mod +++ b/v3/integrations/nrsecurityagent/go.mod @@ -4,29 +4,10 @@ go 1.19 require ( github.com/newrelic/csec-go-agent v0.3.0 - github.com/newrelic/go-agent/v3 v3.23.0 + github.com/newrelic/go-agent/v3 v3.24.0 github.com/newrelic/go-agent/v3/integrations/nrsqlite3 v1.2.0 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 f0dc44e15..29524853c 100644 --- a/v3/integrations/nrsnowflake/go.mod +++ b/v3/integrations/nrsnowflake/go.mod @@ -1,110 +1,9 @@ module github.com/newrelic/go-agent/v3/integrations/nrsnowflake -go 1.17 +go 1.18 require ( - github.com/newrelic/go-agent/v3 v3.20.2 + github.com/newrelic/go-agent/v3 v3.24.0 github.com/snowflakedb/gosnowflake v1.6.19 ) -require ( - github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect - github.com/99designs/keyring v1.2.1 // indirect - github.com/Azure/azure-sdk-for-go/sdk/azcore v1.4.0 // indirect - github.com/Azure/azure-sdk-for-go/sdk/internal v1.1.2 // indirect - github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.0.0 // indirect - github.com/andybalholm/brotli v1.0.4 // indirect - github.com/apache/arrow/go/v10 v10.0.1 // indirect - github.com/apache/thrift v0.16.0 // 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/goccy/go-json v0.9.11 // indirect - github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect - github.com/golang/protobuf v1.5.2 // indirect - github.com/golang/snappy v0.0.4 // indirect - github.com/google/flatbuffers v2.0.8+incompatible // indirect - github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect - github.com/jmespath/go-jmespath v0.4.0 // indirect - github.com/klauspost/asmfmt v1.3.2 // indirect - github.com/klauspost/compress v1.15.11 // indirect - github.com/klauspost/cpuid/v2 v2.0.9 // indirect - github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect - github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // 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 - github.com/zeebo/xxh3 v1.0.2 // indirect - golang.org/x/crypto v0.7.0 // indirect - golang.org/x/mod v0.8.0 // indirect - golang.org/x/net v0.8.0 // indirect - golang.org/x/sys v0.6.0 // indirect - golang.org/x/term v0.6.0 // indirect - golang.org/x/text v0.8.0 // indirect - golang.org/x/tools v0.6.0 // indirect - golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect - google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect - google.golang.org/grpc v1.49.0 // indirect - google.golang.org/protobuf v1.28.1 // indirect -) - -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 3598eda33..d8ca907c1 100644 --- a/v3/integrations/nrsqlite3/go.mod +++ b/v3/integrations/nrsqlite3/go.mod @@ -7,5 +7,5 @@ go 1.9 require ( github.com/mattn/go-sqlite3 v1.0.0 // v3.3.0 includes the new location of ParseQuery - github.com/newrelic/go-agent/v3 v3.3.0 + github.com/newrelic/go-agent/v3 v3.24.0 ) diff --git a/v3/integrations/nrstan/go.mod b/v3/integrations/nrstan/go.mod index 4034ff5cb..2f8c61ca5 100644 --- a/v3/integrations/nrstan/go.mod +++ b/v3/integrations/nrstan/go.mod @@ -6,23 +6,6 @@ go 1.18 require ( github.com/nats-io/stan.go v0.10.4 - github.com/newrelic/go-agent/v3 v3.21.1 + github.com/newrelic/go-agent/v3 v3.24.0 ) -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 5c25d57e3..a3a74eb4f 100644 --- a/v3/integrations/nrzap/go.mod +++ b/v3/integrations/nrzap/go.mod @@ -5,7 +5,7 @@ module github.com/newrelic/go-agent/v3/integrations/nrzap go 1.13 require ( - github.com/newrelic/go-agent/v3 v3.0.0 + github.com/newrelic/go-agent/v3 v3.24.0 // v1.12.0 is the earliest version of zap using modules. go.uber.org/zap v1.12.0 ) diff --git a/v3/newrelic/version.go b/v3/newrelic/version.go index be6fbfed7..6959820c0 100644 --- a/v3/newrelic/version.go +++ b/v3/newrelic/version.go @@ -11,7 +11,7 @@ import ( const ( // Version is the full string version of this Go Agent. - Version = "3.23.1" + Version = "3.24.0" ) var ( From 4daf523c04793aef454dba92a83c756b5f2c627a Mon Sep 17 00:00:00 2001 From: Mirac Kara <55501260+mirackara@users.noreply.github.com> Date: Mon, 31 Jul 2023 16:26:15 -0500 Subject: [PATCH 19/19] update changelog --- CHANGELOG.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b5f1df8d..a01b689f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,28 @@ +## 3.24.0 + +### Added +* Turned Code Level Metrics on by default +* Added new test case to check if the nrsecurityagent is enabled in the gRPC integration +* Added new test case for InfoInterceptorStatusHandler function in the gRPC integration +* Added Name() method for Transaction values to get the current transaction name. + + +### Fixed +* Bumped gin from 1.9.0 to 1.9.1 +* Bumped gosnowflake from 1.6.16 to 1.6.19 +* Bumped nrsecurityagent to 1.1.0 with improved reporting of gRPC protocol versions. +* Fixed a bug where expected errors weren't being properly marked as expected on new relic dashboards + +### 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.23.1 ## Added