phobos 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa6ceb9067bc80835a1460e43cbe613f7fdaaa23
-  data.tar.gz: 43281f6ada2fe5b824da9cc236d56523c58cee02
+  metadata.gz: 8f244c641277c9ee85b12ea07250670fba1a0e8c
+  data.tar.gz: 385b9b4dec2f3991b9a8d1345d1f838c4d1ce04d
 SHA512:
-  metadata.gz: ad5569add3dd9748cb746943816285d3518052dbc148b2102975b60744782081afc81c5d520f7ca80e090505b4c6b592b49959aa8d22820367f799739d4c2e7d
-  data.tar.gz: 2e110cdba90db10a6c0cf4a51bee1f8bdf31ea1090f303d44d817654d6c8dd14837eba52a6a83419e35c31a385a3dc01a083df16142128805adc9e5d5d65b29c
+  metadata.gz: e116a595f2d1de1881ff4c24b07b563c1f2798e28cc2af434b057b3b137fdd94b91bf44d767f4d138dd1b5114f2afba324c85b2eb1f8e4aba38173fb222ec9e1
+  data.tar.gz: 4359fba15e7de514376a5da2ab19c4796523c71155b9ea22a54317edae26c1ec9cfbcfefe5b3a856228aedcd405d1adb369ad21df1b72d8651becb7455aa0242

data/.travis.yml

@@ -2,6 +2,7 @@ sudo: required
 language: ruby
 rvm:
   - 2.4.1
+  - 2.3.6
 
 services:
   - docker

data/CHANGELOG.md

@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## UNRELEASED
 
+## [1.7.1] - 2018-02-22
+### Fixed
+- Phobos overwrites ENV['RAILS_ENV'] with incorrect value #71
+- Possible NoMethodError #force_encoding #63
+- Phobos fails silently #66
+### Added
+- Add offset_retention_time to consumer options #62
+
 ## [1.7.0] - 2017-12-05
 ### Fixed
 - Test are failing with ruby-kafka 0.5.0 #48

data/config/phobos.yml.example

@@ -70,6 +70,8 @@ consumer:
   # number of messages that can be processed before their offsets are committed.
   # If zero, offset commits are not triggered by message processing
   offset_commit_threshold: 0
+  # the time period that committed offsets will be retained, in seconds. Defaults to the broker setting.
+  offset_retention_time:
   # interval between heartbeats; must be less than the session window
   heartbeat_interval: 10
 

data/lib/phobos.rb

@@ -31,13 +31,12 @@ module Phobos
     attr_accessor :silence_log
 
     def configure(configuration)
-      ENV['RAILS_ENV'] = ENV['RACK_ENV'] ||= 'development'
       @config = DeepStruct.new(fetch_settings(configuration))
       @config.class.send(:define_method, :producer_hash) { Phobos.config.producer&.to_hash }
       @config.class.send(:define_method, :consumer_hash) { Phobos.config.consumer&.to_hash }
       @config.listeners ||= []
       configure_logger
-      logger.info { Hash(message: 'Phobos configured', env: ENV['RACK_ENV']) }
+      logger.info { Hash(message: 'Phobos configured', env: ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'N/A') }
     end
 
     def add_listeners(listeners_configuration)

data/lib/phobos/actions/process_message.rb

@@ -51,7 +51,7 @@ module Phobos
       private
 
       def force_encoding(value)
-        @listener.encoding ? value.force_encoding(@listener.encoding) : value
+        @listener.encoding ? value&.force_encoding(@listener.encoding) : value
       end
 
       def process_message(payload)

data/lib/phobos/executor.rb

@@ -18,9 +18,9 @@ module Phobos
       @threads = Concurrent::Array.new
       @listeners = Phobos.config.listeners.flat_map do |config|
         handler_class = config.handler.constantize
-        listener_configs = config.to_hash
+        listener_configs = config.to_hash.deep_symbolize_keys
         max_concurrency = listener_configs[:max_concurrency] || 1
-        max_concurrency.times.map do
+        Array.new(max_concurrency).map do
           configs = listener_configs.select { |k| LISTENER_OPTS.include?(k) }
           Phobos::Listener.new(configs.merge(handler: handler_class))
         end
@@ -48,7 +48,7 @@ module Phobos
       return if @signal_to_stop
       instrument('executor.stop') do
         @signal_to_stop = true
-        @listeners.map(&:stop)
+        @listeners.each(&:stop)
         @threads.select(&:alive?).each { |thread| thread.wakeup rescue nil }
         @thread_pool&.shutdown
         @thread_pool&.wait_for_termination
@@ -58,6 +58,14 @@ module Phobos
 
     private
 
+    def error_metadata(e)
+      {
+        exception_class: e.class.name,
+        exception_message: e.message,
+        backtrace: e.backtrace
+      }
+    end
+
     def run_listener(listener)
       retry_count = 0
       backoff = listener.create_exponential_backoff
@@ -74,11 +82,8 @@ module Phobos
         metadata = {
           listener_id: listener.id,
           retry_count: retry_count,
-          waiting_time: interval,
-          exception_class: e.class.name,
-          exception_message: e.message,
-          backtrace: e.backtrace
-        }
+          waiting_time: interval
+        }.merge(error_metadata(e))
 
         instrument('executor.retry_listener_error', metadata) do
           Phobos.logger.error { Hash(message: "Listener crashed, waiting #{interval}s (#{e.message})").merge(metadata)}
@@ -88,7 +93,9 @@ module Phobos
         retry_count += 1
         retry unless @signal_to_stop
       end
+    rescue Exception => e
+      Phobos.logger.error { Hash(message: "Failed to run listener (#{e.message})").merge(error_metadata(e)) }
+      raise e
     end
-
   end
 end

data/lib/phobos/listener.rb

@@ -2,7 +2,14 @@ module Phobos
   class Listener
     include Phobos::Instrumentation
 
-    KAFKA_CONSUMER_OPTS = %i(session_timeout offset_commit_interval offset_commit_threshold heartbeat_interval).freeze
+    KAFKA_CONSUMER_OPTS = %i(
+      session_timeout
+      offset_commit_interval
+      offset_commit_threshold
+      heartbeat_interval
+      offset_retention_time
+    ).freeze
+
     DEFAULT_MAX_BYTES_PER_PARTITION = 1048576 # 1 MB
     DELIVERY_OPTS = %w[batch message].freeze
 

data/lib/phobos/test/helper.rb

@@ -13,11 +13,9 @@ module Phobos
         )
 
         message = Kafka::FetchedMessage.new(
-          value: payload,
-          key: nil,
+          message: Kafka::Protocol::Message.new(value: payload, key: nil, offset: 13),
           topic: TOPIC,
-          partition: 0,
-          offset: 13,
+          partition: 0
         )
 
         Phobos::Actions::ProcessMessage.new(

data/lib/phobos/version.rb

@@ -1,3 +1,3 @@
 module Phobos
-  VERSION = '1.7.0'
+  VERSION = '1.7.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phobos
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Túlio Ornelas
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-05 00:00:00.000000000 Z
+date: 2018-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler