Fixes after rebase.

nachogiljaldo · nachogiljaldo · commit 5c1acf08f854 · 2024-03-08T15:45:34.000+01:00
diff --git a/go.mod b/go.mod
@@ -5,13 +5,15 @@ go 1.17
 require (
 	github.com/IBM/sarama v1.42.1
 	github.com/ThreeDotsLabs/watermill v1.2.0
+	github.com/ThreeDotsLabs/watermill-kafka/v2 v2.5.0
 	github.com/dnwe/otelsarama v0.0.0-20231212173111-631a0a53d5d4
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/pkg/errors v0.9.1
 	github.com/stretchr/testify v1.8.4
 )
 
 require (
+	github.com/Shopify/sarama v1.38.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/eapache/go-resiliency v1.4.0 // indirect
 	github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect
@@ -34,6 +36,7 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
 	github.com/stretchr/objx v0.5.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/github.com/Shopify/sarama/otelsarama v0.31.0 // indirect
 	go.opentelemetry.io/otel v1.19.0 // indirect
 	go.opentelemetry.io/otel/metric v1.19.0 // indirect
 	go.opentelemetry.io/otel/trace v1.19.0 // indirect
diff --git a/go.sum b/go.sum
diff --git a/pkg/kafka/batch_message_handler.go b/pkg/kafka/batch_message_handler.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	"github.com/ThreeDotsLabs/watermill"
 	"github.com/ThreeDotsLabs/watermill/message"
 )
diff --git a/pkg/kafka/batch_message_handler_bench_test.go b/pkg/kafka/batch_message_handler_bench_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	"github.com/ThreeDotsLabs/watermill"
 	"github.com/ThreeDotsLabs/watermill/message"
 	"github.com/stretchr/testify/assert"
diff --git a/pkg/kafka/batch_message_handler_test.go b/pkg/kafka/batch_message_handler_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	"github.com/ThreeDotsLabs/watermill"
 	"github.com/ThreeDotsLabs/watermill/message"
 	"github.com/stretchr/testify/assert"
diff --git a/pkg/kafka/message_handler.go b/pkg/kafka/message_handler.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	"github.com/ThreeDotsLabs/watermill"
 	"github.com/ThreeDotsLabs/watermill/message"
 	"github.com/pkg/errors"
diff --git a/pkg/kafka/partition_concurrent_message_handler.go b/pkg/kafka/partition_concurrent_message_handler.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	"github.com/ThreeDotsLabs/watermill"
 	"github.com/ThreeDotsLabs/watermill/message"
 )
diff --git a/pkg/kafka/partition_concurrent_message_handler_test.go b/pkg/kafka/partition_concurrent_message_handler_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	"github.com/ThreeDotsLabs/watermill"
 	"github.com/ThreeDotsLabs/watermill/message"
 	"github.com/stretchr/testify/assert"

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"fmt"`
`6`	`6`	`"time"`
`7`	`7`
`8`		`- "github.com/Shopify/sarama"`
	`8`	`+ "github.com/IBM/sarama"`
`9`	`9`	`"github.com/ThreeDotsLabs/watermill"`
`10`	`10`	`"github.com/ThreeDotsLabs/watermill/message"`
`11`	`11`	`)`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"context"`
`5`	`5`	`"time"`
`6`	`6`
`7`		`- "github.com/Shopify/sarama"`
	`7`	`+ "github.com/IBM/sarama"`
`8`	`8`	`"github.com/ThreeDotsLabs/watermill"`
`9`	`9`	`"github.com/ThreeDotsLabs/watermill/message"`
`10`	`10`	`)`