karafka-rdkafka 0.16.1 → 0.17.1.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8685868c1ad3f222639845933ba5aec660ec3923465c4cf91c3235ece03eec8
-  data.tar.gz: 96d7c33291d166418e696f05cce117b89861dd7fbbf53b587dbf1a90a3f4d2b2
+  metadata.gz: 192d225abdb3819438f2da32dde41f7940666ee105f51f315ab55cf670e8c3b9
+  data.tar.gz: bc393b0baa8f62980b9acf4d8d993f63cc1f07f9e3c8da54bceb8a76b387849b
 SHA512:
-  metadata.gz: 30de272e1cac622957ecc061426bf7314791528769dc6afc3f445f5fe6b3241a5b51a88931c97619fcdf1447bd0d6b7913c959ccb3b5d384e32d5ce89ef5d915
-  data.tar.gz: f912ec91dd3983a89807879b272f8bbcf777f705bd305aba77148998afcf2ba4372ae070d2510a19110a424ad9231177c64a25742b5de47b22c426769da5c858
+  metadata.gz: 82476a66a8ae78150ee80122df8d31925afb31ba06bc9cd0467ebf2fa09fcacaaa69f0262e9ff75447461871c29c3db9026cc3adda505cd9b0fe9dd8741f3336
+  data.tar.gz: 86fca73dcffd68a5197276a01cf6366ef4f0ba702656e78209e8666534f76a1bb3f05f5e624f812ed6576255545093b810603be267f2a7653e7005ea42c1ddc0

data/.ruby-version

@@ -1 +1 @@
-3.3.3
+3.3.4

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Rdkafka Changelog
 
+## 0.17.1 (Unreleased)
+- [Enhancement] Support ability to release patches to librdkafka.
+- [Patch] Patch cooperative-sticky assignments in librdkafka.
+
+## 0.17.0 (2024-07-21)
+- [Enhancement] Bump librdkafka to 2.5.0
+
 ## 0.16.1 (2024-07-10)
 - [Feature] Add `#seek_by` to be able to seek for a message by topic, partition and offset (zinahia)
 - [Fix] Switch to local release of librdkafka to mitigate its unavailability.
@@ -11,6 +18,9 @@
 - [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.
 
+## 0.15.2 (2024-07-10)
+- [Fix] Switch to local release of librdkafka to mitigate its unavailability.
+
 ## 0.15.1 (2024-05-09)
 - **[Feature]** Provide ability to use topic config on a producer for custom behaviors per dispatch.
 - [Enhancement] Use topic config reference cache for messages production to prevent topic objects allocation with each message.
@@ -20,6 +30,15 @@
 - **[Feature]** Oauthbearer token refresh callback (bruce-szalwinski-he)
 - **[Feature]** Support incremental config describe + alter API (mensfeld)
 - [Enhancement] name polling Thread as `rdkafka.native_kafka#<name>` (nijikon)
+- [Enhancement] Replace time poll based wait engine with an event based to improve response times on blocking operations and wait (nijikon + mensfeld)
+- [Enhancement] Allow for usage of the second regex engine of librdkafka by setting `RDKAFKA_DISABLE_REGEX_EXT` during build (mensfeld)
+- [Enhancement] name polling Thread as `rdkafka.native_kafka#<name>` (nijikon)
+- [Change] Allow for native kafka thread operations deferring and manual start for consumer, producer and admin.
+- [Change] The `wait_timeout` argument in `AbstractHandle.wait` method is deprecated and will be removed in future versions without replacement. We don't rely on it's value anymore (nijikon)
+- [Fix] Fix bogus case/when syntax. Levels 1, 2, and 6 previously defaulted to UNKNOWN (jjowdy)
+
+## 0.14.11 (2024-07-10)
+- [Fix] Switch to local release of librdkafka to mitigate its unavailability.
 
 ## 0.14.10 (2024-02-08)
 - [Fix] Background logger stops working after forking causing memory leaks (mensfeld).
@@ -67,6 +86,9 @@
 - [Enhancement] Bump librdkafka to 2.3.0
 - [Enhancement] Increase the `#lag` and `#query_watermark_offsets` default timeouts from 100ms to 1000ms. This will compensate for network glitches and remote clusters operations.
 
+## 0.13.10 (2024-07-10)
+- [Fix] Switch to local release of librdkafka to mitigate its unavailability.
+
 ## 0.13.9 (2023-11-07)
 - [Enhancement] Expose alternative way of managing consumer events via a separate queue.
 - [Enhancement] Allow for setting `statistics_callback` as nil to reset predefined settings configured by a different gem.
@@ -121,6 +143,9 @@
 - Retry metadta fetches on certain errors with a backoff (mensfeld)
 - Do not lock access to underlying native kafka client and rely on Karafka granular locking (mensfeld)
 
+## 0.12.4 (2024-07-10)
+- [Fix] Switch to local release of librdkafka to mitigate its unavailability.
+
 ## 0.12.3
 - Include backtrace in non-raised binded errors.
 - Include topic name in the delivery reports

data/README.md

@@ -163,8 +163,8 @@ bundle exec rake produce_messages
 
 | rdkafka-ruby | librdkafka |
 |-|-|
-| 0.17.0 (Unreleased) | 2.4.0 (2024-05-07) |
-| 0.16.0 (2024-06-13) | 2.3.0 (2023-10-25) |
+| 0.17.0 (Unreleased) | 2.5.0 (2024-07-10) |
+| 0.16.0 (2024-06-13) | 2.4.0 (2024-05-07) |
 | 0.15.0 (2023-12-03) | 2.3.0 (2023-10-25) |
 | 0.14.0 (2023-11-21) | 2.2.0 (2023-07-12) |
 | 0.13.0 (2023-07-24) | 2.0.2 (2023-01-20) |

data/dist/patches/rdkafka_sticky_assignor.c.patch

@@ -0,0 +1,26 @@
+# This patch is released under the 2-clause BSD license, same as librdkafka
+# Fixes: https://github.com/confluentinc/librdkafka/issues/4783
+#
+--- librdkafka_2.5.0/src/rdkafka_sticky_assignor.c	2024-07-08 09:47:43.000000000 +0200
++++ librdkafka_2.5.0/src/rdkafka_sticky_assignor.c	2024-07-30 09:44:38.529759640 +0200
+@@ -769,7 +769,7 @@
+         const rd_kafka_topic_partition_list_t *partitions;
+         const char *consumer;
+         const rd_map_elem_t *elem;
+-        int i;
++        int i, j;
+ 
+         /* The assignment is balanced if minimum and maximum numbers of
+          * partitions assigned to consumers differ by at most one. */
+@@ -836,9 +836,9 @@
+ 
+                 /* Otherwise make sure it can't get any more partitions */
+ 
+-                for (i = 0; i < potentialTopicPartitions->cnt; i++) {
++                for (j = 0; j < potentialTopicPartitions->cnt; j++) {
+                         const rd_kafka_topic_partition_t *partition =
+-                            &potentialTopicPartitions->elems[i];
++                            &potentialTopicPartitions->elems[j];
+                         const char *otherConsumer;
+                         int otherConsumerPartitionCount;
+ 

data/docker-compose.yml

@@ -3,7 +3,7 @@ version: '2'
 services:
   kafka:
     container_name: kafka
-    image: confluentinc/cp-kafka:7.6.1
+    image: confluentinc/cp-kafka:7.7.0
 
     ports:
       - 9092:9092

data/ext/README.md

@@ -1,7 +1,7 @@
 # Ext
 
-This gem depends on the `librdkafka` C library. It is downloaded when
-this gem is installed.
+This gem depends on the `librdkafka` C library. It is downloaded, stored in
+`dist/` directory, and checked into source control.
 
 To update the `librdkafka` version follow the following steps:
 
@@ -9,8 +9,9 @@ To update the `librdkafka` version follow the following steps:
   version number and asset checksum for `tar.gz`.
 * Change the version in `lib/rdkafka/version.rb`
 * Change the `sha256` in `lib/rdkafka/version.rb`
-* Run `bundle exec rake` in the `ext` directory to download and build
-  the new version
+* Run `bundle exec rake dist:download` in the `ext` directory to download the
+  new release and place it in the `dist/` for you
+* Run `bundle exec rake` in the `ext` directory to build the new version
 * Run `docker-compose pull` in the main gem directory to ensure the docker
   images used by the tests and run `docker-compose up`
 * Finally, run `bundle exec rspec` in the main gem directory to execute

data/ext/Rakefile

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require File.expand_path('../../lib/rdkafka/version', __FILE__)
+require "digest"
 require "fileutils"
 require "open-uri"
 
@@ -30,6 +31,8 @@ task :default => :clean do
     }
     recipe.configure_options = ["--host=#{recipe.host}"]
 
+    recipe.patch_files = Dir[File.join(releases, 'patches', "*.patch")].sort
+
     # Disable using libc regex engine in favor of the embedded one
     # The default regex engine of librdkafka does not always work exactly as most of the users
     # would expect, hence this flag allows for changing it to the other one
@@ -71,6 +74,42 @@ task :clean do
   FileUtils.rm_rf File.join(File.dirname(__FILE__), "tmp")
 end
 
+namespace :dist do
+  task :dir do
+    ENV["RDKAFKA_DIST_PATH"] ||= File.expand_path(File.join(File.dirname(__FILE__), '..', 'dist'))
+  end
+
+  task :file => "dist:dir" do
+    ENV["RDKAFKA_DIST_FILE"] ||= File.join(ENV["RDKAFKA_DIST_PATH"], "librdkafka_#{Rdkafka::LIBRDKAFKA_VERSION}.tar.gz")
+  end
+
+  task :clean => "dist:file" do
+    Dir.glob(File.join("#{ENV['RDKAFKA_DIST_PATH']}", "*")).each do |filename|
+      next if filename.include? ENV["RDKAFKA_DIST_FILE"]
+
+      FileUtils.rm_rf filename
+    end
+  end
+
+  task :download => "dist:file" do
+    version = Rdkafka::LIBRDKAFKA_VERSION
+    librdkafka_download = "https://codeload.github.com/confluentinc/librdkafka/tar.gz/v#{version}"
+
+    URI.open(librdkafka_download) do |file|
+      filename = ENV["RDKAFKA_DIST_FILE"]
+      data     = file.read
+
+      if Digest::SHA256.hexdigest(data) != Rdkafka::LIBRDKAFKA_SOURCE_SHA256
+        raise "SHA256 does not match downloaded file"
+      end
+
+      File.write(filename, data)
+    end
+  end
+
+  task :update => %w[dist:download dist:clean]
+end
+
 namespace :build do
   desc "Build librdkafka at the given git sha or tag"
   task :git, [:ref] do |task, args|
@@ -78,8 +117,9 @@ namespace :build do
     version = "git-#{ref}"
 
     recipe = MiniPortile.new("librdkafka", version)
-    recipe.files << "https://github.com/edenhill/librdkafka/archive/#{ref}.tar.gz"
+    recipe.files << "https://github.com/confluentinc/librdkafka/archive/#{ref}.tar.gz"
     recipe.configure_options = ["--host=#{recipe.host}","--enable-static", "--enable-zstd"]
+    recipe.patch_files = Dir[File.join(releases, 'patches', "*.patch")].sort
     recipe.cook
 
     ext = recipe.host.include?("darwin") ? "dylib" : "so"

data/lib/rdkafka/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Rdkafka
-  VERSION = "0.16.1"
-  LIBRDKAFKA_VERSION = "2.4.0"
-  LIBRDKAFKA_SOURCE_SHA256 = "d645e47d961db47f1ead29652606a502bdd2a880c85c1e060e94eea040f1a19a"
+  VERSION = "0.17.1.beta1"
+  LIBRDKAFKA_VERSION = "2.5.0"
+  LIBRDKAFKA_SOURCE_SHA256 = "3dc62de731fd516dfb1032861d9a580d4d0b5b0856beb0f185d06df8e6c26259"
 end

data/spec/rdkafka/admin_spec.rb

@@ -34,7 +34,7 @@ describe Rdkafka::Admin do
   describe '#describe_errors' do
     let(:errors) { admin.class.describe_errors }
 
-    it { expect(errors.size).to eq(168) }
+    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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: karafka-rdkafka
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.17.1.beta1
 platform: ruby
 authors:
 - Thijs Cadier
@@ -36,7 +36,7 @@ cert_chain:
   AnG1dJU+yL2BK7vaVytLTstJME5mepSZ46qqIJXMuWob/YPDmVaBF39TDSG9e34s
   msG3BiCqgOgHAnL23+CN3Rt8MsuRfEtoTKpJVcCfoEoNHOkc
   -----END CERTIFICATE-----
-date: 2024-07-10 00:00:00.000000000 Z
+date: 2024-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -186,7 +186,8 @@ files:
 - README.md
 - Rakefile
 - certs/cert_chain.pem
-- dist/librdkafka_2.4.0.tar.gz
+- dist/librdkafka_2.5.0.tar.gz
+- dist/patches/rdkafka_sticky_assignor.c.patch
 - docker-compose.yml
 - ext/README.md
 - ext/Rakefile

metadata.gz.sig

@@ -1 +1,2 @@
-*�lp}�x�F%���5��|��RUs4zD$c��n�/�r�%�5��鵖%Y�j�O�Շ�9�75�6
b��<�tY�[x
:{#fj��-�xE�c
k�!���Y�̼V�/�����2��X>�[�|��C�h"D�~c)��D9�(y��K>��&��X������G�rtکH�:1�P^�=k[���ыQ�����oaH��'�ŕM��48�a�=�ŧ��+(!w�Enn��D�G<}�U�U ��],�xmG�U#�m�#���&�-����1Z�)�F#+�$�X
���rĆ�J�9<NQ;�UYv������^��VZ�T{�m��.>6	,�gd	�Pؼ
��r�s��i�^B�q-�8=l/�!��k�cq�Sr�
+�Y3�&���ikAVt���2�ON׿�����������H[U�ǡ���R�홥̈;�0�@7x�}Վٚ��\Xi�?J")��1��vxI�}�궕��5��ڬ��D�M�h�]����*³�}��k
+�C�+���DO��9���sO��K��{nk��ڤ