site24x7_apminsight 1.4 → 1.5

data/conf/apminsight.conf

@@ -71,24 +71,9 @@ transaction.trace.sql.parametrize=true
 #default value: 3 (second)
 transaction.trace.sql.stacktrace.threshold=3
 
-#Capture HTTP request input parameters, if enabled. 
-#To skip recording specific request parameters use webtrasnaction.trace.input.params.ignore key.
-#default value: false
-webtransaction.trace.input.params.record=false
-
-#Skip recording confidential request parameters like password, authKey, etc.
-#Use comma (,) as parameter names separator.
-#If no value is specified all parameters will be recorded.
-#Value(s) specified for this key are case sensitive.
-webtransaction.trace.input.params.ignore=password, pswd, pass, authKey, parentId, parentID, resourceId, resourceID, id, ID
-
 #Stop listening transactions with specified URL pattern.
 transaction.skip.listening=*.css, *.js, *.gif, *.jpg, *.jpeg, *.bmp, *.png, *.ico
 
-#Sampling counter. Say for example when you specify the value as 20, agent will track one in 20 transactions.
-#default value: 1 (transaction)
-transaction.tracking.request.interval=1
-
 #Directory where agent logs information separately.
 #Defaults to the directory where apminsight-javaagent.jar is installed. 
 #Use forward slash(/) as path separator.

data/lib/agent/am_objectholder.rb

@@ -9,13 +9,13 @@ require "agent/metrics/am_metricscollector"
 require "agent/metrics/am_metricstore"
 require "agent/metrics/am_metricsformatter"
 require "agent/metrics/am_metricsparser"
-require "agent/server/instrument/am_instrumenter"
+require "agent/util/transaction_util"
 
 module ManageEngine
 
 	class APMObjectHolder
-		attr_reader :config,:log,:util,:constants,:shutdown,:connector,:agent,:collector
-		attr_accessor :shutdown,:agent_initialized,:last_dispatch_time,:instrumenter,:store,:formatter,:parser
+		attr_reader :config,:log,:util,:constants,:shutdown,:connector,:agent,:collector, :txn_util
+		attr_accessor :shutdown,:agent_initialized,:last_dispatch_time,:store,:formatter,:parser
 		@@objects = nil
 		#Don't Change the Order of Initialize
 		def initializeObjects
@@ -29,7 +29,7 @@ module ManageEngine
 			@connector 			= 		ManageEngine::APMConnector.new
 			@store 				=	 	ManageEngine::APMMetricsStore.new
 			@collector			=		ManageEngine::APMMetricsCollector.new
-			@instrumenter 		= 		ManageEngine::APMInstrumenter.new
+      @txn_util = ManageEngine::TransactionUtil.new
 			@formatter 			= 		ManageEngine::APMMetricsFormatter.new
 			@parser 			= 		ManageEngine::APMMetricsParser.new
 			@agent 				= 		ManageEngine::APMAgent.new

data/lib/agent/configuration/am_configuration.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'json'
 require 'socket'
-require 'rails'
+#require 'rails'
 require 'agent/am_objectholder'
 require 'version'
 
@@ -9,7 +9,7 @@ module ManageEngine
 	class APMConfig
 		attr_reader :agenthost,:agentport,:instance_id,:alreadyconnected,:apmhost,:apmport,:license_key,:site24x7, :site24x7url
 		attr_reader :appname,:proxyneeded, :apdex_t, :trans_trace, :trans_trace_t, :sql_capture, :sql_capture_params, :sql_trace_t,:proxy_user,:proxy_pass, :metric_overflow_t, :trace_overflow_t
-		attr_reader :proxy_host,:proxy_port ,:is_secured, :logs_dir ,:connection_retry,:agent_enabled,:connect_interval,:db_operations,:include_packages, :url_merge_pattern
+		attr_reader :proxy_host,:proxy_port ,:is_secured, :logs_dir ,:connection_retry,:agent_enabled,:connect_interval,:db_operations,:txn_skip_listen, :url_merge_pattern
 		attr_accessor :app_db,:app_dispatcher,:lastupdatedtime
 		def initialize
 			@obj = ManageEngine::APMObjectHolder.instance
@@ -151,7 +151,7 @@ module ManageEngine
 			@connection_retry = 0
 			@connect_interval = 60
 			@apdex_t=0.5
-			@include_packages=Array.new
+			@txn_skip_listen=Array.new
 			@trans_trace_t=2
 			@sql_trace_t=3
 			@metric_overflow_t=250
@@ -190,7 +190,7 @@ module ManageEngine
 			 when "apminsight.log.dir" then @logs_dir=value
 			 when "agent.connection.retry" then @connection_retry=value #Not in Conf - yet to come
 			when "agent.connection.interval" then	 @connect_interval=value#Not in Conf - yet to come
-			when "include.packages" then @include_packages=@obj.util.getArray value,","
+			when "transaction.skip.listening" then @txn_skip_listen=@obj.util.getArray value.gsub("\s", ""),","
 			end
 		 end
 		end
@@ -221,7 +221,7 @@ module ManageEngine
 			ENV.to_hash.each do |key, value|
 				env[key] = value
 			end
-			env["Application Path"]="#{Rails.root}"
+			#env["Application Path"]="#{Rails.root}"
 			rescue Exception=>e
 			end
 			env

data/lib/agent/metrics/am_metricsformatter.rb

@@ -165,10 +165,7 @@ module ManageEngine
 				dbl = d["db"]
 
 				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

data/lib/agent/metrics/am_metricsparser.rb

@@ -12,114 +12,40 @@ module ManageEngine
 			@obj = ManageEngine::APMObjectHolder.instance
 			parseddata = Hash.new
 			begin
-				data.each do |key,val|
-					@obj.log.debug "[Processing started for - #{key} ]"
-					#lastHash = val.last
-					#name = lastHash["name"]
-					keyForTrans = key
-#					if(name=="process_action.action_controller")
-						#Transaction completed
-						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;
-						start_index = 0;
-						val.each do |arr|
-							#@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=>arr["payload"][:exception_object] != nil ?
-                                                              formatStacktrace(arr["payload"][:exception_object].backtrace) : nil}
-							    exceptionInfo.push(logInfo)
-							  end
-							  
-								if(arr["name"]=="sql.active_record" && @obj.config.sql_capture)
-									dbd = getDBData(arr)
-									if tdata.has_key?("db")
-										tdata["db"].push(dbd)
-									else
-										temp = Array.new
-										temp.push(dbd)
-										tdata["db"]=temp
-									end
-									#trdbdata.push(updateDBTrace(arr,dbd))
-									#@obj.log.debug "TRANS DBBB TRACE : #{dbd}"
-								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
-									#	ended =false;
-									#else
-										ended = true
-										started = false
-										redirect=false
-										parseddata = updateParsedData key,tdata.dup,parseddata
-										#@obj.log.info "TRACE #{@obj.config.trans_trace}"
-										if @obj.config.trans_trace
-												ret = tdata["td"]
-												#@obj.log.info "TRACE COMPARE : #{ret["rt"]} > #{(@obj.config.trans_trace_t.to_f*1000).to_i}"
-												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,exceptionInfo
-												end
-										end
-										key = key + start_index.to_s
-										tdata=Hash.new
-										start_index = val.index(arr) 
-									#end
-									#trdata = updateTransTrace(arr,trdbdata,trdata);
-									#@obj.log.info "TRANS TRACE : #{trdata}"
-									#elsif(arr["name"]==("!render_template.action_view")
-									#Render Action 	
-									#elsif(arr["name"]==("render_template.action_view")
-									#Render Action data not in use
-								elsif(arr["name"]==("start_processing.action_controller"))
-									ended =false;
-									started=true
-									#trdata = updateStartTrace(arr,trdata);
-									#Render Action data not in use
-								elsif(arr["name"]==("redirect_to.action_controller"))
-									  redirect = true;
-								end
-							end
-
-						end # events - do-loop
+				data.each do |txn_name, trackers|
+					@obj.log.debug "[Processing started for - #{txn_name} ]"
 					
-						if !ended
-							@obj.log.debug "Transactions in Thread Continues - so drop data in mem-store #{keyForTrans} -- #{start_index}"
-							if parseddata.has_key?(keyForTrans)
-								#@obj.log.info "BEFORE : #{parseddata.keys}"
-								value = parseddata.delete(keyForTrans)
-								parseddata[key+"_dup"] = value
-								
-								#@obj.log.info "AFTER : #{parseddata.keys}"
-							end
-						end
-						#@obj.log.info "BEFORE METRICS - #{@obj.store.metrics}"
-						@obj.store.removeData key,0,start_index
-						#@obj.log.info "AFTER METRICS - #{@obj.store.metrics}"
-					@obj.log.debug "[Processing END for - #{key} ]"
-					#end
+					trackers.each do |tracker|
+					  
+            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
+					  end
+					  
+					  updateExceptionInfo(tracker, exceptionInfo) # Updating roottracker exception, if any
+					  
+            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)
+            end
+            
+					end # do - trackers
+					
+					@obj.store.removeData txn_name
+					@obj.log.debug "[Processing END for - #{txn_name} ]"
 				end # do-loop
 			rescue Exception=>e
 				@obj.log.info "Exception : #{e}"
@@ -130,10 +56,21 @@ module ManageEngine
 			parseddata
 		end
 
-		def updateParsedData key , tdata, parseddata
+		def updateExceptionInfo (tracker, exceptionInfo)
+      if tracker.error?
+      logInfo = { @obj.constants.mf_loginfo_time => tracker.endtime.to_i,
+                    @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
+		end
+		
+		def updateParsedData (key, tdata, parseddata)
 			begin
 				if parseddata.has_key?(key)
-					key =  @obj.util.currenttimemillis
+					key = rand # Use a random number
 				end
 				#@obj.log.debug "Update parsed data  : #{key} = > #{tdata}"
 				parseddata[key]=tdata
@@ -145,7 +82,7 @@ module ManageEngine
 		end
 		
 		# Generates Trace for the transaction and updates it in 'parseddata' hash
-		def updateTraceData val,parseddata,exceptionInfo
+		def updateTraceData(rootTracker, parseddata, exceptionInfo)
 			if(parseddata.has_key?("trace-data"))
 				tData = parseddata["trace-data"];
 				if(tData.length == @obj.config.trace_overflow_t)
@@ -160,17 +97,17 @@ module ManageEngine
 				end
 			end
 			begin
-			trdata = getTrace val
-						trac = updateTrace(trdata, exceptionInfo)
-						if(parseddata.has_key?("trace-data"))
-							traceData = parseddata["trace-data"];
-							traceData.push(trac);
-							parseddata["trace-data"] = traceData;
-						else
-							traceData = Array.new
-							traceData.push(trac)
-							parseddata["trace-data"] = traceData;
-						end
+			trdata = getTrace(rootTracker)
+			trac = updateTrace(trdata, exceptionInfo)
+			if(parseddata.has_key?("trace-data"))
+				traceData = parseddata["trace-data"];
+				traceData.push(trac);
+				parseddata["trace-data"] = traceData;
+			else
+				traceData = Array.new
+				traceData.push(trac)
+				parseddata["trace-data"] = traceData;
+			end
 			rescue Exception=>e
 				@obj.log.info "Exception in updateTraceData: #{e}"
 				@obj.log.logException "#{e.message}",e
@@ -195,31 +132,19 @@ module ManageEngine
 			return top
 		end
 
-		def getTransData(d,tdata)
-			pl = d["payload"]
+		def getTransData(rootTracker, tdata)
 			ret = nil;
 			begin
-			if(tdata.has_key?("td"))
-				ret = tdata["td"]
-				ret["rt"] = ret["rt"] +  (d["end"] - d["start"]).to_i
-			else
-				rt = (d["end"] - d["start"]).to_i
-				path=pl[:path]
-				#path=pl["path"]
-				
-				@obj.config.url_merge_pattern.each do |key, val|
-					if (path.match(key) != nil)
-						path=val
-						break
-					end
-				end
-				
-				controller=pl[:controller]
-				#controller=pl["controller"]
-				action = pl[:action]
-				#action = pl["action"]
-				ret ={"rt"=>rt,"path"=>path,"name"=>controller+"#"+action}
-			end
+  			if(tdata.has_key?("td"))
+  				ret = tdata["td"]
+  				ret["rt"] = ret["rt"] + rootTracker.duration
+  			else
+  				ret = {"rt"=> rootTracker.duration, "path"=>rootTracker.name}
+  				if (rootTracker.error?)
+  				  ret["error"] = true
+  				  updateExceptionMetric(rootTracker.error, ret)
+  				end
+  			end
 			rescue Exception=>e
 				@obj.log.info "Exception in getTranseData: #{e}"
 				@obj.log.logException "#{e.message}",e
@@ -228,290 +153,72 @@ module ManageEngine
 		end
 
 		# Generates DB metric
-		def getDBData(d)
-			pl = d["payload"]
-			rt = (d["end"] - d["start"])
-			sql = pl[:sql]
-			#sql = pl["sql"]
-			sql.strip!
-			sql.downcase!
-			sqlArr = sql.split(" ")
-			sqlStrip="";
-			tr_name="";
-			begin
-				sqlStrip = getSqlStrip sqlArr,false
-			rescue Exception=>e
-				@obj.log.logException "#{e.message}",e
-				sqlStrip = sqlArr[0]+"/-/dummydb"
-			end
+		def getDBData(databaseTracker, tdata)
+		  dbData = tdata["db"]
+		  if dbData == nil
+		    dbData = Array.new
+		  end
+		  
+			queryInfo = databaseTracker.getQueryInfo
+			sqlStrip = queryInfo[0] + "/" + queryInfo[1] + "/dummydb"
 
-			name=pl[:name]
-			#name=pl["name"]
-			ret ={"rt"=>rt,"sql"=>format(sql),"sql-strip"=>sqlStrip,"name"=>name,"operation"=>sqlArr[0]}
+			ret ={"rt"=>databaseTracker.duration, "sql"=>databaseTracker.getRawQuery,
+			      "sql-strip"=>sqlStrip, "name"=>databaseTracker.name, "operation"=>queryInfo[0]}
 			
-			if (pl[:exception] != nil)
+			if (databaseTracker.error?)
 			  ret["error"] = true
+        updateExceptionMetric(databaseTracker.error, ret)
 			end
-			ret
-		end
-
-		def getSqlStrip sqlArr ,trace
-			sqlStrip =""
-				begin
-				sqlStrip = case sqlArr[0]
-						   when "select" then sqlArr[sqlArr.index("from")+1]
-						   when "insert" then sqlArr[sqlArr.index("into")+1]
-						   when "update" then sqlArr[1]
-						   when "delete" then sqlArr[sqlArr.index("from")+1]
-						   when "create" then sqlArr[1] + sqlArr[2]
-						   when "alter" then sqlArr[1] + sqlArr[2]
-						   when "drop" then sqlArr[1] + sqlArr[2]
-						   when "show" then sqlArr[1] 
-						   when "describe" then sqlArr[1] 
-						   else "-"
-						   end
-				
-				if trace
-					sqlStrip = format(sqlArr[0]) +" - " + format(sqlStrip) 
-				else
-					sqlStrip = format(sqlArr[0]) +"/" + format(sqlStrip) +"/dummydb"
-				end
-
-			rescue Exception=>e
-				@obj.log.logException "#{e.message}",e
-					if trace					
-						sqlStrip = format(sqlArr[0])
-					else
-						sqlStrip = sqlArr[0]+"/-/dummydb"
-					end
-			end
-		end
-
-		def updateDBTrace(d)
-			pl = d["payload"]
-			rt = (d["end"] - d["start"])
-			sql = pl[:sql]
-			#sql = pl["sql"]
-			sql.strip!
-			sql.downcase!
-			sql = format(sql)
-			sqlArr = sql.split(" ")
 			
-			trData = Array.new
-			#trData[0] = (d["start"].to_f * 1000 ).to_i
-			trData[0] = d["ctime"]
-			trData[1] = getSqlStrip sqlArr,true
-			trData[2]  = ""
-			trData[3] = rt.to_i
-			trData[4] = rt.to_i
-			trData[5] = {"query"=>sql}
-			trData[6] = Array.new
-			if(!@obj.config.sql_capture_params)
-				trData[5] = updateQueryParams(d,sql,pl[:binds],rt)
-				#trData[5] = updateQueryParams(d,sql,pl["binds"],rt)
-			else
-				sql = @obj.util.parametrizeQuery sql
-				trData[5] = {"query"=>sql}
-			end
-			trData
+			dbData.push(ret)
+			dbData
 		end
 
-		def updateQueryParams d,sql,binds,rt
-			ret =  {"query"=>sql}
-			begin
-				#args = "";
-				if binds!=nil && binds.size()>0
-					binds.each do |ar|
-						#args =  args + ar.last + "," 
-						if sql!=nil && sql.index("?")!=nil
-							sql["?"]=ar.value.to_s
-						end
-					end
-				end
-				#if args.length>0
-				#	sql  = sql + "\\nPARAMS - ["+args+ "]"
-				#end
-				ret =  {"query"=>sql}
-			rescue Exception=>exe
-				@obj.log.logException "Not severe -#{exe.message}",exe
-				ret =  {"query"=>sql}
-			end
-
-				begin
-					if(rt.to_i > (@obj.config.sql_trace_t.to_f * "1000".to_f ).to_i && d.has_key?("trace") )
-						t = updateSQLStackTrace(d["trace"])
-						ret["stacktrace"] =t
-					end
-				rescue Exception=>e
-					@obj.log.logException "#{e.message}",e
-				end
-
-			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
+		def updateExceptionMetric (exception, tdata)
+		  excData = tdata["exception"]
+		  if (excData == nil)
+		    excData = Hash.new
+		    tdata["exception"] = excData
+		  end
 		  
-		  strace
+		  excData[exception.class.to_s] = excData[exception.class.to_s].to_i + 1
+		  excData[@obj.constants.mf_logmetric_warning] = excData[@obj.constants.mf_logmetric_warning].to_i + 1
 		end
 		
-		def updateSQLStackTrace(d)
-			trace = Array.new;
-			started = false;
-			ended = false;
-			begin
-				#@obj.log.debug "STACKTRACE STARTS"
-				d.each do |arr|
-					
-					if started
-
-						end_ind = arr.index("`send_action'")
-						if  end_ind != nil &&  end_ind >0
-							ended = true
-							break;
-						end
-						#trArr = arr.split(/:[0-1,in]/);
-						#if	trArr[0].length>30
-					#		len = trArr.length
-					#		trArr[0] = "..."+trArr[(len-30),len]
-					#	end	
-						inx=arr.index("`instrument'") 
-						if inx!=nil && inx>0
-							#skip instrumet data
-						else
-							temp  = Array.new
-							temp[0]=arr
-							temp[1]=""
-							temp[2]=""
-							temp[3]=""
-							trace.push(temp)
-						end
-					end
-
-					if started==false
-						ind = arr.index("`instrument'")
-						if  ind != nil &&  ind >0
-							started = true
-						end
-					end
-
-					
-				end
-				#@obj.log.debug "STACKTRACE ENDS"
-
-			trace.shift
-			rescue Exception=>e
-				@obj.log.logException "#{e.message}",e
-			end
-			trace
-		end
-
-		def updateOtherTrace d
-			pl = d["payload"]
-			rt = (d["end"] - d["start"])
-			name = d["name"]
-			if pl.has_key?(:identifier)
-			#if pl.has_key?("identifier")
-				name = pl[:identifier]
-				#name = pl["identifier"]
-			end
+		def updateDBTrace(dbTracker)
 			trData = Array.new
-			#trData[0] = (d["start"].to_f * 1000 ).to_i
-			trData[0] = d["ctime"]
-			trData[1] = name
-			trData[2]  = ""
-			trData[3] = rt.to_i
-			trData[4] = rt.to_i
-			trData[5] = nil
-			trData[6] = Array.new
-			trData
-		end
-
-		def updateTransTrace(d,trData)
-
-			#trData = Array.new
-			#trData[0] = ((d["start"]).to_f * 1000).to_i
-			pl = d["payload"]
-			path = pl[:path]
-			@obj.config.url_merge_pattern.each do |key, val|
-				if (path.match(key) != nil)
-					path=val
-					break
-				end
-			end
-			trData[1] = path + " " +pl[:controller] + "#" + pl[:action]
-			#trData[1] = pl["path"] + " " +pl["controller"] + "#" + pl["action"]
+			trData[0] = dbTracker.starttime
+			queryInfo = dbTracker.getQueryInfo
+			trData[1] = queryInfo[0] + " - " + queryInfo[1]
 			trData[2] = ""
-			trData[3] = (d["end"] - trData[0]).to_i
-			trData[4] = (d["end"] - trData[0]).to_i
-#			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|
-			#	dbTime = dbTime  + dbData[3]
-			#end
-			#trData[4] = ((trData[3]).to_f - (dbTime.to_f )).to_i
-#			if(pl[:db_runtime]!=nil)
-#				trData[4] = ((trData[3]).to_f - (pl[:db_runtime].to_f )).to_i
-#			end
+			trData[3] = dbTracker.duration.to_i
+			trData[4] = trData[3]
+      trData[5] = dbTracker.getAdditionalInfo
+			trData[6] = Array.new
 			trData
 		end
 
-		def updateMethodTrace(d,trData)
-
-			#trData = Array.new
-			#trData[0] = ((d["start"]).to_f * 1000).to_i
-			pl = d["payload"]
-			trData[1] = pl[:method] 
-			#trData[1] = pl["method"] 
-			trData[2] = ""
-			trData[3] = (d["end"] - trData[0]).to_i
-			trData[4] = (d["end"] - trData[0]).to_i
-			trData[5] = nil
-			#trData[6] = Array.new
-			#dbTime = 0
-			#trdbdata.each do |dbData|
-			#	dbTime = dbTime  + dbData[3]
-			#end
-			#trData[4] = ((trData[3]).to_f - (dbTime.to_f )).to_i
-#			if(pl[:db_runtime]!=nil)
-#				trData[4] = ((trData[3]).to_f - (pl[:db_runtime].to_f )).to_i
-#			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(d)
+		def updateStartTrace(rootTracker)
 			trData = Array.new
-			#trData[0] = ((d["start"]).to_f * 1000).to_i
-			trData[0] = d["ctime"]
-			trData[1] =""
-			trData[2] =""
-			trData[3] =0
-			trData[4] =0
-			trData[5] =nil
-			trData[6] =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
@@ -535,110 +242,33 @@ module ManageEngine
 			top[1] = trans
 			top
 		end
-
-		def format s
-			s.gsub!("\"", '')
-			s.gsub!("\n", '')
-			s
-		end
-
 		
-		def getTrace data
-			index = 0
-				data.each do |arr|
-
-					if(arr["name"]=="start_processing.action_controller")
-						index = data.index(arr)
-						break;
-					end
-				end
-				data = data.drop(index)
-				tdata =traceDetails data,Array.new,0
-				tdata = updateExclusiveTrace(tdata[0])
+		def getTrace(rootTracker)
+				tdata = traceDetails(rootTracker)
+				tdata = updateExclusiveTrace(tdata)
 				tdata
 		end
 
-		def traceDetails valo,stack,indx
-			if(valo.size>indx)
-			arr = valo[indx]
-			indx = indx+1
-					if(arr["name"]=="start_processing.action_controller")
-						traceArr = updateStartTrace arr
-						traceArr[6] = Array.new #childs
-#						if stack.size()>0
-#							cur = stack[stack.size()-1]							
-#							c = cur[6]
-#							c.push(traceArr)
-#							cur[6] = c
-#						end
-#							stack.push(traceArr)
-
-						# Incase there are multiple "start_processing" event consider only the last notification
-						if stack.size == 0
-						  stack.push(traceArr)
-						else
-						  stack[stack.size()-1] = traceArr
-						end
-						
-						traceDetails valo,stack,indx
-
-					elsif(arr["name"]=="sql.active_record" &&  @obj.config.sql_capture )
-
-						temp =  updateDBTrace arr
-
-						cur = stack[stack.size()-1]							
-						c = cur[6]
-						c.push(temp)
-						cur[6] = c
-						traceDetails valo,stack,indx
-					elsif(arr["name"]=="apm.methodstart")
-							temp = updateStartTrace arr
-							cur = stack[stack.size()-1]							
-							c = cur[6]
-							c.push(temp)
-							cur[6] = c
-							stack.push(temp)
-							traceDetails valo,stack,indx
-					elsif(arr["name"]=="apm.methodend")
-							updateMethodTrace(arr,stack[stack.size()-1])
-							stack.delete(stack[stack.size()-1])
-							traceDetails valo,stack,indx
-					elsif(arr["name"]=="process_action.action_controller")
-						updateTransTrace(arr,stack[stack.size()-1])
-						if(valo.size()>(indx+1))
-							#Redirection Data
-						  #Skipping all the "start_processing" event after "process_action" event
-							arr = valo[indx]
-							while (arr["name"]!="start_processing.action_controller") do 
-								indx = indx + 1
-								arr = valo[indx]
-							end
-						end	
-						(stack[0])[3] = (arr["end"] - ((stack[0])[0])).to_i
-						(stack[0])[4] = (arr["end"] - ((stack[0])[0])).to_i
-						
-						
-						traceDetails valo,stack,indx
-						#parent[4] = parent[4] - traceArr[4]
-					elsif (arr["name"]=="render_template.action_view")
-						temp =  updateOtherTrace arr
-
-						cur = stack[stack.size()-1]							
-						c = cur[6]
-						c.push(temp)
-						cur[6] = c
-						#traceArr[6] = c
-						#parent[4] = parent[4] - temp[4]
-						traceDetails valo,stack,indx
-					else
-						traceDetails valo,stack,indx
-
-					end
-
-				stack
-			else
-			#Nothing todo
-			end
+		def traceDetails rootTracker
+		  
+		  traceArr = updateStartTrace(rootTracker)
+		  
+		  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
+		  
+		  traceArr
 		end