Skip to content

Commit

Permalink
chore(deps): bump sarama to v1.40.0
Browse files Browse the repository at this point in the history
Note: the module path has changed to github.com/IBM/sarama since
ownership transitioned away from Shopify
  • Loading branch information
dnwe committed Jul 17, 2023
1 parent fbb32e9 commit 7ffdd4b
Show file tree
Hide file tree
Showing 9 changed files with 45 additions and 25 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file.
### Fixed

- Errors encountered by the `gcp_pubsub` output should now present more specific logs.
- Upgraded `kafka` input and output underlying sarama client library to v1.40.0 at new module path github.com/IBM/sarama

## 4.18.0 - 2023-07-02

Expand Down
8 changes: 5 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ require (
github.com/Azure/go-amqp v0.17.0
github.com/ClickHouse/clickhouse-go/v2 v2.6.1
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.4.0
github.com/IBM/sarama v1.40.0
github.com/Jeffail/gabs/v2 v2.7.0
github.com/Jeffail/grok v1.1.0
github.com/Masterminds/squirrel v1.5.2
github.com/OneOfOne/xxhash v1.2.8
github.com/PaesslerAG/gval v1.2.2
github.com/PaesslerAG/jsonpath v0.1.1
github.com/Shopify/sarama v1.30.1
github.com/apache/pulsar-client-go v0.10.0
github.com/aws/aws-lambda-go v1.28.0
github.com/aws/aws-sdk-go v1.42.31
Expand Down Expand Up @@ -224,7 +224,9 @@ require (
github.com/gosimple/unidecode v1.0.1 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.13.0 // indirect
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
github.com/hashicorp/errwrap v1.0.0 // indirect
github.com/hashicorp/go-immutable-radix v1.3.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-uuid v1.0.3 // indirect
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/imdario/mergo v0.3.13 // indirect
Expand Down Expand Up @@ -278,8 +280,8 @@ require (
github.com/stretchr/objx v0.5.0 // indirect
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
github.com/xdg-go/scram v1.1.1 // indirect
github.com/xdg-go/stringprep v1.0.3 // indirect
github.com/xdg-go/scram v1.1.2 // indirect
github.com/xdg-go/stringprep v1.0.4 // indirect
github.com/xdg/stringprep v1.0.3 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
Expand Down
49 changes: 33 additions & 16 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion internal/impl/kafka/input_sarama_kafka.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"sync"
"time"

"github.com/Shopify/sarama"
"github.com/IBM/sarama"

"github.com/benthosdev/benthos/v4/internal/batch/policy"
"github.com/benthosdev/benthos/v4/internal/bundle"
Expand Down
2 changes: 1 addition & 1 deletion internal/impl/kafka/input_sarama_kafka_cg.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"io"
"time"

"github.com/Shopify/sarama"
"github.com/IBM/sarama"

"github.com/benthosdev/benthos/v4/internal/batch/policy"
"github.com/benthosdev/benthos/v4/internal/message"
Expand Down
2 changes: 1 addition & 1 deletion internal/impl/kafka/input_sarama_kafka_parts.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"sync"
"time"

"github.com/Shopify/sarama"
"github.com/IBM/sarama"

"github.com/benthosdev/benthos/v4/internal/batch/policy"
"github.com/benthosdev/benthos/v4/internal/batch/policy/batchconfig"
Expand Down
2 changes: 1 addition & 1 deletion internal/impl/kafka/output_sarama_kafka.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"sync"
"time"

"github.com/Shopify/sarama"
"github.com/IBM/sarama"
"github.com/cenkalti/backoff/v4"

batchInternal "github.com/benthosdev/benthos/v4/internal/batch"
Expand Down
2 changes: 1 addition & 1 deletion internal/impl/kafka/sasl.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"errors"
"fmt"

"github.com/Shopify/sarama"
"github.com/IBM/sarama"

"github.com/benthosdev/benthos/v4/internal/bundle"
"github.com/benthosdev/benthos/v4/internal/component/cache"
Expand Down
2 changes: 1 addition & 1 deletion internal/impl/kafka/sasl_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package kafka_test
import (
"testing"

"github.com/Shopify/sarama"
"github.com/IBM/sarama"
"github.com/stretchr/testify/require"
"gopkg.in/yaml.v3"

Expand Down

0 comments on commit 7ffdd4b

Please sign in to comment.