apminsight 1.0.1 → 1.8.2

data/lib/agent/server/instrument/am_instrumenter.rb

@@ -1,43 +1,55 @@
-require 'agent/am_objectholder'
-require 'socket'
-module ManageEngine
-	class APMInstrumenter
-	@t =nil;
-	def initialize
-		@obj=ManageEngine::APMObjectHolder.instance
-	end
+##
+##  This is Rails framework specific tracking mechanism, they are moved to multiple files for separate tracking
+##
 
-	def doSubscribe
-		@obj=ManageEngine::APMObjectHolder.instance
-		@obj.log.debug "[ instrumenter ] [ Subscriber for Agent ]"
-		@subscriber = ActiveSupport::Notifications.subscribe  do |name, start, finish, id, payload|
-		if(ManageEngine::APMObjectHolder.instance.config.agent_enabled)
-			rt = (finish-start).to_i
-			 ManageEngine::APMWorker.getInstance.start
-			ManageEngine::APMObjectHolder.instance.log.debug "[ Notifications for Agent ] #{Thread.current} #{id} #{name} - #{rt} - #{payload}"
-			trace= caller;
-			id = "#{Thread.current}"
-			stats = Hash.new
-			stats["name"] = name;
-			stats["start"] = start.to_f * 1000;
-			stats["end"] = finish.to_f * 1000;
-			stats["id"] = id;
-			stats["payload"] = payload;
-			if (name=="sql.active_record" && (finish-start)>=(ManageEngine::APMObjectHolder.instance.config.sql_trace_t * 1000 ).to_i)
-				stats["trace"] = trace;
-			end
-			stats["ctime"] =ManageEngine::APMObjectHolder.instance.util.currenttimemillis;
-			ManageEngine::APMObjectHolder.instance.collector.updateTransaction(id,stats);
-		else
-			ActiveSupport::Notifications.unsubscribe @subscriber
-				@obj.log.info "[ instrumenter ] [ RETURNING NO METRICS] "
-		end
-		end
-	end
-
-	def doUnSubscribe
-		ActiveSupport::Notifications.unsubscribe @subscriber
-	end
-
-end #class
-end#module
+#require 'agent/am_objectholder'
+#require 'socket'
+#module ManageEngine
+#	class APMInstrumenter
+#	@t =nil;
+#	def initialize
+#		@obj=ManageEngine::APMObjectHolder.instance
+#	end
+#
+#	def doSubscribe
+#		@obj=ManageEngine::APMObjectHolder.instance
+#		@obj.log.debug "[ instrumenter ] [ Subscriber for Agent ]"
+#		@subscriber = ActiveSupport::Notifications.subscribe  do |name, start, finish, id, payload|
+#		if(ManageEngine::APMObjectHolder.instance.config.agent_enabled)
+#			#rt = (finish-start).to_i
+#			 ManageEngine::APMWorker.getInstance.start
+#			ManageEngine::APMObjectHolder.instance.log.debug "[ Notifications for Agent ] #{Thread.current} #{id} #{name} - #{payload[:path]}"
+#			#trace= caller;
+#			#puts ">>> Threadlocal var : #{Thread.current[:apminsight]}"
+#			if name=="sql.active_record"
+#			  #Thread.current[:apminsight] = "#{Thread.current[:apminsight]} + #{payload[:sql]}"
+#			  if payload[:name] != "SCHEMA"
+#          @obj.log.debug ">>>>>>>> SQL: #{payload[:sql]}"
+#			  end
+#			  @obj.log.debug "~~~~~ SQL Payload: #{payload}"
+#			end
+#			id = "#{Thread.current}"
+#			stats = Hash.new
+#			stats["name"] = name;
+#			stats["start"] = start.to_f * 1000;
+#			stats["end"] = finish.to_f * 1000;
+#			stats["id"] = id;
+#			stats["payload"] = payload;
+#			if (name=="sql.active_record" && (finish.to_f - start.to_f)>=(ManageEngine::APMObjectHolder.instance.config.sql_trace_t).to_f)
+#				stats["trace"] = caller(20); # Taking stacktrace of depth 20
+#			end
+#			stats["ctime"] =ManageEngine::APMObjectHolder.instance.util.currenttimemillis;
+#			ManageEngine::APMObjectHolder.instance.collector.updateTransaction(id,stats);
+#		else
+#			ActiveSupport::Notifications.unsubscribe @subscriber
+#				@obj.log.info "[ instrumenter ] [ RETURNING NO METRICS] "
+#		end
+#		end
+#	end
+#
+#	def doUnSubscribe
+#		ActiveSupport::Notifications.unsubscribe @subscriber
+#	end
+#
+#end #class
+#end#module

data/lib/agent/server/instrument/environment.rb

@@ -0,0 +1,42 @@
+require 'agent/server/instrument/rails'
+require 'agent/server/instrument/sinatra'
+require 'agent/server/instrument/active_record'
+require 'agent/server/instrument/action_view'
+
+module ManageEngine
+  class Environment
+    
+    SUPPORTED_FRAMEWORKS = [
+        ManageEngine::Instrumentation::RailsFramework.new,
+        ManageEngine::Instrumentation::SinatraFramework.new
+    ]
+    
+    DATABASE_INTERCEPTORS = [
+        ManageEngine::Instrumentation::ActiveRecordSQL.new
+    ]
+    
+    OTHER_INTERCEPTORS = [
+        ManageEngine::Instrumentation::ActionView.new
+    ]
+    
+    def detect_and_instrument
+      @framework ||= SUPPORTED_FRAMEWORKS.detect{ |framework| framework.present? }
+      if (@framework != nil)
+        @framework.instrument
+      end
+      
+      DATABASE_INTERCEPTORS.each do |interceptor|
+        if (interceptor.present?)
+          interceptor.instrument
+        end
+      end
+      
+      OTHER_INTERCEPTORS.each do |interceptor|
+        if (interceptor.present?)
+          interceptor.instrument
+        end
+      end
+    end
+    
+  end
+end

data/lib/agent/server/instrument/rails.rb

@@ -0,0 +1,56 @@
+require 'agent/handler/tracker_handler'
+
+module ManageEngine
+  module Instrumentation
+    class RailsFramework
+      
+      def present?
+        defined?(::Rails) && defined?(::ActionController)
+      end
+      
+      def version
+        Rails::VERSION::STRING
+      end
+      
+      def env
+        if Rails::VERSION::MAJOR >= 3 
+          ::Rails.env
+        else
+          RAILS_ENV.dup
+        end
+      end
+      
+      def name
+        'Rails'
+      end
+      
+      def instrument
+        @obj = ManageEngine::APMObjectHolder.instance
+        @obj.log.info "Instrumenting ActionController.. Rails Version: #{version}"
+        @railsTracker = nil
+        
+        ActiveSupport::Notifications.subscribe('start_processing.action_controller') do |name, start, finish, id, payload|
+          path = payload[:path].partition("?")[0]
+          @railsTracker = ManageEngine::Tracker::RootTracker.new("#{payload[:controller]}.#{payload[:action]}", start.to_f * 1000)
+          @railsTracker.url=(path)
+          @railsTracker = ManageEngine::Agent::TrackerHandler.invokeTracker(@railsTracker)
+        end # subscribe
+        
+        
+        ActiveSupport::Notifications.subscribe('process_action.action_controller') do |name, start, finish, id, payload|
+          if @railsTracker != nil
+            @railsTracker.finish(finish.to_f * 1000)
+            exception = payload[:exception_object]
+            if exception != nil
+              @railsTracker.setError(exception)
+              @railsTracker.setStatus(500) # By default, set 500 as status for error txns
+            end
+            ManageEngine::Agent::TrackerHandler.exitTracker(@railsTracker)
+          end
+        end
+        
+      end # def instrument
+      
+    end
+  end
+end

data/lib/agent/server/instrument/sinatra.rb

@@ -0,0 +1,97 @@
+require 'agent/am_objectholder'
+require 'agent/trackers/root_tracker'
+
+module ManageEngine
+  module Instrumentation
+    class SinatraFramework
+      
+      def present?
+        defined?(::Sinatra) && defined?(::Sinatra::Base)
+      end
+      
+      def version
+        ::Sinatra::VERSION
+      end
+      
+      def env
+        ENV['RACK_ENV'] || ENV['RAILS_ENV'] || 'development'
+      end
+      
+      def name
+        'Sinatra'
+      end
+      
+      def instrument
+        ManageEngine::APMObjectHolder.instance.log.info "Instrumenting Sinatra framework. Version: #{version}"
+        ::Sinatra::Base.class_eval do
+          include ManageEngine::Instrumentation::APMInsightSinatra
+          
+          alias original_route_eval route_eval
+          alias route_eval apminsight_route_eval
+          
+#          alias sinatra_exception_handler! handle_exception!
+#          alias handle_exception! apminsight_exception_handler!
+          
+        end # class_eval
+      end # def instrument
+      
+    end # class Sinatra
+    
+    module APMInsightSinatra
+              
+      def apminsight_route_eval(*args, &block)
+        
+        # http://www.rubydoc.info/github/rack/rack/master/Rack/Request
+        url = (env.has_key?('sinatra.route') ? env['sinatra.route'] : @request.path).dup
+        @obj = ManageEngine::APMObjectHolder.instance
+        
+        sinatraTracker = ManageEngine::Tracker::RootTracker.new(url)
+        sinatraTracker.url=(url)
+        sinatraTracker = ManageEngine::Agent::TrackerHandler.invokeTracker(sinatraTracker)
+        
+        # TODO: capture all additional details @request.query_string @request.params
+        
+        begin
+          original_route_eval(*args, &block)
+        
+        rescue Exception => e  # On application error, above method throws exception
+          if (sinatraTracker != nil)
+            sinatraTracker.setError(e)
+            sinatraTracker.setStatus(500) # By default, set 500 as status for error txns
+          end
+          raise e
+        
+        ensure
+          if sinatraTracker != nil
+            sinatraTracker.finish
+          end
+          ManageEngine::Agent::TrackerHandler.exitTracker(sinatraTracker)
+        end
+        
+      end
+      
+#      def apminsight_exception_handler!(*args, &block)
+#        begin
+#          sinatra_exception_handler!(*args, &block)
+#        ensure
+#          tracker = Thread.current[:apminsight]
+#          puts "tracker is #{(tracker == nil)}"
+#          if tracker != nil
+#            tracker.error(args[0]) # Other way, env[sinatra.error]
+#            tracker.status(@response.status)
+#            finishTracker tracker
+#          end #if
+#        end#begin
+#      end#def
+#      
+#      def finishTracker(tracker)
+#        tracker.finish
+#        #ManageEngine::APMObjectHolder.instance.collector.updateTransaction(id,stats)
+#        puts tracker.to_s
+#        Thread.current[:apminsight] = nil
+#      end
+      
+    end # module SinatraFramework
+    
+  end # module Instrumentation
+end

data/lib/agent/server/worker/am_worker.rb

@@ -7,46 +7,63 @@ class APMWorker
 	@status = 'not_init'
 	@id = 0
 	attr_accessor :id
-        def initialize
-                @status = "initialized"
-                @id = Process.pid
-        end
-
-        def start
-                @obj = ManageEngine::APMObjectHolder.instance
-
-				if @status=="working"
-                    @obj.log.debug "woker thread already started"
-                elsif @status == "initialized"
-                	@obj.log.info "start worker thread for - #{Process.pid} :: #{@status}  "
-	                #@obj.log.info "Starting APMWorker Thread #{Process.pid} "
-    	            @apm = Thread.new do
-                            @status  = 'working'
-        	                while !@obj.shutdown do
-								checkforagentstatus
-								updateConfig
-                                dc
-								sleep (@obj.config.connect_interval).to_i
-            	            end#w
-                            @status= "end"
-             	            @obj.log.debug "Worker thread ends"
-                	end
-                end
-        end
+    def initialize
+      @status = "initialized"
+      @id = Process.pid
+    end
 
-        def self.getInstance
-			if(@work==nil || @work.id!=Process.pid)
-            	@work = ManageEngine::APMWorker.new
-            end
-            return @work
+    def start
+      @obj = ManageEngine::APMObjectHolder.instance
+    
+    	if @status=="working"
+        @obj.log.debug "woker thread already started"
+      elsif @status == "initialized"
+        @obj.log.info "start worker thread for - #{Process.pid} :: #{@status}  "
+        #@obj.log.info "Starting APMWorker Thread #{Process.pid} "
+        @apm = Thread.new do
+          @status  = 'working'
+      	  while !@obj.shutdown do
+      	    checkforagentstatus
+    				updateConfig
+            dc
+    				sleep (@obj.config.connect_interval).to_i
+          end#w
+          @status= "end"
+          @obj.log.debug "Worker thread ends"
         end
+      end
+    end
+    
+    def self.getInstance
+      if(@work==nil || @work.id!=Process.pid)
+       	@work = ManageEngine::APMWorker.new
+      end
+      return @work
+    end
 
 		def updateConfig
 			if(@obj.config.lastupdatedtime!=File.mtime(@obj.constants.apm_conf).to_i)
-					@obj.log.info "Configuration File Changed... So Updating Configuration."
+				@obj.log.info "Configuration File Changed... So Updating Configuration."
+				agent_config_data = @obj.config.getAgentConfigData
 				@obj.config.lastupdatedtime=File.mtime(@obj.constants.apm_conf).to_i
 				@obj.config.configureFile
 				@obj.config.assignConfig
+				new_agent_config_data = @obj.config.getAgentConfigData
+				sendUpdate = "false"
+				agent_config_data.each do|key,value|
+					if key != "last.modified.time"
+						newValue = new_agent_config_data[key]
+						if value != newValue
+							sendUpdate = "true"
+						end
+					end
+				end
+				if sendUpdate == "true"
+					@obj.log.info "sending update to server #{new_agent_config_data}"
+					data1 =  Hash.new
+					data1["custom_config_info"]=new_agent_config_data
+ 	       			        resp = @obj.connector.post @obj.constants.connect_config_update_uri+@obj.config.instance_id,data1
+				end
 			end
 		end
 		
@@ -57,12 +74,12 @@ class APMWorker
 				@obj.log.info "Agent in Disabled State."
 				if prevState
 					@obj.log.info "Agent in Disabled State. Going to unsubscribe"
-					@obj.instrumenter.doUnSubscribe
+#					@obj.instrumenter.doUnSubscribe
 				end
 			else
 				if !prevState
 					@obj.log.info "Agent in Active State."
-					@obj.instrumenter.doSubscribe
+#					@obj.instrumenter.doSubscribe
 				end
 			end
 		end
@@ -126,14 +143,18 @@ class APMWorker
                                 tdata.concat(val[0])
                         when 2
                                 tdata.concat(val[0])
-                                trdata.concat(val[1])
+                                if (trdata.size < @obj.config.trace_overflow_t)
+                                  trdata.concat(val[1])
+                                end
                         end
                 end
                 result.push(merge(tdata))
                 resp = @obj.connector.post @obj.constants.connect_data_uri+@obj.config.instance_id,result
+                @obj.log.info "#{tdata.size} metric(s) dispatched."
                 if trdata.size>0
                         result[2]=trdata;
                         resp = @obj.connector.post @obj.constants.connect_trace_uri+@obj.config.instance_id,result
+                        @obj.log.info "#{trdata.size} trace(s) dispatched."
                 end
         end
 
@@ -149,7 +170,7 @@ class APMWorker
         def send_save data
                 begin
                 	if FileTest.exist?(@obj.constants.agent_lock)
-                        if Time.now.to_i - File.mtime(@obj.constants.agent_lock).to_i > (@obj.config.connect_interval).to_i
+                        if Time.now.to_i - File.mtime(@obj.constants.agent_lock).to_i >= (@obj.config.connect_interval).to_i
                                 @obj.log.debug "worker send signal"
                                 senddata data
                         else
@@ -172,7 +193,11 @@ class APMWorker
 			    f.flock(File::LOCK_EX)
             	begin
                		f.each_line do |line|
-	    			data.push(JSON.parse(line))
+               		   begin
+               		     data.push(JSON.parse(line))
+               		   rescue Exception=>ex
+               		     @obj.log.logException "Error Parsing data, Skipping line #{line}", ex
+               		   end
               		end
 			       f.truncate 0
           		rescue Exception=>e
@@ -223,18 +248,36 @@ class APMWorker
 
 
 		def mapdx res,dat
-			res[0] = res[0]+dat[0];
-			if dat[1]<res[1]
-				res[1]=dat[1]
-			end
-			if dat[2]>res[2]
-				res[2]=dat[2]
-			end
-			res[3] = res[3]+dat[3]
-			res[5] = res[5]+dat[5]
-			res[6] = res[6]+dat[6]
-			res[7] = res[7]+dat[7]
-			res[4] = (res[5].to_f + (res[6].to_f/2).to_f).to_f/res[3].to_f
+		  begin
+  		  rtData = res[0];
+  			rtData[0] = rtData[0]+dat[0][0];
+  			if dat[0][1]<rtData[1]
+  			  rtData[1]=dat[0][1]
+  			end
+  			if dat[0][2]>rtData[2]
+  			  rtData[2]=dat[0][2]
+  			end
+  			rtData[3] = rtData[3]+dat[0][3]
+  			rtData[5] = rtData[5]+dat[0][5]
+  			rtData[6] = rtData[6]+dat[0][6]
+  			rtData[7] = rtData[7]+dat[0][7]
+  			rtData[4] = rtData[3] != 0 ? (rtData[5].to_f + (rtData[6].to_f/2).to_f).to_f/rtData[3].to_f : 0
+  			res[0] = rtData
+  			
+  			resExcepData = res[1][@obj.constants.mf_logmetric]
+  			excepData = dat[1][@obj.constants.mf_logmetric]
+  			if (resExcepData == nil)
+  			    resExcepData = excepData
+  			else
+  			  if (excepData != nil)
+  			    resExcepData = resExcepData.merge(excepData){|key, oldval, newval| newval + oldval}
+  			  end
+  			end
+  			
+  			res[1][@obj.constants.mf_logmetric] = resExcepData != nil ? resExcepData : Hash.new
+  			rescue Exception=>e
+  			  @obj.log.logException "Exception while merging data",e
+  			end
 			res
 		end
 
@@ -247,6 +290,7 @@ class APMWorker
 				res[2]=dat[2]
 			end
 			res[3] = res[3]+dat[3]
+			res[4] = res[4]+dat[4]
 			res
 		end