Merge pull request #831 from nr-swilloughby/develop

Resolve conflicts for release
newrelic · Nov 30, 2023 · 7d91b51 · 7d91b51
2 parents dc257ff + e98ff73
commit 7d91b51
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 8 deletions.
diff --git a/v3/integrations/nrfasthttp/examples/client-fasthttp/go.mod b/v3/integrations/nrfasthttp/examples/client-fasthttp/go.mod
@@ -9,4 +9,5 @@ require (
 )
 
 replace github.com/newrelic/go-agent/v3/integrations/nrfasthttp v1.0.0 => ../../
+
 replace github.com/newrelic/go-agent/v3 => ../../../..
diff --git a/v3/integrations/nrfasthttp/examples/server-fasthttp/go.mod b/v3/integrations/nrfasthttp/examples/server-fasthttp/go.mod
@@ -9,4 +9,5 @@ require (
 )
 
 replace github.com/newrelic/go-agent/v3/integrations/nrfasthttp v1.0.0 => ../../
+
 replace github.com/newrelic/go-agent/v3 => ../../../..
diff --git a/v3/integrations/nrfasthttp/go.mod b/v3/integrations/nrfasthttp/go.mod
@@ -6,4 +6,3 @@ require (
 	github.com/newrelic/go-agent/v3 v3.28.1
 	github.com/valyala/fasthttp v1.49.0
 )
-replace github.com/newrelic/go-agent/v3 => ../..
diff --git a/v3/integrations/nrfasthttp/instrumentation.go b/v3/integrations/nrfasthttp/instrumentation.go
@@ -2,17 +2,15 @@ package nrfasthttp
 
 import (
 	"net/http"
+
 	"github.com/newrelic/go-agent/v3/internal"
 	"github.com/newrelic/go-agent/v3/newrelic"
 	"github.com/valyala/fasthttp"
 	"github.com/valyala/fasthttp/fasthttpadaptor"
 )
 
-
 func init() { internal.TrackUsage("integration", "framework", "fasthttp") }
 
-
-
 type fasthttpWrapperResponse struct {
 	ctx *fasthttp.RequestCtx
 }

diff --git a/v3/integrations/nrgraphqlgo/example/go.mod b/v3/integrations/nrgraphqlgo/example/go.mod
@@ -9,7 +9,6 @@ require (
 	github.com/newrelic/go-agent/v3/integrations/nrgraphqlgo v1.0.0
 )
 
-
 replace github.com/newrelic/go-agent/v3/integrations/nrgraphqlgo => ../
 
 replace github.com/newrelic/go-agent/v3 => ../../..
diff --git a/v3/integrations/nrgraphqlgo/go.mod b/v3/integrations/nrgraphqlgo/go.mod
@@ -6,4 +6,6 @@ require (
 	github.com/graphql-go/graphql v0.8.1
 	github.com/newrelic/go-agent/v3 v3.28.1
 )
+
+
 replace github.com/newrelic/go-agent/v3 => ../..
diff --git a/v3/integrations/nrgrpc/go.mod b/v3/integrations/nrgrpc/go.mod
@@ -13,5 +13,6 @@ require (
 	google.golang.org/protobuf v1.30.0
 )
 
-replace github.com/newrelic/go-agent/v3/integrations/nrsecurityagent => ../../integrations/nrsecurityagent
 replace github.com/newrelic/go-agent/v3 => ../..
+
+replace github.com/newrelic/go-agent/v3/integrations/nrsecurityagent => ../../integrations/nrsecurityagent
diff --git a/v3/integrations/nrmicro/go.mod b/v3/integrations/nrmicro/go.mod
@@ -8,6 +8,7 @@ require (
 	github.com/golang/protobuf v1.5.3
 	github.com/micro/go-micro v1.8.0
 	github.com/newrelic/go-agent/v3 v3.28.1
+	google.golang.org/protobuf v1.31.0
 )
 
 

diff --git a/v3/integrations/nrsecurityagent/go.mod b/v3/integrations/nrsecurityagent/go.mod
@@ -9,5 +9,4 @@ require (
 	gopkg.in/yaml.v2 v2.4.0
 )
 
-
 replace github.com/newrelic/go-agent/v3 => ../..
diff --git a/v3/integrations/nrstan/test/go.mod b/v3/integrations/nrstan/test/go.mod
@@ -5,7 +5,7 @@ module github.com/newrelic/go-agent/v3/integrations/nrstan/test
 go 1.19
 
 require (
-	github.com/nats-io/nats-streaming-server v0.25.5
+	github.com/nats-io/nats-streaming-server v0.25.6
 	github.com/nats-io/stan.go v0.10.4
 	github.com/newrelic/go-agent/v3 v3.28.1
 	github.com/newrelic/go-agent/v3/integrations/nrstan v0.0.0