railway-ipc 2.2.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ade6188ad53835d058964953332583db7cf146f2b02b58c4a25cddb42e7f89cf
-  data.tar.gz: 4672c6b08a293c1988f42c944063cc9ba67d6656531b8c3a3fd9b00ab908219e
+  metadata.gz: 8fa6ce7e4b6f8667fa4939cc334dd66845c39e5f357bd4887eb030b7f4edcf3a
+  data.tar.gz: ea8f959e0cf43ed38b71276baac73c4c4e417ee8d4323d47605390a95d573c53
 SHA512:
-  metadata.gz: a76acd180339079bc95bd042e6a6c2512edd05d485ca2763e8211278f85adf0677156f1e8d305ce5cc4186c9304ed85e7c8343b0a32b79560225e1261e7801a9
-  data.tar.gz: ceab6497161f8c640cbb2da715b9380729b1e8dbb40843d11fd879a32214e7f39f5aa130d811eeff66c0f0b59eea743e6cb97aa8fb89bcb2fa62aa06ceffb65f
+  metadata.gz: e76cd2483ea799dd04f7acc27cd5f7799a6f7bd6d6e9bc6e64c08e0a621f55ad6e9ba37fb53c685fea4dd8847b78bde3b73bb97091d9f3764d15c3ce5237c84b
+  data.tar.gz: 62955dfb46eb250156ff8d9c1c9c1570169bc1c45742ca231dbbceadeb091f71439793645620cad63ba5e0c21e393894aa13d96444ac0da4f440c0b7179076a7

data/.gitignore

@@ -4,10 +4,14 @@
 /coverage/
 /doc/
 /pkg/
+/rake
 /spec/reports/
 /tmp/
 Gemfile.lock
 
+# built gems
+railway-ipc-*.gem
+
 # rspec failure tracking
 .rspec_status
 

data/.ruby-version

@@ -0,0 +1 @@
+2.6.5

data/CHANGELOG.md

@@ -10,6 +10,32 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 ### Fixed
 
+## [4.0.1] - 2021-01-12
+### Fixed
+* Fixed `undefined method fetch for Bunny::MessageProperties` error. `Bunny::MessageProperties` isn't really a Hash, it wraps one (and doesn't provide a `#fetch` method).
+
+## [4.0.0] - 2021-01-11
+### Added
+* JSON decoder for consumers that can handle JSON encoded Protobufs. Note that the publishers do not (yet) have the option of encoding the messages as JSON.
+
+### Changed
+* (Breaking Change) Rename `Consumer#work` to `Consumer#work_with_params`. This was necessary so that we can support specifying different message encodings via metadata in the future. If the message encoding cannot be determined from the message metadata fall back to a default decoder (binary protobufs).
+
+### Fixed
+* `./bin/console` script was broken because Pry wasn't a dependency; added Pry as a development dependency only.
+
+## [3.0.0] - 2020-12-07
+### Changed
+* Consumers _will no longer crash_ when an exception is raised. Instead, consumers will move the message that caused the exception to a single dead-letter exchange called 'ipc:errors'. Railway will configure the dead-letter exchange automatically.
+
+## [2.2.2] - 2020-11-20
+### Fixed
+* Fixed Publisher class channel leak. Channels were being created on each instantiation of a Publisher instead of being re-used.
+
+## [2.2.1] - 2020-10-20
+### Added
+* Logging to indicate when options passed via `listen_to`/`from_queue` are overriding the defaults.
+
 ## [2.2.0] - 2020-10-20
 ### Added
 * The ability to configure workers to handle different workloads via `rake railway_ipc::consumers:spawn`
@@ -74,7 +100,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Correlation ID and message UUID are auto generated for messages for IDs are not passed in [#23](https://github.com/learn-co/railway_ipc_gem/pull/23)
 
-[Unreleased]: https://github.com/learn-co/railway_ipc_gem/compare/v2.0.3...HEAD
+[Unreleased]: https://github.com/learn-co/railway_ipc_gem/compare/v4.0.1...HEAD
+[4.0.1]: https://github.com/learn-co/railway_ipc_gem/compare/v4.0.0...v4.0.1
+[4.0.0]: https://github.com/learn-co/railway_ipc_gem/compare/v3.0.0...v4.0.0
+[3.0.0]: https://github.com/learn-co/railway_ipc_gem/compare/v2.2.2...v3.0.0
+[2.2.2]: https://github.com/learn-co/railway_ipc_gem/compare/v2.2.1...v2.2.2
+[2.2.1]: https://github.com/learn-co/railway_ipc_gem/compare/v2.2.0...v2.2.1
+[2.2.0]: https://github.com/learn-co/railway_ipc_gem/compare/v2.1.0...v2.2.0
+[2.1.0]: https://github.com/learn-co/railway_ipc_gem/compare/v2.0.3...v2.1.0
 [2.0.3]: https://github.com/learn-co/railway_ipc_gem/compare/v2.0.2...v2.0.3
 [2.0.2]: https://github.com/learn-co/railway_ipc_gem/compare/v2.0.1...v2.0.2
 [2.0.1]: https://github.com/learn-co/railway_ipc_gem/compare/v2.0.0...v2.0.1

data/README.md

@@ -52,6 +52,26 @@ Then, run your consumers
 bundle exec rake railway_ipc:consumers:start CONSUMERS=YourConsumer,YourOtherConsumer
 ```
 
+You may also configure your consumers more granularly using:
+
+`./config/sneaker_worker_groups.yml`
+```yaml
+HighPriority:
+    classes: YourConsumer,YourOtherConsumer
+    workers: 5
+LowPriority:
+    classes: YourThirdConsumer
+    workers: 1
+```
+
+```bash
+bundle exec rake railway_ipc:consumers:spawn
+```
+
+By default, `spawn` will map to `./config/sneaker_worker_groups.yml` but you can override it by using `WORKER_GROUP_CONFIG`.
+
+See the [Sneaker Documentation](https://github.com/jondot/sneakers/wiki/Handling-different-workloads) for more information.
+
 # Request/Response
 
 Define your server, client and responder. Docs coming soon.

data/lib/railway_ipc.rb

@@ -5,7 +5,7 @@ require 'sneakers'
 require 'sneakers/spawner'
 require 'bunny'
 require 'active_record'
-require 'railway_ipc/version'
+require 'singleton'
 require 'railway_ipc/logger'
 require 'railway_ipc/unhandled_message_error'
 require 'railway_ipc/response'
@@ -14,7 +14,9 @@ require 'railway_ipc/unknown_message.pb'
 require 'railway_ipc/rabbitmq/adapter'
 require 'railway_ipc/handler'
 require 'railway_ipc/handler_store'
+require 'railway_ipc/message_decoders'
 require 'railway_ipc/incoming_message'
+require 'railway_ipc/connection_manager'
 require 'railway_ipc/publisher'
 require 'railway_ipc/responder'
 require 'railway_ipc/rpc/rpc'
@@ -34,12 +36,12 @@ module RailwayIpc
     Sneakers::Spawner.spawn
   end
 
-  def self.configure(log_device=STDOUT, level=::Logger::INFO, log_formatter=nil)
+  def self.configure(log_device=$stdout, level=::Logger::INFO, log_formatter=nil)
     @logger = RailwayIpc::Logger.new(log_device, level, log_formatter)
   end
 
   def self.logger
-    @logger || RailwayIpc::Logger.new(STDOUT)
+    @logger || RailwayIpc::Logger.new($stdout)
   end
 
   def self.bunny_connection

data/lib/railway_ipc/connection_manager.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'singleton'
+
+module RailwayIpc
+  # RabbitMQ connection manager. Ensures there is a single RabbitMQ
+  # connection and channel per thread, which prevents channel leaks.
+  #
+  class ConnectionManager
+    include Singleton
+
+    def initialize
+      establish_connection
+    end
+
+    def establish_connection
+      @connection = Bunny.new(
+        host: settings[:host],
+        user: settings[:user],
+        pass: settings[:pass],
+        port: settings[:port],
+        vhost: settings[:vhost] || '/',
+        logger: RailwayIpc.logger
+      )
+      @connection.start
+      @channel = @connection.create_channel
+
+      @connection
+    end
+
+    def channel
+      return @channel if connected?
+
+      establish_connection
+      @channel
+    end
+
+    def connected?
+      @connection&.connected? && @channel&.open?
+    end
+
+    private
+
+    def amqp_url
+      @amqp_url ||= ENV.fetch('RAILWAY_RABBITMQ_CONNECTION_URL', 'amqp://guest:guest@localhost:5672')
+    end
+
+    def settings
+      @settings ||= AMQ::Settings.parse_amqp_url(amqp_url)
+    end
+  end
+end

data/lib/railway_ipc/consumer/consumer.rb

@@ -5,6 +5,8 @@ module RailwayIpc
     include Sneakers::Worker
 
     def self.inherited(base)
+      super
+
       base.instance_eval do
         def handlers
           @handlers ||= RailwayIpc::HandlerStore.new
@@ -12,14 +14,27 @@ module RailwayIpc
       end
     end
 
+    # rubocop:disable Metrics/MethodLength
     def self.listen_to(queue:, exchange:, options: {})
+      unless options.empty?
+        RailwayIpc.logger.info(
+          "Overriding configuration for #{queue} with new options",
+          feature: 'railway_ipc_consumer',
+          options: options
+        )
+      end
+
       from_queue queue, {
         exchange: exchange,
         durable: true,
         exchange_type: :fanout,
+        arguments: {
+          'x-dead-letter-exchange' => 'ipc:errors'
+        },
         connection: RailwayIpc.bunny_connection
       }.merge(options)
     end
+    # rubocop:enable Metrics/MethodLength
 
     def self.handle(message_type, with:)
       handlers.register(message: message_type, handler: with)
@@ -41,8 +56,14 @@ module RailwayIpc
       queue.opts[:exchange]
     end
 
-    def work(payload)
-      message = RailwayIpc::IncomingMessage.new(payload)
+    # REFACTOR: Long term we should think about not leaking Sneakers
+    # methods as part of Railway's public API since clients can (and do)
+    # override them. -BN
+    def work_with_params(payload, _delivery_info, metadata)
+      headers = metadata.headers || {}
+      message_format = headers.fetch('message_format', 'protobuf_binary')
+
+      message = RailwayIpc::IncomingMessage.new(payload, message_format: message_format)
       RailwayIpc::ProcessIncomingMessage.call(self, message)
       ack!
     rescue StandardError => e
@@ -54,7 +75,7 @@ module RailwayIpc
         error: e.class,
         payload: payload
       )
-      raise e
+      reject!
     end
 
     def get_handler(type)

data/lib/railway_ipc/incoming_message.rb

@@ -2,9 +2,10 @@
 
 module RailwayIpc
   class IncomingMessage
-    attr_reader :type, :payload, :parsed_payload, :errors
+    attr_reader :type, :message_format, :payload, :parsed_payload, :errors
 
-    def initialize(payload)
+    def initialize(payload, message_format: nil)
+      @message_format = message_format
       @parsed_payload = JSON.parse(payload)
       @type = parsed_payload['type']
       @payload = payload
@@ -32,20 +33,23 @@ module RailwayIpc
     end
 
     def decoded
-      @decoded ||=
-        begin
-          protobuf_msg = Base64.decode64(parsed_payload['encoded_message'])
-          decoder = Kernel.const_get(type)
-          decoder.decode(protobuf_msg)
-        rescue Google::Protobuf::ParseError => e
-          raise RailwayIpc::IncomingMessage::ParserError.new(e)
-        rescue NameError
-          RailwayIpc::Messages::Unknown.decode(protobuf_msg)
-        end
+      @decoded ||= \
+        get_decoder(message_format).call(type, parsed_payload['encoded_message'])
     end
 
     def stringify_errors
       errors.values.join(', ')
     end
+
+    private
+
+    DEFAULT_DECODER = RailwayIpc::MessageDecoders::ProtobufBinaryDecoder
+
+    def get_decoder(name)
+      {
+        'protobuf_binary' => RailwayIpc::MessageDecoders::ProtobufBinaryDecoder,
+        'protobuf_json' => RailwayIpc::MessageDecoders::ProtobufJsonDecoder
+      }.fetch(name, DEFAULT_DECODER)
+    end
   end
 end

data/lib/railway_ipc/logger.rb

@@ -21,7 +21,7 @@ module RailwayIpc
   # logger = RailwayIpc::Logger.new(STDOUT, Logger::INFO, OjFormatter)
   #
   class Logger
-    def initialize(device=STDOUT, level=::Logger::INFO, formatter=nil)
+    def initialize(device=$stdout, level=::Logger::INFO, formatter=nil)
       @logger = ::Logger.new(device)
       @logger.level = level
       @logger.formatter = formatter if formatter
@@ -32,7 +32,7 @@ module RailwayIpc
         data.merge!(feature: 'railway_ipc') unless data.key?(:feature)
         return logger.send(level, data.merge(message: message)) unless block
 
-        data = message.merge(data) if message&.is_a?(Hash)
+        data = message.merge(data) if message.is_a?(Hash)
         data.merge!(message: block.call)
 
         # This is for compatability w/ Ruby's Logger. Ruby's Logger class
@@ -41,7 +41,7 @@ module RailwayIpc
         # is assumed to be the `progname`.
         #
         # https://github.com/ruby/logger/blob/master/lib/logger.rb#L471
-        data.merge!(progname: message) if message&.is_a?(String)
+        data.merge!(progname: message) if message.is_a?(String)
         logger.send(level, data)
       end
     end

data/lib/railway_ipc/message_decoders.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module RailwayIpc
+  module MessageDecoders
+    ProtobufBinaryDecoder = lambda do |type, encoded_message|
+      protobuf_msg = Base64.decode64(encoded_message)
+      protobuf_klass = Kernel.const_get(type)
+      protobuf_klass.decode(protobuf_msg)
+    rescue Google::Protobuf::ParseError => e
+      raise RailwayIpc::IncomingMessage::ParserError.new(e)
+    rescue NameError
+      RailwayIpc::Messages::Unknown.decode(protobuf_msg)
+    end
+
+    ProtobufJsonDecoder = lambda do |type, message_hash|
+      protobuf_klass = Kernel.const_get(type)
+      protobuf_klass.new(message_hash)
+    rescue ArgumentError => e
+      raise RailwayIpc::IncomingMessage::ParserError.new(e)
+    rescue NameError
+      # NOTE: I didn't realize this until I made this ProtobufJsonDecoder, but
+      # the ProtobufBinaryDecoder will ignore any unknown keys -- which is
+      # probably not what we want. I'm coding this the same way as the binary
+      # protobuf version for consistency, but we should re-think how we want to
+      # handle this situation. -BN
+      RailwayIpc::Messages::Unknown.new(
+        user_uuid: message_hash.fetch(:user_uuid, ''),
+        correlation_id: message_hash.fetch(:correlation_id, ''),
+        uuid: message_hash.fetch(:uuid, ''),
+        context: message_hash.fetch(:context, {})
+      )
+    end
+  end
+end

data/lib/railway_ipc/publisher.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'singleton'
-
 module RailwayIpc
   class SingletonPublisher < Sneakers::Publisher
     include ::Singleton
@@ -53,19 +51,12 @@ module RailwayIpc
 end
 
 module RailwayIpc
-  class Publisher < Sneakers::Publisher
+  class Publisher
     attr_reader :exchange_name, :message_store
 
     def initialize(opts={})
       @exchange_name = opts.fetch(:exchange_name)
       @message_store = opts.fetch(:message_store, RailwayIpc::PublishedMessage)
-      connection = opts.fetch(:connection, nil)
-      options = {
-        exchange: exchange_name,
-        connection: connection,
-        exchange_type: :fanout
-      }.compact
-      super(options)
     end
 
     # rubocop:disable Metrics/AbcSize
@@ -75,7 +66,7 @@ module RailwayIpc
       RailwayIpc.logger.info('Publishing message', log_message_options(message))
 
       stored_message = message_store.store_message(exchange_name, message)
-      super(RailwayIpc::Rabbitmq::Payload.encode(message))
+      exchange.publish(RailwayIpc::Rabbitmq::Payload.encode(message))
     rescue RailwayIpc::InvalidProtobuf => e
       RailwayIpc.logger.error('Invalid protobuf', log_message_options(message))
       raise e
@@ -88,8 +79,16 @@ module RailwayIpc
     end
     # rubocop:enable Metrics/AbcSize
 
+    def exchange
+      @exchange ||= channel.exchange(exchange_name, type: :fanout, durable: true, auto_delete: false, arguments: {})
+    end
+
     private
 
+    def channel
+      RailwayIpc::ConnectionManager.instance.channel
+    end
+
     def log_message_options(message)
       {
         feature: 'railway_ipc_publisher',

data/lib/railway_ipc/rabbitmq/adapter.rb

@@ -16,7 +16,7 @@ module RailwayIpc
                      :port,
                      :user
 
-      def initialize(amqp_url: ENV['RAILWAY_RABBITMQ_CONNECTION_URL'], exchange_name:, queue_name: '', options: {})
+      def initialize(exchange_name:, amqp_url: ENV['RAILWAY_RABBITMQ_CONNECTION_URL'], queue_name: '', options: {})
         @queue_name = queue_name
         @exchange_name = exchange_name
         settings = AMQ::Settings.parse_amqp_url(amqp_url)

data/lib/railway_ipc/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailwayIpc
-  VERSION = '2.2.0'
+  VERSION = '4.0.1'
 end

data/railway_ipc.gemspec

@@ -48,6 +48,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'database_cleaner', '~> 1.7'
   spec.add_development_dependency 'listen', '~> 3.0.5'
   spec.add_development_dependency 'pg', '~> 0.18'
+  spec.add_development_dependency 'pry', '~> 0.13'
   spec.add_development_dependency 'rails', '~> 5.0.7'
   spec.add_development_dependency 'rspec-rails'
   spec.add_development_dependency 'shoulda-matchers', '~> 4.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: railway-ipc
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 4.0.1
 platform: ruby
 authors:
 - ''
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-20 00:00:00.000000000 Z
+date: 2021-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -164,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.18'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -213,6 +227,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -225,6 +240,7 @@ files:
 - bin/setup
 - lib/railway_ipc.rb
 - lib/railway_ipc/Rakefile
+- lib/railway_ipc/connection_manager.rb
 - lib/railway_ipc/consumer/consumer.rb
 - lib/railway_ipc/consumer/process_incoming_message.rb
 - lib/railway_ipc/errors.rb
@@ -232,6 +248,7 @@ files:
 - lib/railway_ipc/handler_store.rb
 - lib/railway_ipc/incoming_message.rb
 - lib/railway_ipc/logger.rb
+- lib/railway_ipc/message_decoders.rb
 - lib/railway_ipc/models/consumed_message.rb
 - lib/railway_ipc/models/published_message.rb
 - lib/railway_ipc/publisher.rb