process_handler 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4a0b0712332a3351be93705ac3d10cb25aac695
-  data.tar.gz: 04ef8921eeafe7704d6239252f81f6cf992cc723
+  metadata.gz: ec9bd732b3d29be5ca5a8ff8b9376be37edf5ea5
+  data.tar.gz: f37c3dc1f7f4b3b82bf029a274e7154bbdc268f5
 SHA512:
-  metadata.gz: 5eedc6fa3ecc33d660884c3db2260b06e78ea20c61bf3305f20cb412c7c426d55e9834ddf8ba822076e77715cfb93ed9357e4d390dd79ab2ae464c6eee0832de
-  data.tar.gz: efbe06f03d975f036c7a80f8beb3af369cd1f0a273b5c3a00e3cc8da208cba7995933b69d56fab224a122a13f84dd137892dded74f2205c24da57c1ccfd8a09c
+  metadata.gz: cb2d95bee09bba68cb7c50a03aba26444098dc13db709077facd48cd10120a006c19822c961b3bc4782a297f98360a514c16a4d9fd07c013fd13a7aef88bb90e
+  data.tar.gz: 0ca27cf5ea6d3d574095ee36d38acb3a6dab71b018cabec691e9060ff8f4d0538e05778ec96375cc94d70a58b76f5973bdcf88feededac08ea404a23a1d231bd

data/lib/salemove/process_handler/pivot_process.rb

@@ -20,13 +20,21 @@ module Salemove
         @logger = logger
       end
 
-      def initialize(messenger,
+      def self.trace_information
+        if defined?(Freddy) && Freddy.respond_to?(:trace)
+          {trace: Freddy.trace.to_h}
+        else
+          {}
+        end
+      end
+
+      def initialize(freddy,
                      notifier: nil,
                      notifier_factory: NotifierFactory,
                      process_monitor: ProcessMonitor.new,
                      process_name: 'Unknown process',
                      exit_enforcer: nil)
-        @messenger = messenger
+        @freddy = freddy
         @process_monitor = process_monitor
         @exception_notifier = notifier_factory.get_notifier(process_name, notifier)
         # Needed for forcing exit from jruby with exit(0)
@@ -42,7 +50,7 @@ module Salemove
 
       def spawn_queue_threads(service)
         if service.class.const_defined?(:QUEUE)
-          [ServiceSpawner.spawn(service, @messenger, @exception_notifier)]
+          [ServiceSpawner.spawn(service, @freddy, @exception_notifier)]
         else
           []
         end
@@ -51,7 +59,7 @@ module Salemove
       def spawn_tap_threads(service)
         if service.class.const_defined?(:TAPPED_QUEUES)
           service.class::TAPPED_QUEUES.map do |queue|
-            spawner = TapServiceSpawner.new(service, @messenger, @exception_notifier)
+            spawner = TapServiceSpawner.new(service, @freddy, @exception_notifier)
             spawner.spawn(queue)
           end
         else
@@ -67,9 +75,9 @@ module Salemove
 
         bm = Benchmark.measure { result = block.call }
         if defined?(Logasm) && PivotProcess.logger.is_a?(Logasm)
-          PivotProcess.logger.info "Execution time",
-            request_id: input[:request_id], type: type,
-            real: bm.real, user: bm.utime, system: bm.stime
+          PivotProcess.logger.info "Execution time", {
+            type: type, real: bm.real, user: bm.utime, system: bm.stime
+          }.merge(PivotProcess.trace_information)
         end
         result
       end
@@ -82,28 +90,27 @@ module Salemove
       end
 
       class TapServiceSpawner
-        def initialize(service, messenger, exception_notifier)
+        def initialize(service, freddy, exception_notifier)
           @service = service
-          @messenger = messenger
+          @freddy = freddy
           @exception_notifier = exception_notifier
         end
 
         def spawn(queue)
-          @messenger.tap_into(queue) do |input|
-            request_id = SecureRandom.hex(5)
-            delegate_to_service(input.merge(type: queue, request_id: request_id))
+          @freddy.tap_into(queue) do |input|
+            delegate_to_service(input.merge(type: queue))
           end
         end
 
         def delegate_to_service(input)
-          PivotProcess.logger.info "Received request", input
+          PivotProcess.logger.info "Received request", PivotProcess.trace_information.merge(input)
           PivotProcess.benchmark(input) { @service.call(input) }
         rescue => exception
           handle_exception(exception, input)
         end
 
         def handle_exception(e, input)
-          PivotProcess.logger.error(e.inspect + "\n" + e.backtrace.join("\n"), request_id: input[:request_id])
+          PivotProcess.logger.error(e.inspect + "\n" + e.backtrace.join("\n"), PivotProcess.trace_information)
           if @exception_notifier
             @exception_notifier.notify_or_ignore(e, cgi_data: ENV.to_hash, parameters: input)
           end
@@ -113,21 +120,19 @@ module Salemove
       class ServiceSpawner
         PROCESSED_REQUEST_LOG_KEYS = [:error, :success]
 
-        def self.spawn(service, messenger, exception_notifier)
-          new(service, messenger, exception_notifier).spawn
+        def self.spawn(service, freddy, exception_notifier)
+          new(service, freddy, exception_notifier).spawn
         end
 
-        def initialize(service, messenger, exception_notifier)
+        def initialize(service, freddy, exception_notifier)
           @service = service
-          @messenger = messenger
+          @freddy = freddy
           @exception_notifier = exception_notifier
         end
 
         def spawn
-          @messenger.respond_to(@service.class::QUEUE) do |input, handler|
-            request_id = SecureRandom.hex(5)
-
-            response = handle_request(input.merge(request_id: request_id))
+          @freddy.respond_to(@service.class::QUEUE) do |input, handler|
+            response = handle_request(input)
             if response.respond_to?(:fulfilled?)
               handle_fulfillable_response(input, handler, response)
             else
@@ -161,7 +166,7 @@ module Salemove
         end
 
         def handle_request(input)
-          PivotProcess.logger.debug "Received request", input
+          PivotProcess.logger.debug "Received request", PivotProcess.trace_information.merge(input)
           if input.has_key?(:ping)
             { success: true, pong: 'pong' }
           else
@@ -183,13 +188,14 @@ module Salemove
         def log_processed_request(input, result)
           attributes = result
             .select {|k, _| PROCESSED_REQUEST_LOG_KEYS.include?(k)}
-            .merge(request_id: input[:request_id], type: input[:type])
+            .merge(type: input[:type])
+            .merge(PivotProcess.trace_information)
 
           PivotProcess.logger.info "Processed request", attributes
         end
 
         def handle_exception(e, input)
-          PivotProcess.logger.error(e.inspect + "\n" + e.backtrace.join("\n"), request_id: input[:request_id])
+          PivotProcess.logger.error(e.inspect + "\n" + e.backtrace.join("\n"), PivotProcess.trace_information)
           if @exception_notifier
             @exception_notifier.notify_or_ignore(e, cgi_data: ENV.to_hash, parameters: input)
           end

data/lib/salemove/process_handler/version.rb

@@ -1,5 +1,5 @@
 module Salemove
   module ProcessHandler
-    VERSION = '1.0.0'
+    VERSION = '1.1.0'
   end
 end

data/process_handler.gemspec

@@ -6,8 +6,8 @@ require 'salemove/process_handler/version'
 Gem::Specification.new do |spec|
   spec.name          = 'process_handler'
   spec.version       = Salemove::ProcessHandler::VERSION
-  spec.authors       = ['Indrek Juhkam']
-  spec.email         = ['indrek@salemove.com']
+  spec.authors       = ['SaleMove TechMovers']
+  spec.email         = ['techmovers@salemove.com']
   spec.description   = %q{This gem helps to monitor and manage processes}
   spec.summary       = %q{}
   spec.homepage      = ''

data/spec/process_handler/pivot_process_spec.rb

@@ -3,11 +3,11 @@ require 'spec_helper'
 require 'salemove/process_handler/pivot_process'
 
 describe ProcessHandler::PivotProcess do
-  let(:monitor)   { double('Monitor') }
-  let(:messenger) { double('Messenger') }
-  let(:handler)   { double('Handler') }
-  let(:thread)    { double('Thread') }
-  let(:process) { ProcessHandler::PivotProcess.new(messenger, process_params) }
+  let(:monitor) { double('Monitor') }
+  let(:freddy) { double('Freddy') }
+  let(:handler) { double('Handler') }
+  let(:thread) { double('Thread') }
+  let(:process) { ProcessHandler::PivotProcess.new(freddy, process_params) }
   let(:process_params) {{ process_monitor: monitor , notifier_factory: notifier_factory}}
   let(:notifier_factory) { double('NotifierFactory') }
   let(:responder) { double(shutdown: true) }
@@ -43,7 +43,7 @@ describe ProcessHandler::PivotProcess do
     end
 
     def expect_message
-      expect(messenger).to receive(:respond_to) {|destination, &callback|
+      expect(freddy).to receive(:respond_to) {|destination, &callback|
         callback.call(input, handler)
       }.and_return(responder)
     end
@@ -51,14 +51,14 @@ describe ProcessHandler::PivotProcess do
     before do
       expect_message
       expect_handler_thread_to_behave
-      allow(service).to receive(:call).with(input.merge(request_id: anything)) { result }
+      allow(service).to receive(:call).with(input) { result }
     end
 
     describe 'when service responds correctly' do
 
       it 'can be executed with logger' do
         expect(handler).to receive(:success).with(result)
-        expect(service).to receive(:call).with(input.merge(request_id: anything))
+        expect(service).to receive(:call).with(input)
         subject()
       end
 
@@ -68,7 +68,7 @@ describe ProcessHandler::PivotProcess do
       let(:result) { { success: false, error: 'hey' } }
 
       before do
-        expect(service).to receive(:call).with(input.merge(request_id: anything)) { result }
+        expect(service).to receive(:call).with(input) { result }
       end
 
       it 'acks the message properly' do
@@ -106,7 +106,7 @@ describe ProcessHandler::PivotProcess do
       let(:exception) { "what an unexpected exception!" }
 
       before do
-        expect(service).to receive(:call).with(input.merge(request_id: anything)) { raise exception }
+        expect(service).to receive(:call).with(input) { raise exception }
       end
 
       it 'acks the message properly' do
@@ -190,7 +190,7 @@ describe ProcessHandler::PivotProcess do
     let(:input) {{}}
 
     def expect_tap_into
-      expect(messenger).to receive(:tap_into) do |destination, &callback|
+      expect(freddy).to receive(:tap_into) do |destination, &callback|
         callback.call(input)
       end
         .exactly(tap_count).times
@@ -205,8 +205,8 @@ describe ProcessHandler::PivotProcess do
 
     describe 'when service handles the input correctly' do
       it 'can be executed' do
-        expect(service).to receive(:call).with(input.merge(type: 'one', request_id: anything))
-        expect(service).to receive(:call).with(input.merge(type: 'two', request_id: anything))
+        expect(service).to receive(:call).with(input.merge(type: 'one'))
+        expect(service).to receive(:call).with(input.merge(type: 'two'))
         subject()
       end
     end
@@ -237,8 +237,8 @@ describe ProcessHandler::PivotProcess do
       let(:exception) { "what an unexpected exception!" }
 
       before do
-        expect(service).to receive(:call).with(input.merge(type: 'one', request_id: anything)) {}
-        expect(service).to receive(:call).with(input.merge(type: 'two', request_id: anything)) { raise exception }
+        expect(service).to receive(:call).with(input.merge(type: 'one')) {}
+        expect(service).to receive(:call).with(input.merge(type: 'two')) { raise exception }
       end
 
       it_behaves_like 'an error_handler'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: process_handler
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
-- Indrek Juhkam
+- SaleMove TechMovers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-23 00:00:00.000000000 Z
+date: 2017-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrake
@@ -68,7 +68,7 @@ dependencies:
         version: '0'
 description: This gem helps to monitor and manage processes
 email:
-- indrek@salemove.com
+- techmovers@salemove.com
 executables: []
 extensions: []
 extra_rdoc_files: []