rdkafka 0.28.0 → 0.29.0

data/lib/rdkafka/producer.rb

@@ -5,6 +5,7 @@ module Rdkafka
   class Producer
     include Helpers::Time
     include Helpers::OAuth
+    include Helpers::Metadata
 
     # @private
     @@partitions_count_cache = PartitionsCountCache.new
@@ -94,6 +95,12 @@ module Rdkafka
               )
 
               unless result == :config_ok
+                # rd_kafka_topic_new has not been called yet, so librdkafka has not taken
+                # ownership of the config. Destroy it ourselves before raising, otherwise the
+                # partially built rd_kafka_topic_conf_t leaks. (On the rd_kafka_topic_new path
+                # librdkafka frees the conf on both success and failure, so we never destroy it
+                # there.)
+                Rdkafka::Bindings.rd_kafka_topic_conf_destroy(topic_config)
                 raise Config::ConfigError.new(error_buffer.read_string)
               end
             end
@@ -322,14 +329,15 @@ module Rdkafka
         end
 
         topic_metadata ? topic_metadata[:partition_count] : Rdkafka::Bindings::RD_KAFKA_PARTITION_UA
+      rescue Rdkafka::RdkafkaError => e
+        # A missing topic is an expected, cacheable outcome (the topic may be auto-created on
+        # produce, or simply not exist yet). Returning RD_KAFKA_PARTITION_UA from inside the block
+        # caches it, so we don't re-run a blocking metadata query on every produce(partition_key:)
+        # to that topic. Anything else is a real error and is re-raised.
+        raise(e) unless e.code == :unknown_topic_or_part
+
+        Rdkafka::Bindings::RD_KAFKA_PARTITION_UA
       end
-    rescue Rdkafka::RdkafkaError => e
-      # If the topic does not exist, it will be created or if not allowed another error will be
-      # raised. We here return RD_KAFKA_PARTITION_UA so this can happen without early error
-      # happening on metadata discovery.
-      return Rdkafka::Bindings::RD_KAFKA_PARTITION_UA if e.code == :unknown_topic_or_part
-
-      raise(e)
     end
 
     # Produces a message to a Kafka topic. The message is added to rdkafka's queue, call {DeliveryHandle#wait wait} on the returned delivery handle to make sure it is delivered.
@@ -410,8 +418,7 @@ module Rdkafka
       # based on the key when present.
       partition ||= Rdkafka::Bindings::RD_KAFKA_PARTITION_UA
 
-      # If timestamp is nil use 0 and let Kafka set one. If an integer or time
-      # use it.
+      # If timestamp is nil use 0 and let Kafka set one. If an integer or time use it.
       raw_timestamp = if timestamp.nil?
         0
       elsif timestamp.is_a?(Integer)
@@ -431,51 +438,55 @@ module Rdkafka
       delivery_handle[:offset] = Rdkafka::Bindings::RD_KAFKA_PARTITION_UA
       DeliveryHandle.register(delivery_handle)
 
-      args = [
-        :int, Rdkafka::Bindings::RD_KAFKA_VTYPE_RKT, :pointer, topic_ref,
-        :int, Rdkafka::Bindings::RD_KAFKA_VTYPE_MSGFLAGS, :int, Rdkafka::Bindings::RD_KAFKA_MSG_F_COPY,
-        :int, Rdkafka::Bindings::RD_KAFKA_VTYPE_VALUE, :buffer_in, payload, :size_t, payload_size,
-        :int, Rdkafka::Bindings::RD_KAFKA_VTYPE_KEY, :buffer_in, key, :size_t, key_size,
-        :int, Rdkafka::Bindings::RD_KAFKA_VTYPE_PARTITION, :int32, partition,
-        :int, Rdkafka::Bindings::RD_KAFKA_VTYPE_TIMESTAMP, :int64, raw_timestamp,
-        :int, Rdkafka::Bindings::RD_KAFKA_VTYPE_OPAQUE, :pointer, delivery_handle
-      ]
-
-      headers&.each do |key0, value0|
-        key = key0.to_s
-        if value0.is_a?(Array)
-          # Handle array of values per KIP-82
-          value0.each do |value|
-            value = value.to_s
+      begin
+        args = [
+          :int, Rdkafka::Bindings::RD_KAFKA_VTYPE_RKT, :pointer, topic_ref,
+          :int, Rdkafka::Bindings::RD_KAFKA_VTYPE_MSGFLAGS, :int, Rdkafka::Bindings::RD_KAFKA_MSG_F_COPY,
+          :int, Rdkafka::Bindings::RD_KAFKA_VTYPE_VALUE, :buffer_in, payload, :size_t, payload_size,
+          :int, Rdkafka::Bindings::RD_KAFKA_VTYPE_KEY, :buffer_in, key, :size_t, key_size,
+          :int, Rdkafka::Bindings::RD_KAFKA_VTYPE_PARTITION, :int32, partition,
+          :int, Rdkafka::Bindings::RD_KAFKA_VTYPE_TIMESTAMP, :int64, raw_timestamp,
+          :int, Rdkafka::Bindings::RD_KAFKA_VTYPE_OPAQUE, :pointer, delivery_handle
+        ]
+
+        headers&.each do |key0, value0|
+          key = key0.to_s
+          if value0.is_a?(Array)
+            # Handle array of values per KIP-82
+            value0.each do |value|
+              value = value.to_s
+              args << :int << Rdkafka::Bindings::RD_KAFKA_VTYPE_HEADER
+              args << :string << key
+              args << :pointer << value
+              args << :size_t << value.bytesize
+            end
+          else
+            # Handle single value
+            value = value0.to_s
             args << :int << Rdkafka::Bindings::RD_KAFKA_VTYPE_HEADER
             args << :string << key
             args << :pointer << value
             args << :size_t << value.bytesize
           end
-        else
-          # Handle single value
-          value = value0.to_s
-          args << :int << Rdkafka::Bindings::RD_KAFKA_VTYPE_HEADER
-          args << :string << key
-          args << :pointer << value
-          args << :size_t << value.bytesize
         end
-      end
 
-      args << :int << Rdkafka::Bindings::RD_KAFKA_VTYPE_END
+        args << :int << Rdkafka::Bindings::RD_KAFKA_VTYPE_END
 
-      # Produce the message
-      response = @native_kafka.with_inner do |inner|
-        Rdkafka::Bindings.rd_kafka_producev(
-          inner,
-          *args
-        )
-      end
+        # Produce the message
+        response = @native_kafka.with_inner do |inner|
+          Rdkafka::Bindings.rd_kafka_producev(
+            inner,
+            *args
+          )
+        end
 
-      # Raise error if the produce call was not successful
-      if response != Rdkafka::Bindings::RD_KAFKA_RESP_ERR_NO_ERROR
+        # Raise error if the produce call was not successful
+        if response != Rdkafka::Bindings::RD_KAFKA_RESP_ERR_NO_ERROR
+          raise RdkafkaError.new(response)
+        end
+      rescue Exception
         DeliveryHandle.remove(delivery_handle.to_ptr.address)
-        raise RdkafkaError.new(response)
+        raise
       end
 
       delivery_handle
@@ -517,5 +528,6 @@ module Rdkafka
     def closed_producer_check(method)
       raise Rdkafka::ClosedProducerError.new(method) if closed?
     end
+    alias_method :closed_check, :closed_producer_check
   end
 end

data/lib/rdkafka/version.rb

@@ -2,9 +2,9 @@
 
 module Rdkafka
   # Current rdkafka-ruby gem version
-  VERSION = "0.28.0"
+  VERSION = "0.29.0"
   # Target librdkafka version to be used
-  LIBRDKAFKA_VERSION = "2.14.1"
+  LIBRDKAFKA_VERSION = "2.14.2"
   # SHA256 hash of the librdkafka source tarball for verification
-  LIBRDKAFKA_SOURCE_SHA256 = "bb246e754dee3560e9b42bf4e844dc05de4b146a3cae937e36301ffacdc456e7"
+  LIBRDKAFKA_SOURCE_SHA256 = "d7eec9c31c817fa44402f679c252dfbf97e4c338a849a25c3579a31fd127beb8"
 end

data/lib/rdkafka.rb

@@ -8,6 +8,7 @@ require "json"
 require "rdkafka/version"
 require "rdkafka/helpers/time"
 require "rdkafka/helpers/oauth"
+require "rdkafka/helpers/metadata"
 require "rdkafka/defaults"
 require "rdkafka/abstract_handle"
 require "rdkafka/admin"
@@ -36,6 +37,17 @@ require "rdkafka/admin/config_binding_result"
 require "rdkafka/admin/config_resource_binding_result"
 require "rdkafka/bindings"
 require "rdkafka/callbacks"
+require "rdkafka/callbacks/base_handler"
+require "rdkafka/callbacks/create_topic_handler"
+require "rdkafka/callbacks/delete_topic_handler"
+require "rdkafka/callbacks/create_partitions_handler"
+require "rdkafka/callbacks/delete_groups_handler"
+require "rdkafka/callbacks/create_acl_handler"
+require "rdkafka/callbacks/delete_acl_handler"
+require "rdkafka/callbacks/describe_acl_handler"
+require "rdkafka/callbacks/describe_configs_handler"
+require "rdkafka/callbacks/incremental_alter_configs_handler"
+require "rdkafka/callbacks/list_offsets_handler"
 require "rdkafka/config"
 require "rdkafka/consumer"
 require "rdkafka/consumer/headers"

data/package-lock.json

@@ -286,9 +286,9 @@
       }
     },
     "node_modules/smol-toml": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.6.1.tgz",
-      "integrity": "sha512-dWUG8F5sIIARXih1DTaQAX4SsiTXhInKf1buxdY9DIg4ZYPZK5nGM1VRIYmEbDbsHt7USo99xSLFu5Q1IqTmsg==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.7.0.tgz",
+      "integrity": "sha512-aqVvWoyO21L23mb+drl4RmMXbf6N7FdHjAhTRA9ZBL7apWBgfWC16KjrASI+1p9GAroljyMHj6fK67i0UiTNvQ==",
       "dev": true,
       "license": "BSD-3-Clause",
       "engines": {

data/rdkafka.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |gem|
     next true if file.start_with?(".")
     next true if file.start_with?("spec/")
     next true if file.start_with?("ext/README.md")
+    next true if file.start_with?("Gemfile")
 
     false
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdkafka
 version: !ruby/object:Gem::Version
-  version: 0.28.0
+  version: 0.29.0
 platform: ruby
 authors:
 - Thijs Cadier
@@ -89,14 +89,11 @@ extensions:
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
-- Gemfile
-- Gemfile.lint
-- Gemfile.lint.lock
 - MIT-LICENSE
 - README.md
 - Rakefile
 - bin/verify_kafka_warnings
-- dist/librdkafka-2.14.1.tar.gz
+- dist/librdkafka-2.14.2.tar.gz
 - dist/patches/rdkafka_global_init.patch
 - docker-compose-ssl.yml
 - docker-compose.yml
@@ -129,6 +126,17 @@ files:
 - lib/rdkafka/admin/list_offsets_report.rb
 - lib/rdkafka/bindings.rb
 - lib/rdkafka/callbacks.rb
+- lib/rdkafka/callbacks/base_handler.rb
+- lib/rdkafka/callbacks/create_acl_handler.rb
+- lib/rdkafka/callbacks/create_partitions_handler.rb
+- lib/rdkafka/callbacks/create_topic_handler.rb
+- lib/rdkafka/callbacks/delete_acl_handler.rb
+- lib/rdkafka/callbacks/delete_groups_handler.rb
+- lib/rdkafka/callbacks/delete_topic_handler.rb
+- lib/rdkafka/callbacks/describe_acl_handler.rb
+- lib/rdkafka/callbacks/describe_configs_handler.rb
+- lib/rdkafka/callbacks/incremental_alter_configs_handler.rb
+- lib/rdkafka/callbacks/list_offsets_handler.rb
 - lib/rdkafka/config.rb
 - lib/rdkafka/consumer.rb
 - lib/rdkafka/consumer/headers.rb
@@ -137,6 +145,7 @@ files:
 - lib/rdkafka/consumer/topic_partition_list.rb
 - lib/rdkafka/defaults.rb
 - lib/rdkafka/error.rb
+- lib/rdkafka/helpers/metadata.rb
 - lib/rdkafka/helpers/oauth.rb
 - lib/rdkafka/helpers/time.rb
 - lib/rdkafka/metadata.rb

data/Gemfile

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-source "https://rubygems.org"
-
-gemspec
-
-group :development do
-  gem "ostruct"
-  gem "pry"
-  gem "rspec"
-  gem "simplecov"
-  gem "warning"
-end

data/Gemfile.lint

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-source "https://rubygems.org"
-
-# Documentation linting
-gem "yard-lint"
-
-# Code style (StandardRB via RuboCop)
-gem "standard"
-gem "standard-performance"
-gem "rubocop-performance"
-gem "rubocop-rspec"
-gem "standard-rspec"
-gem "rubocop-thread_safety"

data/Gemfile.lint.lock

@@ -1,123 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (2.4.3)
-    json (2.18.0)
-    language_server-protocol (3.17.0.5)
-    lint_roller (1.1.0)
-    parallel (1.27.0)
-    parser (3.3.10.1)
-      ast (~> 2.4.1)
-      racc
-    prism (1.8.0)
-    racc (1.8.1)
-    rainbow (3.1.1)
-    regexp_parser (2.11.3)
-    rubocop (1.82.1)
-      json (~> 2.3)
-      language_server-protocol (~> 3.17.0.2)
-      lint_roller (~> 1.1.0)
-      parallel (~> 1.10)
-      parser (>= 3.3.0.2)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.48.0, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.49.0)
-      parser (>= 3.3.7.2)
-      prism (~> 1.7)
-    rubocop-capybara (2.22.1)
-      lint_roller (~> 1.1)
-      rubocop (~> 1.72, >= 1.72.1)
-    rubocop-factory_bot (2.28.0)
-      lint_roller (~> 1.1)
-      rubocop (~> 1.72, >= 1.72.1)
-    rubocop-performance (1.26.1)
-      lint_roller (~> 1.1)
-      rubocop (>= 1.75.0, < 2.0)
-      rubocop-ast (>= 1.47.1, < 2.0)
-    rubocop-rspec (3.9.0)
-      lint_roller (~> 1.1)
-      rubocop (~> 1.81)
-    rubocop-rspec_rails (2.32.0)
-      lint_roller (~> 1.1)
-      rubocop (~> 1.72, >= 1.72.1)
-      rubocop-rspec (~> 3.5)
-    rubocop-thread_safety (0.7.3)
-      lint_roller (~> 1.1)
-      rubocop (~> 1.72, >= 1.72.1)
-      rubocop-ast (>= 1.44.0, < 2.0)
-    ruby-progressbar (1.13.0)
-    standard (1.53.0)
-      language_server-protocol (~> 3.17.0.2)
-      lint_roller (~> 1.0)
-      rubocop (~> 1.82.0)
-      standard-custom (~> 1.0.0)
-      standard-performance (~> 1.8)
-    standard-custom (1.0.2)
-      lint_roller (~> 1.0)
-      rubocop (~> 1.50)
-    standard-performance (1.9.0)
-      lint_roller (~> 1.1)
-      rubocop-performance (~> 1.26.0)
-    standard-rspec (0.3.1)
-      lint_roller (>= 1.0)
-      rubocop-capybara (~> 2.22)
-      rubocop-factory_bot (~> 2.27)
-      rubocop-rspec (~> 3.5)
-      rubocop-rspec_rails (~> 2.31)
-    unicode-display_width (3.2.0)
-      unicode-emoji (~> 4.1)
-    unicode-emoji (4.2.0)
-    yard (0.9.38)
-    yard-lint (1.4.0)
-      yard (~> 0.9)
-      zeitwerk (~> 2.6)
-    zeitwerk (2.7.4)
-
-PLATFORMS
-  ruby
-  x86_64-linux
-
-DEPENDENCIES
-  rubocop-performance
-  rubocop-rspec
-  rubocop-thread_safety
-  standard
-  standard-performance
-  standard-rspec
-  yard-lint
-
-CHECKSUMS
-  ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383
-  json (2.18.0) sha256=b10506aee4183f5cf49e0efc48073d7b75843ce3782c68dbeb763351c08fd505
-  language_server-protocol (3.17.0.5) sha256=fd1e39a51a28bf3eec959379985a72e296e9f9acfce46f6a79d31ca8760803cc
-  lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87
-  parallel (1.27.0) sha256=4ac151e1806b755fb4e2dc2332cbf0e54f2e24ba821ff2d3dcf86bf6dc4ae130
-  parser (3.3.10.1) sha256=06f6a725d2cd91e5e7f2b7c32ba143631e1f7c8ae2fb918fc4cebec187e6a688
-  prism (1.8.0) sha256=84453a16ef5530ea62c5f03ec16b52a459575ad4e7b9c2b360fd8ce2c39c1254
-  racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
-  rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a
-  regexp_parser (2.11.3) sha256=ca13f381a173b7a93450e53459075c9b76a10433caadcb2f1180f2c741fc55a4
-  rubocop (1.82.1) sha256=09f1a6a654a960eda767aebea33e47603080f8e9c9a3f019bf9b94c9cab5e273
-  rubocop-ast (1.49.0) sha256=49c3676d3123a0923d333e20c6c2dbaaae2d2287b475273fddee0c61da9f71fd
-  rubocop-capybara (2.22.1) sha256=ced88caef23efea53f46e098ff352f8fc1068c649606ca75cb74650970f51c0c
-  rubocop-factory_bot (2.28.0) sha256=4b17fc02124444173317e131759d195b0d762844a71a29fe8139c1105d92f0cb
-  rubocop-performance (1.26.1) sha256=cd19b936ff196df85829d264b522fd4f98b6c89ad271fa52744a8c11b8f71834
-  rubocop-rspec (3.9.0) sha256=8fa70a3619408237d789aeecfb9beef40576acc855173e60939d63332fdb55e2
-  rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100
-  rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431
-  ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33
-  standard (1.53.0) sha256=f3c9493385db7079d0abce6f7582f553122156997b81258cd361d3480eeacf9c
-  standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b
-  standard-performance (1.9.0) sha256=49483d31be448292951d80e5e67cdcb576c2502103c7b40aec6f1b6e9c88e3f2
-  standard-rspec (0.3.1) sha256=67bc957281cacf24f0d88235ca1bf28a8995265b1a60eb519cd0451858b56a22
-  unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42
-  unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f
-  yard (0.9.38) sha256=721fb82afb10532aa49860655f6cc2eaa7130889df291b052e1e6b268283010f
-  yard-lint (1.4.0) sha256=7dd88fbb08fd77cb840bea899d58812817b36d92291b5693dd0eeb3af9f91f0f
-  zeitwerk (2.7.4) sha256=2bef90f356bdafe9a6c2bd32bcd804f83a4f9b8bc27f3600fff051eb3edcec8b
-
-BUNDLED WITH
-  4.0.3