Update confluent-kafka-go to v2.1.0

Author: everesio

.github/workflows/build.yaml

@@ -10,9 +10,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Setup go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
-          go-version: 1.19
+          go-version: '1.20'
+          check-latest: true
+      - run: go version
       - name: Run build
         run: make clean build
       - name: Run test

.github/workflows/release.yaml

@@ -17,9 +17,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Setup go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
-          go-version: 1.19
+          go-version: '1.20'
+          check-latest: true
+      - run: go version
       - name: Run build
         run: make clean build
       - name: Run test

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.19-alpine3.16 as builder
+FROM golang:1.20-alpine3.16 as builder
 
 RUN apk add alpine-sdk ca-certificates
 

Makefile

@@ -2,7 +2,7 @@
 
 .PHONY: clean build fmt test
 
-TAG           ?= v0.2.0
+TAG           ?= v0.3.0
 
 BUILD_FLAGS   ?=
 BINARY        ?= mqtt-proxy

cmd/root_test.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/alecthomas/kong"
-	"github.com/confluentinc/confluent-kafka-go/kafka"
+	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
 	"github.com/grepplabs/mqtt-proxy/pkg/config"
 	"github.com/grepplabs/mqtt-proxy/pkg/log"
 	"github.com/stretchr/testify/require"

go.mod

@@ -1,16 +1,16 @@
 module github.com/grepplabs/mqtt-proxy
 
-go 1.19
+go 1.20
 
 require (
 	github.com/alecthomas/kong v0.7.0
 	github.com/alecthomas/kong-yaml v0.1.1
-	github.com/confluentinc/confluent-kafka-go v1.9.2
+	github.com/confluentinc/confluent-kafka-go/v2 v2.1.0
 	github.com/go-playground/validator/v10 v10.11.1
 	github.com/oklog/run v1.1.0
 	github.com/prometheus/client_golang v1.13.1
 	github.com/prometheus/common v0.37.0
-	github.com/stretchr/testify v1.8.1
+	github.com/stretchr/testify v1.8.2
 	github.com/sykesm/zap-logfmt v0.0.4
 	go.uber.org/atomic v1.10.0
 	go.uber.org/automaxprocs v1.5.1
@@ -19,21 +19,21 @@ require (
 
 require (
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/go-playground/locales v0.14.0 // indirect
 	github.com/go-playground/universal-translator v0.18.0 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/leodido/go-urn v1.2.1 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_model v0.3.0 // indirect
 	github.com/prometheus/procfs v0.8.0 // indirect
 	go.uber.org/multierr v1.8.0 // indirect
 	golang.org/x/crypto v0.1.0 // indirect
-	golang.org/x/sys v0.1.0 // indirect
-	golang.org/x/text v0.4.0 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
+	golang.org/x/sys v0.6.0 // indirect
+	golang.org/x/text v0.8.0 // indirect
+	google.golang.org/protobuf v1.30.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/alecthomas/kong"
-	"github.com/confluentinc/confluent-kafka-go/kafka"
+	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
 	"github.com/go-playground/validator/v10"
 )
 

pkg/config/config.go

@@ -1,7 +1,7 @@
 package config
 
 import (
-	"github.com/confluentinc/confluent-kafka-go/kafka"
+	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
 	"github.com/stretchr/testify/assert"
 	"regexp"
 	"testing"

pkg/config/config_test.go

@@ -10,7 +10,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/confluentinc/confluent-kafka-go/kafka"
+	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
 	"github.com/grepplabs/mqtt-proxy/apis"
 	"github.com/grepplabs/mqtt-proxy/pkg/log"
 	"github.com/grepplabs/mqtt-proxy/pkg/runtime"
@@ -117,7 +117,7 @@ func (s *Publisher) Shutdown(err error) {
 }
 
 func (s *Publisher) shutdown(ctx context.Context) error {
-	if !s.inShutdown.CAS(false, true) {
+	if !s.inShutdown.CompareAndSwap(false, true) {
 		return nil
 	}
 	defer s.Close()
@@ -139,7 +139,7 @@ func (s *Publisher) shutdown(ctx context.Context) error {
 	}
 }
 
-func (s Publisher) Name() string {
+func (s *Publisher) Name() string {
 	return publisherName
 }