freddy 2.2.3 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6be4b4b6d953f837c24d9c55f990e4e75872c13e6c11007d8f61ed335681faa2
-  data.tar.gz: 863042876b2ed673001cd53f296567ad91420864b96cbed5ed02fb6fd7820b22
+  metadata.gz: f2dcf734ec94fc66e09be25bed73991a329b9dc3bb112664cd762c45dc9e0e7c
+  data.tar.gz: 5d929520fbf9c43857b3e8f1d97559402b0028169b657ec9a967eba36a395551
 SHA512:
-  metadata.gz: 002f901659f670dc1561db4ddc97d10e5a9d9b689369897628f1844fa0ffc65f759493fe96bc7541f6b7c204427bb584133fa3b306e19752b133a42b1b077a52
-  data.tar.gz: d2383b11b79800aabf6a0f0fe52a51f900a12c5ebcf17e64be8ca5e31243bd183dadb662e17c14416b0ee3e7d5ad26cbe00e067f7c39b709133a019082358fe8
+  metadata.gz: 33b5603b0775342f4271034dc083b654c5031cee2bf61e6a1d068afd1abe9e12e86579c85497016cb6f17085a2dbeb7efaa49a3957aafb391189e6d596795cd7
+  data.tar.gz: 0ea71e0dd8abdc975477f89b9e1ca1d650ff50ab0f9f9d2e4bf65b49af94e35ee545359eb8779a6e4723fbab3dede9676baa646fb3c6b95b06649fb9653fc482

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/.ruby-version

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

data/Gemfile.lock

@@ -0,0 +1,102 @@
+PATH
+  remote: .
+  specs:
+    freddy (2.4.0)
+      bunny (~> 2.11)
+      oj (~> 3.6)
+      opentelemetry-api (~> 1.0.0.rc3)
+      opentelemetry-semantic_conventions (~> 1.0)
+      thread (~> 0.1)
+      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.11)
+    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.20.1)
+    parser (3.0.2.0)
+      ast (~> 2.4.1)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rainbow (3.0.0)
+    rake (13.0.6)
+    rbtree (0.4.5)
+    regexp_parser (2.1.1)
+    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.19.0)
+      parallel (~> 1.10)
+      parser (>= 3.0.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.9.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.10.0)
+      parser (>= 3.0.1.1)
+    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)
+    thread (0.2.2)
+    unicode-display_width (2.0.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.19)
+  rubocop-rspec (~> 2.4)
+
+BUNDLED WITH
+   2.3.9

data/freddy.gemspec

@@ -11,7 +11,7 @@ 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) }

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/tap_into_consumer.rb

@@ -47,7 +47,7 @@ class Freddy
 
       def process_message(_queue, delivery)
         @consume_thread_pool.process do
-          delivery.in_span(force_follows_from: true) 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/producers/reply_producer.rb

@@ -22,7 +22,7 @@ class Freddy
           routing_key: routing_key,
           content_type: CONTENT_TYPE
         )
-        Tracing.inject_tracing_information_to_properties!(properties)
+        Tracing.inject_tracing_information_to_properties!(properties, span)
 
         @exchange.publish Payload.dump(payload), properties
       ensure

data/lib/freddy/producers/send_and_forget_producer.rb

@@ -18,7 +18,7 @@ class Freddy
           routing_key: routing_key,
           content_type: CONTENT_TYPE
         )
-        Tracing.inject_tracing_information_to_properties!(properties)
+        Tracing.inject_tracing_information_to_properties!(properties, span)
 
         json_payload = Freddy::Encoding.compress(
           Payload.dump(payload),

data/lib/freddy/producers/send_and_wait_response_producer.rb

@@ -49,7 +49,7 @@ class Freddy
           correlation_id: correlation_id, reply_to: @response_queue.name,
           mandatory: true, type: 'request'
         )
-        Tracing.inject_tracing_information_to_properties!(properties)
+        Tracing.inject_tracing_information_to_properties!(properties, span)
 
         # Connection adapters handle thread safety for #publish themselves. No
         # need to lock this.

data/lib/freddy/tracing.rb

@@ -39,9 +39,10 @@ class Freddy
       end
     end
 
-    def self.inject_tracing_information_to_properties!(properties)
+    def self.inject_tracing_information_to_properties!(properties, span)
+      context = OpenTelemetry::Trace.context_with_span(span)
       properties[:headers] ||= {}
-      OpenTelemetry.propagation.inject(properties[:headers])
+      OpenTelemetry.propagation.inject(properties[:headers], context: context)
     end
   end
 end

data/lib/freddy/version.rb

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

data/spec/integration/tracing_spec.rb

@@ -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,10 +145,7 @@ describe 'Tracing' do
                     /freddy-topic\.\w+ process/
                   ])
 
-      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(exporter.finished_spans.map(&:trace_id).uniq.count).to eq(1)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: freddy
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.4.0
 platform: ruby
 authors:
 - Glia TechMovers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-11 00:00:00.000000000 Z
+date: 2022-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -137,6 +137,7 @@ files:
 - ".ruby-gemset"
 - ".ruby-version"
 - Gemfile
+- Gemfile.lock
 - LICENCE.txt
 - README.md
 - Rakefile
@@ -190,7 +191,7 @@ 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:
   - - ">="