alacrity-rails 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c3c649968a43d9431fa8c353627d5738df24e05
-  data.tar.gz: 4e337ca4057a990220e54c43577bdcc1a427edf0
+  metadata.gz: 453dd5ed4a8173cab3ccca146a1fa7827cc81d2e
+  data.tar.gz: 6959b45a643e9a7e8814af00710eb61a188abd97
 SHA512:
-  metadata.gz: 01e088ce25d0f38bbd66daae94701a378c6ffee51a3f1f9f57ecd1f17dee1dcd798bf9c539db0b816239c1dc180a5af420a2e4b266f14d8c2ab45cfbe4735723
-  data.tar.gz: b9cd184d6dfb2ce69773143febf7b89f4d7af603b17d10b0ded3ddbf5edae222a582e38739b2f47fd7b63829af7f9bb80b91a3943911e559854a97bb095e0553
+  metadata.gz: a284cb2d4c66c43244e0689f5499fc81cc96cdda869951b9266dbc1f744d5225f8ad7e1bf3975f272dd87bc3c4b8bb837573fd1d592ba475af769bf299c389e7
+  data.tar.gz: 9da624496779a56b6dd4b1db105fc97b975fef39368b9e443acdea6a4877d3dff7713c643b9a5ddb4b2d3c166c5462e08056ae594d32885225761ea05718de3e

data/lib/alacrity-rails.rb

@@ -12,7 +12,11 @@ module AlacrityRails
   autoload :VERSION,          'alacrity-rails/version'
 
   module Probe
-    autoload :MongoDriver,    'alacrity-rails/probe/mongo_driver'
+    autoload :ActionController,       'alacrity-rails/probe/action_controller'
+    autoload :ActionView,             'alacrity-rails/probe/action_view'
+    autoload :ActiveModelSerializers, 'alacrity-rails/probe/active_model_serializers'
+    autoload :ActiveRecord,           'alacrity-rails/probe/active_record'
+    autoload :MongoDriver,            'alacrity-rails/probe/mongo_driver'
   end
 
   module Transaction

data/lib/alacrity-rails/client.rb

@@ -5,24 +5,12 @@ module AlacrityRails
       new_transaction!(env)
     end
 
-    def self.store_request_metrics(started_at, ended_at, data)
-      if transaction
-        transaction.store_request_metrics(started_at, ended_at, data)
-      end
-    end
-
-    def self.store_database_metrics(started_at, ended_at, data)
-      if transaction
-        transaction.store_database_metrics(started_at, ended_at, data)
-      end
-    end
-
-    def self.store_serializer_metrics(started_at, ended_at, data)
-      transaction&.store_serializer_metrics(started_at, ended_at, data)
+    def self.store_request(data)
+      transaction&.store_request(data)
     end
 
-    def self.store_template_metrics(started_at, ended_at, data)
-      transaction&.store_template_metrics(started_at, ended_at, data)
+    def self.store_timeline_event(data)
+      transaction&.store_timeline_event(data)
     end
 
     def self.close_transaction!

data/lib/alacrity-rails/probe/action_controller.rb

@@ -0,0 +1,18 @@
+module AlacrityRails
+  module Probe
+    class ActionController
+      def self.activate
+        ActiveSupport::Notifications.subscribe 'process_action.action_controller' do |name, started, finished, unique_id, data|
+          AlacrityRails::Client.store_request(
+            started_at: started,
+            finished_at: finished,
+            controller: data[:controller],
+            action: data[:action],
+            format: data[:format],
+            status: data[:status]
+          )
+        end
+      end
+    end
+  end
+end

data/lib/alacrity-rails/probe/action_view.rb

@@ -0,0 +1,18 @@
+module AlacrityRails
+  module Probe
+    class ActionView
+      def self.activate
+        ActiveSupport::Notifications.subscribe 'render_partial.action_view' do |name, started, finished, unique_id, data|
+          AlacrityRails::Client.store_timeline_event(
+            name: 'Template',
+            event_type: 'template',
+            engine: 'ActionView',
+            started_at: started,
+            finished_at: finished,
+            detail: data[:identifier]
+          )
+        end
+      end
+    end
+  end
+end

data/lib/alacrity-rails/probe/active_model_serializers.rb

@@ -0,0 +1,18 @@
+module AlacrityRails
+  module Probe
+    class ActiveModelSerializers
+      def self.activate
+        ActiveSupport::Notifications.subscribe 'render.active_model_serializers' do |name, started, finished, unique_id, data|
+          AlacrityRails::Client.store_timeline_event(
+            name: 'Template',
+            event_type: 'template',
+            engine: 'ActiveModel::Serializers',
+            started_at: started,
+            finished_at: finished,
+            detail: data[:serializer].to_s
+          )
+        end
+      end
+    end
+  end
+end

data/lib/alacrity-rails/probe/active_record.rb

@@ -0,0 +1,18 @@
+module AlacrityRails
+  module Probe
+    class ActiveRecord
+      def self.activate
+        ActiveSupport::Notifications.subscribe 'sql.active_record' do |name, started, finished, unique_id, data|
+          AlacrityRails::Client.store_timeline_event(
+            name: data[:name],
+            event_type: 'database',
+            engine: 'ActiveRecord',
+            started_at: started,
+            finished_at: finished,
+            detail: data[:sql]
+          )
+        end
+      end
+    end
+  end
+end

data/lib/alacrity-rails/probe/mongo_driver.rb

@@ -1,6 +1,12 @@
 module AlacrityRails
   module Probe
     class MongoDriver
+      def self.activate
+        if defined?(Mongo)
+          Mongo::Monitoring::Global.subscribe(Mongo::Monitoring::COMMAND, new)
+        end
+      end
+
       def start_events
         @start_events ||= {}
       end
@@ -18,15 +24,24 @@ module AlacrityRails
           command[key] = value.respond_to?(:keys) ? value.keys : value
         end
 
-        data = {
-          name: "#{event.database_name}.#{event.command_name}",
-          sql: command.to_s
-        }
-        AlacrityRails::Client.store_database_metrics(start_event[:started_at], finished, data)
+        store(event.command_name, start_event[:started_at], finished, command)
       rescue => error
         Logger.error("Alacrity mongo driver tracking failed: #{error.inspect}")
       end
       alias failed succeeded
+
+      protected
+
+      def store(command_name, started_at, finished_at, command)
+        AlacrityRails::Client.store_timeline_event(
+          name: command_name,
+          event_type: 'database',
+          engine: 'Mongo',
+          started_at: started_at,
+          finished_at: finished_at,
+          detail: command.to_s
+        )
+      end
     end
   end
 end

data/lib/alacrity-rails/railtie.rb

@@ -6,25 +6,13 @@ module AlacrityRails
 
         config.middleware.insert_before 0, AlacrityRails::Middleware
 
-        ActiveSupport::Notifications.subscribe 'sql.active_record' do |name, started, finished, unique_id, data|
-          AlacrityRails::Client.store_database_metrics(started, finished, data)
-        end
-
-        ActiveSupport::Notifications.subscribe 'process_action.action_controller' do |name, started, finished, unique_id, data|
-          AlacrityRails::Client.store_request_metrics(started, finished, data)
-        end
-
-        if defined?(Mongo)
-          Mongo::Monitoring::Global.subscribe(Mongo::Monitoring::COMMAND, AlacrityRails::Probe::MongoDriver.new)
-        end
-
-        ActiveSupport::Notifications.subscribe 'render.active_model_serializers' do |name, started, finished, unique_id, data|
-          AlacrityRails::Client.store_serializer_metrics(started, finished, data)
-        end
-
-        ActiveSupport::Notifications.subscribe 'render_partial.action_view' do |name, started, finished, unique_id, data|
-          AlacrityRails::Client.store_template_metrics(started, finished, data)
-        end
+        [
+          Probe::ActionController,
+          Probe::ActionView,
+          Probe::ActiveModelSerializers,
+          Probe::ActiveRecord,
+          Probe::MongoDriver
+        ].each(&:activate)
       end
     end
   end

data/lib/alacrity-rails/transaction/web_transaction.rb

@@ -9,42 +9,23 @@ module AlacrityRails::Transaction
       self.method = env['REQUEST_METHOD']
     end
 
-    def store_database_metrics(started_at, finished_at, data)
-      timeline_events << {
-        name: data[:name],
-        event_type: 'database',
-        started_at: absolute_time(started_at.to_datetime),
-        finished_at: absolute_time(finished_at.to_datetime),
-        detail: data[:sql]
-      }
-    end
-
-    def store_request_metrics(started_at, finished_at, data)
-      self.framework_started_at = absolute_time(started_at.to_datetime)
-      self.framework_finished_at = absolute_time(finished_at.to_datetime)
+    def store_request(data)
+      self.framework_started_at = absolute_time(data[:started_at].to_datetime)
+      self.framework_finished_at = absolute_time(data[:finished_at].to_datetime)
       self.controller = data[:controller]
       self.action = data[:action]
       self.format = data[:format]
       self.status = data[:status]
     end
 
-    def store_serializer_metrics(started_at, finished_at, data)
+    def store_timeline_event(data)
       timeline_events << {
-        name: 'Template',
-        event_type: 'template',
-        started_at: absolute_time(started_at.to_datetime),
-        finished_at: absolute_time(finished_at.to_datetime),
-        detail: data[:serializer].to_s
-      }
-    end
-
-    def store_template_metrics(started_at, finished_at, data)
-      timeline_events << {
-        name: 'Template',
-        event_type: 'template',
-        started_at: absolute_time(started_at.to_datetime),
-        finished_at: absolute_time(finished_at.to_datetime),
-        detail: data[:identifier]
+        name: data[:name],
+        event_type: data[:event_type],
+        engine: data[:engine],
+        started_at: absolute_time(data[:started_at].to_datetime),
+        finished_at: absolute_time(data[:finished_at].to_datetime),
+        detail: data[:detail]
       }
     end
 

data/lib/alacrity-rails/version.rb

@@ -1,3 +1,3 @@
 module AlacrityRails
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alacrity-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Alacrity, LLC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-07 00:00:00.000000000 Z
+date: 2017-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -39,6 +39,10 @@ files:
 - lib/alacrity-rails/config.rb
 - lib/alacrity-rails/connection_tester.rb
 - lib/alacrity-rails/middleware.rb
+- lib/alacrity-rails/probe/action_controller.rb
+- lib/alacrity-rails/probe/action_view.rb
+- lib/alacrity-rails/probe/active_model_serializers.rb
+- lib/alacrity-rails/probe/active_record.rb
 - lib/alacrity-rails/probe/mongo_driver.rb
 - lib/alacrity-rails/railtie.rb
 - lib/alacrity-rails/server_config.rb