zix99 · zix99 · Dec 18, 2024 · Dec 18, 2024 · Dec 18, 2024 · Dec 18, 2024
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v1
         with:
-          go-version: 1.18
+          go-version: 1.23
       - name: Checkout
         uses: actions/checkout@v1
       - name: Get
@@ -26,7 +26,7 @@ jobs:
           go test -tags=pcre2 rare/pkg/fastregex
       - name: StaticCheck
         run: |
-          go run honnef.co/go/tools/cmd/staticcheck ./...
+          go run honnef.co/go/tools/cmd/staticcheck@2024.1.1 ./...
       - name: Codecov
         uses: codecov/codecov-action@v3
         with:

diff --git a/README.md b/README.md
@@ -81,7 +81,7 @@ sudo port install rare
 
 Clone the repo, and:
 
-Requires GO 1.18 or higher
+Requires GO 1.23 or higher
 
 ```sh
 go mod download

diff --git a/cmd/helpers/updatingAggregator_test.go b/cmd/helpers/updatingAggregator_test.go
@@ -1,7 +1,7 @@
 package helpers
 
 import (
-	"io/ioutil"
+	"io"
 	"rare/pkg/extractor"
 	"rare/pkg/extractor/batchers"
 	"strings"
@@ -29,7 +29,7 @@ func (s *VirtualAggregator) ParseErrors() uint64 {
 
 func TestAggregationLoop(t *testing.T) {
 	// Build a real extractor
-	batcher := batchers.OpenReaderToChan("test", ioutil.NopCloser(strings.NewReader(testData)), 1, 1)
+	batcher := batchers.OpenReaderToChan("test", io.NopCloser(strings.NewReader(testData)), 1, 1)
 	ex, err := extractor.New(batcher.BatchChan(), &extractor.Config{
 		Regex:   `(\d+)`,
 		Extract: "val:{1}",

diff --git a/default.pgo b/default.pgo
diff --git a/docs/index.md b/docs/index.md
@@ -76,7 +76,7 @@ sudo port install rare
 
 Clone the repo, and:
 
-Requires GO 1.18 or higher
+Requires GO 1.23 or higher
 
 ```sh
 go mod download

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module rare
 
-go 1.18
+go 1.23
 
 require (
 	github.com/araddon/dateparse v0.0.0-20210207001429-0eec95c9db7e

diff --git a/go.sum b/go.sum
@@ -1,4 +1,5 @@
 github.com/BurntSushi/toml v1.1.0 h1:ksErzDEI1khOiGPgpwuI7x2ebx/uXQNw7xJpn9Eq1+I=
+github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/araddon/dateparse v0.0.0-20210207001429-0eec95c9db7e h1:OjdSMCht0ZVX7IH0nTdf00xEustvbtUGRgMh3gbdmOg=
 github.com/araddon/dateparse v0.0.0-20210207001429-0eec95c9db7e/go.mod h1:DCaWoUhZrYW9p1lxo/cm8EmUOOzAPSEZNGF2DK1dJgw=
 github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=

diff --git a/pkg/extractor/batchers/readerBatcher_test.go b/pkg/extractor/batchers/readerBatcher_test.go
@@ -1,15 +1,15 @@
 package batchers
 
 import (
-	"io/ioutil"
+	"io"
 	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 )
 
 func TestOpenReaderToChan(t *testing.T) {
-	r := ioutil.NopCloser(strings.NewReader("Hello\nthere\nbob"))
+	r := io.NopCloser(strings.NewReader("Hello\nthere\nbob"))
 	b := OpenReaderToChan("src", r, 1, 1)
 
 	b1 := <-b.BatchChan()

diff --git a/pkg/extractor/batchers/tailBatcher_test.go b/pkg/extractor/batchers/tailBatcher_test.go
@@ -1,7 +1,6 @@
 package batchers
 
 import (
-	"io/ioutil"
 	"os"
 	"testing"
 	"time"
@@ -22,7 +21,7 @@ func TestBatchFollowFile(t *testing.T) {
 }
 
 func TestBatchFollowTailFile(t *testing.T) {
-	tmp, err := ioutil.TempFile("", "followtest-")
+	tmp, err := os.CreateTemp("", "followtest-")
 	if err != nil {
 		panic(err)
 	}

diff --git a/pkg/followreader/followreader_test.go b/pkg/followreader/followreader_test.go
@@ -1,7 +1,6 @@
 package followreader
 
 import (
-	"io/ioutil"
 	"os"
 	"sync"
 	"testing"
@@ -38,7 +37,7 @@ func CreateAppendingFromFile(filename string) *testAppendingFile {
 }
 
 func CreateAppendingTempFile() *testAppendingFile {
-	f, err := ioutil.TempFile("", "go-test-")
+	f, err := os.CreateTemp("", "go-test-")
 	if err != nil {
 		panic(err)
 	}

diff --git a/pkg/followreader/notify.go b/pkg/followreader/notify.go
@@ -62,7 +62,7 @@ func (s *NotifyFollowReader) Close() error {
 
 func (s *NotifyFollowReader) Drain() error {
 	if s.f != nil {
-		_, err := s.f.Seek(0, os.SEEK_END)
+		_, err := s.f.Seek(0, io.SeekEnd)
 		return err
 	}
 	return nil

diff --git a/pkg/followreader/poller.go b/pkg/followreader/poller.go
@@ -43,7 +43,7 @@ func NewPolling(filename string, reopen bool) (*PollingFollowReader, error) {
 
 // Drain navigates to the end of the stream
 func (s *PollingFollowReader) Drain() error {
-	offset, err := s.f.Seek(0, os.SEEK_END)
+	offset, err := s.f.Seek(0, io.SeekEnd)
 	if err == nil {
 		s.readBytes = offset
 	}