switch from github.com/jtolio/eventkit to storj.io/eventkit package name

Contributed by @egon, I just squashed the patches.

Change-Id: I48fd6277f6598e74d8bef2426ffdceef3bed7247

client.go

@@ -8,10 +8,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/jtolio/eventkit/pb"
-	"github.com/jtolio/eventkit/utils"
 	"golang.org/x/sync/errgroup"
 
+	"storj.io/eventkit/pb"
+	"storj.io/eventkit/utils"
 	"storj.io/picobuf"
 )
 

client_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jtolio/eventkit/pb"
+	"storj.io/eventkit/pb"
 )
 
 func BenchmarkOutgoingPacket(b *testing.B) {

eventkitd-bigquery/bigquery/client.go

@@ -8,9 +8,10 @@ import (
 	"time"
 
 	"cloud.google.com/go/bigquery"
-	"github.com/jtolio/eventkit/pb"
 	"github.com/pkg/errors"
 	"google.golang.org/api/googleapi"
+
+	"storj.io/eventkit/pb"
 )
 
 var nonSafeTableNameCharacters = regexp.MustCompile(`[^a-zA-Z0-9]+`)

eventkitd-bigquery/bigquery/destination.go

@@ -6,8 +6,8 @@ import (
 	"os"
 	"time"
 
-	"github.com/jtolio/eventkit"
-	"github.com/jtolio/eventkit/pb"
+	"storj.io/eventkit"
+	"storj.io/eventkit/pb"
 )
 
 // BigQueryDestination can be used to save each evenkit package directly to server.

eventkitd-bigquery/bigquery/record.go

@@ -4,7 +4,8 @@ import (
 	"time"
 
 	"cloud.google.com/go/bigquery"
-	"github.com/jtolio/eventkit/pb"
+
+	"storj.io/eventkit/pb"
 )
 
 var _ bigquery.ValueSaver = &Record{}

eventkitd-bigquery/bigquery/sink.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"time"
 
-	"github.com/jtolio/eventkit/eventkitd/listener"
-	"github.com/jtolio/eventkit/pb"
+	"storj.io/eventkit/eventkitd/listener"
+	"storj.io/eventkit/pb"
 )
 
 // BigQuerySink provides an abstraction for processing events in a transport agnostic way.

eventkitd-bigquery/go.mod

@@ -1,40 +1,38 @@
-module github.com/jtolio/eventkit/eventkitd-bigquery
+module storj.io/eventkit/eventkitd-bigquery
 
 go 1.19
 
 require (
-	cloud.google.com/go/bigquery v1.42.0
-	github.com/jtolio/eventkit v0.0.0-20220927171925-c181046ab8ab
-	github.com/jtolio/eventkit/eventkitd v0.0.0-20230608090656-a7bf79729b78
+	cloud.google.com/go/bigquery v1.44.0
 	github.com/pkg/errors v0.9.1
-	google.golang.org/api v0.97.0
+	github.com/spacemonkeygo/monkit/v3 v3.0.22
+	google.golang.org/api v0.107.0
 )
 
 require (
-	cloud.google.com/go v0.104.0 // indirect
-	cloud.google.com/go/compute v1.10.0 // indirect
-	cloud.google.com/go/iam v0.4.0 // indirect
+	cloud.google.com/go v0.105.0 // indirect
+	cloud.google.com/go/compute v1.14.0 // indirect
+	cloud.google.com/go/compute/metadata v0.2.3 // indirect
+	cloud.google.com/go/iam v0.8.0 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/gopacket v1.1.19 // indirect
 	github.com/google/uuid v1.3.0 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.1.0 // indirect
-	github.com/googleapis/gax-go/v2 v2.5.1 // indirect
-	github.com/klauspost/compress v1.15.11 // indirect
-	github.com/spacemonkeygo/monkit/v3 v3.0.22 // indirect
-	go.opencensus.io v0.23.0 // indirect
-	go.uber.org/atomic v1.10.0 // indirect
-	go.uber.org/multierr v1.8.0 // indirect
-	go.uber.org/zap v1.23.0 // indirect
-	golang.org/x/net v0.0.0-20220926192436-02166a98028e // indirect
-	golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 // indirect
-	golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0 // indirect
-	golang.org/x/sys v0.0.0-20220926163933-8cfa568d3c25 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	github.com/googleapis/enterprise-certificate-proxy v0.2.1 // indirect
+	github.com/googleapis/gax-go/v2 v2.7.0 // indirect
+	go.opencensus.io v0.24.0 // indirect
+	go.uber.org/multierr v1.10.0 // indirect
+	go.uber.org/zap v1.26.0 // indirect
+	golang.org/x/net v0.4.0 // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
+	golang.org/x/sync v0.4.0 // indirect
+	golang.org/x/sys v0.3.0 // indirect
+	golang.org/x/text v0.5.0 // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20220926220553-6981cbe3cfce // indirect
-	google.golang.org/grpc v1.49.0 // indirect
+	google.golang.org/genproto v0.0.0-20221227171554-f9683d7f8bef // indirect
+	google.golang.org/grpc v1.52.0 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
 )

eventkitd-bigquery/main.go

@@ -15,10 +15,11 @@ import (
 	"time"
 
 	"cloud.google.com/go/bigquery"
-	bq "github.com/jtolio/eventkit/eventkitd-bigquery/bigquery"
-	"github.com/jtolio/eventkit/eventkitd/listener"
-	"github.com/jtolio/eventkit/pb"
 	"google.golang.org/api/googleapi"
+
+	bq "storj.io/eventkit/eventkitd-bigquery/bigquery"
+	"storj.io/eventkit/eventkitd/listener"
+	"storj.io/eventkit/pb"
 )
 
 type Application struct {

eventkitd/go.mod

@@ -1,18 +1,18 @@
-module github.com/jtolio/eventkit/eventkitd
+module storj.io/eventkit/eventkitd
 
 go 1.18
 
 require (
-	github.com/gogo/protobuf v1.3.2
 	github.com/google/gopacket v1.1.19
-	github.com/jtolio/eventkit v0.0.0-20231019094657-5d77ebb407d9
 	github.com/spacemonkeygo/monkit/v3 v3.0.22
 	go.uber.org/zap v1.26.0
 	golang.org/x/sync v0.4.0
+	storj.io/picobuf v0.0.1
 )
 
 require (
 	go.uber.org/multierr v1.10.0 // indirect
-	golang.org/x/net v0.0.0-20201021035429-f5854403a974 // indirect
-	golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f // indirect
+	golang.org/x/net v0.4.0 // indirect
+	golang.org/x/sys v0.3.0 // indirect
+	google.golang.org/protobuf v1.28.1 // indirect
 )

eventkitd/go.sum

@@ -1,59 +1,33 @@
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
-github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8=
 github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo=
-github.com/jtolio/eventkit v0.0.0-20231019094657-5d77ebb407d9 h1:5aw4qPuPiOjYJGATzHQllDfom77cgZrzE1ttOj7GRWQ=
-github.com/jtolio/eventkit v0.0.0-20231019094657-5d77ebb407d9/go.mod h1:PXFUrknJu7TkBNyL8t7XWDPtDFFLFrNQQAdsXv9YfJE=
-github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
-github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/spacemonkeygo/monkit/v3 v3.0.22 h1:4/g8IVItBDKLdVnqrdHZrCVPpIrwDBzl1jrV0IHQHDU=
 github.com/spacemonkeygo/monkit/v3 v3.0.22/go.mod h1:XkZYGzknZwkD0AKUnZaSXhRiVTLCkq7CWVa3IsE72gA=
 github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/zeebo/assert v1.3.1 h1:vukIABvugfNMZMQO1ABsyQDJDTVQbn+LWSMy1ol1h6A=
 go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk=
-go.uber.org/goleak v1.2.0/go.mod h1:XJYK+MuIchqpmGmUSAzotztawfKvYLUIgg7guXrwVUo=
 go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ=
 go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
 go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974 h1:IX6qOQeG5uLjB/hjjwjedwfjND0hgjPMMyO1RoIXQNI=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ=
 golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f h1:+Nyd8tzPX9R7BWHguqsrbFdRx3WQ/1ib8I44HXV5yTA=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+storj.io/picobuf v0.0.1 h1:ekEvxSQCbEjTVIi/qxj2za13SJyfRE37yE30IBkZeT0=

eventkitd/listener/listener.go

@@ -13,11 +13,12 @@ import (
 
 	"github.com/google/gopacket"
 	"github.com/google/gopacket/layers"
-	"github.com/jtolio/eventkit/pb"
-	"github.com/jtolio/eventkit/transport"
 	"github.com/spacemonkeygo/monkit/v3"
 	"go.uber.org/zap"
 	"golang.org/x/sync/errgroup"
+
+	"storj.io/eventkit/pb"
+	"storj.io/eventkit/transport"
 )
 
 var mon = monkit.Package()

eventkitd/main.go

@@ -7,9 +7,9 @@ import (
 	"runtime"
 	"time"
 
-	"github.com/jtolio/eventkit/eventkitd/listener"
-	"github.com/jtolio/eventkit/eventkitd/private/path"
-	"github.com/jtolio/eventkit/pb"
+	"storj.io/eventkit/eventkitd/listener"
+	"storj.io/eventkit/eventkitd/private/path"
+	"storj.io/eventkit/pb"
 )
 
 var (

eventkitd/private/protostream/fuzz_test.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/jtolio/eventkit/pb"
+	"storj.io/eventkit/pb"
 )
 
 func FuzzBasic(f *testing.F) {

eventkitd/private/protostream/protostream_test.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/jtolio/eventkit/pb"
+	"storj.io/eventkit/pb"
 )
 
 func assert(t testing.TB, val bool) {

eventkitd/private/protostream/reader.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/gogo/protobuf/proto"
+	"storj.io/picobuf"
 )
 
 type Reader struct {
@@ -18,7 +18,7 @@ func NewReader(base io.Reader) *Reader {
 	}
 }
 
-func (r *Reader) Unmarshal(pb proto.Message) error {
+func (r *Reader) Unmarshal(pb picobuf.Message) error {
 	var header [4]byte
 	_, err := io.ReadFull(r.base, header[:])
 	if err != nil {
@@ -33,5 +33,5 @@ func (r *Reader) Unmarshal(pb proto.Message) error {
 	if err != nil {
 		return err
 	}
-	return proto.Unmarshal(buf, pb)
+	return picobuf.Unmarshal(buf, pb)
 }

eventkitd/private/protostream/writer.go

@@ -5,14 +5,13 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/gogo/protobuf/proto"
+	"storj.io/picobuf"
 )
 
 const maxSerializedSize = 4 * 1024 * 1024
 
 type Writer struct {
 	base io.Writer
-	buf  proto.Buffer
 }
 
 func NewWriter(base io.Writer) *Writer {
@@ -21,13 +20,11 @@ func NewWriter(base io.Writer) *Writer {
 	}
 }
 
-func (w *Writer) Marshal(pb proto.Message) error {
-	w.buf.Reset()
-	err := w.buf.Marshal(pb)
+func (w *Writer) Marshal(pb picobuf.Message) error {
+	data, err := picobuf.Marshal(pb)
 	if err != nil {
 		return err
 	}
-	data := w.buf.Bytes()
 	if len(data) > maxSerializedSize {
 		return fmt.Errorf("too large of message for stream")
 	}

eventkitd/private/resumablecompressed/reader.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"io"
 
-	"github.com/jtolio/eventkit/eventkitd/private/delimited"
+	"storj.io/eventkit/eventkitd/private/delimited"
 )
 
 type Reader struct {

eventkitd/private/resumablecompressed/writer.go

@@ -4,7 +4,7 @@ import (
 	"compress/zlib"
 	"io"
 
-	"github.com/jtolio/eventkit/eventkitd/private/delimited"
+	"storj.io/eventkit/eventkitd/private/delimited"
 )
 
 type Writer struct {

eventkitd/utils/events-to-csv/main.go

@@ -13,10 +13,10 @@ import (
 	"sort"
 	"time"
 
-	"github.com/jtolio/eventkit/eventkitd/private/path"
-	"github.com/jtolio/eventkit/eventkitd/private/protostream"
-	"github.com/jtolio/eventkit/eventkitd/private/resumablecompressed"
-	"github.com/jtolio/eventkit/pb"
+	"storj.io/eventkit/eventkitd/private/path"
+	"storj.io/eventkit/eventkitd/private/protostream"
+	"storj.io/eventkit/eventkitd/private/resumablecompressed"
+	"storj.io/eventkit/pb"
 )
 
 type rowMap map[string]string

eventkitd/utils/events-to-json/main.go

@@ -9,10 +9,10 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/jtolio/eventkit/eventkitd/private/path"
-	"github.com/jtolio/eventkit/eventkitd/private/protostream"
-	"github.com/jtolio/eventkit/eventkitd/private/resumablecompressed"
-	"github.com/jtolio/eventkit/pb"
+	"storj.io/eventkit/eventkitd/private/path"
+	"storj.io/eventkit/eventkitd/private/protostream"
+	"storj.io/eventkit/eventkitd/private/resumablecompressed"
+	"storj.io/eventkit/pb"
 )
 
 type jsonRecord struct {