Update dependency hpcloud/tail to the successor nxadm/tail (#15)

* switch to nxadm/tail * fix integration tests
cloudfoundry · Nov 5, 2021 · ffa646e · ffa646e
1 parent 8a6b2ee
commit ffa646e
Show file tree

Hide file tree

Showing 47 changed files with 9 additions and 3,853 deletions.
diff --git a/ci/test-task.yml b/ci/test-task.yml
@@ -18,7 +18,7 @@ run:
       ln -s $workspace/blackbox $GOPATH/src/code.cloudfoundry.org/blackbox
       go get -u golang.org/x/tools/...
       go get github.com/onsi/ginkgo
-      go get github.com/hpcloud/tail
+      go get github.com/nxadm/tail
       go get github.com/onsi/gomega
       go get github.com/tedsuo/ifrit
       go get github.com/ziutek/syslog

diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module code.cloudfoundry.org/blackbox
 go 1.16
 
 require (
-	github.com/hpcloud/tail v1.0.0
+	github.com/nxadm/tail v1.4.8
 	github.com/onsi/ginkgo v1.16.2
 	github.com/onsi/gomega v1.12.0
 	github.com/stretchr/testify v1.7.0

diff --git a/go.sum b/go.sum
@@ -19,8 +19,6 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
-github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
 github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
@@ -92,7 +90,6 @@ google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/l
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=

diff --git a/integration/blackbox.go b/integration/blackbox.go
@@ -7,7 +7,6 @@ import (
 	"os"
 	"os/exec"
 	"runtime"
-	"strings"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
@@ -98,7 +97,7 @@ func (runner *BlackboxRunner) StartWithConfig(config blackbox.Config, tailerCoun
 			Name:          "blackbox",
 			Command:       blackboxCmd,
 			AnsiColorCode: "90m",
-			StartCheck:    "Seeked" + strings.Repeat(".*\\n.*Seeked", tailerCount-1),
+			StartCheck:    "Start tail...",
 			Cleanup: func() {
 				os.Remove(configPath)
 			},

diff --git a/integration/syslog_test.go b/integration/syslog_test.go
@@ -120,7 +120,7 @@ var _ = Describe("Blackbox", func() {
 				Expect(message.Content).To(ContainSubstring("hello"))
 				Expect(message.Content).To(ContainSubstring(tagName))
 				Expect(message.Content).To(ContainSubstring(Hostname()))
-				Expect(message.Content).To(MatchRegexp(`.*\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d*Z.*`))
+				Expect(message.Content).To(MatchRegexp(`.*\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d*[Z\+].*`))
 
 				blackboxRunner.Stop()
 			})
@@ -611,7 +611,7 @@ var _ = Describe("Blackbox", func() {
 				Buffer: buffer,
 			})
 
-			Eventually(session.Err, "10s").Should(gbytes.Say("Seeked"))
+			Eventually(session.Err, "10s").Should(gbytes.Say("Start tail..."))
 
 			logFile.WriteString("hello\n")
 			logFile.WriteString("world\n")

diff --git a/tailer.go b/tailer.go
@@ -5,8 +5,8 @@ import (
 	"os"
 	"time"
 
-	"github.com/hpcloud/tail"
-	"github.com/hpcloud/tail/watch"
+	"github.com/nxadm/tail"
+	"github.com/nxadm/tail/watch"
 
 	"code.cloudfoundry.org/blackbox/syslog"
 )
@@ -21,6 +21,7 @@ type Tailer struct {
 func (tailer *Tailer) Run(signals <-chan os.Signal, ready chan<- struct{}) error {
 	watch.POLL_DURATION = 1 * time.Second
 
+	tailer.Logger.Printf("Start tail...")
 	t, err := tail.TailFile(tailer.Path, tail.Config{
 		Follow: true,
 		ReOpen: true,

diff --git a/vendor/github.com/hpcloud/tail/.gitignore b/vendor/github.com/hpcloud/tail/.gitignore
diff --git a/vendor/github.com/hpcloud/tail/.travis.yml b/vendor/github.com/hpcloud/tail/.travis.yml
diff --git a/vendor/github.com/hpcloud/tail/CHANGES.md b/vendor/github.com/hpcloud/tail/CHANGES.md
diff --git a/vendor/github.com/hpcloud/tail/Dockerfile b/vendor/github.com/hpcloud/tail/Dockerfile
diff --git a/vendor/github.com/hpcloud/tail/LICENSE.txt b/vendor/github.com/hpcloud/tail/LICENSE.txt
diff --git a/vendor/github.com/hpcloud/tail/Makefile b/vendor/github.com/hpcloud/tail/Makefile
diff --git a/vendor/github.com/hpcloud/tail/README.md b/vendor/github.com/hpcloud/tail/README.md
diff --git a/vendor/github.com/hpcloud/tail/appveyor.yml b/vendor/github.com/hpcloud/tail/appveyor.yml
diff --git a/vendor/github.com/hpcloud/tail/ratelimiter/Licence b/vendor/github.com/hpcloud/tail/ratelimiter/Licence
diff --git a/vendor/github.com/hpcloud/tail/ratelimiter/leakybucket.go b/vendor/github.com/hpcloud/tail/ratelimiter/leakybucket.go