apminsight 1.0.1 → 1.8.6

data/lib/agent/logging/am_logger.rb

@@ -4,6 +4,8 @@ require "logger"
 module ManageEngine
 	class APMLogger
 		@apmlog=nil;
+		@apmLogPath=nil;
+		
 		def initialize
 			@obj=ManageEngine::APMObjectHolder.instance
 			path = getLogsPath
@@ -11,20 +13,29 @@ module ManageEngine
 			if  Dir[path] == []
 				Dir.mkdir(path)
 			end
-			path= path + '/apm.log'
+			@apmLogPath= path + '/apm.log'
 			#puts "#{path}"
 #			file = open(path, File::WRONLY | File::APPEND | File::CREAT)
-			@apmlog = Logger.new(path, 10, 100 * 1024 * 1024)
-			#	@apmlog = Logger.new(file)
-			@apmlog.level = Logger::INFO
-			@apmlog.datetime_format = "%Y-%m-%d %H:%M:%S"	
+      begin
+        @apmlog = Logger.new(@apmLogPath, 10, 5 * 1024 * 1024)
+        @apmlog.level = Logger::INFO
+      rescue Exception => e
+        puts "Unable to create/edit the log file #{@apmLogPath}. Writing agent logs to STDOUT.\nError: #{e.message}"
+        @apmlog = Logger.new(STDOUT)
+        @apmlog.level = Logger::WARN
+      end
+      # @apmlog = Logger.new(file)
+      @apmlog.datetime_format = "%Y-%m-%d %H:%M:%S" 
 			@apmlog.formatter = proc do |severity, datetime, progname, msg|
-				"[#{datetime}|#{Process.pid}]:#{msg}\n"
+				"[#{datetime}|#{Process.pid}][#{severity}]:#{msg}\n"
 			end
 			@apmlog.debug("[LOGGER] APM Agent Logging Initialized")
 
 		end 
 
+		def getLogFilePath
+		  return @apmLogPath
+		end
 
 		def	getLogsPath
 			props = {}
@@ -53,7 +64,7 @@ module ManageEngine
 			if props["apminsight.log.dir"]!=nil
 				return props["apminsight.log.dir"]
 			else
-				return "./log"
+				return @obj.constants.conf_location+"log"
 			end
 
 		end
@@ -96,10 +107,8 @@ module ManageEngine
 
 
 		def logException(msg,e)
-			@apmlog.info( "#{msg} => #{e.message}")
-			@apmlog.debug( "!!!!!!!!!!!!!!!!!!!!!!EXCEPTION !!!!!!!!!!!!!!!!!!!!!!!!!!!!")
-			@apmlog.debug( "Message  : #{msg}\nTrace :\n#{e.backtrace}")
-			@apmlog.debug( "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!")
+			@apmlog.warn( "#{msg} => #{e.message}")
+			@apmlog.warn( "Message  : #{msg}\nTrace :\n#{e.backtrace}")
 		end
 
 		def close

data/lib/agent/metrics/am_metricsformatter.rb

@@ -6,8 +6,8 @@ module ManageEngine
 			@obj = ManageEngine::APMObjectHolder.instance
 			@apdex_threshold = 0
 		end
-		#trans	Vs #[0-rspTime,1-min rt,2-max rt,3-cnt,4-apdx,5-stat,6-toler,7-frustating]
-		#DBtrans	Vs #[rspTime,min rt,max rt,cnt]
+		#trans	Vs #[0-rspTime,1-min rt,2-max rt,3-cnt,4-apdx,5-stat,6-toler,7-frustating,8-error_count]
+		#DBtrans	Vs #[rspTime,min rt,max rt,cnt,error_count]
 		#trace
 
 		def format d
@@ -95,34 +95,41 @@ module ManageEngine
 		end
 
 		def updateinstance
-			ins_apdx = Array.new
-			cnt = 0;
-			rt = 0;
-			s=0;
-			t=0;
-			f=0;
-			min = -1;
-			max = 0;
+			ins_apdx = [0,-1,-1,0,0,0,0,0,0]
+			logmetric = Hash.new
 			@transaction.each do |key,value|
-				rt = rt + value[0]
-				if min == -1
-					min = value[1]
-					max = value[2]
-				end
-				if(value[1]<min)
-					min = value[1]
-				end
-				if (value[2]>max)
-					max = value[2]
+			  apdexValue = value[0]
+			  ins_apdx[0] += apdexValue[0]
+				if ins_apdx[1] == -1
+				  ins_apdx[1] = apdexValue[1]
+				  ins_apdx[2] = apdexValue[2]
+				else
+  				if(apdexValue[1]<ins_apdx[1])
+  				  ins_apdx[1] = apdexValue[1]
+          end
+          if (apdexValue[2]>ins_apdx[2])
+            ins_apdx[2] = apdexValue[2]
+          end
 				end
-				cnt = cnt  + value[3]
+				ins_apdx[3] += apdexValue[3]
 
-				s = s + value[5]	
-				t = t + value[6]	
-				f = f + value[7]	
+				ins_apdx[5] += apdexValue[5]	
+				ins_apdx[6] += apdexValue[6]	
+				ins_apdx[7] += apdexValue[7]	
+				ins_apdx[8] += apdexValue[8]
+				
+				exceptions = value[1][@obj.constants.mf_logmetric]
+				if (exceptions != nil)
+  				exceptions.each do |name, count|
+  				  logmetric[name] = logmetric[name].to_i + count
+  				end
+				end
+			end
+			if (ins_apdx[3] > 0)
+			  ins_apdx[4] = (ins_apdx[5].to_f + (ins_apdx[6]/2).to_f).to_f/ins_apdx[3].to_f
+			  ins_apdx[0] = ins_apdx[0].round(2)
 			end
-			apx = (s.to_f + (t/2).to_f).to_f/cnt.to_f
-			@instance[":apdex"]=[rt.round(2),min,max,cnt,apx,s,t,f]
+			@instance[":apdex"]=[ins_apdx, {@obj.constants.mf_logmetric=>logmetric}]
 		end
 
 		def updatedbinstance
@@ -130,6 +137,7 @@ module ManageEngine
 			rt = 0;
 			min = -1;
 			max = 0;
+			error_count = 0;
 			if(@db.length>0)
 				@db.each do |key,val|
 					value = val["metrics"]
@@ -145,8 +153,9 @@ module ManageEngine
 						max = value[2]
 					end
 					cnt = cnt  + value[3]
+					error_count += value[4]
 				end
-				@dbinstance[":apdex"]=[rt.round(2),min,max,cnt]
+				@dbinstance[":apdex"]=[rt.round(2),min,max,cnt,error_count]
 			end
 		end
 
@@ -154,25 +163,61 @@ module ManageEngine
 			begin
 				pl = d["td"]
 				dbl = d["db"]
+				exc = d["exception"]
 
 				rt = pl["rt"].round(2)
-				path = pl["path"]
-				name = pl["name"]
-
-				path = @obj.constants.mf_transaction + @obj.constants.mf_separator + path + " " +name
+				path = @obj.constants.mf_transaction + @obj.constants.mf_separator + pl["path"]
 
 
 				apx_stat =  nil
+				additionalInfo = nil
 				if(@transaction.has_key?(path))
-					apx_stat = @transaction[path]
+					apx_stat = @transaction[path][0]
+					additionalInfo = @transaction[path][1]
 				else
+					if @transaction.length == @obj.config.metric_overflow_t
+					  @obj.log.debug "Metricstore overflow. Current Size: #{@obj.config.metric_overflow_t} #{path}"
+					  return
+					end
 					apx_stat = Array.new
-					apx_stat = [0,rt,rt,0,0,0,0,0]
+					apx_stat = [0,0,0,0,0,0,0,0,0]
+					additionalInfo = Hash.new
 				end
-				apx_stat = apxarray apx_stat,rt
-				@transaction[path] = apx_stat
+				
+				if (pl.has_key?("error"))
+				  apx_stat[8] += 1
+				else
+				  apx_stat = apxarray apx_stat,rt
+				end
+				
+				if (exc != nil)
+				  logmetric = additionalInfo[@obj.constants.mf_logmetric]
+				  if (logmetric == nil)
+            additionalInfo[@obj.constants.mf_logmetric] = exc
+				  else
+            exc.each do |name, count|
+              logmetric[name] = logmetric[name].to_i + count
+            end
+          end
+				end
+				
+				@transaction[path] = [apx_stat, additionalInfo]
 				if(dbl!=nil)
-					updatedb dbl,path
+					if @db.length < @obj.config.dbmetric_overflow_t
+						updatedb dbl,path
+					elsif @db.length == @obj.config.dbmetric_overflow_t
+						@obj.log.debug "DB metric overflow. Current Size: #{@obj.config.dbmetric_overflow_t} #{path}"
+						#@obj.log.info "data = #{@db}"
+						of = Hash.new
+						stats = Array.new
+						stats = [0,0,0,0,0]
+						of["tpath"] = @obj.constants.mf_overflow
+						#of["tpath"] = @obj.constants.mf_transaction + @obj.constants.mf_separator + @obj.constants.mf_overflow #using this for testing purpose
+						of["path"] = @obj.constants.mf_db + @obj.constants.mf_separator + @obj.constants.mf_overflow + @obj.constants.mf_separator + "-" + @obj.constants.mf_separator
+						of["metrics"] = stats
+						@db[@obj.constants.mf_overflow]=of
+						#@obj.log.info "data updated = #{@db}"
+					end
 				end
 			rescue Exception=>e
 				@obj.log.info "#{e.message}"
@@ -181,6 +226,7 @@ module ManageEngine
 			#	Apmagent::ApmLogger.instance.info "update transaction end"
 		end
 
+		# Updates apdex score and increases statisfied, tolerating, frustrated count accordingly
 		def apxarray apx_stat,rt 
 
 			#	Apmagent::ApmLogger.instance.info "apxarray : start #{apx_stat}"
@@ -193,16 +239,19 @@ module ManageEngine
 				apx_stat[6] = apx_stat[6] + 1 
 			end		
 
-			apx_stat[4] = (apx_stat[5].to_f + (apx_stat[6].to_f/2).to_f)/apx_stat[3].to_f
+			if (apx_stat[3] > 0)
+			  apx_stat[4] = (apx_stat[5].to_f + (apx_stat[6].to_f/2).to_f)/apx_stat[3].to_f
+			end
 			#	Apmagent::ApmLogger.instance.info "apxarray : end #{apx_stat}"
 			apx_stat
 		end
 
+		# Updates resp time, min rt and max rt in apdex metric
 		def updatert apx_stat,rt 
 			#	Apmagent::ApmLogger.instance.info "updatert : start"
-			apx_stat[3] =  apx_stat[3] +1
+			apx_stat[3] =  apx_stat[3] + 1
 			apx_stat[0] = apx_stat[0] + rt
-			if(rt < apx_stat[1])
+			if(apx_stat[1] == 0 || rt < apx_stat[1])
 				apx_stat[1] = rt
 			end
 			if(rt > apx_stat[2])
@@ -211,7 +260,8 @@ module ManageEngine
 			#Apmagent::ApmLogger.instance.info "updatert : end"
 			apx_stat
 		end
-		#DBtrans	Vs #[rspTime,min rt,max rt,cnt]
+		
+		#DBtrans	Vs #[rspTime,min rt,max rt,cnt,error_count]
 		def updatedb dpl,tpath
 			#	Apmagent::ApmLogger.instance.info "updatedb : start"
 			dpl.each do |pl|
@@ -227,37 +277,45 @@ module ManageEngine
 					stat = val["metrics"]
 				else
 					val=Hash.new
+					val["tpath"] = tpath
+          val["path"] = dpath
 					stat = Array.new
-					stat = [rt,rt,rt,0]
+					stat = [0,rt,rt,0,0]
+				end
+				if (pl.has_key?("error"))
+				  stat[4] += 1
+				else
+				  stat = updatert stat,rt
 				end
-				stat = updatert stat,rt
-				val["tpath"] = tpath
-				val["path"] = dpath
 				val["metrics"] = stat
 				@db[path] = val
-				updatedboperations rt, pl["operation"]
+				updatedboperations rt, pl["operation"], pl["error"]
 			end
 			#Apmagent::ApmLogger.instance.info "updatedb : end"
 		end
 
-		def updatedboperations rt,operation
-			opstats = Array.new;
-			#puts "#{operation} "
+		def updatedboperations rt, operation, isError
 			if(@dboperations.has_key?(operation))
 				opstats = @dboperations[operation]
 			else
-				opstats = [0.0,rt,rt,0]
-			end
-			opstats[0] = opstats[0] + rt
-			if(rt<opstats[1])
-				opstats[1] = rt
+			  opstats = Array.new;
+				opstats = [0.0,rt,rt,0,0]
 			end
-			if (rt>opstats[2])
-				opstats[2] = rt
-			end
-			opstats[3] = opstats[3] +1
+			
+			if (isError)
+			  opstats[4] += 1
+			else
+  			opstats[0] = opstats[0] + rt
+  			if(rt<opstats[1])
+  				opstats[1] = rt
+  			end
+  			if (rt>opstats[2])
+  				opstats[2] = rt
+  			end
+  			opstats[3] = opstats[3] +1
+  		end
 			@dboperations[operation]=opstats
 		end
 
-	end
-end
+	end#class
+end#module