racecar 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76c24f3e555a6dc918ac8305af887ffef0ac01a69777a23b87f82ceffde2ac10
-  data.tar.gz: d726316346947532195ee496a6968d7805a488d79e365e729bc5402b8fc72020
+  metadata.gz: 9bb07a3f984de71b18b9401ec7908158aba831c54a4972e9de7af59d2d7ae3ea
+  data.tar.gz: 6e00e2f40495624944963868001e0cf20885c9f33e49ad8d147d0037562e96fa
 SHA512:
-  metadata.gz: 26717684ff1357eea174e0da260242aaa2dbc5f9114e3b9a740f76c905e42ee2a9e888dbe8baf9fb03df4a493ce9f310d0a38e296cf0810c94c378627d0f96bc
-  data.tar.gz: 1cfabc0277274391c0ffe58d4ad6e222de078e526e581eb262e32b1b4c23dbb76713f2a39649d8e4578c5d141bf9c42c9700c2de638dbc3dc23895f99a53c66b
+  metadata.gz: 0f5d1b6b84dbd96343a09387709676e0ac1250f1ac79f82225cb2060d8900f91f724f1bf0c722d6c440ce6c65ee175da930fc0bd542f6138eeeaab7d80d9662a
+  data.tar.gz: ca635a04ca6ea5019e625563417ac5c3097d2999d145a26089a9f86eb00312cf242110dcf44958180bdafbfebac5a319fb70b559d2cebe364c906caa93db9ced

data/.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby-version: ["2.5", "2.6", "3.0"]
+        ruby-version: ["2.4", "2.5", "2.6", "3.0"]
 
     steps:
     - uses: zendesk/checkout@v2

data/CHANGELOG.md

@@ -1,6 +1,9 @@
 # Changelog
 
-## Unreleased
+## v2.4.0
+
+* Update librdkafka version from 1.4.0 to 1.5.0 by upgrading from rdkafka 0.8.0 to 0.10.0. ([#263](https://github.com/zendesk/racecar/pull/263))
+* Restore support for Ruby 2.4 (#258)
 
 ## racecar v2.3.1
 

data/Gemfile

@@ -4,3 +4,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in racecar.gemspec
 gemspec
+
+# We actually support version 6.0 (see gemspec); this extra restriction is added just for running the test suite also
+# on Ruby 2.4, which activesupport 6.0 no longer supports
+gem 'activesupport', '< 6.0'

data/Gemfile.lock

@@ -1,35 +1,34 @@
 PATH
   remote: .
   specs:
-    racecar (2.3.0)
+    racecar (2.3.1)
       king_konf (~> 1.0.0)
-      rdkafka (~> 0.8.0)
+      rdkafka (~> 0.10.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.4)
+    activesupport (5.2.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
     coderay (1.1.3)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.9)
     diff-lcs (1.4.4)
     dogstatsd-ruby (4.8.2)
-    ffi (1.15.3)
-    i18n (1.8.5)
+    ffi (1.15.4)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     king_konf (1.0.0)
     method_source (1.0.0)
-    mini_portile2 (2.6.1)
-    minitest (5.14.2)
+    mini_portile2 (2.7.0)
+    minitest (5.14.4)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     rake (13.0.1)
-    rdkafka (0.8.1)
+    rdkafka (0.10.0)
       ffi (~> 1.9)
       mini_portile2 (~> 2.1)
       rake (>= 12.3)
@@ -48,15 +47,14 @@ GEM
     rspec-support (3.10.2)
     thread_safe (0.3.6)
     timecop (0.9.2)
-    tzinfo (1.2.8)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
-    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (>= 4.0, < 6.1)
+  activesupport (< 6.0)
   bundler (>= 1.13, < 3)
   dogstatsd-ruby (>= 4.0.0, < 5.0.0)
   pry
@@ -66,4 +64,4 @@ DEPENDENCIES
   timecop
 
 BUNDLED WITH
-   2.1.4
+   2.2.15

data/lib/racecar/consumer.rb

@@ -63,25 +63,27 @@ module Racecar
 
         @instrumenter.instrument('deliver_messages', instrumentation_payload) do
           @delivery_handles.each do |handle|
-            # rdkafka-ruby checks every wait_timeout seconds if the message was
-            # successfully delivered, up to max_wait_timeout seconds before raising
-            # Rdkafka::AbstractHandle::WaitTimeoutError. librdkafka will (re)try to
-            # deliver all messages in the background, until "config.message_timeout"
-            # (message.timeout.ms) is exceeded. Phrased differently, rdkafka-ruby's
-            # WaitTimeoutError is just informative.
-            # The raising can be avoided if max_wait_timeout below is greater than
-            # config.message_timeout, but config is not available here (without
-            # changing the interface).
-            handle.wait(max_wait_timeout: 60, wait_timeout: 0.1)
-          rescue Rdkafka::AbstractHandle::WaitTimeoutError => e
-            partition = MessageDeliveryError.partition_from_delivery_handle(handle)
-            # ideally we could use the logger passed to the Runner, but it is not
-            # available here. The runner sets it for Rdkafka, though, so we can use
-            # that instead.
-            @config.logger.debug "Still trying to deliver message to (partition #{partition})... (will try up to Racecar.config.message_timeout)"
-            retry
-          rescue Rdkafka::RdkafkaError => e
-            raise MessageDeliveryError.new(e, handle)
+            begin
+              # rdkafka-ruby checks every wait_timeout seconds if the message was
+              # successfully delivered, up to max_wait_timeout seconds before raising
+              # Rdkafka::AbstractHandle::WaitTimeoutError. librdkafka will (re)try to
+              # deliver all messages in the background, until "config.message_timeout"
+              # (message.timeout.ms) is exceeded. Phrased differently, rdkafka-ruby's
+              # WaitTimeoutError is just informative.
+              # The raising can be avoided if max_wait_timeout below is greater than
+              # config.message_timeout, but config is not available here (without
+              # changing the interface).
+              handle.wait(max_wait_timeout: 60, wait_timeout: 0.1)
+            rescue Rdkafka::AbstractHandle::WaitTimeoutError => e
+              partition = MessageDeliveryError.partition_from_delivery_handle(handle)
+              # ideally we could use the logger passed to the Runner, but it is not
+              # available here. The runner sets it for Rdkafka, though, so we can use
+              # that instead.
+              @config.logger.debug "Still trying to deliver message to (partition #{partition})... (will try up to Racecar.config.message_timeout)"
+              retry
+            rescue Rdkafka::RdkafkaError => e
+              raise MessageDeliveryError.new(e, handle)
+            end
           end
         end
       end

data/lib/racecar/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Racecar
-  VERSION = "2.3.1"
+  VERSION = "2.4.0"
 end

data/racecar.gemspec

@@ -20,8 +20,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = '>= 2.4'
+
   spec.add_runtime_dependency "king_konf", "~> 1.0.0"
-  spec.add_runtime_dependency "rdkafka",   "~> 0.8.0"
+  spec.add_runtime_dependency "rdkafka",   "~> 0.10.0"
 
   spec.add_development_dependency "bundler", [">= 1.13", "< 3"]
   spec.add_development_dependency "pry"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: racecar
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Daniel Schierbeck
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-02 00:00:00.000000000 Z
+date: 2021-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: king_konf
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -222,7 +222,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="