File tree Expand file tree Collapse file tree 3 files changed +10
-7
lines changed Expand file tree Collapse file tree 3 files changed +10
-7
lines changed Original file line number Diff line number Diff line change @@ -3,5 +3,12 @@ source 'https://rubygems.org'
33# Specify your gem's dependencies in fluent-plugin-kafka.gemspec
44gemspec
55
6- gem 'json' , '2.7.3' # override of 2.7.4 version
7- gem 'rdkafka' , ENV [ 'RDKAFKA_VERSION_MIN_RANGE' ] , ENV [ 'RDKAFKA_VERSION_MAX_RANGE' ] if ENV [ 'USE_RDKAFKA' ]
6+ if ENV [ 'USE_RDKAFKA' ]
7+ gem 'rdkafka' , ENV [ 'RDKAFKA_VERSION_MIN_RANGE' ] , ENV [ 'RDKAFKA_VERSION_MAX_RANGE' ]
8+ min_version = Gem ::Version . new ( '0.16.0' )
9+ min_range_version = Gem ::Version . new ( ENV [ 'RDKAFKA_VERSION_MIN_RANGE' ] . split ( ' ' ) . last )
10+ if min_range_version >= min_version
11+ gem 'aws-msk-iam-sasl-signer'
12+ gem 'json' , '2.7.3' # override of 2.7.4 version
13+ end
14+ end
Original file line number Diff line number Diff line change @@ -19,8 +19,6 @@ Gem::Specification.new do |gem|
1919 gem . add_dependency "fluentd" , [ ">= 0.10.58" , "< 2" ]
2020 gem . add_dependency 'ltsv'
2121 gem . add_dependency 'ruby-kafka' , '>= 1.5.0' , '< 2'
22- gem . add_dependency 'rdkafka'
23- gem . add_dependency 'aws-msk-iam-sasl-signer'
2422 gem . add_development_dependency "rake" , ">= 0.9.2"
2523 gem . add_development_dependency "test-unit" , ">= 3.0.8"
2624 gem . add_development_dependency "test-unit-rr" , "~> 1.0"
Original file line number Diff line number Diff line change 44require 'fluent/plugin/kafka_plugin_util'
55
66require 'rdkafka'
7- require 'aws_msk_iam_sasl_signer'
87
98begin
109 rdkafka_version = Gem ::Version ::create ( Rdkafka ::VERSION )
1615 require_relative 'rdkafka_patch/0_14_0'
1716 elsif rdkafka_version >= Gem ::Version . create ( '0.16.0' )
1817 require_relative 'rdkafka_patch/0_16_0'
18+ require 'aws_msk_iam_sasl_signer'
1919 end
2020rescue LoadError , NameError
2121 raise "unable to patch rdkafka."
@@ -208,7 +208,6 @@ def add(level, message = nil)
208208 end
209209 end
210210 }
211- # HERE -----------------
212211 Rdkafka ::Config . logger = log
213212 config = build_config
214213 @rdkafka = Rdkafka ::Config . new ( config )
@@ -217,7 +216,6 @@ def add(level, message = nil)
217216 if config [ :"security.protocol" ] == "sasl_ssl" && config [ :"sasl.mechanisms" ] == "OAUTHBEARER"
218217 Rdkafka ::Config . oauthbearer_token_refresh_callback = method ( :refresh_token )
219218 end
220- # HERE -----------------
221219
222220 if @default_topic . nil?
223221 if @use_default_for_unknown_topic || @use_default_for_unknown_partition_error
You can’t perform that action at this time.
0 commit comments