freddy 2.2.4 → 2.5.0.pre.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d6513e834c71f74caf3c8417644369fddf4087d226d8160c0d72f63d6551db0
-  data.tar.gz: e4cd3e5016030ec1b5727d9764593d7af91c389b528458a2befeecc502a6600a
+  metadata.gz: 9e09e2059a52cd5e7395cdbd6a329c7d2531e479c6ef7113f11d8d2f2c198a72
+  data.tar.gz: 25b7ce6639e57cb65c03e3d87b3671528c948c3678d1fbf7dd39f5407929d4a7
 SHA512:
-  metadata.gz: 81581b4a9c227aebcfb7f96db79367e4d233502bc0586599500530bb339826371dad203f928e45b2e512f74469c87c8f6f591ca9602d0a14e2e6f047868dae61
-  data.tar.gz: '090195d2a78659ac91cfef94099dca0bdf382b52590b9298680cd17ed5a04586ee87f5ace05e2fb2a465dc8cf87a07c3504445d78f3d25d6839c34208b291a10'
+  metadata.gz: b775211cbc18668d00ddf5214bd0d7f75a679db6c80c59e837a3f3403a5a430965bae52418245563e12e6e612b653e68dd81982cde8d443357e50f89d3bf7dd1
+  data.tar.gz: 4fdca691514bd170ce0456aff8f69544b98e70dd2083fbd6a909905cd7d28f216fff74ff3236654b18be3a35465239230c65cdc212355c63b1ee05d07a33a1a9

data/.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.6']
+        ruby-version: ['2.7']
     services:
       rabbitmq:
         image: rabbitmq
@@ -27,5 +27,6 @@ jobs:
       with:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true
+        cache-version: 2
     - name: Run lint & tests
       run: bundle exec rake

data/.gitignore

@@ -1,5 +1,4 @@
 .bundle/
-Gemfile.lock
 pkg
 .tags
 .tags1

data/.rubocop.yml

@@ -28,3 +28,6 @@ Style/FrozenStringLiteralComment:
 
 Naming/FileName:
   Enabled: no
+
+Gemspec/RequireMFA:
+  Enabled: no

data/.ruby-version

@@ -1 +1 @@
-2.6
+2.7

data/Gemfile

@@ -4,7 +4,7 @@ gem 'hamster', '~> 3.0'
 gem 'opentelemetry-sdk', '~> 1.0.0.rc3'
 gem 'pry'
 gem 'rspec'
-gem 'rubocop', '~> 1.19'
+gem 'rubocop', '~> 1.30'
 gem 'rubocop-rspec', '~> 2.4'
 
 gemspec

data/Gemfile.lock

@@ -0,0 +1,101 @@
+PATH
+  remote: .
+  specs:
+    freddy (2.5.0.pre.rc.1)
+      bunny (~> 2.11)
+      concurrent-ruby (~> 1.0)
+      oj (~> 3.6)
+      opentelemetry-api (~> 1.0.0.rc3)
+      opentelemetry-semantic_conventions (~> 1.0)
+      zlib (~> 1.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    amq-protocol (2.3.2)
+    ast (2.4.2)
+    bunny (2.19.0)
+      amq-protocol (~> 2.3, >= 2.3.1)
+      sorted_set (~> 1, >= 1.0.2)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.9)
+    diff-lcs (1.4.4)
+    hamster (3.0.0)
+      concurrent-ruby (~> 1.0)
+    method_source (1.0.0)
+    oj (3.13.14)
+    opentelemetry-api (1.0.0.rc3)
+    opentelemetry-common (0.19.1)
+      opentelemetry-api (~> 1.0.0.rc3)
+    opentelemetry-instrumentation-base (0.18.2)
+      opentelemetry-api (~> 1.0.0.rc3)
+    opentelemetry-sdk (1.0.0.rc3)
+      opentelemetry-api (~> 1.0.0.rc3)
+      opentelemetry-common (~> 0.19.1)
+      opentelemetry-instrumentation-base (~> 0.18.2)
+      opentelemetry-semantic_conventions
+    opentelemetry-semantic_conventions (1.6.0)
+      opentelemetry-api (~> 1.0.0.rc3)
+    parallel (1.22.1)
+    parser (3.1.2.0)
+      ast (~> 2.4.1)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    rbtree (0.4.5)
+    regexp_parser (2.5.0)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.30.1)
+      parallel (~> 1.10)
+      parser (>= 3.1.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.18.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.18.0)
+      parser (>= 3.1.1.0)
+    rubocop-rspec (2.4.0)
+      rubocop (~> 1.0)
+      rubocop-ast (>= 1.1.0)
+    ruby-progressbar (1.11.0)
+    set (1.0.2)
+    sorted_set (1.0.3)
+      rbtree
+      set (~> 1.0)
+    unicode-display_width (2.1.0)
+    zlib (1.1.0)
+
+PLATFORMS
+  ruby
+  x86_64-linux
+
+DEPENDENCIES
+  bundler
+  freddy!
+  hamster (~> 3.0)
+  opentelemetry-sdk (~> 1.0.0.rc3)
+  pry
+  rake
+  rspec
+  rubocop (~> 1.30)
+  rubocop-rspec (~> 2.4)
+
+BUNDLED WITH
+   2.3.9

data/freddy.gemspec

@@ -11,20 +11,19 @@ Gem::Specification.new do |spec|
   spec.summary       = 'API for inter-application messaging supporting acknowledgements and request-response'
   spec.license       = 'MIT'
   spec.homepage      = 'https://github.com/salemove/freddy'
-  spec.required_ruby_version = '>= 2.6'
+  spec.required_ruby_version = '>= 2.7'
 
   spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
 
   spec.add_dependency 'bunny', '~> 2.11'
+  spec.add_dependency 'concurrent-ruby', '~> 1.0'
   spec.add_dependency 'oj', '~> 3.6'
   spec.add_dependency 'opentelemetry-api', '~> 1.0.0.rc3'
   spec.add_dependency 'opentelemetry-semantic_conventions', '~> 1.0'
-  spec.add_dependency 'thread', '~> 0.1'
   spec.add_dependency 'zlib', '~> 1.1'
 end

data/lib/freddy/adapters/bunny_adapter.rb

@@ -6,8 +6,14 @@ require 'forwardable'
 class Freddy
   module Adapters
     class BunnyAdapter
+      DEFAULT_OPTIONS = {
+        connection_timeout: 5,
+        read_timeout: 5,
+        write_timeout: 5
+      }.freeze
+
       def self.connect(config)
-        bunny = Bunny.new(config)
+        bunny = Bunny.new(DEFAULT_OPTIONS.merge(config))
         bunny.start
         new(bunny)
       end

data/lib/freddy/consumers/respond_to_consumer.rb

@@ -34,7 +34,7 @@ class Freddy
       end
 
       def process_message(delivery)
-        @consume_thread_pool.process do
+        @consume_thread_pool.post do
           delivery.in_span do
             yield(delivery)
           end

data/lib/freddy/consumers/tap_into_consumer.rb

@@ -46,8 +46,8 @@ class Freddy
       end
 
       def process_message(_queue, delivery)
-        @consume_thread_pool.process do
-          delivery.in_span(force_follows_from: true) do
+        @consume_thread_pool.post do
+          delivery.in_span do
             yield delivery.payload, delivery.routing_key
             @channel.acknowledge(delivery.tag)
           end

data/lib/freddy/delivery.rb

@@ -24,28 +24,13 @@ class Freddy
       @metadata.reply_to
     end
 
-    def in_span(force_follows_from: false, &block)
+    def in_span(&block)
       name = "#{Tracing.span_destination(@exchange, @routing_key)} process"
       kind = OpenTelemetry::Trace::SpanKind::CONSUMER
       producer_context = OpenTelemetry.propagation.extract(@metadata[:headers] || {})
 
-      if force_follows_from
-        producer_span_context = OpenTelemetry::Trace.current_span(producer_context).context
-
-        links = []
-        links << OpenTelemetry::Trace::Link.new(producer_span_context) if producer_span_context.valid?
-
-        root_span = Freddy.tracer.start_root_span(name, attributes: span_attributes, links: links, kind: kind)
-
-        OpenTelemetry::Trace.with_span(root_span) do
-          block.call
-        ensure
-          root_span.finish
-        end
-      else
-        OpenTelemetry::Context.with_current(producer_context) do
-          Freddy.tracer.in_span(name, attributes: span_attributes, kind: kind, &block)
-        end
+      OpenTelemetry::Context.with_current(producer_context) do
+        Freddy.tracer.in_span(name, attributes: span_attributes, kind: kind, &block)
       end
     end
 

data/lib/freddy/responder_handler.rb

@@ -20,7 +20,8 @@ class Freddy
     #   responder.shutdown
     def shutdown
       @consumer.cancel
-      @consume_thread_pool.wait(:done)
+      @consume_thread_pool.shutdown
+      @consume_thread_pool.wait_for_termination
     end
   end
 end

data/lib/freddy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Freddy
-  VERSION = '2.2.4'
+  VERSION = '2.5.0-rc.1'
 end

data/lib/freddy.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'json'
-require 'thread/pool'
+require 'concurrent'
 require 'securerandom'
 require 'opentelemetry'
 require 'opentelemetry/semantic_conventions'
@@ -85,7 +85,7 @@ class Freddy
     handler_adapter_factory = MessageHandlerAdapters::Factory.new(producer)
 
     Consumers::RespondToConsumer.consume(
-      thread_pool: Thread.pool(@prefetch_buffer_size),
+      thread_pool: Concurrent::FixedThreadPool.new(@prefetch_buffer_size),
       destination: destination,
       channel: channel,
       handler_adapter_factory: handler_adapter_factory,
@@ -128,7 +128,7 @@ class Freddy
     @logger.debug "Tapping into messages that match #{pattern_or_patterns}"
 
     Consumers::TapIntoConsumer.consume(
-      thread_pool: Thread.pool(@prefetch_buffer_size),
+      thread_pool: Concurrent::FixedThreadPool.new(@prefetch_buffer_size),
       patterns: Array(pattern_or_patterns),
       channel: @connection.create_channel(prefetch: @prefetch_buffer_size),
       options: options,

data/spec/freddy/consumers/respond_to_consumer_spec.rb

@@ -16,7 +16,7 @@ describe Freddy::Consumers::RespondToConsumer do
   let(:msg_handler_adapter_factory) { double(for: msg_handler_adapter) }
   let(:msg_handler_adapter) { Freddy::MessageHandlerAdapters::NoOpHandler.new }
   let(:prefetch_buffer_size) { 2 }
-  let(:thread_pool) { Thread.pool(prefetch_buffer_size) }
+  let(:thread_pool) { Concurrent::FixedThreadPool.new(prefetch_buffer_size) }
 
   after do
     connection.close

data/spec/freddy/sync_response_container_spec.rb

@@ -31,12 +31,13 @@ describe Freddy::SyncResponseContainer do
   describe '#wait_for_response' do
     let(:timeout) { 2 }
     let(:response) { { msg: 'response' } }
-    let(:delivery) { OpenStruct.new(type: 'success') }
 
     context 'when called after #call' do
       let(:max_wait_time_in_seconds) { 0.5 }
 
       before do
+        delivery = instance_double(Freddy::Delivery)
+        allow(delivery).to receive(:type).and_return('success')
         container.call(response, delivery)
       end
 

data/spec/integration/tracing_spec.rb

@@ -57,8 +57,8 @@ describe 'Tracing' do
       freddy.deliver_with_response(destination, {})
       names = exporter.finished_spans.map(&:name)
 
-      expect(names.any? { |name| name.include?('amq.gen-') }).to eq(false)
-      expect(names.any? { |name| name.include?('(response queue)') }).to eq(true)
+      expect(names.any? { |name| name.include?('amq.gen-') }).to be(false)
+      expect(names.any? { |name| name.include?('(response queue)') }).to be(true)
     end
   end
 
@@ -132,10 +132,8 @@ describe 'Tracing' do
       freddy.close
     end
 
-    it 'creates a new trace and links it with the sender' do
-      initiator_span = nil
+    it 'continues the existing trace' do
       Freddy.tracer.in_span('test') do
-        initiator_span = current_span_attributes
         freddy.deliver(destination, {})
       end
       wait_for { @deliver_span }
@@ -147,13 +145,7 @@ describe 'Tracing' do
                     /freddy-topic\.\w+ process/
                   ])
 
-      send_span = exporter.finished_spans.find { |span| span.name =~ /\.\w+ send/ }
-
-      expect(@deliver_span.fetch(:trace_id)).not_to eq(initiator_span.fetch(:trace_id))
-
-      link = @deliver_span.fetch(:links)[0]
-      expect(link.span_context.trace_id).to eq(initiator_span.fetch(:trace_id))
-      expect(link.span_context.span_id).to eq(send_span.span_id)
+      expect(exporter.finished_spans.map(&:trace_id).uniq.count).to eq(1)
     end
   end
 

data/spec/spec_helper.rb

@@ -18,8 +18,6 @@ OpenTelemetry::SDK.configure do |c|
   c.add_span_processor(span_processor)
 end
 
-Thread.abort_on_exception = true
-
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run :focus

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: freddy
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.5.0.pre.rc.1
 platform: ruby
 authors:
 - Glia TechMovers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-12 00:00:00.000000000 Z
+date: 2022-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,61 +53,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.11'
 - !ruby/object:Gem::Dependency
-  name: oj
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: opentelemetry-api
+  name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
+        version: '3.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
+        version: '3.6'
 - !ruby/object:Gem::Dependency
-  name: opentelemetry-semantic_conventions
+  name: opentelemetry-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.0.rc3
 - !ruby/object:Gem::Dependency
-  name: thread
+  name: opentelemetry-semantic_conventions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: zlib
   requirement: !ruby/object:Gem::Requirement
@@ -137,6 +137,7 @@ files:
 - ".ruby-gemset"
 - ".ruby-version"
 - Gemfile
+- Gemfile.lock
 - LICENCE.txt
 - README.md
 - Rakefile
@@ -190,28 +191,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.0.9
 signing_key: 
 specification_version: 4
 summary: API for inter-application messaging supporting acknowledgements and request-response
-test_files:
-- spec/.rubocop.yml
-- spec/freddy/consumers/respond_to_consumer_spec.rb
-- spec/freddy/error_response_spec.rb
-- spec/freddy/freddy_spec.rb
-- spec/freddy/message_handler_spec.rb
-- spec/freddy/payload_spec.rb
-- spec/freddy/responder_handler_spec.rb
-- spec/freddy/sync_response_container_spec.rb
-- spec/integration/concurrency_spec.rb
-- spec/integration/reply_spec.rb
-- spec/integration/tap_into_with_group_spec.rb
-- spec/integration/tracing_spec.rb
-- spec/spec_helper.rb
+test_files: []