site24x7_apminsight 1.5.3 → 1.6.0

data/lib/agent/metrics/am_metricsparser.rb

@@ -12,37 +12,34 @@ module ManageEngine
 			@obj = ManageEngine::APMObjectHolder.instance
 			parseddata = Hash.new
 			begin
-				data.each do |txn_name, trackers|
+				data.each do |txn_name, seqBag|
 					@obj.log.debug "[Processing started for - #{txn_name} ]"
 					
-					trackers.each do |tracker|
+					seqBag.each do |seqData|
 					  
             tdata = Hash.new #transaction data -> rt, path,..
             exceptionInfo = Array.new # data to be sent in trace as 'loginfo'
 					  
-					  tdata["td"] = getTransData(tracker,tdata)
-					  
-					  children = tracker.children
-					  if (children != nil)
-					    children.each do |child|
-					      
-					      if child.kind_of?(ManageEngine::Tracker::DatabaseTracker)
-					        tdata["db"] = getDBData(child, tdata)
-					      end
-					      
-					      updateExceptionInfo(child,exceptionInfo)
-					    end # do - children
+            rootTracker = seqData["roottracker"]
+            
+					  tdata["td"] = getTransData(rootTracker,tdata)
+					  tdata["db"] = getDBData(rootTracker, tdata, exceptionInfo)
+            
+					  exceptionBag = seqData["exceptions"]
+					  if exceptionBag != nil
+					    exceptionBag.each do |exceptionRecord|
+					      updateExceptionMetric(exceptionRecord.exception,tdata)
+					      updateExceptionInfo(exceptionInfo, exceptionRecord.time, exceptionRecord.exception, exceptionRecord.message)
+					    end
 					  end
 					  
-					  updateExceptionInfo(tracker, exceptionInfo) # Updating roottracker exception, if any
-					  
-            parseddata = updateParsedData(txn_name, tdata.dup, parseddata)
+					  parseddata = updateParsedData(txn_name, tdata.dup, parseddata)
             
-            if @obj.config.trans_trace && (tracker.duration >= (@obj.config.trans_trace_t.to_f*1000).to_i || tracker.error?)
-              parseddata = updateTraceData(tracker, parseddata, exceptionInfo)
+            if @obj.config.trans_trace && (rootTracker.duration >= (@obj.config.trans_trace_t.to_f*1000).to_i || rootTracker.error?)
+              parseddata = updateTraceData(rootTracker, parseddata, exceptionInfo)
             end
             
-					end # do - trackers
+					end # do - seqBag
 					
 					@obj.store.removeData txn_name
 					@obj.log.debug "[Processing END for - #{txn_name} ]"
@@ -56,15 +53,13 @@ module ManageEngine
 			parseddata
 		end
 
-		def updateExceptionInfo (tracker, exceptionInfo)
-      if tracker.error?
-      logInfo = { @obj.constants.mf_loginfo_time => tracker.endtime.to_i,
+		def updateExceptionInfo (exceptionInfo, time, error, message = nil)
+      logInfo = { @obj.constants.mf_loginfo_time => time,
                     @obj.constants.mf_loginfo_level => @obj.constants.mf_loginfo_level_warn,
-                    @obj.constants.mf_loginfo_str => tracker.error.message,
-                    @obj.constants.mf_loginfo_err_clz => tracker.error.class.to_s,
-                    @obj.constants.mf_loginfo_st => @obj.util.formatStacktrace(tracker.error.backtrace) }
-        exceptionInfo.push(logInfo)
-      end
+                    @obj.constants.mf_loginfo_str => message != nil ? message : error.message,
+                    @obj.constants.mf_loginfo_err_clz => error.class.to_s,
+                    @obj.constants.mf_loginfo_st => @obj.util.formatStacktrace(error.backtrace) }
+      exceptionInfo.push(logInfo)
 		end
 		
 		def updateParsedData (key, tdata, parseddata)
@@ -98,7 +93,7 @@ module ManageEngine
 			end
 			begin
 			trdata = getTrace(rootTracker)
-			trac = updateTrace(trdata, exceptionInfo)
+			trac = updateTrace(rootTracker.url, trdata, exceptionInfo)
 			if(parseddata.has_key?("trace-data"))
 				traceData = parseddata["trace-data"];
 				traceData.push(trac);
@@ -139,10 +134,9 @@ module ManageEngine
   				ret = tdata["td"]
   				ret["rt"] = ret["rt"] + rootTracker.duration
   			else
-  				ret = {"rt"=> rootTracker.duration, "path"=>rootTracker.name}
+  				ret = {"rt"=> rootTracker.duration, "path"=>rootTracker.url}
   				if (rootTracker.error?)
   				  ret["error"] = true
-  				  updateExceptionMetric(rootTracker.error, ret)
   				end
   			end
 			rescue Exception=>e
@@ -153,24 +147,36 @@ module ManageEngine
 		end
 
 		# Generates DB metric
-		def getDBData(databaseTracker, tdata)
-		  dbData = tdata["db"]
-		  if dbData == nil
-		    dbData = Array.new
-		  end
+		def getDBData(tracker, tdata, exceptionInfo)
+		  while (tracker != nil)
+		    dbData = getDBData(tracker.child, tdata, exceptionInfo)
+		    
+		    if tracker.kind_of?(ManageEngine::Tracker::DatabaseTracker)
+          if dbData == nil
+            dbData = Array.new
+          end
+          
+          queryInfo = tracker.getQueryInfo
+          sqlStrip = queryInfo[0] + "/" + queryInfo[1] + "/dummydb"
+    
+          ret ={"rt"=>tracker.duration, "sql"=>tracker.getRawQuery,
+                "sql-strip"=>sqlStrip, "name"=>tracker.name, "operation"=>queryInfo[0]}
+          
+          if (tracker.error?)
+            ret["error"] = true
+          end
+          
+          dbData.push(ret)
+		    end ## DBTracker check
+		    
+		    if (tracker.error?)
+          updateExceptionMetric(tracker.error, tdata) # <= previously it was 'ret'
+          updateExceptionInfo(exceptionInfo, tracker.endtime.to_i, tracker.error)
+		    end
+		    
+		    tracker = tracker.sibling
+		  end ## while loop
 		  
-			queryInfo = databaseTracker.getQueryInfo
-			sqlStrip = queryInfo[0] + "/" + queryInfo[1] + "/dummydb"
-
-			ret ={"rt"=>databaseTracker.duration, "sql"=>databaseTracker.getRawQuery,
-			      "sql-strip"=>sqlStrip, "name"=>databaseTracker.name, "operation"=>queryInfo[0]}
-			
-			if (databaseTracker.error?)
-			  ret["error"] = true
-        updateExceptionMetric(databaseTracker.error, ret)
-			end
-			
-			dbData.push(ret)
 			dbData
 		end
 
@@ -185,48 +191,10 @@ module ManageEngine
 		  excData[@obj.constants.mf_logmetric_warning] = excData[@obj.constants.mf_logmetric_warning].to_i + 1
 		end
 		
-		def updateDBTrace(dbTracker)
-			trData = Array.new
-			trData[0] = dbTracker.starttime
-			queryInfo = dbTracker.getQueryInfo
-			trData[1] = queryInfo[0] + " - " + queryInfo[1]
-			trData[2] = ""
-			trData[3] = dbTracker.duration.to_i
-			trData[4] = trData[3]
-      trData[5] = dbTracker.getAdditionalInfo
-			trData[6] = Array.new
-			trData
-		end
-
-		def updateOtherTrace(tracker)
-			trData = Array.new
-			trData[0] = tracker.starttime
-			trData[1] = tracker.name
-			trData[2]  = ""
-			trData[3] = tracker.duration
-			trData[4] = tracker.duration
-			trData[5] = tracker.getAdditionalInfo
-			trData[6] = Array.new
-			trData
-		end
-
-		def updateStartTrace(rootTracker)
-			trData = Array.new
-			trData[0] = rootTracker.starttime
-			trData[1] = rootTracker.name  # tracker name
-			trData[2] = "" # component
-			trData[3] = rootTracker.duration # total time
-			trData[4] = trData[3]  # exclusive time
-			trData[5] = rootTracker.getAdditionalInfo  # additional info
-			trData[6] = Array.new # children
-
-			trData
-		end
-
-		def updateTrace(trans, exceptionInfo)
+		def updateTrace(url, trans, exceptionInfo)
 #			{"thread_name":"http-8080-6","s_time":1326276180289,"t_name":"transaction\/http\/Test-App\/login","r_time":18,"thread_id":141}
 			top =  Array.new
-			path = @obj.constants.mf_transaction + @obj.constants.mf_separator + trans[1]
+			path = @obj.constants.mf_transaction + @obj.constants.mf_separator + url
 			det = {"thread_name"=>"rorthread","s_time"=>trans[0],"t_name"=>path,"r_time"=>trans[3],"thread_id"=>141}
 			
 			exception = trans[5] != nil ? trans[5][@obj.constants.mf_exception_st] : nil
@@ -244,31 +212,43 @@ module ManageEngine
 		end
 		
 		def getTrace(rootTracker)
-				tdata = traceDetails(rootTracker)
-				tdata = updateExclusiveTrace(tdata)
-				tdata
+		  trace = Array.new
+		  traceDetails(rootTracker, trace)
+		  
+		  return trace[0]
 		end
 
-		def traceDetails rootTracker
+		def traceDetails tracker, traceArr
 		  
-		  traceArr = updateStartTrace(rootTracker)
+		  siblingDuration = 0
 		  
-		  children = rootTracker.children
-		  if (children != nil)
-		    children.each do |child|
-		      
-		      if child.kind_of?(ManageEngine::Tracker::DatabaseTracker)
-		        dbTrace = updateDBTrace(child)
-		        traceArr[6].push(dbTrace)
-		      else
-		        trace = updateOtherTrace(child)
-		        traceArr[6].push(trace)
-		      end
-		      
-		    end # do - children
-		  end # if children
+		  while tracker != nil
+		    
+		    childTrace = Array.new
+		    childDuration = traceDetails tracker.child, childTrace
+		    
+		    traceItem = Array.new
+		    traceItem[0] = tracker.starttime
+		    if tracker.kind_of?(ManageEngine::Tracker::DatabaseTracker)
+          queryInfo = tracker.getQueryInfo
+          traceItem[1] = queryInfo[0] + " - " + queryInfo[1]
+        else
+          traceItem[1] = tracker.name
+		    end
+		    traceItem[2] = ""
+		    traceItem[3] = tracker.duration
+        traceItem[4] = tracker.duration - childDuration
+        traceItem[5] = tracker.getAdditionalInfo
+		    traceItem[6] = childTrace.empty? ? nil : childTrace
+		    
+		    traceArr.push(traceItem)
+		    
+		    siblingDuration += tracker.duration
+		    
+		    tracker = tracker.sibling
+		  end
 		  
-		  traceArr
+		  return siblingDuration
 		end
 
 

data/lib/agent/metrics/exception_record.rb

@@ -0,0 +1,24 @@
+module APMInsight
+  module Errors
+    class ExceptionRecord
+      
+      attr_reader :time, :message, :exception
+      
+      def initialize(exception, time = Time.now)
+        @time = time.to_f * 1000;
+        @message = exception.message
+        @exception = exception
+      end
+      
+      def ==(obj)
+        return obj != nil && @exception == obj.exception
+      end
+      
+      def hash
+        return @exception.hash
+      end
+      
+      
+    end
+  end
+end

data/lib/agent/server/am_connector.rb

@@ -126,7 +126,7 @@ module ManageEngine
 		end
 
 		def responseParser resp
-			if resp == Net::HTTPSuccess || Net::HTTPOK
+			if resp.kind_of? Net::HTTPOK
 				rawData = resp.body
 				if rawData.length>=2
 					rBody = JSON.parse(rawData)

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

@@ -0,0 +1,64 @@
+require 'agent/am_objectholder'
+require 'agent/trackers/default_tracker'
+require 'agent/handler/tracker_handler'
+
+module ManageEngine
+  module Instrumentation
+    class ActionView
+      
+      def present?
+        defined?(::Rails)
+      end
+      
+      def name
+        'ActiveView'
+      end
+      
+      def instrument
+        @obj = ManageEngine::APMObjectHolder.instance
+        @obj.log.info "Instrumenting ActiveRecord"
+        
+        ActiveSupport::Notifications.subscribe('render_template.action_view') do |name, start, finish, id, payload|
+          collect_data(name, start, finish, payload)
+        end ## subscribe
+        
+        ActiveSupport::Notifications.subscribe('render_partial.action_view') do |name, start, finish, id, payload|
+          collect_data(name, start, finish, payload)
+        end ## subscribe
+        
+        ActiveSupport::Notifications.subscribe('render_collection.action_view') do |name, start, finish, id, payload|
+          collect_data(name, start, finish, payload)
+        end ## subscribe
+        
+      end  ## def instrument
+      
+      def collect_data(name, start, finish, payload)
+        begin
+          
+          if name != 'render_template.action_view'
+            name = "Partial # #{payload[:identifier]}"
+          else
+            name = "Rendering # #{payload[:identifier]}"
+          end
+          
+          tracker = ManageEngine::Tracker::DefaultTracker.new(name, start.to_f * 1000)
+          tracker = ManageEngine::Agent::TrackerHandler.invokeTracker(tracker)
+          
+          if tracker != nil
+            tracker.finish(finish.to_f * 1000)
+            
+            exception = payload[:exception_object]
+            if exception != nil
+              tracker.setError(exception)
+            end
+            
+            ManageEngine::Agent::TrackerHandler.exitTracker(tracker)
+          end
+        rescue Exception => e
+          @obj.log.logException("Error processing #{name} payload", e)
+        end
+      end ## def collect_data
+      
+    end ## class ActionView
+  end
+end

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

@@ -1,5 +1,6 @@
 require 'agent/am_objectholder'
 require 'agent/trackers/database_tracker'
+require 'agent/handler/tracker_handler'
 
 module ManageEngine
   module Instrumentation
@@ -19,15 +20,16 @@ module ManageEngine
         
         ActiveSupport::Notifications.subscribe('sql.active_record') do |name, start, finish, id, payload|
           begin 
-            if @obj.config.agent_enabled && @obj.config.sql_capture && payload[:name] != "SCHEMA" # Dropping internal schema related queries
-              tracker = Thread.current[:apminsight]
-              if tracker != nil
-                dbTracker = ManageEngine::Tracker::DatabaseTracker.new(payload[:name], start.to_f * 1000)
-                dbTracker.sql(payload[:sql])
-                dbTracker.params(payload[:binds])
+            if @obj.config.sql_capture && payload[:name] != "SCHEMA" # Dropping internal schema related queries
+              dbTracker = ManageEngine::Tracker::DatabaseTracker.new(payload[:name], start.to_f * 1000)
+              dbTracker.sql(payload[:sql])
+              dbTracker.params(payload[:binds])
+              dbTracker = ManageEngine::Agent::TrackerHandler.invokeTracker(dbTracker)
+              
+              if dbTracker != nil
                 dbTracker.finish(finish.to_f * 1000)
                 
-                if dbTracker.duration >= @obj.config.sql_trace_t.to_f
+                if dbTracker.duration >= (@obj.config.sql_trace_t.to_f * 1000)
                   dbTracker.sqlBacktrace(caller(10))
                 end
                 
@@ -36,7 +38,7 @@ module ManageEngine
                   dbTracker.setError(exception)
                 end
                 
-                tracker.addChild(dbTracker)
+                ManageEngine::Agent::TrackerHandler.exitTracker(dbTracker)
               end
             end
           rescue Exception => e

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

@@ -1,6 +1,7 @@
 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
@@ -14,6 +15,10 @@ module ManageEngine
         ManageEngine::Instrumentation::ActiveRecordSQL.new
     ]
     
+    OTHER_INTERCEPTORS = [
+        ManageEngine::Instrumentation::ActionView.new
+    ]
+    
     def detect_and_instrument
       @framework ||= SUPPORTED_FRAMEWORKS.detect{ |framework| framework.present? }
       @framework.instrument
@@ -23,6 +28,12 @@ module ManageEngine
           interceptor.instrument
         end
       end
+      
+      OTHER_INTERCEPTORS.each do |interceptor|
+        if (interceptor.present?)
+          interceptor.instrument
+        end
+      end
     end
     
   end

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

@@ -1,3 +1,5 @@
+require 'agent/handler/tracker_handler'
+
 module ManageEngine
   module Instrumentation
     class RailsFramework
@@ -25,28 +27,25 @@ module ManageEngine
       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]
-          if @obj.config.agent_enabled && @obj.txn_util.listen?(path)
-            url = "#{path} #{payload[:controller]}##{payload[:action]}"
-            railsTracker = ManageEngine::Tracker::RootTracker.new(url, start.to_f * 1000)
-            Thread.current[:apminsight] = railsTracker
-          end
+          @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|
-          tracker = Thread.current[:apminsight]
-          if tracker != nil
-            tracker.finish(finish.to_f * 1000)
+          if @railsTracker != nil
+            @railsTracker.finish(finish.to_f * 1000)
             exception = payload[:exception_object]
             if exception != nil
-              tracker.setError(exception)
-              tracker.setStatus(500) # By default, set 500 as status for error txns
+              @railsTracker.setError(exception)
+              @railsTracker.setStatus(500) # By default, set 500 as status for error txns
             end
-            ManageEngine::APMObjectHolder.instance.collector.updateTransaction(tracker.name, tracker)
-            Thread.current[:apminsight] = nil # Removing threadlocal
+            ManageEngine::Agent::TrackerHandler.exitTracker(@railsTracker)
           end
         end
         

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

@@ -45,26 +45,27 @@ module ManageEngine
         url = (env.has_key?('sinatra.route') ? env['sinatra.route'] : @request.path).dup
         @obj = ManageEngine::APMObjectHolder.instance
         
-        if !@obj.config.agent_enabled || !@obj.txn_util.listen?(url)
-          original_route_eval(*args, &block)
-        end
-        
         sinatraTracker = ManageEngine::Tracker::RootTracker.new(url)
-        Thread.current[:apminsight] = sinatraTracker
+        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
-          sinatraTracker.setError(e)
-          sinatraTracker.setStatus(500) # By default, set 500 as status for error txns
+          if (sinatraTracker != nil)
+            sinatraTracker.setError(e)
+            sinatraTracker.setStatus(500) # By default, set 500 as status for error txns
+          end
           raise e
         
         ensure
-          sinatraTracker.finish
-          ManageEngine::APMObjectHolder.instance.collector.updateTransaction(sinatraTracker.name, sinatraTracker)
-          Thread.current[:apminsight] = nil
+          if sinatraTracker != nil
+            sinatraTracker.finish
+          end
+          ManageEngine::Agent::TrackerHandler.exitTracker(sinatraTracker)
         end
         
       end

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

@@ -7,39 +7,39 @@ 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)

data/lib/agent/trackers/default_tracker.rb

@@ -3,11 +3,11 @@ module ManageEngine
     
     class DefaultTracker
       
-    attr_accessor :name, :error, :endtime, :starttime
+    attr_accessor :name, :error, :endtime, :starttime, :child, :sibling
       
       def initialize(name = "unknonwn", time = ManageEngine::APMObjectHolder.instance.util.currenttimemillis)
         @starttime = time.to_i
-        @name = ManageEngine::APMObjectHolder.instance.txn_util.normalizeName(name)
+        @name = name
         @logger = ManageEngine::APMObjectHolder.instance.log
       end
       
@@ -31,6 +31,14 @@ module ManageEngine
         (@endtime - @starttime).to_i
       end
       
+      def ==(obj)
+        return obj != nil && @name == obj.name
+      end
+      
+      def hash
+        return @name.hash
+      end
+      
       def to_s
         @name
       end

data/lib/agent/trackers/root_tracker.rb

@@ -4,7 +4,11 @@ module ManageEngine
   module Tracker
     class RootTracker < DefaultTracker
       
-      attr_accessor :children, :status
+      attr_accessor :status, :url
+      
+      def url=(url = "unknown")
+        @url = ManageEngine::APMObjectHolder.instance.txn_util.normalizeName(url)
+      end
       
       def http_method(method)
         @http_method = method
@@ -22,13 +26,6 @@ module ManageEngine
         @status = httpcode
       end
       
-      def addChild(tracker)
-        if @children == nil
-          @children = Array.new
-        end
-        @children.push(tracker)
-      end
-      
       def getAdditionalInfo
         info = super
         if (@http_method != nil && @queryString != nil && @status != nil)