Upgrades

.github/workflows/e2e.yml

@@ -25,6 +25,7 @@ jobs:
 
       - name: Starting service
         run:  |
+          docker ps -a
           go build . 
           nohup ./service &
         working-directory: ./examples/service

.github/workflows/go.yml

@@ -25,7 +25,7 @@ jobs:
     name: CI on Go ${{ matrix.go-image-version}}
     strategy:
       matrix:
-        go-image-version: ["1.20"]
+        go-image-version: ["1.21"]
     runs-on: ubuntu-latest
     steps:
       - name: Set up Go ${{ matrix.go-image-version }}

README.md

@@ -17,7 +17,7 @@ The entry point of the framework is the `Service`. The `Service` uses `Component
 - logging
 
 `Patron` provides the same defaults for making the usage as simple as possible.
-`Patron` needs Go 1.20 as a minimum.
+`Patron` needs Go 1.21 as a minimum.
 
 ## Table of Contents
 

client/kafka/async_producer.go

@@ -5,7 +5,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	patronerrors "github.com/beatlabs/patron/errors"
 	"github.com/beatlabs/patron/trace"
 	"github.com/opentracing/opentracing-go"

client/kafka/integration_test.go

@@ -6,7 +6,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	"github.com/opentracing/opentracing-go"
 	"github.com/opentracing/opentracing-go/ext"
 	"github.com/opentracing/opentracing-go/mocktracer"

client/kafka/kafka.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	"github.com/beatlabs/patron/correlation"
 	patronerrors "github.com/beatlabs/patron/errors"
 	"github.com/beatlabs/patron/internal/validation"

client/kafka/kafka_test.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	"github.com/beatlabs/patron/correlation"
 	"github.com/beatlabs/patron/trace"
 	"github.com/opentracing/opentracing-go"

client/kafka/sync_producer.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	patronerrors "github.com/beatlabs/patron/errors"
 	"github.com/beatlabs/patron/trace"
 	"github.com/opentracing/opentracing-go"

client/mqtt/integration_test.go

@@ -97,8 +97,11 @@ func createSubscriber(t *testing.T, u *url.URL, router paho.Router) (*autopaho.C
 		ConnectTimeout:    1 * time.Second,
 		OnConnectionUp: func(cm *autopaho.ConnectionManager, _ *paho.Connack) {
 			_, err := cm.Subscribe(context.Background(), &paho.Subscribe{
-				Subscriptions: map[string]paho.SubscribeOptions{
-					testTopic: {QoS: 1},
+				Subscriptions: []paho.SubscribeOptions{
+					{
+						Topic: testTopic,
+						QoS:   1,
+					},
 				},
 			})
 			require.NoError(t, err)

component/async/kafka/group/group.go

@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	"github.com/beatlabs/patron/component/async"
 	"github.com/beatlabs/patron/component/async/kafka"
 	"github.com/beatlabs/patron/internal/validation"

component/async/kafka/group/group_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	"github.com/beatlabs/patron/component/async"
 	"github.com/beatlabs/patron/component/async/kafka"
 	kafkacmp "github.com/beatlabs/patron/component/kafka"

component/async/kafka/group/integration_test.go

@@ -13,7 +13,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	"github.com/beatlabs/patron"
 	"github.com/beatlabs/patron/component/async"
 	"github.com/beatlabs/patron/component/async/kafka"

component/async/kafka/kafka.go

@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	"github.com/beatlabs/patron/component/async"
 	"github.com/beatlabs/patron/correlation"
 	"github.com/beatlabs/patron/encoding"

component/async/kafka/kafka_test.go

@@ -11,7 +11,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	"github.com/beatlabs/patron/component/async"
 	"github.com/beatlabs/patron/correlation"
 	"github.com/beatlabs/patron/encoding"

component/async/kafka/option.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	"github.com/beatlabs/patron/encoding"
 	"github.com/beatlabs/patron/encoding/json"
 )

component/async/kafka/option_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	"github.com/beatlabs/patron/encoding"
 	"github.com/beatlabs/patron/encoding/json"
 	"github.com/stretchr/testify/assert"

component/async/kafka/simple/duration_client_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

component/async/kafka/simple/duration_kafka.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 )
 
 type outOfRangeOffsetError struct {

component/async/kafka/simple/integration_test.go

@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	"github.com/beatlabs/patron/component/async/kafka"
 	kafkacmp "github.com/beatlabs/patron/component/kafka"
 	testkafka "github.com/beatlabs/patron/test/kafka"

component/async/kafka/simple/simple.go

@@ -8,7 +8,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	"github.com/beatlabs/patron/component/async"
 	"github.com/beatlabs/patron/component/async/kafka"
 	"github.com/beatlabs/patron/internal/validation"

component/async/kafka/simple/simple_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	"github.com/beatlabs/patron/component/async/kafka"
 	kafkacmp "github.com/beatlabs/patron/component/kafka"
 	"github.com/stretchr/testify/assert"

component/kafka/component.go

@@ -8,7 +8,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	"github.com/beatlabs/patron/correlation"
 	patronErrors "github.com/beatlabs/patron/errors"
 	"github.com/beatlabs/patron/internal/validation"

component/kafka/component_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	"github.com/beatlabs/patron/correlation"
 	"github.com/beatlabs/patron/encoding"
 	"github.com/beatlabs/patron/encoding/json"

component/kafka/integration_test.go

@@ -12,7 +12,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	kafkaclient "github.com/beatlabs/patron/client/kafka"
 	"github.com/beatlabs/patron/correlation"
 	testkafka "github.com/beatlabs/patron/test/kafka"

component/kafka/kafka.go

@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	"github.com/opentracing/opentracing-go"
 )
 

component/kafka/kafka_test.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	"github.com/beatlabs/patron/correlation"
 	"github.com/opentracing/opentracing-go/mocktracer"
 	"github.com/stretchr/testify/assert"

component/kafka/option.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	"golang.org/x/exp/slog"
 )
 

component/kafka/option_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	"github.com/stretchr/testify/assert"
 )
 

docker-compose.yml

@@ -21,7 +21,7 @@ services:
     depends_on:
       - zookeeper
   rabbitmq:
-    image: docker.io/bitnami/rabbitmq:3.9
+    image: docker.io/bitnami/rabbitmq:latest
     ports:
       - '4369:4369'
       - '5551:5551'
@@ -47,7 +47,7 @@ services:
     expose:
       - '3306'
     volumes:
-      - mysql-db:/var/lib/mysql
+      - mysql_data:/var/lib/mysql
   redis:
     image: docker.io/bitnami/redis:6.2
     environment:
@@ -57,7 +57,7 @@ services:
     volumes:
       - 'redis_data:/bitnami/redis/data'
   localstack:
-    image: localstack/localstack:2.1
+    image: localstack/localstack:2.3.2
     ports:
       - "127.0.0.1:4566:4566" # LocalStack Gateway
       - "127.0.0.1:4510-4559:4510-4559" # external services port range
@@ -97,6 +97,7 @@ services:
 volumes:
   rabbitmq_data:
     driver: local
-  mysql-db:
+  mysql_data:
+    driver: local
   redis_data:
     driver: local

examples/client/main.go

@@ -10,7 +10,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/sqs"
 	patronamqp "github.com/beatlabs/patron/client/amqp"

examples/docker-compose.yml

@@ -2,7 +2,7 @@ version: '2.1'
 
 services:
   rabbitmq:
-    image: docker.io/bitnami/rabbitmq:3.9
+    image: docker.io/bitnami/rabbitmq:latest
     ports:
       - '4369:4369'
       - '5551:5551'
@@ -35,7 +35,7 @@ services:
     depends_on:
       - zookeeper
   localstack:
-    image: localstack/localstack:2.1
+    image: localstack/localstack:2.3.2
     ports:
       - "127.0.0.1:4566:4566" # LocalStack Gateway
       - "127.0.0.1:4510-4559:4510-4559" # external services port range

examples/service/kafka.go

@@ -3,7 +3,7 @@ package main
 import (
 	"time"
 
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	"github.com/beatlabs/patron"
 	"github.com/beatlabs/patron/component/kafka"
 	"github.com/beatlabs/patron/examples"