freddy 2.5.1 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d1f9939bd9e7f0a172fc7a4d33a75e7fc8c2ca0f5d955efcdb7a650fba7799d
-  data.tar.gz: 06e3027b141fd5416d2e875f8fce78b1b7e969db3e5f8990821c6b5fea03d6ef
+  metadata.gz: addf621163f5d1faf987bf6ab91d027a538631303543833e1aea8946d3bc0e0b
+  data.tar.gz: 22d6eddbd383a2d7b7b46a4e69b2f78b1a0ba6e8a803a1c8b13be7a8be9d3948
 SHA512:
-  metadata.gz: c4624e65aaa2837868783c660dbd1ed8e6d51618c8c062a26812bd873b8f95464a8cd0df39c33220c1ee21f0b485dbf2d9e9b4d8337c22af0821e2f58c156c7e
-  data.tar.gz: 48c0e50064604225a46bb2060cf1c9e7a9bd92da221189eac1b2c902ab1ca6b7ef2c78290827142d263ea71fd624e9df602572bbef455929d88971196ba8c16a
+  metadata.gz: 569d91cfe03265013e808bd1847c023b5e307e0411b12ef8113e54e3c471953f21f7a0ed3603c81513cf4a4d628447347d1d582e808b14cdd7f58ef5c8d5023c
+  data.tar.gz: bdeb3e75486d8f026e30d1766db834f2d6f7bad2e788f8d74eaaa836e428d02f56101d1e67b8ec5697cbd04ed9b891e6b98933d5c483c17e200b64cf8b877afd

data/.github/workflows/publish.yml

@@ -15,8 +15,7 @@ jobs:
 
 
       - name: Release Gem
-        uses: discourse/publish-rubygems-action@b55d7b91b55e61752dc6cbc2972f8e16fe6c1a02
+        uses: discourse/publish-rubygems-action@ec5415e2cc3509a5cc8c4eef9499cf3fb05f8391
         env:
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
           RUBYGEMS_API_KEY: ${{secrets.RUBYGEMS_API_KEY}}
           RELEASE_COMMAND: rake release

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    freddy (2.5.1)
+    freddy (2.7.0)
       bunny (~> 2.11)
       concurrent-ruby (~> 1.0)
       oj (~> 3.6)
@@ -14,16 +14,16 @@ GEM
   specs:
     amq-protocol (2.3.2)
     ast (2.4.2)
-    bunny (2.19.0)
+    bunny (2.22.0)
       amq-protocol (~> 2.3, >= 2.3.1)
       sorted_set (~> 1, >= 1.0.2)
     coderay (1.1.3)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.2.2)
     diff-lcs (1.4.4)
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
     method_source (1.0.0)
-    oj (3.13.21)
+    oj (3.15.0)
     opentelemetry-api (1.1.0)
     opentelemetry-common (0.19.6)
       opentelemetry-api (~> 1.0)
@@ -34,7 +34,7 @@ GEM
       opentelemetry-common (~> 0.19.3)
       opentelemetry-registry (~> 0.2)
       opentelemetry-semantic_conventions
-    opentelemetry-semantic_conventions (1.8.0)
+    opentelemetry-semantic_conventions (1.10.0)
       opentelemetry-api (~> 1.0)
     parallel (1.22.1)
     parser (3.1.2.0)
@@ -44,7 +44,7 @@ GEM
       method_source (~> 1.0)
     rainbow (3.1.1)
     rake (13.0.6)
-    rbtree (0.4.5)
+    rbtree (0.4.6)
     regexp_parser (2.5.0)
     rexml (3.2.5)
     rspec (3.10.0)

data/lib/freddy/consumers/respond_to_consumer.rb

@@ -3,8 +3,8 @@
 class Freddy
   module Consumers
     class RespondToConsumer
-      def self.consume(*attrs, &block)
-        new(*attrs).consume(&block)
+      def self.consume(**attrs, &block)
+        new(**attrs).consume(&block)
       end
 
       def initialize(thread_pool:, destination:, channel:, handler_adapter_factory:)

data/lib/freddy/consumers/tap_into_consumer.rb

@@ -3,8 +3,8 @@
 class Freddy
   module Consumers
     class TapIntoConsumer
-      def self.consume(*attrs, &block)
-        new(*attrs).consume(&block)
+      def self.consume(**attrs, &block)
+        new(**attrs).consume(&block)
       end
 
       def initialize(thread_pool:, patterns:, channel:, options:)
@@ -29,7 +29,7 @@ class Freddy
       private
 
       def create_queue
-        topic_exchange = @channel.topic(Freddy::FREDDY_TOPIC_EXCHANGE_NAME)
+        topic_exchange = @channel.topic(exchange_name)
 
         queue =
           if group
@@ -48,7 +48,7 @@ class Freddy
       def process_message(_queue, delivery)
         @consume_thread_pool.post do
           delivery.in_span do
-            yield delivery.payload, delivery.routing_key
+            yield delivery.payload, delivery.routing_key, delivery.timestamp
             @channel.acknowledge(delivery.tag)
           end
         rescue StandardError
@@ -76,6 +76,10 @@ class Freddy
       def on_exception
         @options.fetch(:on_exception, :ack)
       end
+
+      def exchange_name
+        @options.fetch(:exchange_name, Freddy::FREDDY_TOPIC_EXCHANGE_NAME)
+      end
     end
   end
 end

data/lib/freddy/delivery.rb

@@ -24,6 +24,10 @@ class Freddy
       @metadata.reply_to
     end
 
+    def timestamp
+      @metadata[:timestamp]
+    end
+
     def in_span(&block)
       name = "#{Tracing.span_destination(@exchange, @routing_key)} process"
       kind = OpenTelemetry::Trace::SpanKind::CONSUMER

data/lib/freddy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Freddy
-  VERSION = '2.5.1'
+  VERSION = '2.7.0'
 end

data/lib/freddy.rb

@@ -85,10 +85,12 @@ class Freddy
     handler_adapter_factory = MessageHandlerAdapters::Factory.new(producer)
 
     Consumers::RespondToConsumer.consume(
-      thread_pool: Concurrent::FixedThreadPool.new(@prefetch_buffer_size),
-      destination: destination,
-      channel: channel,
-      handler_adapter_factory: handler_adapter_factory,
+      **{
+        thread_pool: Concurrent::FixedThreadPool.new(@prefetch_buffer_size),
+        destination: destination,
+        channel: channel,
+        handler_adapter_factory: handler_adapter_factory
+      },
       &callback
     )
   end
@@ -115,8 +117,16 @@ class Freddy
   #   `:ack` simply acknowledges the message and re-raises the exception. `:reject`
   #   rejects the message without requeueing it. `:requeue` rejects the message with
   #   `requeue` flag.
+  # @option options [String] :exchange_name
+  #   Exchange to bind to. Default is `freddy-topic`.
   #
-  # @yield [message] Yields received message to the block
+  # @yield [message] Yields received message to the block.
+  # @yieldparam [Object] payload
+  #   Yields the received message's payload.
+  # @yieldparam [String] routing_key
+  #   Yields the received message's routing key.
+  # @yieldparam [Time] timestamp
+  #   Yields received message's timestamp.
   #
   # @return [#shutdown]
   #
@@ -128,10 +138,12 @@ class Freddy
     @logger.debug "Tapping into messages that match #{pattern_or_patterns}"
 
     Consumers::TapIntoConsumer.consume(
-      thread_pool: Concurrent::FixedThreadPool.new(@prefetch_buffer_size),
-      patterns: Array(pattern_or_patterns),
-      channel: @connection.create_channel(prefetch: @prefetch_buffer_size),
-      options: options,
+      **{
+        thread_pool: Concurrent::FixedThreadPool.new(@prefetch_buffer_size),
+        patterns: Array(pattern_or_patterns),
+        channel: @connection.create_channel(prefetch: @prefetch_buffer_size),
+        options: options
+      },
       &callback
     )
   end

data/spec/freddy/freddy_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Freddy do
-  let(:freddy) { described_class.build(logger, config) }
+  let(:freddy) { described_class.build(logger, **config) }
 
   let(:destination)  { random_destination }
   let(:destination2) { random_destination }

data/spec/freddy/responder_handler_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Freddy::ResponderHandler do
-  let(:freddy) { Freddy.build(logger, config) }
+  let(:freddy) { Freddy.build(logger, **config) }
 
   let(:destination) { random_destination }
   let(:payload)     { { pay: 'load' } }

data/spec/integration/concurrency_spec.rb

@@ -2,9 +2,9 @@ require 'spec_helper'
 require 'hamster/experimental/mutable_set'
 
 describe 'Concurrency' do
-  let(:freddy1) { Freddy.build(logger, config) }
-  let(:freddy2) { Freddy.build(logger, config) }
-  let(:freddy3) { Freddy.build(logger, config) }
+  let(:freddy1) { Freddy.build(logger, **config) }
+  let(:freddy2) { Freddy.build(logger, **config) }
+  let(:freddy3) { Freddy.build(logger, **config) }
 
   after { [freddy1, freddy2, freddy3].each(&:close) }
 

data/spec/integration/reply_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'Reply' do
-  let(:freddy) { Freddy.build(logger, config) }
+  let(:freddy) { Freddy.build(logger, **config) }
 
   let(:destination) { random_destination }
   let(:request_payload) { { req: 'load' } }

data/spec/integration/tap_into_with_exchange_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe 'Tapping into with exchange identifier' do
+  let(:freddy) { Freddy.build(logger, **config) }
+
+  let(:connection) { Freddy::Adapters.determine.connect(config) }
+  let(:topic) { 'test_topic_exchange' }
+  let(:channel) { connection.create_channel }
+  let(:message_payload) { { test: 'test' }.to_json }
+  let(:expected_payload) { { test: 'test' } }
+  let(:publish_timestamp) { Time.now.to_i }
+
+  after do
+    connection.close
+    freddy.close
+  end
+
+  it 'receives message' do
+    freddy.tap_into('pattern.*', exchange_name: topic) do |payload, _routing_key, timestamp|
+      @received_payload = payload
+      @received_timestamp = timestamp
+    end
+
+    channel.topic(topic).publish(message_payload, { routing_key: 'pattern.random', timestamp: publish_timestamp })
+
+    wait_for { @received_payload }
+    wait_for { @received_timestamp }
+
+    expect(@received_payload).to eq(expected_payload)
+    expect(@received_timestamp.to_i).to eq(publish_timestamp)
+  end
+
+  it 'receives message with nil timestamp when timestamp is not published' do
+    received_timestamp = 0
+    freddy.tap_into('pattern.*', exchange_name: topic) do |_payload, _routing_key, timestamp|
+      received_timestamp = timestamp
+    end
+
+    channel.topic(topic).publish(message_payload, { routing_key: 'pattern.random' })
+    default_sleep
+
+    expect(received_timestamp).to eq(nil)
+  end
+end

data/spec/integration/tap_into_with_group_spec.rb

@@ -2,9 +2,9 @@ require 'spec_helper'
 require 'hamster/experimental/mutable_set'
 
 describe 'Tapping into with group identifier' do
-  let(:deliverer) { Freddy.build(logger, config) }
-  let(:responder1) { Freddy.build(logger, config) }
-  let(:responder2) { Freddy.build(logger, config) }
+  let(:deliverer) { Freddy.build(logger, **config) }
+  let(:responder1) { Freddy.build(logger, **config) }
+  let(:responder2) { Freddy.build(logger, **config) }
 
   let(:destination)  { random_destination }
 

data/spec/integration/tracing_spec.rb

@@ -8,8 +8,8 @@ describe 'Tracing' do
   end
 
   context 'when receiving a traced request' do
-    let(:freddy) { Freddy.build(logger, config) }
-    let(:freddy2) { Freddy.build(logger, config) }
+    let(:freddy) { Freddy.build(logger, **config) }
+    let(:freddy2) { Freddy.build(logger, **config) }
 
     let(:destination) { random_destination }
     let(:destination2) { random_destination }
@@ -63,9 +63,9 @@ describe 'Tracing' do
   end
 
   context 'when receiving a nested traced request' do
-    let(:freddy) { Freddy.build(logger, config) }
-    let(:freddy2) { Freddy.build(logger, config) }
-    let(:freddy3) { Freddy.build(logger, config) }
+    let(:freddy) { Freddy.build(logger, **config) }
+    let(:freddy2) { Freddy.build(logger, **config) }
+    let(:freddy3) { Freddy.build(logger, **config) }
 
     let(:destination) { random_destination }
     let(:destination2) { random_destination }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: freddy
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.7.0
 platform: ruby
 authors:
 - Glia TechMovers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-29 00:00:00.000000000 Z
+date: 2023-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -176,6 +176,7 @@ files:
 - spec/freddy/sync_response_container_spec.rb
 - spec/integration/concurrency_spec.rb
 - spec/integration/reply_spec.rb
+- spec/integration/tap_into_with_exchange_spec.rb
 - spec/integration/tap_into_with_group_spec.rb
 - spec/integration/tracing_spec.rb
 - spec/spec_helper.rb