karafka-rdkafka 0.23.0.beta1-x86_64-linux-gnu → 0.23.0.beta2-x86_64-linux-gnu

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1231ae8609eb005cb434362c45b620a6783c89e6a29acfcc05b5192f1008646
-  data.tar.gz: 4f0f1241ba0f9ecf14dd5e81ddabc04747732edaadb6f405244a1fbed509b92b
+  metadata.gz: 55f4b9985ace9673ecbf88ee9432bec2a7d925cbd23871af4a90abd5f0f6607f
+  data.tar.gz: 21da9178451190689149455321fcf3ae806a1aef784f1ded27a763098e349dbb
 SHA512:
-  metadata.gz: 8655f8f03d30d9618775a2a4ea0d8b5ebefd91871d3adad0748da49b344f8efdb87eaff3ef4809b168fb6d3b71a18fd0e3bf65416312a2d9049dff0d5c6cf98c
-  data.tar.gz: a7c11c5d0a636e7127d89030e50da88ee0e655e6d66481d93073a862389a219a5579c31c13f9334eac8e891e724caa4d7be30a4a273d6ce6d88ccd3a58e0181d
+  metadata.gz: 5ba5e94d82a59fd2ec88374a726e6cfeddb2fbd41f3d21595058438eca6dea13ecf6036875587e89e36f45a1d7cbb457ba1ac8d12e30357cc40030f523364bff
+  data.tar.gz: b55c117dead4f44b68797bd766c1dbeeffab9f81c8b29daab84ac0d48eb2faca218da63026603264db43ca844262cec12680e6df6a5b7269e7f9149258125ec9

data/CHANGELOG.md

@@ -1,7 +1,9 @@
 # Rdkafka Changelog
 
 ## 0.23.0 (Unreleased)
-- [Enhancement] Bump librdkafka to 2.12.0.
+- [Enhancement] Bump librdkafka to 2.12.1.
+- [Enhancement] Force lock FFI to 1.17.1 or higher to include critical bug fixes around GCC, write barriers, and thread restarts for forks.
+- [Fix] Fix for Core dump when providing extensions to oauthbearer_set_token (dssjoblom)
 
 ## 0.22.2 (2025-10-09)
 - [Fix] Fix Github Action Ruby reference preventing non-compiled releases.
@@ -11,7 +13,7 @@
 - [Enhancement] Optimize producer header processing with early returns and efficient array operations (69% faster for nil headers, 41% faster for empty headers, 12-32% faster when headers are present, with larger improvements for complex header scenarios).
 
 ## 0.22.0 (2025-09-26)
-- **[Breaking]** Drop support for Ruby 3.1 to move forward with the fiber scheduler work.
+- **[EOL]** Drop support for Ruby 3.1 to move forward with the fiber scheduler work.
 - [Enhancement] Bump librdkafka to 2.11.1.
 - [Enhancement] Improve sigstore attestation for precompiled releases.
 - [Fix] Fix incorrectly set default SSL certs dir.
@@ -71,7 +73,7 @@
 - [Fix] Do not run `Rdkafka::Bindings.rd_kafka_global_init` on require to prevent some of macos versions from hanging on Puma fork.
 
 ## 0.18.0 (2024-11-26)
-- **[Breaking]** Drop Ruby 3.0 support
+- **[EOL]** Drop Ruby 3.0 support
 - [Enhancement] Bump librdkafka to 2.6.1
 - [Enhancement] Use default oauth callback if none is passed (bachmanity1)
 - [Enhancement] Expose `rd_kafka_global_init` to mitigate macos forking issues.
@@ -112,7 +114,7 @@
 - **[Breaking]** `HashWithSymbolKeysTreatedLikeStrings` has been removed so headers are regular hashes with string keys.
 - [Enhancement] Bump librdkafka to 2.4.0
 - [Enhancement] Save two objects on message produced and lower CPU usage on message produced with small improvements.
-- [Fix] Remove support for Ruby 2.7. Supporting it was a bug since rest of the karafka ecosystem no longer supports it.
+- **[EOL]** Remove support for Ruby 2.7. Supporting it was a bug since rest of the karafka ecosystem no longer supports it.
 
 ## 0.15.2 (2024-07-10)
 - [Fix] Switch to local release of librdkafka to mitigate its unavailability.
@@ -193,7 +195,7 @@
 - [Enhancement] Get consumer position (thijsc & mensfeld)
 
 ## 0.13.7 (2023-10-31)
-- [Change] Drop support for Ruby 2.6 due to incompatibilities in usage of `ObjectSpace::WeakMap`
+- **[EOL]** Drop support for Ruby 2.6 due to incompatibilities in usage of `ObjectSpace::WeakMap`
 - [Fix] Fix dangling Opaque references.
 
 ## 0.13.6 (2023-10-17)
@@ -260,7 +262,7 @@
 
 ## 0.11.0 (2021-11-17)
 - Upgrade librdkafka to 1.8.2
-- Bump supported minimum Ruby version to 2.6
+- **[EOL]** Bump supported minimum Ruby version to 2.6
 - Better homebrew path detection
 
 ## 0.10.0 (2021-09-07)

data/README.md

@@ -63,7 +63,7 @@ Contributions should generally be made to the upstream [rdkafka-ruby repository]
 
 | rdkafka-ruby | librdkafka | patches |
 |-|-|-|
-| 0.23.x (Unreleased) | 2.12.0 (2025-10-09)  | yes |
+| 0.23.x (Unreleased) | 2.12.1 (2025-10-16)  | yes |
 | 0.22.x (2025-09-26) | 2.11.1 (2025-08-18)  | yes |
 | 0.21.x (2025-08-18) | 2.11.0 (2025-07-03)  | yes |
 | 0.20.x (2025-07-17) | 2.8.0  (2025-01-07)  | yes |

data/karafka-rdkafka.gemspec

@@ -67,7 +67,7 @@ Gem::Specification.new do |gem|
     gem.extensions = %w(ext/Rakefile)
   end
 
-  gem.add_dependency 'ffi', '~> 1.15'
+  gem.add_dependency 'ffi', '~> 1.17.1'
   gem.add_dependency 'json', '> 2.0'
   gem.add_dependency 'logger'
   gem.add_dependency 'mini_portile2', '~> 2.6'

data/lib/rdkafka/helpers/oauth.rb

@@ -12,12 +12,18 @@ module Rdkafka
       # @return [Integer] 0 on success
       def oauthbearer_set_token(token:, lifetime_ms:, principal_name:, extensions: nil)
         error_buffer = FFI::MemoryPointer.from_string(" " * 256)
+        extensions_ptr, extensions_str_ptrs = map_extensions(extensions)
 
-        response = @native_kafka.with_inner do |inner|
-          Rdkafka::Bindings.rd_kafka_oauthbearer_set_token(
-            inner, token, lifetime_ms, principal_name,
-            flatten_extensions(extensions), extension_size(extensions), error_buffer, 256
-          )
+        begin
+          response = @native_kafka.with_inner do |inner|
+            Rdkafka::Bindings.rd_kafka_oauthbearer_set_token(
+              inner, token, lifetime_ms, principal_name,
+              extensions_ptr, extension_size(extensions), error_buffer, 256
+            )
+          end
+        ensure
+          extensions_str_ptrs&.each { |ptr| ptr.free }
+          extensions_ptr&.free
         end
 
         return response if response.zero?
@@ -41,10 +47,31 @@ module Rdkafka
 
       private
 
-      # Flatten the extensions hash into a string according to the spec, https://datatracker.ietf.org/doc/html/rfc7628#section-3.1
-      def flatten_extensions(extensions)
-        return nil unless extensions
-        "\x01#{extensions.map { |e| e.join("=") }.join("\x01")}"
+      # Convert extensions hash to FFI::MemoryPointer (const char **).
+      # Note: the returned pointers must be freed manually (autorelease = false).
+      def map_extensions(extensions)
+        return [nil, nil] if extensions.nil? || extensions.empty?
+
+        # https://github.com/confluentinc/librdkafka/blob/master/src/rdkafka_sasl_oauthbearer.c#L327-L347
+
+        # The method argument is const char **
+        array_ptr = FFI::MemoryPointer.new(:pointer, extension_size(extensions))
+        array_ptr.autorelease = false
+        str_ptrs = []
+
+        # Element i is the key, i + 1 is the value.
+        extensions.each_with_index do |(k, v), i|
+          k_ptr = FFI::MemoryPointer.from_string(k.to_s)
+          k_ptr.autorelease = false
+          str_ptrs << k_ptr
+          v_ptr = FFI::MemoryPointer.from_string(v.to_s)
+          v_ptr.autorelease = false
+          str_ptrs << v_ptr
+          array_ptr[i * 2].put_pointer(0, k_ptr)
+          array_ptr[i * 2 + 1].put_pointer(0, v_ptr)
+        end
+
+        [array_ptr, str_ptrs]
       end
 
       # extension_size is the number of keys + values which should be a non-negative even number

data/lib/rdkafka/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Rdkafka
-  VERSION = "0.23.0.beta1"
-  LIBRDKAFKA_VERSION = "2.12.0"
-  LIBRDKAFKA_SOURCE_SHA256 = "1355d81091d13643aed140ba0fe62437c02d9434b44e90975aaefab84c2bf237"
+  VERSION = "0.23.0.beta2"
+  LIBRDKAFKA_VERSION = "2.12.1"
+  LIBRDKAFKA_SOURCE_SHA256 = "ec103fa05cb0f251e375f6ea0b6112cfc9d0acd977dc5b69fdc54242ba38a16f"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: karafka-rdkafka
 version: !ruby/object:Gem::Version
-  version: 0.23.0.beta1
+  version: 0.23.0.beta2
 platform: x86_64-linux-gnu
 authors:
 - Thijs Cadier
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: 1.17.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: 1.17.1
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement