freddy 1.7.0 → 2.0.0

data/spec/integration/tracing_spec.rb

@@ -1,13 +1,8 @@
 require 'spec_helper'
-require 'opentracing_test_tracer'
 
 describe 'Tracing' do
-  let(:tracer) { OpenTracingTestTracer.build(logger: logger) }
   let(:logger) { spy }
 
-  before { OpenTracing.global_tracer = tracer }
-  after { OpenTracing.global_tracer = nil }
-
   context 'when receiving a traced request' do
     let(:freddy) { Freddy.build(logger, config) }
     let(:freddy2) { Freddy.build(logger, config) }
@@ -18,21 +13,13 @@ describe 'Tracing' do
     before do
       freddy.respond_to(destination) do |_payload, msg_handler|
         msg_handler.success(
-          trace_initiator: {
-            trace_id: active_span.context.trace_id,
-            parent_id: active_span.context.parent_id,
-            span_id: active_span.context.span_id
-          },
+          trace_initiator: current_span_attributes,
           current_receiver: freddy.deliver_with_response(destination2, {})
         )
       end
 
       freddy2.respond_to(destination2) do |_payload, msg_handler|
-        msg_handler.success(
-          trace_id: active_span.context.trace_id,
-          parent_id: active_span.context.parent_id,
-          span_id: active_span.context.span_id
-        )
+        msg_handler.success(current_span_attributes)
       end
     end
 
@@ -75,31 +62,19 @@ describe 'Tracing' do
     before do
       freddy.respond_to(destination) do |_payload, msg_handler|
         msg_handler.success({
-          trace_initiator: {
-            trace_id: active_span.context.trace_id,
-            parent_id: active_span.context.parent_id,
-            span_id: active_span.context.span_id
-          }
+          trace_initiator: current_span_attributes
         }.merge(freddy.deliver_with_response(destination2, {})))
       end
 
       freddy2.respond_to(destination2) do |_payload, msg_handler|
         msg_handler.success(
-          previous_receiver: {
-            trace_id: active_span.context.trace_id,
-            parent_id: active_span.context.parent_id,
-            span_id: active_span.context.span_id
-          },
+          previous_receiver: current_span_attributes,
           current_receiver: freddy2.deliver_with_response(destination3, {})
         )
       end
 
       freddy3.respond_to(destination3) do |_payload, msg_handler|
-        msg_handler.success(
-          trace_id: active_span.context.trace_id,
-          parent_id: active_span.context.parent_id,
-          span_id: active_span.context.span_id
-        )
+        msg_handler.success(current_span_attributes)
       end
     end
 
@@ -131,7 +106,15 @@ describe 'Tracing' do
     end
   end
 
-  def active_span
-    OpenTracing.active_span
+  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
+    }
+  end
+
+  def current_span
+    OpenTelemetry::Trace.current_span
   end
 end

data/spec/spec_helper.rb

@@ -2,14 +2,9 @@ require 'rubygems'
 require 'bundler'
 Bundler.setup
 
-require 'codeclimate-test-reporter'
-SimpleCov.start do
-  formatter SimpleCov::Formatter::MultiFormatter.new([
-                                                       SimpleCov::Formatter::HTMLFormatter,
-                                                       CodeClimate::TestReporter::Formatter
-                                                     ])
-  add_filter '/spec/'
-end
+ENV['OTEL_TRACES_EXPORTER'] = 'none'
+require 'opentelemetry/sdk'
+OpenTelemetry::SDK.configure
 
 require 'pry'
 require 'freddy'
@@ -22,10 +17,6 @@ RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
   config.order = 'random'
-
-  config.before do
-    OpenTracing.global_tracer ||= OpenTracing::Tracer.new
-  end
 end
 
 def random_destination
@@ -43,6 +34,7 @@ end
 def wait_for
   100.times do
     return if yield
+
     sleep 0.005
   end
 end
@@ -53,7 +45,7 @@ def deliver(custom_destination = destination)
 end
 
 def logger
-  Logger.new(STDOUT).tap { |l| l.level = Logger::ERROR }
+  Logger.new($stdout).tap { |l| l.level = Logger::ERROR }
 end
 
 def config

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: freddy
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Glia TechMovers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-20 00:00:00.000000000 Z
+date: 2021-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,19 +67,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.6'
 - !ruby/object:Gem::Dependency
-  name: opentracing
+  name: opentelemetry-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 1.0.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 1.0.0.rc3
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-semantic_conventions
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: thread
   requirement: !ruby/object:Gem::Requirement
@@ -101,13 +115,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".npmignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-gemset"
 - ".ruby-version"
-- ".travis.yml"
 - Gemfile
 - LICENCE.txt
 - README.md
@@ -116,7 +129,6 @@ files:
 - lib/freddy.rb
 - lib/freddy/adapters.rb
 - lib/freddy/adapters/bunny_adapter.rb
-- lib/freddy/adapters/march_hare_adapter.rb
 - lib/freddy/consumers.rb
 - lib/freddy/consumers/respond_to_consumer.rb
 - lib/freddy/consumers/response_consumer.rb
@@ -135,7 +147,9 @@ files:
 - lib/freddy/responder_handler.rb
 - lib/freddy/sync_response_container.rb
 - lib/freddy/timeout_error.rb
-- lib/freddy/trace_carrier.rb
+- lib/freddy/tracing.rb
+- lib/freddy/version.rb
+- spec/.rubocop.yml
 - spec/freddy/consumers/respond_to_consumer_spec.rb
 - spec/freddy/error_response_spec.rb
 - spec/freddy/freddy_spec.rb
@@ -143,15 +157,14 @@ files:
 - spec/freddy/payload_spec.rb
 - spec/freddy/responder_handler_spec.rb
 - spec/freddy/sync_response_container_spec.rb
-- spec/freddy/trace_carrier_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
-homepage: 
+homepage: https://github.com/salemove/freddy
 licenses:
-- Private
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -161,18 +174,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.4
 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
@@ -180,7 +194,6 @@ test_files:
 - spec/freddy/payload_spec.rb
 - spec/freddy/responder_handler_spec.rb
 - spec/freddy/sync_response_container_spec.rb
-- spec/freddy/trace_carrier_spec.rb
 - spec/integration/concurrency_spec.rb
 - spec/integration/reply_spec.rb
 - spec/integration/tap_into_with_group_spec.rb

data/.npmignore

@@ -1,8 +0,0 @@
-.git*
-.rspec
-.ruby*
-Gemfile*
-*.gemspec
-spec/
-*.rb
-lib/messaging

data/.travis.yml

@@ -1,16 +0,0 @@
-language: ruby
-rvm:
-  - 2.5.6
-  - jruby-9.2.8.0
-addons:
-  code_climate:
-    repo_token: 1f3842b985fdeff6a36168165d491ca5f444667e9381a85c899a61706a9dd285
-  apt:
-    packages:
-      - rabbitmq-server
-services:
-  - rabbitmq
-before_script:
-  - gem install bundler
-  - bundle install
-script: bundle exec rake

data/lib/freddy/adapters/march_hare_adapter.rb

@@ -1,64 +0,0 @@
-# frozen_string_literal: true
-
-require 'march_hare'
-
-class Freddy
-  module Adapters
-    class MarchHareAdapter
-      def self.connect(config)
-        hare = MarchHare.connect(config)
-        new(hare)
-      end
-
-      def initialize(hare)
-        @hare = hare
-      end
-
-      def create_channel(prefetch: nil)
-        hare_channel = @hare.create_channel
-        hare_channel.basic_qos(prefetch) if prefetch
-        Channel.new(hare_channel)
-      end
-
-      def close
-        @hare.close
-      end
-
-      class Channel
-        extend Forwardable
-
-        NO_ROUTE = 312
-
-        def initialize(channel)
-          @channel = channel
-        end
-
-        def_delegators :@channel, :topic, :default_exchange, :consumers, :acknowledge, :reject
-
-        def queue(*args)
-          Queue.new(@channel.queue(*args))
-        end
-
-        def on_no_route
-          @channel.on_return do |reply_code, _, exchange_name, _, properties|
-            if exchange_name != Freddy::FREDDY_TOPIC_EXCHANGE_NAME && reply_code == NO_ROUTE
-              yield(properties.correlation_id)
-            end
-          end
-        end
-      end
-
-      class Queue < Shared::Queue
-        def subscribe(manual_ack: false)
-          @queue.subscribe(manual_ack: manual_ack) do |meta, payload|
-            parsed_payload = Payload.parse(payload)
-            delivery = Delivery.new(
-              parsed_payload, meta, meta.routing_key, meta.delivery_tag
-            )
-            yield(delivery)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/freddy/trace_carrier.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-class Freddy
-  # Carrier for rabbitmq following OpenTracing API
-  # See https://github.com/opentracing/opentracing-ruby/blob/master/lib/opentracing/carrier.rb
-  class TraceCarrier
-    def initialize(properties)
-      @properties = properties
-    end
-
-    def [](key)
-      @properties.headers && @properties.headers["x-trace-#{key}"]
-    end
-
-    def []=(key, value)
-      @properties[:headers] ||= {}
-      @properties[:headers]["x-trace-#{key}"] = value
-    end
-
-    def each(&block)
-      Hash[
-        (@properties.headers || {})
-        .select { |key, _| key =~ /^x-trace/ }
-        .map { |key, value| [key.sub(/x-trace-/, ''), value] }
-      ].each(&block)
-    end
-  end
-end

data/spec/freddy/trace_carrier_spec.rb

@@ -1,56 +0,0 @@
-require 'spec_helper'
-
-describe Freddy::TraceCarrier do
-  subject(:carrier) { described_class.new(properties) }
-
-  context 'when adding trace information' do
-    let(:properties) { { x: 'y' } }
-    let(:key_name) { 'some-key' }
-    let(:key_value) { 'some-key' }
-
-    it 'adds a header with x-trace- prefix' do
-      carrier[key_name] = key_value
-      expect(properties[:headers]["x-trace-#{key_name}"]).to eq(key_value)
-    end
-  end
-
-  context 'when extracting trace information' do
-    let(:key_name) { 'some-key' }
-    let(:serialized_key_name) { "x-trace-#{key_name}" }
-    let(:key_value) { 'some-key' }
-
-    let(:properties) do
-      double(headers: { serialized_key_name => key_value })
-    end
-
-    it 'extracts a header with x-trace- prefix' do
-      expect(carrier[key_name]).to eq(key_value)
-    end
-  end
-
-  describe '#each' do
-    context 'when headers are present' do
-      let(:properties) do
-        double(
-          headers: {
-            'x-trace-key1' => 'value1',
-            'x-trace-key2' => 'value2',
-            'other-key' => 'value3'
-          }
-        )
-      end
-
-      it 'iterates over keys starting with x-trace- prefix' do
-        expect(carrier.each.count).to eq(2)
-      end
-    end
-
-    context 'when no headers' do
-      let(:properties) { double(headers: nil) }
-
-      it 'iterates over an empty list' do
-        expect(carrier.each.count).to eq(0)
-      end
-    end
-  end
-end