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

Jump to bottom

hotfix nrwriter packaging #573

Merged
merged 1 commit into from Sep 16, 2022
Merged

hotfix nrwriter packaging #573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
View file
Open in desktop
Expand Up @@ -105,7 +105,7 @@ jobs:
dirs: v3/integrations/logcontext-v2/nrzerolog
extratesting: go get -u github.com/rs/zerolog@master
- go-version: 1.17.x
dirs: v3/internal/logcontext/nrWriter
dirs: v3/integrations/logcontext-v2/nrwriter
- go-version: 1.17.x
dirs: v3/integrations/logcontext-v2/zerologWriter
extratesting: go get -u github.com/rs/zerolog@master
Expand Down
5 changes: 4 additions & 1 deletion v3/integrations/logcontext-v2/logWriter/go.mod
View file
Open in desktop
Expand Up @@ -2,4 +2,7 @@ module github.com/newrelic/go-agent/v3/integrations/logcontext-v2/logWriter

go 1.17

require github.com/newrelic/go-agent/v3 v3.19.0
require (
github.com/newrelic/go-agent/v3 v3.19.0
github.com/newrelic/go-agent/v3/integrations/logcontext-v2/nrwriter v1.0.0
)
3 changes: 2 additions & 1 deletion v3/integrations/logcontext-v2/logWriter/log-writer.go
View file
Open in desktop
Expand Up @@ -4,7 +4,8 @@ import (
"context"
"io"

"github.com/newrelic/go-agent/v3/internal/logcontext/nrwriter"
"github.com/newrelic/go-agent/v3/integrations/logcontext-v2/nrwriter"
"github.com/newrelic/go-agent/v3/internal"
"github.com/newrelic/go-agent/v3/newrelic"
)

Expand Down
10 changes: 10 additions & 0 deletions v3/integrations/logcontext-v2/nrlogrus/go.mod
View file
Open in desktop
Expand Up @@ -6,3 +6,13 @@ 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
)
5 changes: 5 additions & 0 deletions v3/integrations/logcontext-v2/nrwriter/go.mod
View file
Open in desktop
@@ -0,0 +1,5 @@
module github.com/newrelic/go-agent/v3/integrations/logcontext-v2/nrwriter

go 1.17

require github.com/newrelic/go-agent/v3 v3.19.0
0 v3/internal/logcontext/nrWriter/nrwriter.go → ...ations/logcontext-v2/nrwriter/nrwriter.go
View file
Open in desktop
File renamed without changes.
0 ...rnal/logcontext/nrWriter/nrwriter_test.go → ...s/logcontext-v2/nrwriter/nrwriter_test.go
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions v3/integrations/logcontext-v2/zerologWriter/go.mod
View file
Open in desktop
Expand Up @@ -4,5 +4,6 @@ go 1.17

require (
github.com/newrelic/go-agent/v3 v3.19.0
github.com/newrelic/go-agent/v3/integrations/logcontext-v2/nrwriter v1.0.0
github.com/rs/zerolog v1.27.0
)
3 changes: 2 additions & 1 deletion v3/integrations/logcontext-v2/zerologWriter/zerolog-writer.go
View file
Open in desktop
Expand Up @@ -5,7 +5,8 @@ import (
"io"
"strings"

"github.com/newrelic/go-agent/v3/internal/logcontext/nrwriter"
"github.com/newrelic/go-agent/v3/integrations/logcontext-v2/nrwriter"
"github.com/newrelic/go-agent/v3/internal"
"github.com/newrelic/go-agent/v3/newrelic"
"github.com/rs/zerolog"
)
Expand Down