Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
nr-swilloughby committed Nov 30, 2023
2 parents 77cfc28 + 0e521dc commit e98ff73
Show file tree
Hide file tree
Showing 7 changed files with 4 additions and 8 deletions.
1 change: 1 addition & 0 deletions v3/integrations/nrfasthttp/examples/client-fasthttp/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ require (
)

replace github.com/newrelic/go-agent/v3/integrations/nrfasthttp v1.0.0 => ../../

replace github.com/newrelic/go-agent/v3 => ../../../..
1 change: 1 addition & 0 deletions v3/integrations/nrfasthttp/examples/server-fasthttp/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ require (
)

replace github.com/newrelic/go-agent/v3/integrations/nrfasthttp v1.0.0 => ../../

replace github.com/newrelic/go-agent/v3 => ../../../..
1 change: 0 additions & 1 deletion v3/integrations/nrfasthttp/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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 => ../..
4 changes: 1 addition & 3 deletions v3/integrations/nrfasthttp/instrumentation.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
1 change: 0 additions & 1 deletion v3/integrations/nrgraphqlgo/example/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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 => ../../..
3 changes: 1 addition & 2 deletions v3/integrations/nrgrpc/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ require (
google.golang.org/protobuf v1.30.0
)

replace github.com/newrelic/go-agent/v3 => ../..

replace github.com/newrelic/go-agent/v3/integrations/nrsecurityagent => ../../integrations/nrsecurityagent

replace github.com/newrelic/go-agent/v3 => ../..
1 change: 0 additions & 1 deletion v3/integrations/nrsecurityagent/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,4 @@ require (
gopkg.in/yaml.v2 v2.4.0
)


replace github.com/newrelic/go-agent/v3 => ../..

0 comments on commit e98ff73

Please sign in to comment.