Merge pull request #81 from Nextdoor/go-update-deps

Update go deps

app/runner.go

@@ -12,15 +12,15 @@
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
- */
+*/
 
 package app
 
 import (
 	"github.com/Nextdoor/pg-bifrost.git/app/config"
 	"github.com/Nextdoor/pg-bifrost.git/partitioner"
 	"github.com/Nextdoor/pg-bifrost.git/transport/batcher"
-	"github.com/jackc/pgconn"
+	"github.com/jackc/pgx/v5/pgconn"
 	"time"
 
 	"github.com/Nextdoor/pg-bifrost.git/filter"

go.mod

@@ -3,45 +3,44 @@ module github.com/Nextdoor/pg-bifrost.git
 go 1.20
 
 require (
-	github.com/DataDog/datadog-go v2.2.0+incompatible
+	github.com/DataDog/datadog-go/v5 v5.3.0
 	github.com/NeowayLabs/wabbit v0.0.0-20190108150251-e762dd02f7f2
 	github.com/Nextdoor/parselogical v0.0.0-20180824214823-31546f21ba34
-	github.com/aws/aws-sdk-go v1.15.38
-	github.com/cenkalti/backoff v2.1.1+incompatible
+	github.com/aws/aws-sdk-go v1.44.258
+	github.com/cenkalti/backoff/v4 v4.2.1
 	github.com/cevaris/ordered_map v0.0.0-20180310183325-0efaee1733e3
 	github.com/golang/mock v1.6.0
 	github.com/google/go-cmp v0.5.9
-	github.com/jackc/pgconn v1.1.0
-	github.com/jackc/pglogrepl v0.0.0-20200309144228-32ec418076b3
-	github.com/jackc/pgproto3/v2 v2.0.0
+	github.com/jackc/pglogrepl v0.0.0-20230428004623-0c5b98f52784
+	github.com/jackc/pgx/v5 v5.0.3
 	github.com/json-iterator/go v1.1.12
 	github.com/pkg/errors v0.9.1
-	github.com/sirupsen/logrus v1.8.1
+	github.com/sirupsen/logrus v1.9.0
 	github.com/streadway/amqp v0.0.0-20181205114330-a314942b2fd9
-	github.com/stretchr/testify v1.7.0
+	github.com/stretchr/testify v1.8.1
 	gopkg.in/Nextdoor/cli.v1 v1.20.2
 )
 
 require (
 	github.com/BurntSushi/toml v1.2.1 // indirect
+	github.com/Microsoft/go-winio v0.6.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/fsouza/go-dockerclient v1.9.7 // indirect
-	github.com/go-ini/ini v1.25.4 // indirect
 	github.com/google/uuid v1.0.0 // indirect
-	github.com/jackc/chunkreader/v2 v2.0.0 // indirect
 	github.com/jackc/pgio v1.0.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
-	github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8 // indirect
+	github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
+	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/pborman/uuid v1.2.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/smartystreets/goconvey v1.8.0 // indirect
 	github.com/tiago4orion/conjure v0.0.0-20150908101743-93cb30b9d218 // indirect
-	golang.org/x/crypto v0.0.0-20191117063200-497ca9f6d64f // indirect
+	golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 // indirect
+	golang.org/x/mod v0.9.0 // indirect
 	golang.org/x/sys v0.6.0 // indirect
-	golang.org/x/text v0.3.3 // indirect
-	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
-	gopkg.in/yaml.v2 v2.2.2 // indirect
-	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
+	golang.org/x/text v0.4.0 // indirect
+	golang.org/x/tools v0.7.0 // indirect
+	gopkg.in/yaml.v2 v2.2.8 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

itests/common.bash

@@ -227,7 +227,7 @@ _profile() {
   fi
 
   log "Comparing Memory Profile"
-  memprofile=$(go tool pprof -normalize -top -show github.com/Nextdoor -diff_base tests/$BATS_TEST_DESCRIPTION/perf_base/mem.pprof ../target/pg-bifrost tests/$BATS_TEST_DESCRIPTION/perf_output/mem.pprof | grep -v -E "^(\s+)?-" | tail -n +9 | tr -s ' ' | awk '{$1=$1};1' | cut -d ' ' -f5- | egrep -v vendor/gopkg.in/Nextdoor/cli)
+  memprofile=$(go tool pprof -normalize -top -show github.com/Nextdoor -ignore github.com/Nextdoor/pg-bifrost.git/stats -diff_base tests/$BATS_TEST_DESCRIPTION/perf_base/mem.pprof ../target/pg-bifrost tests/$BATS_TEST_DESCRIPTION/perf_output/mem.pprof | grep -v -E "^(\s+)?-" | tail -n +9 | tr -s ' ' | awk '{$1=$1};1' | cut -d ' ' -f5- | egrep -v vendor/gopkg.in/Nextdoor/cli)
   memory_leak=false
   while read -r line; do
     percent=$(echo $line | cut -d ' ' -f1 | rev | cut -c 2- | rev)
@@ -238,7 +238,7 @@ _profile() {
   done <<< "$memprofile"
 
   log "Comparing CPU Profile"
-  cpuprofile=$(go tool pprof -normalize -top -show github.com/Nextdoor -diff_base tests/$BATS_TEST_DESCRIPTION/perf_base/cpu.pprof tests/$BATS_TEST_DESCRIPTION/perf_output/cpu.pprof | tail -n +10 | tr -s ' ' | awk '{$1=$1};1' | cut -d ' ' -f5-)
+  cpuprofile=$(go tool pprof -normalize -top -show github.com/Nextdoor -ignore github.com/Nextdoor/pg-bifrost.git/stats -diff_base tests/$BATS_TEST_DESCRIPTION/perf_base/cpu.pprof tests/$BATS_TEST_DESCRIPTION/perf_output/cpu.pprof | tail -n +10 | tr -s ' ' | awk '{$1=$1};1' | cut -d ' ' -f5-)
   cpu_hot=false
   while read -r line; do
     percent=$(echo $line | cut -d ' ' -f1 | rev | cut -c 2- | rev)

itests/tests/base/test_large_sleep/envfile.env

@@ -2,4 +2,5 @@ EXPECTED_COUNT=50000
 MEMPROFILE=/perf/mem.pprof
 CPUPROFILE=/perf/cpu.pprof
 KINESIS_POLLER_WAIT_TIME=180
-S3_POLLER_INITIAL_WAIT_TIME=180
+S3_POLLER_INITIAL_WAIT_TIME=180
+GODEBUG=memprofilerate=1

itests/tests/base/test_large_txn/envfile.env

@@ -2,4 +2,5 @@ EXPECTED_COUNT=50000
 MEMPROFILE=/perf/mem.pprof
 CPUPROFILE=/perf/cpu.pprof
 KINESIS_POLLER_WAIT_TIME=180
-S3_POLLER_INITIAL_WAIT_TIME=180
+S3_POLLER_INITIAL_WAIT_TIME=180
+GODEBUG=memprofilerate=1

itests/tests/kinesis/test_multi_worker_high_kinesis_errors/envfile.env

@@ -5,4 +5,5 @@ WORKERS=4
 KINESIS_POLLER_WAIT_TIME=120
 MEMPROFILE=/perf/mem.pprof
 CPUPROFILE=/perf/cpu.pprof
-KINESIS_POLLER_WAIT_TIME=180
+KINESIS_POLLER_WAIT_TIME=180
+GODEBUG=memprofilerate=1

itests/tests/kinesis/test_multi_worker_no_kinesis_errors/envfile.env

@@ -2,4 +2,5 @@ EXPECTED_COUNT=50000
 WORKERS=4
 MEMPROFILE=/perf/mem.pprof
 CPUPROFILE=/perf/cpu.pprof
-KINESIS_POLLER_WAIT_TIME=180
+KINESIS_POLLER_WAIT_TIME=180
+GODEBUG=memprofilerate=1

itests/tests/kinesis/test_strict_order_shared/envfile.env

@@ -4,4 +4,5 @@ WORKERS=2
 PARTITION_METHOD=transaction-bucket
 BATCHER_ROUTING_METHOD=partition
 MEMPROFILE=/perf/mem.pprof
-CPUPROFILE=/perf/cpu.pprof
+CPUPROFILE=/perf/cpu.pprof
+GODEBUG=memprofilerate=1

main/main.go

@@ -12,7 +12,7 @@
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
- */
+*/
 
 package main
 
@@ -41,7 +41,7 @@ import (
 	"github.com/Nextdoor/pg-bifrost.git/utils"
 
 	"github.com/Nextdoor/pg-bifrost.git/shutdown"
-	"github.com/jackc/pgconn"
+	"github.com/jackc/pgx/v5/pgconn"
 
 	"github.com/sirupsen/logrus"
 	"gopkg.in/Nextdoor/cli.v1"
@@ -121,8 +121,8 @@ var (
 			EnvVar: "DATADOG_HOST",
 		}),
 		altsrc.NewStringFlag(cli.StringFlag{
-			Name:   config.VAR_NAME_DD_TAGS,
-			Usage:  "datadog tags to add to emitted metrics. These are specified as key:value and are " +
+			Name: config.VAR_NAME_DD_TAGS,
+			Usage: "datadog tags to add to emitted metrics. These are specified as key:value and are " +
 				"delimited by ','. For example key1:value1,key2:value2",
 			Value:  "",
 			EnvVar: "DATADOG_TAGS",

replication/client/client.go

@@ -19,9 +19,9 @@ package client
 import (
 	"context"
 	"github.com/Nextdoor/parselogical"
-	"github.com/jackc/pgconn"
 	"github.com/jackc/pglogrepl"
-	"github.com/jackc/pgproto3/v2"
+	"github.com/jackc/pgx/v5/pgconn"
+	"github.com/jackc/pgx/v5/pgproto3"
 	"os"
 	"strconv"
 	"strings"
@@ -315,7 +315,7 @@ func (c *Replicator) Start(progressChan <-chan uint64) {
 
 		// Check for error and connection status
 		if rplErr != nil {
-			if pgconn.Timeout(rplErr) {
+			if pgconn.Timeout(rplErr) || errors.Is(rplErr, context.DeadlineExceeded) {
 				if err := c.handleProgress(true); err != nil {
 					log.Error(err)
 					return

replication/client/client_test.go

@@ -28,7 +28,7 @@ import (
 	"github.com/Nextdoor/pg-bifrost.git/stats"
 	"github.com/golang/mock/gomock"
 	"github.com/jackc/pglogrepl"
-	"github.com/jackc/pgproto3/v2"
+	"github.com/jackc/pgx/v5/pgproto3"
 	"github.com/stretchr/testify/assert"
 	"time"
 

replication/client/conn/conn.go

@@ -18,10 +18,10 @@ package conn
 
 import (
 	"context"
-	"github.com/cenkalti/backoff"
-	"github.com/jackc/pgconn"
+	"github.com/cenkalti/backoff/v4"
 	"github.com/jackc/pglogrepl"
-	"github.com/jackc/pgproto3/v2"
+	"github.com/jackc/pgx/v5/pgconn"
+	"github.com/jackc/pgx/v5/pgproto3"
 	"time"
 )
 

replication/client/conn/interface.go

@@ -19,7 +19,7 @@ package conn
 import (
 	"context"
 	"github.com/jackc/pglogrepl"
-	"github.com/jackc/pgproto3/v2"
+	"github.com/jackc/pgx/v5/pgproto3"
 )
 
 // Conn is a interface which both our PgReplConnWrapper and pgx.ReplicationConn implement to help with gomocks

replication/client/conn/manager.go

@@ -12,14 +12,14 @@
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
- */
+*/
 
 package conn
 
 import (
 	"context"
-	"github.com/jackc/pgconn"
 	"github.com/jackc/pglogrepl"
+	"github.com/jackc/pgx/v5/pgconn"
 	"github.com/sirupsen/logrus"
 	"os"
 	"time"
@@ -95,4 +95,3 @@ func (m *Manager) Close() {
 	m.conn.Close(context.Background())
 	m.conn = nil
 }
-

stats/reporters/datadog/datadog.go

@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/DataDog/datadog-go/v5/statsd"
 	"github.com/Nextdoor/pg-bifrost.git/shutdown"
 	"github.com/Nextdoor/pg-bifrost.git/stats"
 	"github.com/Nextdoor/pg-bifrost.git/stats/reporters"
-	"github.com/DataDog/datadog-go/statsd"
 	"github.com/sirupsen/logrus"
 )
 

stats/reporters/factory/factory.go

@@ -1,7 +1,7 @@
 package factory
 
 import (
-	"github.com/DataDog/datadog-go/statsd"
+	"github.com/DataDog/datadog-go/v5/statsd"
 	"github.com/Nextdoor/pg-bifrost.git/app/config"
 	"github.com/Nextdoor/pg-bifrost.git/shutdown"
 	"github.com/Nextdoor/pg-bifrost.git/stats"

transport/transporters/kinesis/factory.go

@@ -12,7 +12,7 @@
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
- */
+*/
 
 package kinesis
 
@@ -28,7 +28,7 @@ import (
 	"github.com/Nextdoor/pg-bifrost.git/transport"
 	"github.com/Nextdoor/pg-bifrost.git/transport/transporters/kinesis/batch"
 	"github.com/Nextdoor/pg-bifrost.git/transport/transporters/kinesis/transporter"
-	"github.com/cenkalti/backoff"
+	"github.com/cenkalti/backoff/v4"
 	"github.com/cevaris/ordered_map"
 	"github.com/sirupsen/logrus"
 )