From d55d9567620f77e7edca11dfcd801e8d331b5ce4 Mon Sep 17 00:00:00 2001 From: mengfanwei Date: Fri, 20 Sep 2024 10:51:01 +0800 Subject: [PATCH 1/4] feat: upgrade go kafka client sarama version v1.42.2 to v1.43.3 --- go.mod | 22 +++++++++++----------- go.sum | 46 +++++++++++++++++++++++----------------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/go.mod b/go.mod index 8988860d5c..f9d9f44b23 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/ClickHouse/clickhouse-go/v2 v2.6.0 - github.com/IBM/sarama v1.42.2 + github.com/IBM/sarama v1.43.3 github.com/VictoriaMetrics/VictoriaMetrics v1.83.0 github.com/alibaba/ilogtail/pkg v0.0.0 github.com/apache/pulsar-client-go v0.10.0 @@ -52,7 +52,7 @@ require ( github.com/sirupsen/logrus v1.8.1 github.com/smartystreets/goconvey v1.7.2 github.com/streadway/handy v0.0.0-20230327021402-6a47ec586270 - github.com/stretchr/testify v1.8.4 + github.com/stretchr/testify v1.9.0 github.com/syndtr/goleveldb v0.0.0-20170725064836-b89cc31ef797 github.com/xdg-go/scram v1.1.2 go.opentelemetry.io/collector/consumer v0.66.0 @@ -60,7 +60,7 @@ require ( go.opentelemetry.io/proto/otlp v0.19.0 go.uber.org/atomic v1.11.0 go.uber.org/multierr v1.11.0 - golang.org/x/sys v0.17.0 + golang.org/x/sys v0.23.0 google.golang.org/grpc v1.53.0 google.golang.org/protobuf v1.31.0 gopkg.in/yaml.v2 v2.4.0 @@ -118,7 +118,7 @@ require ( github.com/docker/go-metrics v0.0.1 // indirect github.com/docker/go-units v0.5.0 // indirect github.com/dvsekhvalnov/jose2go v1.5.0 // indirect - github.com/eapache/go-resiliency v1.6.0 // indirect + github.com/eapache/go-resiliency v1.7.0 // indirect github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect github.com/eapache/queue v1.1.0 // indirect github.com/elastic/elastic-transport-go/v8 v8.0.0-20211216131617-bbee439d559c // indirect @@ -182,7 +182,7 @@ require ( github.com/josharian/intern v1.0.0 // indirect github.com/jpillora/backoff v1.0.0 // indirect github.com/jtolds/gls v4.20.0+incompatible // indirect - github.com/klauspost/compress v1.17.7 // indirect + github.com/klauspost/compress v1.17.9 // indirect github.com/leodido/go-urn v1.4.0 // indirect github.com/linkedin/goavro/v2 v2.9.8 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect @@ -248,14 +248,14 @@ require ( go.opentelemetry.io/otel/trace v1.11.2 // indirect go.uber.org/goleak v1.2.1 // indirect go.uber.org/zap v1.26.0 // indirect - golang.org/x/crypto v0.19.0 // indirect + golang.org/x/crypto v0.26.0 // indirect golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect - golang.org/x/mod v0.13.0 // indirect - golang.org/x/net v0.21.0 // indirect + golang.org/x/mod v0.17.0 // indirect + golang.org/x/net v0.28.0 // indirect golang.org/x/oauth2 v0.5.0 // indirect - golang.org/x/sync v0.6.0 // indirect - golang.org/x/term v0.17.0 // indirect - golang.org/x/text v0.14.0 // indirect + golang.org/x/sync v0.8.0 // indirect + golang.org/x/term v0.23.0 // indirect + golang.org/x/text v0.17.0 // indirect golang.org/x/time v0.3.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect diff --git a/go.sum b/go.sum index 3b5590895e..6db1909329 100644 --- a/go.sum +++ b/go.sum @@ -100,8 +100,8 @@ github.com/ClickHouse/clickhouse-go/v2 v2.6.0/go.mod h1:SvXuWqDsiHJE3VAn2+3+nz9W github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/zstd v1.5.0 h1:+K/VEwIAaPcHiMtQvpLD4lqW7f0Gk3xdYZmI1hD+CXo= github.com/DataDog/zstd v1.5.0/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= -github.com/IBM/sarama v1.42.2 h1:VoY4hVIZ+WQJ8G9KNY/SQlWguBQXQ9uvFPOnrcu8hEw= -github.com/IBM/sarama v1.42.2/go.mod h1:FLPGUGwYqEs62hq2bVG6Io2+5n+pS6s/WOXVKWSLFtE= +github.com/IBM/sarama v1.43.3 h1:Yj6L2IaNvb2mRBop39N7mmJAHBVY3dTPncr3qGVkxPA= +github.com/IBM/sarama v1.43.3/go.mod h1:FVIRaLrhK3Cla/9FfRF5X9Zua2KpS3SYIXxhac1H+FQ= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= @@ -472,8 +472,8 @@ github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25Kn github.com/dvsekhvalnov/jose2go v1.5.0 h1:3j8ya4Z4kMCwT5nXIKFSV84YS+HdqSSO0VsTQxaLAeM= github.com/dvsekhvalnov/jose2go v1.5.0/go.mod h1:QsHjhyTlD/lAVqn/NSbVZmSCGeDehTB/mPZadG+mhXU= github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= -github.com/eapache/go-resiliency v1.6.0 h1:CqGDTLtpwuWKn6Nj3uNUdflaq+/kIPsg0gfNzHton30= -github.com/eapache/go-resiliency v1.6.0/go.mod h1:5yPzW0MIvSe0JDsv0v+DvcjEv2FyD6iZYSs1ZI+iQho= +github.com/eapache/go-resiliency v1.7.0 h1:n3NRTnBn5N0Cbi/IeOHuQn9s2UwVUH7Ga0ZWcP+9JTA= +github.com/eapache/go-resiliency v1.7.0/go.mod h1:5yPzW0MIvSe0JDsv0v+DvcjEv2FyD6iZYSs1ZI+iQho= github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 h1:Oy0F4ALJ04o5Qqpdz8XLIpNA3WM/iSIXqxtqo7UGVws= github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3/go.mod h1:YvSRo5mw33fLEx1+DlK6L2VV43tJt5Eyel9n9XBcR+0= @@ -1034,8 +1034,8 @@ github.com/klauspost/compress v1.11.13/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdY github.com/klauspost/compress v1.13.4/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= github.com/klauspost/compress v1.13.5/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg= -github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= +github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/knz/strtime v0.0.0-20181018220328-af2256ee352c h1:45aLE1GlZRKxNfTMkok85BUKAJNLdHr5GAm3h8Fqoww= github.com/knz/strtime v0.0.0-20181018220328-af2256ee352c/go.mod h1:4ZxfWkxwtc7dBeifERVVWRy9F9rTU9p0yCDgeCtlius= github.com/kolo/xmlrpc v0.0.0-20201022064351-38db28db192b/go.mod h1:pcaDhQK0/NJZEvtCO0qQPPropqV0sJOJ6YW7X+9kRwM= @@ -1487,8 +1487,8 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= github.com/stretchr/testify v0.0.0-20180303142811-b89eecf5ca5d/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= @@ -1499,8 +1499,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= @@ -1716,8 +1716,8 @@ golang.org/x/crypto v0.0.0-20211202192323-5770296d904e/go.mod h1:IxCIyHEi3zRg3s0 golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= -golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo= -golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= +golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -1759,8 +1759,8 @@ golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY= -golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= +golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1835,8 +1835,8 @@ golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= +golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1870,8 +1870,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= -golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -2004,16 +2004,16 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= +golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.17.0 h1:mkTF7LCd6WGJNL3K1Ad7kwxNfYAW6a8a8QqtMblp/4U= -golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= +golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU= +golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -2025,8 +2025,8 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= +golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= From cca1b4299569449573faa6f52c053dbd08448be2 Mon Sep 17 00:00:00 2001 From: mengfanwei Date: Mon, 23 Sep 2024 15:40:31 +0800 Subject: [PATCH 2/4] feat: update kafka producer MaxMessageBytes default size --- docs/cn/plugins/flusher/flusher-kafka_v2.md | 100 ++++++++++---------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/docs/cn/plugins/flusher/flusher-kafka_v2.md b/docs/cn/plugins/flusher/flusher-kafka_v2.md index f57482bbaf..52cc0e4736 100644 --- a/docs/cn/plugins/flusher/flusher-kafka_v2.md +++ b/docs/cn/plugins/flusher/flusher-kafka_v2.md @@ -10,56 +10,56 @@ ## 配置参数 -| 参数 | 类型 | 是否必选 | 说明 | -|---------------------------------------|----------|------|------------------------------------------------------------------------------------------------------------| -| Type | String | 是 | 插件类型 | -| Brokers | String数组 | 是 | Kafka Brokers | -| Topic | String | 是 | Kafka Topic,支持动态topic, 例如: `test_%{content.appname}` | -| Version | String | 否 | Kafka协议版本号 ,例如：`2.0.0`，默认值：`1.0.0` | -| Headers | header数组 | 否 | kafka消息头 ，配置使用请参考本文中`Headers`配置用例 | -| Convert | Struct | 否 | iLogtail数据转换协议配置 | -| Convert.Protocol | String | 否 | iLogtail数据转换协议，kafka flusher 可选值：`custom_single`,`custom_single_flatten`,`otlp_log_v1`。默认值：`custom_single` | -| Convert.Encoding | String | 否 | iLogtail flusher数据转换编码，可选值：`json`、`none`、`protobuf`，默认值：`json` | -| Convert.TagFieldsRename | Map | 否 | 对日志中tags中的json字段重命名 | -| Convert.ProtocolFieldsRename | Map | 否 | iLogtail日志协议字段重命名，可当前可重命名的字段：`contents`,`tags`和`time` | -| Authentication | Struct | 否 | Kafka连接访问认证配置，支持`SASL/PLAIN`，根据kafka服务端认证方式选择配置 | -| Authentication.PlainText.Username | String | 否 | PlainText认证用户名 | -| Authentication.PlainText.Password | String | 否 | PlainText认证密码 | -| Authentication.SASL.Username | String | 否 | SASL认证用户名 | -| Authentication.SASL.Password | String | 否 | SASL认证密码 | -| Authentication.Sasl.SaslMechanism | String | 否 | SASL认证，配置可选项：`PLAIN`、`SCRAM-SHA-256`、`SCRAM-SHA-512` | -| Authentication.TLS.Enabled | Boolean | 否 | 是否启用TLS安全连接, | -| Authentication.TLS.CAFile | String | 否 | TLS CA根证书文件路径 | -| Authentication.TLS.CertFile | String | 否 | TLS连接`kafka`证书文件路径 | -| Authentication.TLS.KeyFile | String | 否 | TLS连接`kafka`私钥文件路径 | -| Authentication.TLS.MinVersion | String | 否 | TLS支持协议最小版本，可选配置：`1.0, 1.1, 1.2, 1.3`,默认：`1.2` | -| Authentication.TLS.MaxVersion | String | 否 | TLS支持协议最大版本,可选配置：`1.0, 1.1, 1.2, 1.3`,默认采用：`crypto/tls`支持的版本，当前`1.3` | -| Authentication.TLS.InsecureSkipVerify | Boolean | 否 | 是否跳过TLS证书校验 | -| Authentication.Kerberos.ServiceName | String | 否 | 服务名称，例如：kafka | -| Authentication.Kerberos.UseKeyTab | Boolean | 否 | 是否采用keytab，配置此项后需要配置KeyTabPath，默认为：`false` | -| Authentication.Kerberos.Username | Boolean | 否 | UseKeyTab设置为`false`的情况下，需要指定用户名 | -| Authentication.Kerberos.Password | String | 否 | UseKeyTab设置为`false`的情况下，需要指定密码 | -| Authentication.Kerberos.Realm | String | 否 | kerberos认证管理域,大小写敏感 | -| Authentication.Kerberos.ConfigPath | Boolean | 否 | Kerberos krb5.conf | -| Authentication.Kerberos.KeyTabPath | String | 否 | keytab的路径 | -| PartitionerType | String | 否 | Partitioner类型。取值：`roundrobin`、`hash`、`random`。默认为：`random`。 | -| RequiredAcks | int | 否 | ACK的可靠等级.0=无响应,1=等待本地消息,-1=等待所有副本提交.默认1， | -| Compression | String | 否 | 压缩算法，可选值：`none`, `snappy`，`lz4`和`gzip`，默认值`none` | -| CompressionLevel | Int | 否 | 压缩级别，可选值：`1~9`，默认值：`4`,设置为`0`则禁用`Compression` | -| MaxMessageBytes | Int | 否 | 一个批次提交的大小限制，配置和`message.max.bytes`对应，默认值：`1000000` | -| MaxOpenRequests | Int | 否 | 一个连接允许的最大打开的请求数，默认值:`5` | -| MaxRetries | Int | 否 | 提交失败重试次数，最大`3`次，默认值：`3` | -| BulkMaxSize | Int | 否 | 单次请求提交事件数，默认`2048` | -| BulkFlushFrequency | Int | 否 | 发送批量 Kafka 请求之前等待的时间,0标识没有时延，默认值:`0` | -| Timeout | Int | 否 | 等待Kafka brokers响应的超时时间，默认`30s` | -| BrokerTimeout | int | 否 | kafka broker等待请求的最大时长，默认`10s` | -| Metadata.Retry.Max | int | 否 | 最大重试次数，默认值：`3` | -| Metadata.Retry.Backoff | int | 否 | 在重试之前等待leader选举发生的时间，默认值：`250ms` | -| Metadata.RefreshFrequency | int | 否 | Metadata刷新频率，默认值：`250ms` | -| Metadata.Full | int | 否 | 获取原数数据的策略，获取元数据时使用的策略，当此选项为`true`时，客户端将为所有可用主题维护一整套元数据，如果此选项设置为`false`，它将仅刷新已配置主题的元数据。默认值:`false`。 | -| HashKeys | String数组 | 否 | PartitionerType为`hash`时，需指定HashKeys。 | -| HashOnce | Boolean | 否 | | -| ClientID | String | 否 | 写入Kafka的Client ID，默认取值：`LogtailPlugin`。 | +| 参数 | 类型 | 是否必选 | 说明 | +| ------------------------------------- | ---------- | -------- | ------------------------------------------------------------ | +| Type | String | 是 | 插件类型 | +| Brokers | String数组 | 是 | Kafka Brokers | +| Topic | String | 是 | Kafka Topic,支持动态topic, 例如: `test_%{content.appname}` | +| Version | String | 否 | Kafka协议版本号 ,例如：`2.0.0`，默认值：`1.0.0` | +| Headers | header数组 | 否 | kafka消息头 ，配置使用请参考本文中`Headers`配置用例 | +| Convert | Struct | 否 | iLogtail数据转换协议配置 | +| Convert.Protocol | String | 否 | iLogtail数据转换协议，kafka flusher 可选值：`custom_single`,`custom_single_flatten`,`otlp_log_v1`。默认值：`custom_single` | +| Convert.Encoding | String | 否 | iLogtail flusher数据转换编码，可选值：`json`、`none`、`protobuf`，默认值：`json` | +| Convert.TagFieldsRename | Map | 否 | 对日志中tags中的json字段重命名 | +| Convert.ProtocolFieldsRename | Map | 否 | iLogtail日志协议字段重命名，可当前可重命名的字段：`contents`,`tags`和`time` | +| Authentication | Struct | 否 | Kafka连接访问认证配置，支持`SASL/PLAIN`，根据kafka服务端认证方式选择配置 | +| Authentication.PlainText.Username | String | 否 | PlainText认证用户名 | +| Authentication.PlainText.Password | String | 否 | PlainText认证密码 | +| Authentication.SASL.Username | String | 否 | SASL认证用户名 | +| Authentication.SASL.Password | String | 否 | SASL认证密码 | +| Authentication.Sasl.SaslMechanism | String | 否 | SASL认证，配置可选项：`PLAIN`、`SCRAM-SHA-256`、`SCRAM-SHA-512` | +| Authentication.TLS.Enabled | Boolean | 否 | 是否启用TLS安全连接, | +| Authentication.TLS.CAFile | String | 否 | TLS CA根证书文件路径 | +| Authentication.TLS.CertFile | String | 否 | TLS连接`kafka`证书文件路径 | +| Authentication.TLS.KeyFile | String | 否 | TLS连接`kafka`私钥文件路径 | +| Authentication.TLS.MinVersion | String | 否 | TLS支持协议最小版本，可选配置：`1.0, 1.1, 1.2, 1.3`,默认：`1.2` | +| Authentication.TLS.MaxVersion | String | 否 | TLS支持协议最大版本,可选配置：`1.0, 1.1, 1.2, 1.3`,默认采用：`crypto/tls`支持的版本，当前`1.3` | +| Authentication.TLS.InsecureSkipVerify | Boolean | 否 | 是否跳过TLS证书校验 | +| Authentication.Kerberos.ServiceName | String | 否 | 服务名称，例如：kafka | +| Authentication.Kerberos.UseKeyTab | Boolean | 否 | 是否采用keytab，配置此项后需要配置KeyTabPath，默认为：`false` | +| Authentication.Kerberos.Username | Boolean | 否 | UseKeyTab设置为`false`的情况下，需要指定用户名 | +| Authentication.Kerberos.Password | String | 否 | UseKeyTab设置为`false`的情况下，需要指定密码 | +| Authentication.Kerberos.Realm | String | 否 | kerberos认证管理域,大小写敏感 | +| Authentication.Kerberos.ConfigPath | Boolean | 否 | Kerberos krb5.conf | +| Authentication.Kerberos.KeyTabPath | String | 否 | keytab的路径 | +| PartitionerType | String | 否 | Partitioner类型。取值：`roundrobin`、`hash`、`random`。默认为：`random`。 | +| RequiredAcks | int | 否 | ACK的可靠等级.0=无响应,1=等待本地消息,-1=等待所有副本提交.默认1， | +| Compression | String | 否 | 压缩算法，可选值：`none`, `snappy`，`lz4`和`gzip`，默认值`none` | +| CompressionLevel | Int | 否 | 压缩级别，可选值：`1~9`，默认值：`4`,设置为`0`则禁用`Compression` | +| MaxMessageBytes | Int | 否 | 一个批次提交的大小限制，配置和`message.max.bytes`对应，默认值：`1048576` | +| MaxOpenRequests | Int | 否 | 一个连接允许的最大打开的请求数，默认值:`5` | +| MaxRetries | Int | 否 | 提交失败重试次数，最大`3`次，默认值：`3` | +| BulkMaxSize | Int | 否 | 单次请求提交事件数，默认`2048` | +| BulkFlushFrequency | Int | 否 | 发送批量 Kafka 请求之前等待的时间,0标识没有时延，默认值:`0` | +| Timeout | Int | 否 | 等待Kafka brokers响应的超时时间，默认`30s` | +| BrokerTimeout | int | 否 | kafka broker等待请求的最大时长，默认`10s` | +| Metadata.Retry.Max | int | 否 | 最大重试次数，默认值：`3` | +| Metadata.Retry.Backoff | int | 否 | 在重试之前等待leader选举发生的时间，默认值：`250ms` | +| Metadata.RefreshFrequency | int | 否 | Metadata刷新频率，默认值：`250ms` | +| Metadata.Full | int | 否 | 获取原数数据的策略，获取元数据时使用的策略，当此选项为`true`时，客户端将为所有可用主题维护一整套元数据，如果此选项设置为`false`，它将仅刷新已配置主题的元数据。默认值:`false`。 | +| HashKeys | String数组 | 否 | PartitionerType为`hash`时，需指定HashKeys。 | +| HashOnce | Boolean | 否 | | +| ClientID | String | 否 | 写入Kafka的Client ID，默认取值：`LogtailPlugin`。 | - `Version`需要填写的是`kafka protocol version`版本号，`flusher_kafka_v2`当前支持的`kafka`版本范围：`0.8.2.x~3.3.1`。 请根据自己的`kafka`版本号参照下面的`kafka protocol version`规则进行配置。**建议根据自己的`kafka` From f7e4370a4490a2dc7569c084a10ce85b005fa2f6 Mon Sep 17 00:00:00 2001 From: mengfanwei Date: Tue, 24 Sep 2024 19:27:49 +0800 Subject: [PATCH 3/4] feat: change kafka default protocol version 1.0.0 to 2.1.0 --- docs/cn/plugins/flusher/flusher-kafka_v2.md | 4 ++-- plugins/flusher/kafkav2/flusher_kafka_v2.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/cn/plugins/flusher/flusher-kafka_v2.md b/docs/cn/plugins/flusher/flusher-kafka_v2.md index 52cc0e4736..1143517c55 100644 --- a/docs/cn/plugins/flusher/flusher-kafka_v2.md +++ b/docs/cn/plugins/flusher/flusher-kafka_v2.md @@ -15,7 +15,7 @@ | Type | String | 是 | 插件类型 | | Brokers | String数组 | 是 | Kafka Brokers | | Topic | String | 是 | Kafka Topic,支持动态topic, 例如: `test_%{content.appname}` | -| Version | String | 否 | Kafka协议版本号 ,例如：`2.0.0`，默认值：`1.0.0` | +| Version | String | 否 | Kafka协议版本号 ,例如：`2.1.0`，默认值：`2.1.0` | | Headers | header数组 | 否 | kafka消息头 ，配置使用请参考本文中`Headers`配置用例 | | Convert | Struct | 否 | iLogtail数据转换协议配置 | | Convert.Protocol | String | 否 | iLogtail数据转换协议，kafka flusher 可选值：`custom_single`,`custom_single_flatten`,`otlp_log_v1`。默认值：`custom_single` | @@ -61,7 +61,7 @@ | HashOnce | Boolean | 否 | | | ClientID | String | 否 | 写入Kafka的Client ID，默认取值：`LogtailPlugin`。 | -- `Version`需要填写的是`kafka protocol version`版本号，`flusher_kafka_v2`当前支持的`kafka`版本范围：`0.8.2.x~3.3.1`。 +- `Version`需要填写的是`kafka protocol version`版本号，`flusher_kafka_v2`当前支持的`kafka`版本范围：`0.8.2.x~3.6.0`。 请根据自己的`kafka`版本号参照下面的`kafka protocol version`规则进行配置。**建议根据自己的`kafka` 版本指定对应`protocol version`**, `kafka protocol version`支持版本号如下： diff --git a/plugins/flusher/kafkav2/flusher_kafka_v2.go b/plugins/flusher/kafkav2/flusher_kafka_v2.go index a537cb9136..247624de53 100644 --- a/plugins/flusher/kafkav2/flusher_kafka_v2.go +++ b/plugins/flusher/kafkav2/flusher_kafka_v2.go @@ -186,7 +186,7 @@ func NewFlusherKafka() *FlusherKafka { BrokerTimeout: 10 * time.Second, Compression: "none", CompressionLevel: 4, - Version: "1.0.0", + Version: "2.1.0", MaxRetries: 3, Headers: nil, Backoff: backoffConfig{ From 08295e150238689ec9f87eee12b6e2f518f79f69 Mon Sep 17 00:00:00 2001 From: mengfanwei Date: Tue, 24 Sep 2024 19:42:36 +0800 Subject: [PATCH 4/4] feat: update kafka doc, update supported kafka version 3.8.0 --- docs/cn/plugins/flusher/flusher-kafka_v2.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/cn/plugins/flusher/flusher-kafka_v2.md b/docs/cn/plugins/flusher/flusher-kafka_v2.md index 1143517c55..09d542baf2 100644 --- a/docs/cn/plugins/flusher/flusher-kafka_v2.md +++ b/docs/cn/plugins/flusher/flusher-kafka_v2.md @@ -61,7 +61,7 @@ | HashOnce | Boolean | 否 | | | ClientID | String | 否 | 写入Kafka的Client ID，默认取值：`LogtailPlugin`。 | -- `Version`需要填写的是`kafka protocol version`版本号，`flusher_kafka_v2`当前支持的`kafka`版本范围：`0.8.2.x~3.6.0`。 +- `Version`需要填写的是`kafka protocol version`版本号，`flusher_kafka_v2`当前支持的`kafka`版本范围：`0.8.2.x~3.8.0`。 请根据自己的`kafka`版本号参照下面的`kafka protocol version`规则进行配置。**建议根据自己的`kafka` 版本指定对应`protocol version`**, `kafka protocol version`支持版本号如下：