freddy 1.7.0 → 2.2.1

data/lib/freddy/version.rb

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

data/lib/freddy.rb

@@ -3,9 +3,11 @@
 require 'json'
 require 'thread/pool'
 require 'securerandom'
-require 'opentracing'
+require 'opentelemetry'
+require 'opentelemetry/semantic_conventions'
+require_relative './freddy/version'
 
-Dir[File.dirname(__FILE__) + '/freddy/*.rb'].each(&method(:require))
+Dir["#{File.dirname(__FILE__)}/freddy/*.rb"].sort.each(&method(:require))
 
 class Freddy
   FREDDY_TOPIC_EXCHANGE_NAME = 'freddy-topic'
@@ -26,22 +28,15 @@ class Freddy
   # @return [Freddy]
   #
   # @example
-  #   Freddy.build(Logger.new(STDOUT), user: 'thumper', pass: 'howdy')
-  def self.build(logger = Logger.new(STDOUT), max_concurrency: DEFAULT_MAX_CONCURRENCY, **config)
-    OpenTracing.global_tracer ||= OpenTracing::Tracer.new
-
+  #   Freddy.build(Logger.new($stdout), user: 'thumper', pass: 'howdy')
+  def self.build(logger = Logger.new($stdout), max_concurrency: DEFAULT_MAX_CONCURRENCY, **config)
     connection = Adapters.determine.connect(config)
     new(connection, logger, max_concurrency)
   end
 
-  # @deprecated Use {OpenTracing.active_span} instead
-  def self.trace
-    OpenTracing.active_span
-  end
-
-  # @deprecated Use OpenTracing ScopeManager instead
-  def self.trace=(trace)
-    OpenTracing.scope_manager.activate(trace) if OpenTracing.active_span != trace
+  # @private
+  def self.tracer
+    @tracer ||= OpenTelemetry.tracer_provider.tracer('freddy', Freddy::VERSION)
   end
 
   def initialize(connection, logger, max_concurrency)
@@ -70,7 +65,7 @@ class Freddy
   #   Received message as a ruby hash with symbolized keys
   # @yieldparam [#success, #error] handler
   #   Handler for responding to messages. Use handler#success for successful
-  #   respone and handler#error for error response.
+  #   response and handler#error for error response.
   #
   # @return [#shutdown]
   #
@@ -104,7 +99,7 @@ class Freddy
   # consuming them. It is useful for general messages that two or more clients
   # are interested.
   #
-  # @param [String] pattern
+  # @param [String] pattern_or_patterns
   #   the destination pattern. Use `#` wildcard for matching 0 or more words.
   #   Use `*` to match exactly one word.
   # @param [Hash] options
@@ -157,15 +152,18 @@ class Freddy
   # @option options [Integer] :timeout (0)
   #   discards the message after given seconds if nobody consumes it. Message
   #   won't be discarded if timeout it set to 0 (default).
-  #
+  # @option options [String] :compress (nil)
+  #   - 'zlib' - compresses the payload with zlib
   # @return [void]
   #
   # @example
   #   freddy.deliver 'Metrics', user_id: 5, metric: 'signed_in'
   def deliver(destination, payload, options = {})
     timeout = options.fetch(:timeout, 0)
+    compression_algorithm = options.fetch(:compress, nil)
     opts = {}
     opts[:expiration] = (timeout * 1000).to_i if timeout.positive?
+    opts[:content_encoding] = compression_algorithm if compression_algorithm
 
     @send_and_forget_producer.produce(destination, payload, opts)
   end

data/spec/.rubocop.yml

@@ -0,0 +1,26 @@
+require: rubocop-rspec
+inherit_from: ../.rubocop.yml
+
+RSpec/ExampleLength:
+  Enabled: no
+
+RSpec/MultipleExpectations:
+  Enabled: no
+
+RSpec/MessageSpies:
+  Enabled: no
+
+RSpec/VerifiedDoubles:
+  Enabled: no
+
+RSpec/InstanceVariable:
+  Enabled: no
+
+RSpec/NestedGroups:
+  Enabled: no
+
+RSpec/DescribeClass:
+  Enabled: no
+
+RSpec/MultipleMemoizedHelpers:
+  Enabled: no

data/spec/freddy/error_response_spec.rb

@@ -13,10 +13,10 @@ describe Freddy::ErrorResponse do
     end
 
     describe '#message' do
-      subject { error.message }
+      subject(:message) { error.message }
 
       it 'uses error type as a message' do
-        is_expected.to eq('SomeError')
+        expect(message).to eq('SomeError')
       end
     end
   end
@@ -31,10 +31,10 @@ describe Freddy::ErrorResponse do
     end
 
     describe '#message' do
-      subject { error.message }
+      subject(:message) { error.message }
 
       it 'uses error type as a message' do
-        is_expected.to eq('SomeError: extra info')
+        expect(message).to eq('SomeError: extra info')
       end
     end
   end
@@ -49,10 +49,10 @@ describe Freddy::ErrorResponse do
     end
 
     describe '#message' do
-      subject { error.message }
+      subject(:message) { error.message }
 
       it 'uses default error message as a message' do
-        is_expected.to eq('Use #response to get the error response')
+        expect(message).to eq('Use #response to get the error response')
       end
     end
   end

data/spec/freddy/freddy_spec.rb

@@ -49,6 +49,29 @@ describe Freddy do
         expect(processed_after_timeout).to be(true)
       end
     end
+
+    context 'with compress' do
+      it 'compresses the payload' do
+        expect(Freddy::Encoding).to receive(:compress).with(anything, 'zlib').and_call_original
+
+        freddy.tap_into(destination) { |msg| @tapped_message = msg }
+        freddy.deliver(destination, payload, compress: 'zlib')
+        default_sleep
+
+        wait_for { @tapped_message }
+        expect(@tapped_message).to eq(payload)
+      end
+    end
+
+    context 'without compress' do
+      it 'does not compress the payload' do
+        freddy.tap_into(destination) { |msg| @tapped_message = msg }
+        deliver
+
+        wait_for { @tapped_message }
+        expect(@tapped_message).to eq(payload)
+      end
+    end
   end
 
   context 'when making a synchronized request' do

data/spec/freddy/payload_spec.rb

@@ -2,19 +2,28 @@ require 'spec_helper'
 
 describe Freddy::Payload do
   describe '#dump' do
-    it 'serializes time objects as iso8601 format strings' do
-      expect(dump(time: Time.utc(2016, 1, 4, 20, 18)))
-        .to eq('{"time":"2016-01-04T20:18:00Z"}')
-    end
-
-    it 'serializes time objects in an array as iso8601 format strings' do
-      expect(dump(time: [Time.utc(2016, 1, 4, 20, 18)]))
-        .to eq('{"time":["2016-01-04T20:18:00Z"]}')
-    end
-
-    it 'serializes time objects in a nested hash as iso8601 format strings' do
-      expect(dump(x: { time: Time.utc(2016, 1, 4, 20, 18) }))
-        .to eq('{"x":{"time":"2016-01-04T20:18:00Z"}}')
+    context 'with a given Ruby engine' do
+      let(:ts) do
+        RUBY_ENGINE == 'jruby' ? '{"time":"2016-01-04T20:18:00Z"}' : '{"time":"2016-01-04T20:18:00.000000Z"}'
+      end
+      let(:ts_array) do
+        RUBY_ENGINE == 'jruby' ? '{"time":["2016-01-04T20:18:00Z"]}' : '{"time":["2016-01-04T20:18:00.000000Z"]}'
+      end
+
+      it 'serializes time objects as iso8601 format strings' do
+        expect(dump(time: Time.utc(2016, 1, 4, 20, 18)))
+          .to eq(ts)
+      end
+
+      it 'serializes time objects in an array as iso8601 format strings' do
+        expect(dump(time: [Time.utc(2016, 1, 4, 20, 18)]))
+          .to eq(ts_array)
+      end
+
+      it 'serializes time objects in a nested hash as iso8601 format strings' do
+        expect(dump(x: { time: Time.utc(2016, 1, 4, 20, 18) }))
+          .to eq("{\"x\":#{ts}}")
+      end
     end
 
     it 'serializes date objects as iso8601 format strings' do
@@ -33,17 +42,17 @@ describe Freddy::Payload do
     end
 
     it 'serializes datetime objects as iso8601 format strings' do
-      expect(dump(datetime: DateTime.new(2016, 1, 4, 20, 18))) # rubocop:disable Style/DateTime
+      expect(dump(datetime: DateTime.new(2016, 1, 4, 20, 18)))
         .to eq('{"datetime":"2016-01-04T20:18:00+00:00"}')
     end
 
     it 'serializes datetime objects in an array as iso8601 format strings' do
-      expect(dump(datetime: [DateTime.new(2016, 1, 4, 20, 18)])) # rubocop:disable Style/DateTime
+      expect(dump(datetime: [DateTime.new(2016, 1, 4, 20, 18)]))
         .to eq('{"datetime":["2016-01-04T20:18:00+00:00"]}')
     end
 
     it 'serializes datetime objects in a nested hash as iso8601 format strings' do
-      expect(dump(x: { datetime: DateTime.new(2016, 1, 4, 20, 18) })) # rubocop:disable Style/DateTime
+      expect(dump(x: { datetime: DateTime.new(2016, 1, 4, 20, 18) }))
         .to eq('{"x":{"datetime":"2016-01-04T20:18:00+00:00"}}')
     end
 

data/spec/integration/concurrency_spec.rb

@@ -10,21 +10,17 @@ describe 'Concurrency' do
 
   it 'supports multiple requests in #respond_to' do
     freddy1.respond_to 'Concurrency1' do |_payload, msg_handler|
-      begin
-        freddy1.deliver_with_response 'Concurrency2', msg: 'noop'
-        result2 = freddy1.deliver_with_response 'Concurrency3', msg: 'noop'
-        msg_handler.success(result2)
-      rescue Freddy::InvalidRequestError => e
-        msg_handler.error(e.response)
-      end
+      freddy1.deliver_with_response 'Concurrency2', msg: 'noop'
+      result2 = freddy1.deliver_with_response 'Concurrency3', msg: 'noop'
+      msg_handler.success(result2)
+    rescue Freddy::InvalidRequestError => e
+      msg_handler.error(e.response)
     end
 
     freddy2.respond_to 'Concurrency2' do |_payload, msg_handler|
-      begin
-        msg_handler.success(from: 'Concurrency2')
-      rescue Freddy::InvalidRequestError => e
-        msg_handler.error(e.response)
-      end
+      msg_handler.success(from: 'Concurrency2')
+    rescue Freddy::InvalidRequestError => e
+      msg_handler.error(e.response)
     end
 
     freddy3.respond_to 'Concurrency3' do |_payload, msg_handler|

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,45 @@ describe 'Tracing' do
     end
   end
 
-  def active_span
-    OpenTracing.active_span
+  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,
+      links: current_span.links || []
+    }
+  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.2.1
 platform: ruby
 authors:
 - Glia TechMovers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-20 00:00:00.000000000 Z
+date: 2021-09-15 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
@@ -94,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: zlib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 description: Messaging API
 email:
 - techmovers@salemove.com
@@ -101,13 +129,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,12 +143,12 @@ 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
 - lib/freddy/consumers/tap_into_consumer.rb
 - lib/freddy/delivery.rb
+- lib/freddy/encoding.rb
 - lib/freddy/error_response.rb
 - lib/freddy/invalid_request_error.rb
 - lib/freddy/message_handler.rb
@@ -135,7 +162,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 +172,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 +189,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.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
@@ -180,7 +209,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