hotfix nrwriter packaging

newrelic · Sep 16, 2022 · 6c351a0 · 6c351a0
1 parent 5a8fcd0
commit 6c351a0
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 4 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -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

diff --git a/v3/integrations/logcontext-v2/logWriter/go.mod b/v3/integrations/logcontext-v2/logWriter/go.mod
@@ -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
+)
diff --git a/v3/integrations/logcontext-v2/logWriter/log-writer.go b/v3/integrations/logcontext-v2/logWriter/log-writer.go
@@ -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"
 )
 

diff --git a/v3/integrations/logcontext-v2/nrlogrus/go.mod b/v3/integrations/logcontext-v2/nrlogrus/go.mod
@@ -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
+)
diff --git a/v3/integrations/logcontext-v2/nrwriter/go.mod b/v3/integrations/logcontext-v2/nrwriter/go.mod
@@ -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
diff --git a/v3/internal/logcontext/nrWriter/nrwriter.go → ...ations/logcontext-v2/nrwriter/nrwriter.go b/v3/internal/logcontext/nrWriter/nrwriter.go → ...ations/logcontext-v2/nrwriter/nrwriter.go
diff --git a/...rnal/logcontext/nrWriter/nrwriter_test.go → ...s/logcontext-v2/nrwriter/nrwriter_test.go b/...rnal/logcontext/nrWriter/nrwriter_test.go → ...s/logcontext-v2/nrwriter/nrwriter_test.go
diff --git a/v3/integrations/logcontext-v2/zerologWriter/go.mod b/v3/integrations/logcontext-v2/zerologWriter/go.mod
@@ -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
 )
diff --git a/v3/integrations/logcontext-v2/zerologWriter/zerolog-writer.go b/v3/integrations/logcontext-v2/zerologWriter/zerolog-writer.go
@@ -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"
 )