Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve conflicts for release #831

Merged
merged 8 commits into from
Nov 30, 2023
Merged

Resolve conflicts for release #831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a8c6bf8
Release 3.25.0 (#782)
mirackara Sep 18, 2023
56cfa1c
Merge branch 'develop'
nr-swilloughby Sep 18, 2023
e9f0cf7
Merge pull request #790 from nr-swilloughby/master
nr-swilloughby Sep 18, 2023
d0a46d0
Merge pull request #794 from newrelic/develop
nr-swilloughby Sep 29, 2023
79d3bfd
Merge pull request #801 from newrelic/develop
iamemilio Oct 19, 2023
0e521dc
Release 3.28.0 (#818)
iamemilio Nov 16, 2023
77cfc28
updated go.mod files
nr-swilloughby Nov 30, 2023
e98ff73
Merge branch 'master' into develop
nr-swilloughby Nov 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions v3/integrations/nrfasthttp/examples/client-fasthttp/go.mod
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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 => ../../..
2 changes: 2 additions & 0 deletions v3/integrations/nrgraphqlgo/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 => ../..
3 changes: 2 additions & 1 deletion v3/integrations/nrgrpc/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions v3/integrations/nrmicro/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)


Expand Down
1 change: 0 additions & 1 deletion v3/integrations/nrsecurityagent/go.mod
View file
Open in desktop
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 => ../..
2 changes: 1 addition & 1 deletion v3/integrations/nrstan/test/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading