Revert "librdkafka v2.10.0 (#579)" (#584)

This reverts commit 3fd5b7d.

Author: mensfeld

CHANGELOG.md

@@ -1,12 +1,9 @@
 # Rdkafka Changelog
 
-## 0.22.0 (Unreleased)
-- [Enhancement] Align default configuration with deprecation warnings of librdkafka `2.10.0`.
-- [Enhancement] Bump librdkafka to `2.10.0`.
+## 0.21.1 (Unreleased)
 - [Enhancement] Support producing and consuming of headers with mulitple values (KIP-82).
 - [Enhancement] Allow native Kafka customization poll time.
 - [Enhancement] Roll out experimental jruby support.
-- [Enhancement] Add `logger` gem to dependencies since moved out of Ruby.
 
 ## 0.21.0 (2025-02-13)
 - [Enhancement] Bump librdkafka to `2.8.0`

README.md

@@ -163,7 +163,6 @@ bundle exec rake produce_messages
 
 | rdkafka-ruby | librdkafka | patches |
 |-|-|-|
-| 0.22.0 (Unreleased) | 2.10.0 (2025-04-18) | yes |
 | 0.21.0 (2025-02-13) | 2.8.0 (2025-01-07) | yes |
 | 0.20.0 (2025-01-07) | 2.6.1 (2024-11-18) | yes |
 | 0.19.0 (2024-10-01) | 2.5.3 (2024-09-02) | yes |

dist/librdkafka-2.10.0.tar.gz renamed to dist/librdkafka-2.8.0.tar.gz

@@ -129,7 +129,10 @@ def self.opaques
     end
 
     # Default config that can be overwritten.
-    DEFAULT_CONFIG = {}.freeze
+    DEFAULT_CONFIG = {
+      # Request api version so advanced features work
+      :"api.version.request" => true
+    }.freeze
 
     # Required config that cannot be overwritten.
     REQUIRED_CONFIG = {

lib/rdkafka/config.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Rdkafka
-  VERSION = "0.22.0"
-  LIBRDKAFKA_VERSION = "2.10.0"
-  LIBRDKAFKA_SOURCE_SHA256 = "004b1cc2685d1d6d416b90b426a0a9d27327a214c6b807df6f9ea5887346ba3a"
+  VERSION = "0.21.1"
+  LIBRDKAFKA_VERSION = "2.8.0"
+  LIBRDKAFKA_SOURCE_SHA256 = "5bd1c46f63265f31c6bfcedcde78703f77d28238eadf23821c2b43fc30be3e25"
 end

lib/rdkafka/version.rb

@@ -26,7 +26,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'ffi', '~> 1.15'
   gem.add_dependency 'mini_portile2', '~> 2.6'
   gem.add_dependency 'rake', '> 12'
-  gem.add_dependency 'logger', '>= 1.5'
 
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'rspec', '~> 3.5'

rdkafka.gemspec

@@ -34,7 +34,7 @@
   describe '#describe_errors' do
     let(:errors) { admin.class.describe_errors }
 
-    it { expect(errors.size).to eq(172) }
+    it { expect(errors.size).to eq(170) }
     it { expect(errors[-184]).to eq(code: -184, description: 'Local: Queue full', name: '_QUEUE_FULL') }
     it { expect(errors[21]).to eq(code: 21, description: 'Broker: Invalid required acks value', name: 'INVALID_REQUIRED_ACKS') }
   end

spec/rdkafka/admin_spec.rb

@@ -159,7 +159,7 @@ def call(config, client_name); end
 
     it "should use default configuration" do
       config = Rdkafka::Config.new
-      expect(config[:"api.version.request"]).to eq nil
+      expect(config[:"api.version.request"]).to eq true
     end
 
     it "should create a consumer with valid config" do

spec/rdkafka/config_spec.rb

@@ -263,6 +263,8 @@ def call(_, handle)
     expect(message.partition).to eq 1
     expect(message.payload).to eq "payload"
     expect(message.key).to eq "key"
+    # Since api.version.request is on by default we will get
+    # the message creation timestamp if it's not set.
     expect(message.timestamp).to be_within(10).of(Time.now)
   end
 

spec/rdkafka/producer_spec.rb

@@ -15,7 +15,9 @@
 
 def rdkafka_base_config
   {
-    :"bootstrap.servers" => "localhost:9092"
+    :"api.version.request" => false,
+    :"broker.version.fallback" => "1.0",
+    :"bootstrap.servers" => "localhost:9092",
   }
 end