Skip to content

Commit 1cf4813

Browse files
renovate[bot]paul1r
renovate[bot]
and
paul1r
authored
fix(deps): update module github.com/shopify/sarama to v1.43.3 (#14059)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Paul Rogers <[email protected]> Co-authored-by: Paul Rogers <[email protected]>
1 parent 4009d88 commit 1cf4813

File tree

174 files changed

+5736
-2473
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

174 files changed

+5736
-2473
lines changed

‎clients/pkg/promtail/scrapeconfig/scrapeconfig.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"reflect"
66
"time"
77

8-
"github.com/Shopify/sarama"
8+
"github.com/IBM/sarama"
99
"github.com/grafana/dskit/flagext"
1010

1111
"github.com/grafana/dskit/server"

‎clients/pkg/promtail/targets/azureeventhubs/parser.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"strings"
88
"time"
99

10-
"github.com/Shopify/sarama"
10+
"github.com/IBM/sarama"
1111
"github.com/prometheus/common/model"
1212
"github.com/prometheus/prometheus/model/labels"
1313
"github.com/prometheus/prometheus/model/relabel"

‎clients/pkg/promtail/targets/azureeventhubs/parser_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"testing"
66
"time"
77

8-
"github.com/Shopify/sarama"
8+
"github.com/IBM/sarama"
99
"github.com/prometheus/common/model"
1010
"github.com/prometheus/prometheus/model/relabel"
1111
"github.com/stretchr/testify/assert"

‎clients/pkg/promtail/targets/azureeventhubs/target_syncer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"fmt"
77
"time"
88

9-
"github.com/Shopify/sarama"
9+
"github.com/IBM/sarama"
1010
"github.com/go-kit/log"
1111
"github.com/prometheus/client_golang/prometheus"
1212

‎clients/pkg/promtail/targets/azureeventhubs/target_syncer_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"testing"
66
"time"
77

8-
"github.com/Shopify/sarama"
8+
"github.com/IBM/sarama"
99
"github.com/go-kit/log"
1010
"github.com/prometheus/client_golang/prometheus"
1111
"github.com/stretchr/testify/assert"

‎clients/pkg/promtail/targets/kafka/consumer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"sync"
77
"time"
88

9-
"github.com/Shopify/sarama"
9+
"github.com/IBM/sarama"
1010
"github.com/go-kit/log"
1111
"github.com/go-kit/log/level"
1212
"github.com/grafana/dskit/backoff"

‎clients/pkg/promtail/targets/kafka/consumer_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"testing"
88
"time"
99

10-
"github.com/Shopify/sarama"
10+
"github.com/IBM/sarama"
1111
"github.com/go-kit/log"
1212
"github.com/prometheus/common/model"
1313
"github.com/stretchr/testify/require"

‎clients/pkg/promtail/targets/kafka/parser.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package kafka
22

33
import (
4-
"github.com/Shopify/sarama"
4+
"github.com/IBM/sarama"
55
"github.com/prometheus/common/model"
66
"github.com/prometheus/prometheus/model/relabel"
77

‎clients/pkg/promtail/targets/kafka/target.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"fmt"
55
"time"
66

7-
"github.com/Shopify/sarama"
7+
"github.com/IBM/sarama"
88
"github.com/go-kit/log"
99
"github.com/go-kit/log/level"
1010
"github.com/prometheus/common/model"

‎clients/pkg/promtail/targets/kafka/target_syncer.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"sync"
99
"time"
1010

11-
"github.com/Shopify/sarama"
11+
"github.com/IBM/sarama"
1212
"github.com/go-kit/log"
1313
"github.com/go-kit/log/level"
1414
"github.com/prometheus/client_golang/prometheus"
@@ -77,11 +77,11 @@ func NewSyncerFromScrapeConfig(
7777

7878
switch cfg.KafkaConfig.Assignor {
7979
case sarama.StickyBalanceStrategyName:
80-
config.Consumer.Group.Rebalance.Strategy = sarama.BalanceStrategySticky
80+
config.Consumer.Group.Rebalance.Strategy = sarama.NewBalanceStrategySticky()
8181
case sarama.RoundRobinBalanceStrategyName:
82-
config.Consumer.Group.Rebalance.Strategy = sarama.BalanceStrategyRoundRobin
82+
config.Consumer.Group.Rebalance.Strategy = sarama.NewBalanceStrategyRoundRobin()
8383
case sarama.RangeBalanceStrategyName, "":
84-
config.Consumer.Group.Rebalance.Strategy = sarama.BalanceStrategyRange
84+
config.Consumer.Group.Rebalance.Strategy = sarama.NewBalanceStrategyRange()
8585
default:
8686
return nil, fmt.Errorf("unrecognized consumer group partition assignor: %s", cfg.KafkaConfig.Assignor)
8787
}

‎clients/pkg/promtail/targets/kafka/target_syncer_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"testing"
99
"time"
1010

11-
"github.com/Shopify/sarama"
11+
"github.com/IBM/sarama"
1212
"github.com/go-kit/log"
1313
"github.com/grafana/dskit/flagext"
1414
"github.com/prometheus/client_golang/prometheus"

‎clients/pkg/promtail/targets/kafka/target_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"testing"
88
"time"
99

10-
"github.com/Shopify/sarama"
10+
"github.com/IBM/sarama"
1111
"github.com/prometheus/common/model"
1212
"github.com/prometheus/prometheus/model/relabel"
1313
"github.com/stretchr/testify/require"

‎go.mod

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ require (
1212
github.com/Azure/azure-storage-blob-go v0.14.0
1313
github.com/Azure/go-autorest/autorest/adal v0.9.24
1414
github.com/Azure/go-autorest/autorest/azure/auth v0.5.13
15+
github.com/IBM/sarama v1.43.3
1516
github.com/Masterminds/sprig/v3 v3.2.3
1617
github.com/NYTimes/gziphandler v1.1.1
17-
github.com/Shopify/sarama v1.38.1
1818
github.com/Workiva/go-datastructures v1.1.5
1919
github.com/alicebob/miniredis/v2 v2.30.4
2020
github.com/aliyun/aliyun-oss-go-sdk v2.2.10+incompatible
@@ -252,8 +252,8 @@ require (
252252
github.com/docker/go-metrics v0.0.1 // indirect
253253
github.com/docker/go-units v0.5.0 // indirect
254254
github.com/dolthub/maphash v0.1.0 // indirect
255-
github.com/eapache/go-resiliency v1.3.0 // indirect
256-
github.com/eapache/go-xerial-snappy v0.0.0-20230111030713-bf00bc1b83b6 // indirect
255+
github.com/eapache/go-resiliency v1.7.0 // indirect
256+
github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect
257257
github.com/eapache/queue v1.1.0 // indirect
258258
github.com/edsrzf/mmap-go v1.1.0 // indirect
259259
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
@@ -307,7 +307,7 @@ require (
307307
github.com/jcmturner/aescts/v2 v2.0.0 // indirect
308308
github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
309309
github.com/jcmturner/gofork v1.7.6 // indirect
310-
github.com/jcmturner/gokrb5/v8 v8.4.3 // indirect
310+
github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect
311311
github.com/jcmturner/rpc/v2 v2.0.3 // indirect
312312
github.com/josharian/intern v1.0.0 // indirect
313313
github.com/jpillora/backoff v1.0.0 // indirect

‎go.sum

+9-12
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,8 @@ github.com/IBM/go-sdk-core/v5 v5.17.5 h1:AjGC7xNee5tgDIjndekBDW5AbypdERHSgib3EZ1
266266
github.com/IBM/go-sdk-core/v5 v5.17.5/go.mod h1:KsAAI7eStAWwQa4F96MLy+whYSh39JzNjklZRbN/8ns=
267267
github.com/IBM/ibm-cos-sdk-go v1.11.1 h1:Pye61hmWA4ZVCfOfFLTJBjPka4HIGrLqmpZ2d2KlrCE=
268268
github.com/IBM/ibm-cos-sdk-go v1.11.1/go.mod h1:d8vET3w8wgmGwCsCVs+0y4V8+1hRNT6+pbpGaEHvSCI=
269+
github.com/IBM/sarama v1.43.3 h1:Yj6L2IaNvb2mRBop39N7mmJAHBVY3dTPncr3qGVkxPA=
270+
github.com/IBM/sarama v1.43.3/go.mod h1:FVIRaLrhK3Cla/9FfRF5X9Zua2KpS3SYIXxhac1H+FQ=
269271
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
270272
github.com/MasslessParticle/azure-storage-blob-go v0.14.1-0.20240322194317-344980fda573 h1:DCPjdUAi+jcGnL7iN+A7uNY8xG584oMRuisYh/VE21E=
271273
github.com/MasslessParticle/azure-storage-blob-go v0.14.1-0.20240322194317-344980fda573/go.mod h1:SMqIBi+SuiQH32bvyjngEewEeXoPfKMgWlBDaYf6fck=
@@ -296,12 +298,7 @@ github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdko
296298
github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
297299
github.com/Shopify/sarama v1.21.0/go.mod h1:yuqtN/pe8cXRWG5zPaO7hCfNJp5MwmkoJEoLjkm5tCQ=
298300
github.com/Shopify/sarama v1.27.1/go.mod h1:g5s5osgELxgM+Md9Qni9rzo7Rbt+vvFQI4bt/Mc93II=
299-
github.com/Shopify/sarama v1.38.1 h1:lqqPUPQZ7zPqYlWpTh+LQ9bhYNu2xJL6k1SJN4WVe2A=
300-
github.com/Shopify/sarama v1.38.1/go.mod h1:iwv9a67Ha8VNa+TifujYoWGxWnu2kNVAQdSdZ4X2o5g=
301-
github.com/Shopify/toxiproxy v2.1.4+incompatible h1:TKdv8HiTLgE5wdJuEML90aBgNWsokNbMijUGhmcoBJc=
302301
github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
303-
github.com/Shopify/toxiproxy/v2 v2.5.0 h1:i4LPT+qrSlKNtQf5QliVjdP08GyAH8+BUIc9gT0eahc=
304-
github.com/Shopify/toxiproxy/v2 v2.5.0/go.mod h1:yhM2epWtAmel9CB8r2+L+PCmhH6yH2pITaPAo7jxJl0=
305302
github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
306303
github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
307304
github.com/Workiva/go-datastructures v1.1.5 h1:5YfhQ4ry7bZc2Mc7R0YZyYwpf5c6t1cEFvdAhd6Mkf4=
@@ -583,11 +580,11 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp
583580
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
584581
github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
585582
github.com/eapache/go-resiliency v1.2.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
586-
github.com/eapache/go-resiliency v1.3.0 h1:RRL0nge+cWGlxXbUzJ7yMcq6w2XBEr19dCN6HECGaT0=
587-
github.com/eapache/go-resiliency v1.3.0/go.mod h1:5yPzW0MIvSe0JDsv0v+DvcjEv2FyD6iZYSs1ZI+iQho=
583+
github.com/eapache/go-resiliency v1.7.0 h1:n3NRTnBn5N0Cbi/IeOHuQn9s2UwVUH7Ga0ZWcP+9JTA=
584+
github.com/eapache/go-resiliency v1.7.0/go.mod h1:5yPzW0MIvSe0JDsv0v+DvcjEv2FyD6iZYSs1ZI+iQho=
588585
github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
589-
github.com/eapache/go-xerial-snappy v0.0.0-20230111030713-bf00bc1b83b6 h1:8yY/I9ndfrgrXUbOGObLHKBR4Fl3nZXwM2c7OYTT8hM=
590-
github.com/eapache/go-xerial-snappy v0.0.0-20230111030713-bf00bc1b83b6/go.mod h1:YvSRo5mw33fLEx1+DlK6L2VV43tJt5Eyel9n9XBcR+0=
586+
github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 h1:Oy0F4ALJ04o5Qqpdz8XLIpNA3WM/iSIXqxtqo7UGVws=
587+
github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3/go.mod h1:YvSRo5mw33fLEx1+DlK6L2VV43tJt5Eyel9n9XBcR+0=
591588
github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc=
592589
github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
593590
github.com/ebitengine/purego v0.8.0 h1:JbqvnEzRvPpxhCJzJJ2y0RbiZ8nyjccVUrSM3q+GvvE=
@@ -1265,8 +1262,8 @@ github.com/jcmturner/gofork v1.7.6 h1:QH0l3hzAU1tfT3rZCnW5zXl+orbkNMMRGJfdJjHVET
12651262
github.com/jcmturner/gofork v1.7.6/go.mod h1:1622LH6i/EZqLloHfE7IeZ0uEJwMSUyQ/nDd82IeqRo=
12661263
github.com/jcmturner/goidentity/v6 v6.0.1 h1:VKnZd2oEIMorCTsFBnJWbExfNN7yZr3EhJAxwOkZg6o=
12671264
github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg=
1268-
github.com/jcmturner/gokrb5/v8 v8.4.3 h1:iTonLeSJOn7MVUtyMT+arAn5AKAPrkilzhGw8wE/Tq8=
1269-
github.com/jcmturner/gokrb5/v8 v8.4.3/go.mod h1:dqRwJGXznQrzw6cWmyo6kH+E7jksEQG/CyVWsJEsJO0=
1265+
github.com/jcmturner/gokrb5/v8 v8.4.4 h1:x1Sv4HaTpepFkXbt2IkL29DXRf8sOfZXo8eRKh687T8=
1266+
github.com/jcmturner/gokrb5/v8 v8.4.4/go.mod h1:1btQEpgT6k+unzCwX1KdWMEwPPkkgBtP+F6aCACiMrs=
12701267
github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY=
12711268
github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc=
12721269
github.com/jimstudt/http-authentication v0.0.0-20140401203705-3eca13d6893a/go.mod h1:wK6yTYYcgjHE1Z1QtXACPDjcFJyBskHEdagmnq3vsP8=
@@ -2150,11 +2147,11 @@ golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug
21502147
golang.org/x/net v0.0.0-20220617184016-355a448f1bc9/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
21512148
golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
21522149
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
2153-
golang.org/x/net v0.0.0-20220725212005-46097bf591d3/go.mod h1:AaygXjzTFtRAg2ttMY5RMuhpJ3cNnI0XpyFJD1iQRSM=
21542150
golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
21552151
golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
21562152
golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
21572153
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
2154+
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
21582155
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
21592156
golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
21602157
golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=

‎vendor/github.com/Shopify/sarama/.gitignore ‎vendor/github.com/IBM/sarama/.gitignore

File renamed without changes.

‎vendor/github.com/Shopify/sarama/.golangci.yml ‎vendor/github.com/IBM/sarama/.golangci.yml

+16-15
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/IBM/sarama/.pre-commit-config.yaml

+41
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)