freddy 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49a24c63763b6d607d1b5ee60ca4f65211a212999ca5852637c6a567ed6b13d2
-  data.tar.gz: da8e0b5d8818df0b054a66412c61b9b57f5648295b1a81f0e7f79b017cae66ba
+  metadata.gz: 5ccc6957f658f70ad21c03dbdd3a1477ae0e84cbb3c91c18b127fea5b02c2e67
+  data.tar.gz: d6f766526c1d60f8f324846cb92de6c284e3f22357545fc0590bba93ab8726e7
 SHA512:
-  metadata.gz: 6323a6cb6f468a10c3395c318d3edb9f9de1de984b6f995786fceb17ca8b7a5b37adcc87649ade6caa7868da7671b09bf01d92365d9c46b9c0fa4b6a0a1e4db5
-  data.tar.gz: c41436342bcb7523f236c4ecec8ba77c0d990fef21aaaff7e3ea9f56071e2797b84faa3266fb176e01d452c1d706e82825c673ac83ac1f4bb4d8ed94f59e5d3a
+  metadata.gz: 7b3a9b5de12182558c09cad3f029fec1ab221688a56c6473d6b7fe110d55ea3d0fcf6f31106798190f54ef4ba8a362928d82c983eca23c8a7b6c32cede406e18
+  data.tar.gz: 3f0e57546ad9671ec00381a4da2b12c2e574d4a2d807a9929d65d2f81887dd3318f94a7a3bc4a4a388b4745a9576ae3648acebe6ecd634b70a1d2e605a6072e1

data/lib/freddy/delivery.rb

@@ -35,12 +35,11 @@ class Freddy
         links = []
         links << OpenTelemetry::Trace::Link.new(producer_span_context) if producer_span_context.valid?
 
-        # In general we should start a new trace here and just link two traces
-        # together. But Zipkin (which we currently use) doesn't support links.
-        # So even though the root trace could finish before anything here
-        # starts executing, we'll continue with the root trace here as well.
-        OpenTelemetry::Context.with_current(producer_context) do
+        root_span = Freddy.tracer.start_root_span(name, attributes: span_attributes, links: links, kind: kind)
+        OpenTelemetry::Trace.with_span(root_span) do
           Freddy.tracer.in_span(name, attributes: span_attributes, links: links, kind: kind, &block)
+        ensure
+          root_span.finish
         end
       else
         OpenTelemetry::Context.with_current(producer_context) do
@@ -60,7 +59,7 @@ class Freddy
         OpenTelemetry::SemanticConventions::Trace::MESSAGING_DESTINATION => @exchange,
         OpenTelemetry::SemanticConventions::Trace::MESSAGING_DESTINATION_KIND => destination_kind,
         OpenTelemetry::SemanticConventions::Trace::MESSAGING_RABBITMQ_ROUTING_KEY => @routing_key,
-        OpenTelemetry::SemanticConventions::Trace::MESSAGING_OPERATION => 'receive'
+        OpenTelemetry::SemanticConventions::Trace::MESSAGING_OPERATION => 'process'
       }
 
       # There's no correlation_id when a message was sent using

data/lib/freddy/version.rb

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

data/spec/integration/tracing_spec.rb

@@ -106,11 +106,41 @@ describe 'Tracing' do
     end
   end
 
+  context 'when receiving a broadcast' do
+    let(:freddy) { Freddy.build(logger, config) }
+    let(:destination) { random_destination }
+
+    before do
+      freddy.tap_into(destination) do
+        @deliver_span = current_span_attributes
+      end
+    end
+
+    after do
+      freddy.close
+    end
+
+    it 'creates a new trace and links it with the sender' do
+      initiator_span = nil
+      Freddy.tracer.in_span('test') do
+        initiator_span = current_span_attributes
+        freddy.deliver(destination, {})
+      end
+      wait_for { @deliver_span }
+
+      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))
+    end
+  end
+
   def current_span_attributes
     {
       trace_id: current_span.context.trace_id,
       parent_id: current_span.parent_span_id,
-      span_id: current_span.context.span_id
+      span_id: current_span.context.span_id,
+      links: current_span.links || []
     }
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: freddy
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Glia TechMovers
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-07 00:00:00.000000000 Z
+date: 2021-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -181,7 +181,7 @@ homepage: https://github.com/salemove/freddy
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -196,8 +196,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: API for inter-application messaging supporting acknowledgements and request-response
 test_files: