site24x7_apminsight 1.2.0 → 1.3

data/LICENSE.txt

@@ -1,4 +1,4 @@
-This License Agreement details the policy for license of ManageEngine APM Insight Ruby Agent ("Licensed Software")
+This License Agreement details the policy for license of Site24x7 APM Insight Ruby Agent ("Licensed Software")
 Please read the following license carefully, before either (i) downloading the Licensed Software from an authorized website, or (ii) installing the Licensed Software. You acknowledge that you have read this License Agreement, have understood it, and agree to be bound by its terms. If you do not agree to the terms and conditions of this Agreement, do not download or install the Licensed Software.
 
 1. LICENSE GRANT

data/README.rdoc

@@ -1,5 +1,5 @@
 APM Insight Ruby Agent
-	Applications Manager's Ruby agent gives you end-to-end web-transaction awareness enabling you to isolate performance issues and resolve them quickly.Applications Manager requires a monitoring agent (ruby gem) to be deployed in your application server to monitor Ruby application performance. Download the latest Ruby Agent(apminsight.gem) and deploy it in your application server. The agent collects application performance metrics and sends it to the central Applications Manager server at fixed intervals i.e. every 60 seconds.
+	Site24x7 APM Insight Ruby agent gives you end-to-end web-transaction awareness enabling you to isolate performance issues and resolve them quickly. Site24x7 APM Insight requires a monitoring agent (ruby gem) to be deployed in your application server to monitor Ruby application performance. Download the latest Ruby Agent(site24x7_apminsight.gem) and deploy it in your application server. The agent collects application performance metrics and sends it to the central Site24x7 server at fixed intervals i.e. every 60 seconds. You can view them at https://site24x7.com in your accounts page.
  
 Installing APM Insight Agent
 
@@ -7,13 +7,13 @@ Installing APM Insight Agent
 
     	* Install from RubyGems by using the following command in the system where Ruby is installed : 
 		
-			gem install apminsight
+		gem install site24x7_apminsight
     				
 			OR
 
-	    * Download the apminsight.gem file directly from our website or the RubyGems website and run the command 
+	* Download the site24x7_apminsight.gem file from your accounts page in https://site24x7.com (after sign in) or the RubyGems website and run the command 
 		
-			gem install apminsight.gem
+			gem install site24x7_apminsight.gem
 
 Configuration
 
@@ -21,30 +21,28 @@ Configuration
 
     	For each of your applications, add the following line to the application gemfile:
 
-        	gem 'apminsight'
+        	gem 'site24x7_apminsight'
 		
 				OR
 
     	For each of your applications, add the following line to the application initializer block:
 
-        	require 'apminsight'
+        	require 'site24x7_apminsight'
 
-	A copy of the configuration file apminsight.conf will be available in the <Gem Installed folder> /apminsight/conf/. Configure the class name in the configuration file(include.packages), so that all the methods in that class can be instrumented and details will be reported in tracedata.
+	A copy of the configuration file apminsight.conf will be available in the <Gem Installed folder> /site24x7_apminsight/conf/. Configure the class name in the configuration file(include.packages), so that all the methods in that class can be instrumented and details will be reported in tracedata.
  
 
 The following configuration options are mandatory and should be provided for the agent to be initialized:
 
-    application.name - The application's name to be displayed in Applications Manager.
+    application.name - The application's name to be displayed in Site24x7 server.
 
-    apm.host - The host where Applications Manager is running.
-
-    apm.port - The HTTP port of Applications Manager.
+    license.key - The license api key from your account page after sign in (https://site24x7.com)
 
     behind.proxy - The proxy network under which the agent is installed
 
     agent.server.port - The HTTP listening port of the Application Server.
 
-More configuration options of APM Insight Ruby Agent can be found here.
+More configuration options of APM Insight Ruby Agent can be found here. https://www.site24x7.com/help/apm/apm-insight-configuration.html
  
 Supported Environments :
 
@@ -54,16 +52,16 @@ Supported Environments :
 
 References
 
-	* Download link for Applications Manager
-
-		http://www.manageengine.com/products/applications_manager/
+	* Create an apminsight account in Site24x7 server (https://www.site24x7.com)
 
-	* Download link for apminsight 
+	* Download link for site24x7_apminsight gem 
 
-		http://www.manageengine.com/products/applications_manager/
-		http://rubygems.org/gems/apminsight
+		From your account page after valid sign in
+			or
+		http://rubygems.org/gems/site24x7_apminsight
 
 	* Help Documentation for apminsight
 
-		http://www.manageengine.com/products/applications_manager/help/APMInsight/installing-transaction-agent.html
-		
+		https://www.site24x7.com/help/apm/ruby-agent.html
+		https://support.site24x7.com/portal/helpcenter/site24x7/apm-insight/ruby-monitoring
+

data/Rakefile

@@ -14,13 +14,13 @@ require 'rake'
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "apminsight"
-  gem.homepage = "http://www.manageengine.com/products/applications_manager/ruby-webtransaction-monitoring.html"
+  gem.name = "site24x7_apminsight"
+  gem.homepage = "https://www.site24x7.com/help/apm/ruby-agent.html"
   gem.license = "MIT"
   gem.summary = %Q{Application Performace Monitor}
   gem.description = %Q{Application Performace Monitor : Monitor the web tranasactions}
   gem.email = "apm-insight@zohocorp.com"
-  gem.authors = ["Sabarinathan P"]
+  gem.authors = ["Rajalakshmi Ezhilan"]
   gem.files=Dir.glob('lib/**/*.*')
   # dependencies defined in Gemfile
 end
@@ -48,7 +48,7 @@ Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "apminsight #{version}"
+  rdoc.title = "site24x7_apminsight #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.*')
   rdoc.rdoc_files.include('lib/agent/**/*.*')

data/VERSION

@@ -1 +1 @@
-1.2
+1.3.0

data/lib/agent/configuration/am_configuration.rb

@@ -3,6 +3,7 @@ require 'json'
 require 'socket'
 require 'rails'
 require 'agent/am_objectholder'
+require 'version'
 
 module ManageEngine
 	class APMConfig
@@ -27,6 +28,7 @@ module ManageEngine
 			@obj.log.debug "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
 			@obj.log.debug "APP HOME #{File.absolute_path(".")} "
 			@obj.log.debug "APP HOME #{Dir.pwd} "
+			@obj.log.debug "Agent Version : #{ManageEngine::APMInsight::VERSION}"
 			@obj.log.debug "Configuration : "
 			@obj.log.debug "Agent Name : #{@agenthost}"
 			@obj.log.debug "Agent Already Connected : #{@alreadyconnected}"
@@ -202,7 +204,7 @@ module ManageEngine
 		def getAgentInfo
 			data =  Hash.new
 			agentdata = Hash.new
-			agentdata = {"application.type"=>"RUBY","application.name"=>@appname,"hostname"=>@agenthost,"port"=>@agentport,"agent.version"=>"1.2"}
+			agentdata = {"application.type"=>"RUBY","application.name"=>@appname,"hostname"=>@agenthost,"port"=>@agentport,"agent.version"=>ManageEngine::APMInsight::MAJOR_VERSION}
 			data["agent_info"]=agentdata
 			data["environment"]=getEnvData
 			data["custom_config_info"]=getAgentConfigData

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
 
@@ -167,10 +176,21 @@ module ManageEngine
 					apx_stat = @transaction[path]
 				else
 					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]
 				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
+				
+				additionalInfo = Hash.new
+				if (pl.has_key?("exception"))
+				  additionalInfo[@obj.constants.mf_logmetric] = pl["exception"]
+				end
+				
+				@transaction[path] = [apx_stat, additionalInfo]
 				if(dbl!=nil)
 					if @db.length < @obj.config.metric_overflow_t
 						updatedb dbl,path
@@ -179,7 +199,7 @@ module ManageEngine
 						#@obj.log.info "data = #{@db}"
 						of = Hash.new
 						stats = Array.new
-						stats = [0,0,0,0]
+						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
@@ -195,6 +215,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}"
@@ -207,16 +228,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[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])
@@ -225,7 +249,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|
@@ -241,37 +266,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["error"] != nil)
+				  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

data/lib/agent/metrics/am_metricsparser.rb

@@ -2,9 +2,12 @@ require 'agent/am_objectholder'
 
 module ManageEngine
 	class APMMetricsParser
-		def initialize
+		
+	  def initialize
 			@obj = ManageEngine::APMObjectHolder.instance
 		end
+		
+		# Invoked by APMWorker in dc
 		def parse(data)
 			@obj = ManageEngine::APMObjectHolder.instance
 			parseddata = Hash.new
@@ -16,9 +19,11 @@ module ManageEngine
 					keyForTrans = key
 #					if(name=="process_action.action_controller")
 						#Transaction completed
-						tdata = Hash.new
-						trdbdata = Array.new
-						trdata = Array.new
+						tdata = Hash.new #transaction data -> rt, path,..
+						trdbdata = Array.new #db data -> sql, operation, rt,..
+						exceptionData = Hash.new #exception data -> clz name, count
+						exceptionInfo = Array.new # data to be sent in trace as 'loginfo'
+						trdata = Array.new #trace data
 						started = false
 						redirect=false
 						ended =false;
@@ -27,6 +32,18 @@ module ManageEngine
 							#@obj.log.debug "Processing : #{arr["name"]}"
 							if(started || arr["name"]==("start_processing.action_controller") )
 
+							  exception = arr["payload"][:exception] #[0-exception clz, 1-exception msg]
+							  if (exception != nil)
+							    exceptionData[exception[0]] = exceptionData[exception[0]].to_i + 1
+							    exceptionData[@obj.constants.mf_logmetric_warning] = exceptionData[@obj.constants.mf_logmetric_warning].to_i + 1
+							    logInfo = {@obj.constants.mf_loginfo_time=>arr["end"].to_i,
+							                @obj.constants.mf_loginfo_level=>@obj.constants.mf_loginfo_level_warn,
+							                @obj.constants.mf_loginfo_str=>exception[1],
+							                @obj.constants.mf_loginfo_err_clz=>exception[0],
+							                @obj.constants.mf_loginfo_st=>formatStacktrace(arr["payload"][:exception_object].backtrace)}
+							    exceptionInfo.push(logInfo)
+							  end
+							  
 								if(arr["name"]=="sql.active_record" && @obj.config.sql_capture)
 									dbd = getDBData(arr)
 									if tdata.has_key?("db")
@@ -41,6 +58,11 @@ module ManageEngine
 								elsif (arr["name"]=="process_action.action_controller")
 
 									tdata["td"]=getTransData(arr,tdata)
+									
+									if (exception != nil)
+									  tdata["td"]["error"] = true
+									end
+									tdata["td"]["exception"]=exceptionData
 									#if redirect
 									#	started = false
 									#	redirect=false
@@ -57,7 +79,7 @@ module ManageEngine
 												if (ret["rt"]).to_i > (@obj.config.trans_trace_t.to_f* 1000).to_i
 													tval = val[(start_index)..val.index(arr)]
 													#@obj.log.debug "Gng To Trace : #{start_index} to #{val.index(arr)}"
-													parseddata =updateTraceData tval,parseddata
+													parseddata =updateTraceData tval,parseddata,exceptionInfo
 												end
 										end
 										key = key + start_index.to_s
@@ -80,7 +102,7 @@ module ManageEngine
 								end
 							end
 
-						end
+						end # events - do-loop
 					
 						if !ended
 							@obj.log.debug "Transactions in Thread Continues - so drop data in mem-store #{keyForTrans} -- #{start_index}"
@@ -97,12 +119,13 @@ module ManageEngine
 						#@obj.log.info "AFTER METRICS - #{@obj.store.metrics}"
 					@obj.log.debug "[Processing END for - #{key} ]"
 					#end
-				end
+				end # do-loop
 			rescue Exception=>e
 				@obj.log.info "Exception : #{e}"
 				@obj.log.logException "#{e.message}",e
 			end
 #			@obj.log.debug "[PARSER] End"
+			
 			parseddata
 		end
 
@@ -119,7 +142,9 @@ module ManageEngine
 			end
 				parseddata
 		end
-		def updateTraceData val,parseddata
+		
+		# Generates Trace for the transaction and updates it in 'parseddata' hash
+		def updateTraceData val,parseddata,exceptionInfo
 			if(parseddata.has_key?("trace-data"))
 				tData = parseddata["trace-data"];
 				if(tData.length == @obj.config.trace_overflow_t)
@@ -135,7 +160,7 @@ module ManageEngine
 			end
 			begin
 			trdata = getTrace val
-						trac = updateTrace(trdata)
+						trac = updateTrace(trdata, exceptionInfo)
 						if(parseddata.has_key?("trace-data"))
 							traceData = parseddata["trace-data"];
 							traceData.push(trac);
@@ -201,7 +226,7 @@ module ManageEngine
 			ret
 		end
 
-
+		# Generates DB metric
 		def getDBData(d)
 			pl = d["payload"]
 			rt = (d["end"] - d["start"])
@@ -222,6 +247,10 @@ module ManageEngine
 			name=pl[:name]
 			#name=pl["name"]
 			ret ={"rt"=>rt,"sql"=>format(sql),"sql-strip"=>sqlStrip,"name"=>name,"operation"=>sqlArr[0]}
+			
+			if (pl[:exception] != nil)
+			  ret["error"] = true
+			end
 			ret
 		end
 
@@ -283,27 +312,24 @@ module ManageEngine
 				sql = @obj.util.parametrizeQuery sql
 				trData[5] = {"query"=>sql}
 			end
-			
-			
-
 			trData
 		end
 
 		def updateQueryParams d,sql,binds,rt
 			ret =  {"query"=>sql}
 			begin
-				args = "";
+				#args = "";
 				if binds!=nil && binds.size()>0
 					binds.each do |ar|
 						#args =  args + ar.last + "," 
 						if sql!=nil && sql.index("?")!=nil
-							sql["?"]=ar.last
+							sql["?"]=ar.value.to_s
 						end
 					end
 				end
-				if args.length>0
-					sql  = sql + "\\nPARAMS - ["+args+ "]"
-				end
+				#if args.length>0
+				#	sql  = sql + "\\nPARAMS - ["+args+ "]"
+				#end
 				ret =  {"query"=>sql}
 			rescue Exception=>exe
 				@obj.log.logException "Not severe -#{exe.message}",exe
@@ -322,6 +348,28 @@ module ManageEngine
 			ret
 		end
 
+		def formatStacktrace(stacktrace)
+		  strace = Array.new;
+		  begin
+		    stacktrace = Rails.backtrace_cleaner.clean(stacktrace)
+  		  stacktrace.each do |stackelement|
+  		    temp = Array.new
+  		    temp[0] = stackelement
+  		    temp[1] = ""
+  		    temp[2] = ""
+  		    temp[3] = ""
+  		    strace.push(temp)
+  		    if (strace.size == 20)
+  		      break;
+  		    end
+  		  end
+      rescue Exception=>e
+        @obj.log.logException "Error while formatting stack trace. #{e.message}", e
+      end
+		  
+		  strace
+		end
+		
 		def updateSQLStackTrace(d)
 			trace = Array.new;
 			started = false;
@@ -411,7 +459,13 @@ module ManageEngine
 			trData[2] = ""
 			trData[3] = (d["end"] - trData[0]).to_i
 			trData[4] = (d["end"] - trData[0]).to_i
-			trData[5] = nil
+#			trData[5] = nil
+			exception = pl[:exception_object]
+			if (exception != nil)
+			  trData[5] = {@obj.constants.mf_exception_st=>formatStacktrace(exception.backtrace)}
+			else
+			  trData[5] = nil
+			end
 			#trData[6] = Array.new
 			#dbTime = 0
 			#trdbdata.each do |dbData|
@@ -461,15 +515,24 @@ module ManageEngine
 			trData
 		end
 
-		def updateTrace(trans)
+		def updateTrace(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]
 			det = {"thread_name"=>"rorthread","s_time"=>trans[0],"t_name"=>path,"r_time"=>trans[3],"thread_id"=>141}
-				#trans[6] = db;
-				top[0] = det
-				top[1] = trans
-				top
+			
+			exception = trans[5] != nil ? trans[5][@obj.constants.mf_exception_st] : nil
+			if (exception != nil)
+			  det[@obj.constants.mf_err_st] = exception
+			end
+			
+			if (exceptionInfo.length > 0)
+			  det[@obj.constants.mf_loginfo] = exceptionInfo
+			end
+			
+			top[0] = det
+			top[1] = trans
+			top
 		end
 
 		def format s

data/lib/agent/server/am_agent.rb

@@ -58,7 +58,7 @@ module ManageEngine
 						aData["agent.id"]=aData.delete("instanceid")
 						aData["agent.enabled"]=true
 						@obj.config.updateAgentInfoFile(aData)
-						@obj.log.debug "[doConnect] Connected - InstanceID  : #{@obj.config.instance_id}"
+						@obj.log.info "[doConnect] Agent successfully connected - InstanceID  : #{@obj.config.instance_id}"
 					end
 
 					if(!@obj.shutdown)

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

@@ -148,9 +148,11 @@ class APMWorker
                 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
 

data/lib/agent/util/am_constants.rb

@@ -5,6 +5,7 @@ module ManageEngine
 		attr_reader :apm_gem,:s247_apm_gem,:apm_conf,:agent_conf,:connection_open_timeout,:connection_read_timeout,:connect_uri,:connect_data_uri,:connect_trace_uri,:connect_config_update_uri,:site24x7url, :mergepattern_conf
 		attr_reader :licence_exceeds,:licence_expired,:unmanage_agent,:manage_agent,:agent_config_updated,:error_notfound,:error_server,:delete_agent,:response_code,:custom_config_info
 		attr_reader :mf_transaction,:mf_separator,:mf_db,:mf_apdex,:mf_namespace,:mf_name,:mf_all,:agent_store,:agent_lock,:mf_overflow
+		attr_reader :mf_logmetric, :mf_logmetric_warning, :mf_exception_st, :mf_err_st, :mf_loginfo, :mf_loginfo_time, :mf_loginfo_level, :mf_loginfo_str, :mf_loginfo_err_clz, :mf_loginfo_st, :mf_loginfo_level_warn
 		
 		def initialize
 			
@@ -72,6 +73,17 @@ module ManageEngine
 			@mf_db = "db"
 			@mf_overflow = "0verf10w"
 
+      @mf_logmetric = "logmetric"
+      @mf_logmetric_warning = "warning"
+      @mf_err_st = "err_st"
+      @mf_exception_st = "exception_st"
+      @mf_loginfo = "loginfo"
+      @mf_loginfo_time = "time"
+      @mf_loginfo_level = "level"
+      @mf_loginfo_str = "str"
+      @mf_loginfo_err_clz = "err_clz"
+      @mf_loginfo_st = "st"
+      @mf_loginfo_level_warn = "WARN"
 
 		end
 

data/lib/version.rb

@@ -0,0 +1,13 @@
+# Holds the major and minor versions of the agent
+# These values are used in gemspec and in agent communication
+# This is one point change, no need to update version numbers at multiple places
+#
+# NOTE: Changing version in 'VERSION' file is optional.
+
+module ManageEngine
+  class APMInsight
+    VERSION = '1.3'
+    MAJOR_VERSION = '1.3'
+    MINOR_VERSION = '0'
+  end
+end

data/site24x7-agent.gemspec

@@ -3,13 +3,15 @@
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
+require './lib/version'
+
 Gem::Specification.new do |s|
   s.name = "site24x7_apminsight"
-  s.version = "1.2.0"
+  s.version = ManageEngine::APMInsight::VERSION
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adithyan P"]
-  s.date = "2016-12-19"
+  s.date = Date.today.to_s
   s.description = "Site24x7 APMInsight gives you end-to-end web-transaction awareness of Rails applications enabling you to isolate performance issues and resolve them quickly. To monitor Rails application performance, download and deploy Ruby agent(site24x7_apminsight) in your Application Server. This agent allows you to send information about Ruby applications. You can install APM Insight Agent via Rubygems or download it from your user account in Site24x7"
 
   s.email = "apm-insight@zohocorp.com"
@@ -24,6 +26,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "site24x7-agent.gemspec",
     "conf/apminsight.conf",
+    "lib/version.rb",
     "lib/site24x7_apminsight.rb",
 	"lib/agent/am_objectholder.rb",
     "lib/agent/logging/am_logger.rb",

metadata

@@ -1,85 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: site24x7_apminsight
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: '1.3'
+  prerelease: 
 platform: ruby
 authors:
 - Adithyan P
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-19 00:00:00.000000000 Z
+date: 2017-01-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &27221448 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *27221448
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &27221160 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
+  version_requirements: *27221160
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &27220872 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.6.4
+  version_requirements: *27220872
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &27220584 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *27220584
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &27220296 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
+  version_requirements: *27220296
 description: Site24x7 APMInsight gives you end-to-end web-transaction awareness of
   Rails applications enabling you to isolate performance issues and resolve them quickly.
   To monitor Rails application performance, download and deploy Ruby agent(site24x7_apminsight)
@@ -97,43 +83,45 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- site24x7-agent.gemspec
 - conf/apminsight.conf
+- lib/version.rb
+- lib/site24x7_apminsight.rb
 - lib/agent/am_objectholder.rb
-- lib/agent/configuration/am_configuration.rb
 - lib/agent/logging/am_logger.rb
-- lib/agent/metrics/am_metricscollector.rb
+- lib/agent/configuration/am_configuration.rb
+- lib/agent/util/am_constants.rb
+- lib/agent/util/am_util.rb
 - lib/agent/metrics/am_metricsformatter.rb
-- lib/agent/metrics/am_metricsparser.rb
 - lib/agent/metrics/am_metricstore.rb
+- lib/agent/metrics/am_metricscollector.rb
+- lib/agent/metrics/am_metricsparser.rb
 - lib/agent/server/am_agent.rb
 - lib/agent/server/am_connector.rb
+- lib/agent/server/worker/am_worker.rb
 - lib/agent/server/instrument/am_apm.rb
 - lib/agent/server/instrument/am_instrumenter.rb
-- lib/agent/server/worker/am_worker.rb
-- lib/agent/util/am_constants.rb
-- lib/agent/util/am_util.rb
-- lib/site24x7_apminsight.rb
-- site24x7-agent.gemspec
 homepage: https://www.site24x7.com/help/apm/ruby-agent.html
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Site24x7 APMInsight gives you end-to-end web-transaction awareness of Rails

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 032c120ceab9ac813a443666cd20afc8417abee5
-  data.tar.gz: 53fcb0baf07f8ea9146fb895b784bcfc32e1f72b
-SHA512:
-  metadata.gz: ac75fa482fee2f69d7e7e0b3728f3ce86553002d41a81a842aff0a0d5f7a277e292a182f757362ee9cd1dbbd51c6a6a318e77155ceb40aa04caff5929ec8f8e0
-  data.tar.gz: e4caabce3d0918c160a8d69b4a1876a5eb5b10cc421a884cf1ab6336f8fe1adaafd0249ada5381f9aa43394199f7b358ed6cb4da365d24e9a1928bb230ced73c