freddy 2.2.4 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d6513e834c71f74caf3c8417644369fddf4087d226d8160c0d72f63d6551db0
-  data.tar.gz: e4cd3e5016030ec1b5727d9764593d7af91c389b528458a2befeecc502a6600a
+  metadata.gz: 55182881b38a721d174a649943e973134d3ebac9c0502b34cce14ddc503f33db
+  data.tar.gz: 2e0c118f4a4af53745b070d512a74bdc87245e8c8489ea6985d788b71ddd9eab
 SHA512:
-  metadata.gz: 81581b4a9c227aebcfb7f96db79367e4d233502bc0586599500530bb339826371dad203f928e45b2e512f74469c87c8f6f591ca9602d0a14e2e6f047868dae61
-  data.tar.gz: '090195d2a78659ac91cfef94099dca0bdf382b52590b9298680cd17ed5a04586ee87f5ace05e2fb2a465dc8cf87a07c3504445d78f3d25d6839c34208b291a10'
+  metadata.gz: b72b0edde6c555492c90a722d19e99ccc32cd49a8066e7a7fcde71625541c90b1a893980b98f002beadc0644132512954e6f4d7850f55b536ef3f4771e71c1b0
+  data.tar.gz: 79a42a9ea43f43a472066129ea8fe5a00c793c458fe36d482d51286dc45e44d7de3cfc2f0fd23828e05cb4d2fe95471b9304d59a1e09c27cbcbbdb53c33fc1c8

data/.github/workflows/ci.yml

@@ -27,5 +27,6 @@ jobs:
       with:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true
+        cache-version: 1
     - name: Run lint & tests
       run: bundle exec rake

data/.gitignore

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

data/Gemfile.lock

@@ -0,0 +1,102 @@
+PATH
+  remote: .
+  specs:
+    freddy (2.3.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.2)
+    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.4)
+    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.1)
+    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.2.27

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Freddy
-  VERSION = '2.2.4'
+  VERSION = '2.3.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,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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: freddy
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.3.0
 platform: ruby
 authors:
 - Glia TechMovers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-12 00:00:00.000000000 Z
+date: 2021-12-20 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