deimos-ruby 1.9.1 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96d4d5c0b33f644a070ecd29d3e1060a63b7563e6e753ccf595e10a3126c9597
-  data.tar.gz: 8908d289256d3297599eb4be447d3858a69f98eb2ca85a0de3b8339f6f105362
+  metadata.gz: 32eb1834570b6a1ea7d61274bf35be7365f16f1bb818c5c1148459bbc5a0b87a
+  data.tar.gz: eb1ea3e922b947c631f05c0e1a41ce65a3c7a366b42e9b5884de499fff14817b
 SHA512:
-  metadata.gz: ab1508cee3db45b7f2674aaef4e7182c0f32ee11711802e11866b129651ac989f56ec47f11c7526e47c7dba02fc0cf399d1186d7a2dfbc0eeb579b290137857b
-  data.tar.gz: e95a3dbb7b8e60db19796c906d21897f28174cc39c986078778e1ea612d4ab103e2fb94361429b59660dcde24dd55e417dfbe50a2bed1ce76608e86788794e8c
+  metadata.gz: f9d27f061f4ddcc3db165c08aaa09c02d80471cfa8b815cb2fc91909a6992615a49697870f517e70fae958d8bd8fa022b2369310f839c5bcba60a415c9a95750
+  data.tar.gz: '0578c18592f11f646ae89b44a12c712ef86403b282ce9624c7e3127f5d54ba9f20faa634fd463e03b1287dd84d4bfddbecc2ee20e503a76b2f83a700c491b72e'

data/CHANGELOG.md

@@ -7,11 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## UNRELEASED
 
-## 1.9.1 - 2021-01-29
+
+## 1.9.2 - 2021-01-29
 
 - ### Fixes :wrench:
 
-Fix for `uninitialized constant ActiveSupport::Autoload` in certain circumstances
+- Fix for `uninitialized constant ActiveSupport::Autoload` in certain circumstances
+- Removed unnecessary monkey patch which was crashing on newer versions of ruby-kafka
 
 ## 1.9.0 - 2021-01-28
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    deimos-ruby (1.9.0)
+    deimos-ruby (1.9.1)
       avro_turf (~> 0.11)
       phobos (>= 1.9, < 3.0)
       ruby-kafka (< 2)

data/lib/deimos.rb

@@ -20,7 +20,6 @@ require 'deimos/backends/test'
 
 require 'deimos/schema_backends/base'
 
-require 'deimos/monkey_patches/ruby_kafka_heartbeat'
 require 'deimos/monkey_patches/phobos_producer'
 require 'deimos/monkey_patches/phobos_cli'
 

data/lib/deimos/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Deimos
-  VERSION = '1.9.1'
+  VERSION = '1.9.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deimos-ruby
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.9.2
 platform: ruby
 authors:
 - Daniel Orner
@@ -386,7 +386,6 @@ files:
 - lib/deimos/metrics/provider.rb
 - lib/deimos/monkey_patches/phobos_cli.rb
 - lib/deimos/monkey_patches/phobos_producer.rb
-- lib/deimos/monkey_patches/ruby_kafka_heartbeat.rb
 - lib/deimos/poll_info.rb
 - lib/deimos/producer.rb
 - lib/deimos/railtie.rb

data/lib/deimos/monkey_patches/ruby_kafka_heartbeat.rb

@@ -1,85 +0,0 @@
-# frozen_string_literal: true
-
-module Kafka
-  class Heartbeat
-    def initialize(group:, interval:, instrumenter:)
-      @group = group
-      @interval = interval
-      @last_heartbeat = Time.now
-      @instrumenter = instrumenter
-    end
-
-    def trigger!
-      @instrumenter.instrument('heartbeat.consumer',
-                               group_id: @group.group_id,
-                               topic_partitions: @group.assigned_partitions) do
-                                 @group.heartbeat
-                                 @last_heartbeat = Time.now
-                               end
-    end
-  end
-
-  class Client
-    def consumer(
-        group_id:,
-        session_timeout: 30,
-        offset_commit_interval: 10,
-        offset_commit_threshold: 0,
-        heartbeat_interval: 10,
-        offset_retention_time: nil,
-        fetcher_max_queue_size: 100
-      )
-      cluster = initialize_cluster
-
-      instrumenter = DecoratingInstrumenter.new(@instrumenter,
-                                                group_id: group_id)
-
-      # The Kafka protocol expects the retention time to be in ms.
-      retention_time = (offset_retention_time && offset_retention_time * 1_000) || -1
-
-      group = ConsumerGroup.new(
-        cluster: cluster,
-        logger: @logger,
-        group_id: group_id,
-        session_timeout: session_timeout,
-        retention_time: retention_time,
-        instrumenter: instrumenter
-      )
-
-      fetcher = Fetcher.new(
-        cluster: initialize_cluster,
-        group: group,
-        logger: @logger,
-        instrumenter: instrumenter,
-        max_queue_size: fetcher_max_queue_size
-      )
-
-      offset_manager = OffsetManager.new(
-        cluster: cluster,
-        group: group,
-        fetcher: fetcher,
-        logger: @logger,
-        commit_interval: offset_commit_interval,
-        commit_threshold: offset_commit_threshold,
-        offset_retention_time: offset_retention_time
-      )
-
-      heartbeat = Heartbeat.new(
-        group: group,
-        interval: heartbeat_interval,
-        instrumenter: instrumenter
-      )
-
-      Consumer.new(
-        cluster: cluster,
-        logger: @logger,
-        instrumenter: instrumenter,
-        group: group,
-        offset_manager: offset_manager,
-        fetcher: fetcher,
-        session_timeout: session_timeout,
-        heartbeat: heartbeat
-      )
-    end
-  end
-end