netuitive_rails_agent 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 975a4ec373b457b5ba2b588f6e1520eeda01c62f
-  data.tar.gz: 65fd061a753f56958bdf0e8a7dc734c4f64c79a4
+  metadata.gz: 969d9606b4bfea03043b3dcb2bd3e35792aa1cd7
+  data.tar.gz: 348a570cddf4b5a3be8850fe6cd42db13fc6dfd9
 SHA512:
-  metadata.gz: e6919bbceee094fdb25218b368161a00ee04d57ea83389903bb5945cf6df84f4d8709f27d63187c4abf45db5f3c3d9901f00d74f5bdbbe854bf11ef2f69e573b
-  data.tar.gz: 24820184860f7f95537b5b8f29525d970f0946d6751589ecbaba3386fd63c45beaf38cbe691a8d120446c2603a9745dba677300c5a76a946edcd478da362b1a4
+  metadata.gz: 34ef1dbbbbb5c7666985d90780c96f9c6659d68e6006c1f87170d030ad186aa2fbe74fd84864f92bd59d8a2957ef2f309bbfdebd4dcab29e3b276822a889a29b
+  data.tar.gz: 0461912ef0e63eabf17a8d592bdff6492bd05845b8974468a8a7fb97abc5149541192db3a4ea0537d86483f3fb3c0d7175cc7b65c6ee9a59d26c320c08cccfe0

data/lib/netuitive/action_controller.rb

@@ -9,33 +9,33 @@ module NetuitiveActionControllerSub
       host = "host:#{ENV['INSTRUMENTATION_HOSTNAME']}"
       status = event.payload[:status]
       tags = [controller, action, format, host] 
-      NetuitiveRubyAPI::aggregator.addSample("#{controller}.#{action}.request.total_duration", event.duration)
-      NetuitiveRubyAPI::aggregator.addSample("#{controller}.#{action}.request.query_time", event.payload[:db_runtime])
-      NetuitiveRubyAPI::aggregator.addSample("#{controller}.#{action}.request.view_time", event.payload[:view_runtime])
+      NetuitiveRubyAPI::netuitivedServer.addSample("#{controller}.#{action}.request.total_duration", event.duration)
+      NetuitiveRubyAPI::netuitivedServer.addSample("#{controller}.#{action}.request.query_time", event.payload[:db_runtime])
+      NetuitiveRubyAPI::netuitivedServer.addSample("#{controller}.#{action}.request.view_time", event.payload[:view_runtime])
     end
     ActiveSupport::Notifications.subscribe /write_fragment.action_controller/ do |*args| 
-      NetuitiveRubyAPI::aggregator.aggregateMetric("action_controller.write_fragment", 1)
+      NetuitiveRubyAPI::netuitivedServer.aggregateMetric("action_controller.write_fragment", 1)
     end
     ActiveSupport::Notifications.subscribe /read_fragment.action_controller/ do |*args| 
-      NetuitiveRubyAPI::aggregator.aggregateMetric("action_controller.read_fragment", 1)
+      NetuitiveRubyAPI::netuitivedServer.aggregateMetric("action_controller.read_fragment", 1)
     end
     ActiveSupport::Notifications.subscribe /expire_fragment.action_controller/ do |*args| 
-      NetuitiveRubyAPI::aggregator.aggregateMetric("action_controller.expire_fragment", 1)
+      NetuitiveRubyAPI::netuitivedServer.aggregateMetric("action_controller.expire_fragment", 1)
     end
     ActiveSupport::Notifications.subscribe /write_page.action_controller/ do |*args| 
-      NetuitiveRubyAPI::aggregator.aggregateMetric("action_controller.write_page", 1)
+      NetuitiveRubyAPI::netuitivedServer.aggregateMetric("action_controller.write_page", 1)
     end
     ActiveSupport::Notifications.subscribe /expire_page.action_controller/ do |*args| 
-      NetuitiveRubyAPI::aggregator.aggregateMetric("action_controller.expire_page", 1)
+      NetuitiveRubyAPI::netuitivedServer.aggregateMetric("action_controller.expire_page", 1)
     end
     ActiveSupport::Notifications.subscribe /send_file.action_controller/ do |*args| 
-      NetuitiveRubyAPI::aggregator.aggregateMetric("action_controller.sent_file", 1)
+      NetuitiveRubyAPI::netuitivedServer.aggregateMetric("action_controller.sent_file", 1)
     end
     ActiveSupport::Notifications.subscribe /redirect_to.action_controller/ do |*args| 
-      NetuitiveRubyAPI::aggregator.aggregateMetric("action_controller.redirect", 1)
+      NetuitiveRubyAPI::netuitivedServer.aggregateMetric("action_controller.redirect", 1)
     end
     ActiveSupport::Notifications.subscribe /halted_callback.action_controller/ do |*args| 
-      NetuitiveRubyAPI::aggregator.aggregateMetric("action_controller.halted_callback", 1)
+      NetuitiveRubyAPI::netuitivedServer.aggregateMetric("action_controller.halted_callback", 1)
     end
   end
 end

data/lib/netuitive/action_mailer.rb

@@ -3,12 +3,12 @@ module NetuitiveActionMailer
   	ActiveSupport::Notifications.subscribe /receive.action_mailer/ do |*args| 
       event = ActiveSupport::Notifications::Event.new(*args)
       mailer = "#{event.payload[:mailer]}"
-      NetuitiveRubyAPI::aggregator.aggregateMetric("action_mailer.#{mailer}.receive", 1)
+      NetuitiveRubyAPI::netuitivedServer.aggregateMetric("action_mailer.#{mailer}.receive", 1)
     end
     ActiveSupport::Notifications.subscribe /deliver.action_mailer/ do |*args| 
       event = ActiveSupport::Notifications::Event.new(*args)
       mailer = "#{event.payload[:mailer]}"
-      NetuitiveRubyAPI::aggregator.aggregateMetric("action_mailer.#{mailer}.deliver", 1)
+      NetuitiveRubyAPI::netuitivedServer.aggregateMetric("action_mailer.#{mailer}.deliver", 1)
     end
   end
 end

data/lib/netuitive/action_view.rb

@@ -1,10 +1,10 @@
 module NetuitiveActionViewSub
   def self.subscribe
     ActiveSupport::Notifications.subscribe /render_template.action_view/ do |*args| 
-      NetuitiveRubyAPI::aggregator.aggregateMetric("action_view.render_template", 1)
+      NetuitiveRubyAPI::netuitivedServer.aggregateMetric("action_view.render_template", 1)
     end
     ActiveSupport::Notifications.subscribe /render_partial.action_view/ do |*args| 
-      NetuitiveRubyAPI::aggregator.aggregateMetric("action_view.render_partial", 1)
+      NetuitiveRubyAPI::netuitivedServer.aggregateMetric("action_view.render_partial", 1)
     end
   end
 end

data/lib/netuitive/active_job.rb

@@ -1,10 +1,10 @@
 module NetuitiveActiveJobSub
   def self.subscribe
     ActiveSupport::Notifications.subscribe /enqueue.active_job/ do |*args| 
-      NetuitiveRubyAPI::aggregator.aggregateMetric("active_job.enqueue", 1)
+      NetuitiveRubyAPI::netuitivedServer.aggregateMetric("active_job.enqueue", 1)
     end
     ActiveSupport::Notifications.subscribe /perform.active_job/ do |*args| 
-      NetuitiveRubyAPI::aggregator.aggregateMetric("active_job.perform", 1)
+      NetuitiveRubyAPI::netuitivedServer.aggregateMetric("active_job.perform", 1)
     end
   end
 end  

data/lib/netuitive/active_record.rb

@@ -1,11 +1,11 @@
 module NetuitiveActiveRecordSub
   def self.subscribe
     ActiveSupport::Notifications.subscribe /instantiation.active_record/ do |*args| 
-      NetuitiveRubyAPI::aggregator.aggregateMetric("active_record.instantiation", 1)
+      NetuitiveRubyAPI::netuitivedServer.aggregateMetric("active_record.instantiation", 1)
     end
     
     ActiveSupport::Notifications.subscribe /sql.active_record/ do |*args| 
-      NetuitiveRubyAPI::aggregator.aggregateMetric("active_record.sql.statement", 1)
+      NetuitiveRubyAPI::netuitivedServer.aggregateMetric("active_record.sql.statement", 1)
     end
   end
 end

data/lib/netuitive/active_support.rb

@@ -1,19 +1,19 @@
 module NetuitiveActiveSupportSub
   def self.subscribe
     ActiveSupport::Notifications.subscribe /cache_read.active_support/ do |*args| 
-      NetuitiveRubyAPI::aggregator.aggregateMetric("active_support.cache_read", 1)
+      NetuitiveRubyAPI::netuitivedServer.aggregateMetric("active_support.cache_read", 1)
     end
     ActiveSupport::Notifications.subscribe /cache_generate.active_support/ do |*args| 
-      NetuitiveRubyAPI::aggregator.aggregateMetric("active_support.cache_generate", 1)
+      NetuitiveRubyAPI::netuitivedServer.aggregateMetric("active_support.cache_generate", 1)
     end
     ActiveSupport::Notifications.subscribe /cache_fetch_hit.active_support/ do |*args| 
-      NetuitiveRubyAPI::aggregator.aggregateMetric("active_support.cache_fetch_hit", 1)
+      NetuitiveRubyAPI::netuitivedServer.aggregateMetric("active_support.cache_fetch_hit", 1)
     end
     ActiveSupport::Notifications.subscribe /cache_write.active_support/ do |*args| 
-      NetuitiveRubyAPI::aggregator.aggregateMetric("active_support.cache_write", 1)
+      NetuitiveRubyAPI::netuitivedServer.aggregateMetric("active_support.cache_write", 1)
     end
     ActiveSupport::Notifications.subscribe /cache_delete.active_support/ do |*args| 
-      NetuitiveRubyAPI::aggregator.aggregateMetric("active_support.cache_delete", 1)
+      NetuitiveRubyAPI::netuitivedServer.aggregateMetric("active_support.cache_delete", 1)
     end
   end
 end 

data/lib/netuitive/rails_config_manager.rb

@@ -1,7 +1,5 @@
 class ConfigManager
 
-	attr_accessor :interval
-
 	def initialize()
 		@error=0
 		@info=1
@@ -33,7 +31,6 @@ class ConfigManager
 	def readConfig()
 		gem_root= File.expand_path("../../..", __FILE__)
 		data=YAML.load_file "#{gem_root}/config/agent.yml"
-		@interval=data["interval"]
 		debugLevelString=data["debugLevel"]
 		if debugLevelString == "error"
 			@debugLevel=@error
@@ -47,7 +44,6 @@ class ConfigManager
 
 		if isDebug?
 			puts "read config file. Results: 
-			interval: #{interval}
 			debugLevel: #{debugLevelString}"
 		end
 	end

data/lib/netuitive_rails_agent.rb

@@ -1,6 +1,5 @@
 require 'netuitive_ruby_api'
 require 'active_support/all'
-require 'netuitive/scheduler'
 require 'netuitive/action_controller'
 require 'netuitive/active_record'
 require 'netuitive/action_view'
@@ -14,5 +13,3 @@ NetuitiveActionViewSub::subscribe
 NetuitiveActionMailer::subscribe
 NetuitiveActiveSupportSub::subscribe
 NetuitiveActiveJobSub::subscribe
-scheduler = Scheduler.new
-scheduler.startSchedule

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: netuitive_rails_agent
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - John King
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2015-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netuitive_ruby_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.0
 description: Automatically generates Rails metrics for submission to Netuitive's API
@@ -37,10 +37,9 @@ files:
 - lib/netuitive/active_record.rb
 - lib/netuitive/active_support.rb
 - lib/netuitive/rails_config_manager.rb
-- lib/netuitive/scheduler.rb
 - lib/netuitive_rails_agent.rb
 - config/agent.yml
-- ./LICENSE
+- "./LICENSE"
 homepage: http://rubygems.org/gems/netuitive_rails_agent
 licenses:
 - Apache v2.0
@@ -51,12 +50,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []

data/lib/netuitive/scheduler.rb

@@ -1,16 +0,0 @@
-require 'netuitive/rails_config_manager'
-class Scheduler
-
-	def initialize
-		@configManager=ConfigManager.new
-	end
-
-	def startSchedule
-		Thread.new do
-  			while true do
-  				sleep(@configManager.interval)
-    			NetuitiveRubyAPI::aggregator.sendMetrics
-  			end
-		end
-	end
-end