netuitive_rails_agent 1.0.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: de1f11bcfe4f7aeb12a5a2f22745eadaeed5431e
-  data.tar.gz: 846af5ccbb8f70a198cdcef530345c0d359e8d12
+SHA256:
+  metadata.gz: ee90f352cfeb37d1b2c7f8f12f97afd419505c3cb05ca1526b4db7688d6b4dbc
+  data.tar.gz: 68bd86e6990cd49c0a2fab3c9133497d861f61a24718d86f644ff2e48de088e0
 SHA512:
-  metadata.gz: 26736f7dd7b2aa8bedbd4518f0330484cdf5fe699d8445857d6174cd1cab1e281ae840780d98b8367dcf62495c20cde8171d447c53ddc4a7663379ab1a637e21
-  data.tar.gz: 10e99349e652f6a6f1ee66ba2d3666e85267911f04f5220a163cf0e5fd4c953f11fd23431b125c03e774be0beb93693e0f1b91a0a56be5cd06f71309326ff552
+  metadata.gz: 767059630df4d7030605a6daffd7e8e64b4b7d6c99e93af94e06e1e29eda008e7ae630e2f7d13cf8a9fb6df3d926a720ab263871c2f6ce7dc0771a7ca977e594
+  data.tar.gz: dbd849d8dbf06823d1768266f3aefc701f784db680530f34a99161fd798fe646fa050aaac23d4c242b109d5f388ad37ccc6487cbb27a789b1f8480e6bff91973

data/config/agent.yml

@@ -26,6 +26,9 @@ sidekiqEnabled: false #NETUITIVE_RAILS_SIDEKIQ_ENABLED toggle for collection of
 sendErrorEvents: false #NETUITIVE_RAILS_SEND_ERROR_EVENTS toggle for sending exceptions to netuitived for export as external events.
 
 #feature configs
+actionControllerWhitelist: .* #NETUITIVE_RAILS_ACTION_CONTROLLER_WHITELIST this is required to filter out action controller metrics
+#Example: ^Rails::WelcomeController$
+#The whitelist needs to be valid RegEx
 queueTimeUnits: 1 #NETUITIVE_RAILS_QUEUE_TIME_UNITS this is the divisor required to get the queue time metric into seconds. examples: seconds: 1, milliseconds: 1000, microseconds: 1000000.
 ignoredErrors: #NETUITIVE_RAILS_IGNORED_ERRORS list of exceptions to ignore. should be provided in the following yaml format:
 #ignoredErrors:

data/lib/netuitive_rails_agent/action_controller.rb

@@ -49,17 +49,20 @@ module NetuitiveRailsAgent
         event = ActiveSupport::Notifications::Event.new(*args)
         controller = event.payload[:controller].to_s
         action = event.payload[:action].to_s
-        interaction.add_sample("action_controller.#{controller}.#{action}.request.total_duration", event.duration)
-        interaction.add_sample("action_controller.#{controller}.#{action}.request.query_time", event.payload[:db_runtime])
-        interaction.add_sample("action_controller.#{controller}.#{action}.request.view_time", event.payload[:view_runtime])
-        interaction.add_sample("action_controller.#{controller}.request.total_duration", event.duration)
-        interaction.add_sample("action_controller.#{controller}.request.query_time", event.payload[:db_runtime])
-        interaction.add_sample("action_controller.#{controller}.request.view_time", event.payload[:view_runtime])
+        ac_whitelist_string = NetuitiveRailsAgent::ConfigManager.action_controller_whitelist
+        if controller =~ /#{ac_whitelist_string}/
+          interaction.add_sample("action_controller.#{controller}.#{action}.request.total_duration", event.duration)
+          interaction.add_sample("action_controller.#{controller}.#{action}.request.query_time", event.payload[:db_runtime])
+          interaction.add_sample("action_controller.#{controller}.#{action}.request.view_time", event.payload[:view_runtime])
+          interaction.add_sample("action_controller.#{controller}.request.total_duration", event.duration)
+          interaction.add_sample("action_controller.#{controller}.request.query_time", event.payload[:db_runtime])
+          interaction.add_sample("action_controller.#{controller}.request.view_time", event.payload[:view_runtime])
+          interaction.aggregate_metric("action_controller.#{controller}.#{action}.total_requests", 1)
+          interaction.aggregate_metric("action_controller.#{controller}.total_requests", 1)
+        end
         interaction.add_sample('action_controller.request.total_duration', event.duration)
         interaction.add_sample('action_controller.request.query_time', event.payload[:db_runtime])
         interaction.add_sample('action_controller.request.view_time', event.payload[:view_runtime])
-        interaction.aggregate_metric("action_controller.#{controller}.#{action}.total_requests", 1)
-        interaction.aggregate_metric("action_controller.#{controller}.total_requests", 1)
         interaction.aggregate_metric('action_controller.total_requests', 1)
       end
     end

data/lib/netuitive_rails_agent/config_manager.rb

@@ -29,6 +29,8 @@ module NetuitiveRailsAgent
 
       attr_accessor :object_space_enabled
 
+      attr_accessor :action_controller_whitelist
+
       attr_accessor :data
 
       def property(name, var, default = nil)
@@ -101,6 +103,7 @@ module NetuitiveRailsAgent
         @action_errors_enabled = boolean_property('actionErrorsEnabled', 'NETUITIVE_RAILS_ACTION_ERRORS_ENABLED')
         @gc_enabled = boolean_property('gcEnabled', 'NETUITIVE_RAILS_GC_ENABLED')
         @object_space_enabled = boolean_property('objectSpaceEnabled', 'NETUITIVE_RAILS_OBJECT_SPACE_ENABLED')
+        @action_controller_whitelist = property('actionControllerWhitelist', 'NETUITIVE_RAILS_ACTION_CONTROLLER_WHITELIST')
 
         NetuitiveRailsAgent::NetuitiveLogger.log.debug "read config file. Results:
           debugLevel: #{debug_level_string},
@@ -117,7 +120,8 @@ module NetuitiveRailsAgent
           request_wrapper_enabled: #{request_wrapper_enabled},
           action_errors_enabled: #{action_errors_enabled},
           gc_enabled: #{gc_enabled},
-          object_space_enabled: #{object_space_enabled}"
+          object_space_enabled: #{object_space_enabled}
+          action_controller_whitelist: #{action_controller_whitelist}"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: netuitive_rails_agent
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.2.0
 platform: ruby
 authors:
 - John King
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-23 00:00:00.000000000 Z
+date: 2018-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netuitive_ruby_api
@@ -66,7 +66,6 @@ files:
 - lib/netuitive_rails_agent/request_data.rb
 - lib/netuitive_rails_agent/scheduler.rb
 - lib/netuitive_rails_agent/sidekiq.rb
-- log/netuitive.log
 homepage: http://rubygems.org/gems/netuitive_rails_agent
 licenses:
 - Apache-2.0
@@ -87,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Rails metrics for Netuitive's API