site24x7_apminsight 1.9.1 → 1.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6adf1511641c4e23c0e5f0a0ac71336dd62c4fe0ee23b0df46b07e804c74841a
-  data.tar.gz: 1d5dcaa91fd5e185f3592c86f686af35f33d20918297ef0f1d2deeaffa5a5c7b
+  metadata.gz: ef71f92d00c156ed7effd7fa726820409f00bab68076033c970d6ceec197c8d5
+  data.tar.gz: '095a029352700363cfdc03029946c7d76d1e529c5e9d421bb0526fe25f9ccd53'
 SHA512:
-  metadata.gz: 7a01e038e40a5656c0c62dd353dcb5c118bc071312612aef245fdf1d2edcf2ae4a6dded206406febda1f029b42a961b5b75758565758938dc5ee77a7e837b92c
-  data.tar.gz: 80d84c7ba2f6095adb9050040283a788242d94f7ad9e00b9141b76addbb88123fa16027de9af33723bd3a60daa9e5a01c4a75b5ea0205a0d3c009aed7f23ca3c
+  metadata.gz: c187ad0e32c93c24e772b470c7b732285187bccf36687981ab28ae41935ad0bbfebe2ca04a60cafd4a3af2e08837ebb70e8e6ff8b269c8f4a8aa497284566cd5
+  data.tar.gz: 6b0233843a2a86cca28cdf2f29531c546eebbfafb59ff9909efa371d16250a1cd3f8f9738a8a68d6ac165c40b9e742b40235e78418136b2d7b724ac96af6bc71

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.8.2
+1.8.2

data/lib/agent/configuration/am_configuration.rb

@@ -267,6 +267,28 @@ module ManageEngine
 		end
 		
 		def getHostType
+		  begin
+		    # Checking for OpenShift
+		    if (ENV.has_key?('OPENSHIFT_BUILD_NAMESPACE'))
+		      @obj.log.info "Agent is hosted in OpenShift"
+          @hostType = "DOCKER"
+           return @hostType
+		    end
+		    # Checking for k8s env
+		    if (ENV.has_key?('KUBERNETES_SERVICE_HOST'))
+		      @obj.log.info "Agent is hosted in Kubernetes"
+		      @hostType = "DOCKER"
+		      return @hostType
+		    end
+		    # Checking for Docker
+        if (File.exist?('/.dockerenv') || File.read('/proc/1/cgroup').include?('docker'))
+          @obj.log.info "Agent is hosted in DOCKER"
+          @hostType = "DOCKER"
+          return @hostType
+        end
+		  rescue Exception => e
+		  end
+		  
 		  begin
   		  # Check for AWS environment
 		    url = URI.parse('http://169.254.169.254/latest/meta-data/') # AWS metadata url
@@ -275,6 +297,20 @@ module ManageEngine
   		  if (response.kind_of? Net::HTTPOK)
   		    @hostType = "AWS"
   		    return @hostType
+  		  elsif (response.kind_of? Net::HTTPUnauthorized)
+          uri = URI('http://169.254.169.254/latest/api/token')
+          request = Net::HTTP::Put.new(uri)
+          request['X-aws-ec2-metadata-token-ttl-seconds'] = '30'
+          response = Net::HTTP.start(uri.hostname, uri.port) {|http| http.request(request)}
+          token = response.body
+          url = URI.parse('http://169.254.169.254/latest/meta-data/instance-id') # AWS metadata url
+          request = Net::HTTP::Get.new(url.path)
+          request['X-aws-ec2-metadata-token'] = token
+          response = Net::HTTP.start(url.host, url.port, :read_timeout => 2) {|http| http.request(request)}
+          if (response.kind_of? Net::HTTPOK)
+            @hostType = "AWS"
+            return @hostType
+          end
   		  end
       rescue Exception => e
       end
@@ -294,6 +330,7 @@ module ManageEngine
       begin
         # Check for Heroku env. In the backgroud it is using AWS EC2, hence sending as AWS
         if (ENV.has_key?('DYNO') || ENV.has_key?('STACK'))
+          @obj.log.info "Agent is hosted in Heroku"
           @hostType = "AWS"
           return @hostType
         end

data/lib/agent/handler/sequence_book.rb

@@ -3,11 +3,11 @@ require 'agent/metrics/exception_record'
 module APMInsight
   module Agent
     class SequenceBook
-      attr_reader :openTracker, :closedTracker, :rootTracker, :trackerCount, :closedTrackerCount, :exceptionBag, :listenFlag
+      attr_reader :openTracker, :rootTracker, :trackerCount, :exceptionBag, :listenFlag
       
       def initialize
-        @rootTracker = createDummyTracker()
-        @closedTracker = @rootTracker
+        @rootTracker = nil
+        #@closedTracker = @rootTracker
         @openTracker = nil
         
         @trackerCount = 0
@@ -22,32 +22,34 @@ module APMInsight
         end
         
         # If RootTracker is not set, check type and set
-        if @rootTracker == @closedTracker
+        if @rootTracker == nil
           if !tracker.is_a?(ManageEngine::Tracker::RootTracker)
             closeSequence()
             return nil
           end
           @rootTracker = tracker
-          
           updateListenFlag()
         end
         
+        tracker.setParent(openTracker)
+        @openTracker = tracker
+        
         
         # Attach tracker as Sibling or Child and set nominee
-        if @closedTracker != nil
-          tracker.sibling = @closedTracker
-          @closedTracker.sibling = tracker # Nominee - if dropped/corrupted, defaults to this tracker
-          @openTracker = tracker
-          @closedTracker = nil
-        else
-          if tracker.equal?(@openTracker)
-            return nil
-          end
-          
-          @openTracker.child = tracker
-          tracker.sibling = @openTracker
-          @openTracker = tracker
-        end
+#        if @closedTracker != nil
+#          tracker.sibling = @closedTracker
+#          @closedTracker.sibling = tracker # Nominee - if dropped/corrupted, defaults to this tracker
+#          @openTracker = tracker
+#          @closedTracker = nil
+#        else
+#          if tracker.equal?(@openTracker)
+#            return nil
+#          end
+#          
+#          @openTracker.child = tracker
+#          tracker.sibling = @openTracker
+#          @openTracker = tracker
+#        end
         
         checkAndArrestSequence()
         
@@ -55,24 +57,26 @@ module APMInsight
       end
       
       def closeTracker tracker
-        @closedTrackerCount += 1
-        @closedTracker = tracker
-        tracker.sibling = nil
-        @openTracker = nil
+#        @closedTrackerCount += 1
+#        @closedTracker = tracker
+#        tracker.sibling = nil
+#        @openTracker = nil
+        @openTracker = tracker.parent;
         
         # Marks end of transaction
-        if @rootTracker == tracker
+#        if @rootTracker == tracker
+        if @openTracker == nil 
           if @listenFlag < 1 || (@listenFlag >= 1 && @trackerCount > 0)
             # if some trackers are not closed, while processing the metrics, it may go into infinite loop
-            if (@closedTrackerCount - @trackerCount) == 0
+#            if (@closedTrackerCount - @trackerCount) == 0
               sequenceBag = Hash.new
               sequenceBag["roottracker"] = @rootTracker
               sequenceBag["exceptions"] = @exceptionBag
               
               ManageEngine::APMObjectHolder.instance.collector.updateTransaction(@rootTracker.url, sequenceBag)
-            else
-              ManageEngine::APMObjectHolder.instance.log.warn "Some trackers are not closed, dropping the metrics for #{@rootTracker.url}"
-            end
+#            else
+#              ManageEngine::APMObjectHolder.instance.log.warn "Some trackers are not closed, dropping the metrics for #{@rootTracker.url}"
+#            end
           end
           closeSequence()
         end

data/lib/agent/logging/am_logger.rb

@@ -107,8 +107,8 @@ module ManageEngine
 
 
 		def logException(msg,e)
-			@apmlog.warn( "#{msg} => #{e.message}")
-			@apmlog.warn( "Message  : #{msg}\nTrace :\n#{e.backtrace}")
+			@apmlog.warn( "#{msg} => #{e.message} => #{e.backtrace}")
+			#@apmlog.warn( "Message  : #{msg}\nTrace :\n#{e.backtrace}")
 		end
 
 		def close

data/lib/agent/metrics/am_metricsformatter.rb

@@ -124,6 +124,8 @@ module ManageEngine
 			ins_apdx = [0,-1,-1,0,0,0,0,0,0]
 			logmetric = Hash.new
 			error_rt = 0
+			httpstatus = Hash.new
+			
 			@transaction.each do |key,value|
 			  apdexValue = value[0]
 			  ins_apdx[0] += apdexValue[0]
@@ -150,16 +152,23 @@ module ManageEngine
 				end
 				exceptions = value[1][@obj.constants.mf_logmetric]
 				if (exceptions != nil)
-  				exceptions.each do |name, count|
-  				  logmetric[name] = logmetric[name].to_i + count
-  				end
+				  logmetric = logmetric.merge(exceptions) { |key, oldval, newval| oldval + newval }
+#  				exceptions.each do |name, count|
+#  				  logmetric[name] = logmetric[name].to_i + count
+#  				end
 				end
+				
+        status = value[1][@obj.constants.httpstatus]
+        if (status != nil)
+          httpstatus = httpstatus.merge(status) { |key, oldval, newval| oldval + newval }
+        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
-			@instance[":apdex"]=[ins_apdx, {@obj.constants.mf_logmetric=>logmetric, @obj.constants.error_rt=>error_rt}]
+			
+			@instance[":apdex"]=[ins_apdx, {@obj.constants.mf_logmetric=>logmetric, @obj.constants.error_rt=>error_rt, @obj.constants.httpstatus=>httpstatus}]
 		end
 
 		def updatebginstance
@@ -233,6 +242,7 @@ module ManageEngine
 				pl = d["td"]
 				dbl = d["db"]
 				exc = d["exception"]
+#				comp = d["comp"]
 
 				rt = pl["rt"].round(2)
 #				path = @obj.constants.mf_transaction + @obj.constants.mf_separator + pl["path"]
@@ -266,6 +276,20 @@ module ManageEngine
   				  apx_stat = apxarray apx_stat,rt
   				end
 				
+  				if (pl.has_key?("status"))
+  				  statusHash = additionalInfo[@obj.constants.httpstatus]
+  				   if (statusHash == nil)
+  				     statusHash = Hash.new
+               additionalInfo[@obj.constants.httpstatus] = statusHash
+  				   end
+  				   
+  				   if (statusHash.has_key?(pl["status"]))
+  				      statusHash[pl["status"]] += 1
+  				   else
+  				      statusHash[pl["status"]] = 1
+  				   end
+  				end
+  				
   				if (exc != nil)
   				  logmetric = additionalInfo[@obj.constants.mf_logmetric]
   				  if (logmetric == nil)
@@ -277,6 +301,20 @@ module ManageEngine
             end
   				end
   				
+#  				if (comp != nil)
+#  				  begin
+#    				  compData = additionalInfo[@obj.constants.components]
+#    				    if (compData == nil) 
+#    				      compData = Array.new
+#                  additionalInfo[@obj.constants.components] = compData
+#    				    end
+#    				    comp.each do |name, info|
+#    				       if (compData.has)
+#    				    end
+#				    rescue Exception=>e
+#  				  end
+#  				end
+  				
   				@transaction[path] = [apx_stat, additionalInfo]		
         else
           stat =  nil
@@ -417,7 +455,7 @@ module ManageEngine
 				opstats = @dboperations[operation]
 			else
 			  opstats = Array.new;
-				opstats = [0.0,rt,rt,0,0]
+				opstats = [0,rt,rt,0,0]
 			end
 			
 			if (isError)

data/lib/agent/metrics/am_metricsparser.rb

@@ -25,6 +25,10 @@ module ManageEngine
 					  tdata["td"] = getTransData(rootTracker,tdata)
 					  tdata["db"] = getDBData(rootTracker, tdata, exceptionInfo)
             
+					  if (rootTracker.error?) # root tracker will be left out in above flow
+              updateExceptionMetric(rootTracker.error, tdata) # <= previously it was 'ret'
+              updateExceptionInfo(exceptionInfo, rootTracker.endtime.to_i, rootTracker.error)
+					  end
 					  exceptionBag = seqData["exceptions"]
 					  if exceptionBag != nil
 					    exceptionBag.each do |exceptionRecord|
@@ -87,14 +91,15 @@ module ManageEngine
 					tData.push(trac)
 					parseddata["trace-data"]=tData
 					@obj.log.debug "dummy trace added"
+          @obj.log.debug "trace threshold exceeded. Current Size: #{@obj.config.trace_overflow_t}"
 					return parseddata
 				elsif tData.length > @obj.config.trace_overflow_t
-					@obj.log.debug "trace threshold exceeded. Current Size: #{@obj.config.trace_overflow_t}"
 					return parseddata
 				end
 			end
 			begin
-			trdata = getTrace(rootTracker)
+			#trdata = getTrace(rootTracker)
+			  trdata = rootTracker.getTrace()
 			trac = updateTrace(rootTracker, trdata, exceptionInfo)
 			if(parseddata.has_key?("trace-data"))
 				traceData = parseddata["trace-data"];
@@ -141,6 +146,10 @@ module ManageEngine
   				  ret["error"] = true
   				end
   			end
+  			if (rootTracker.getStatus != nil && rootTracker.getStatus >= 400) 
+  			  ret["status"] = rootTracker.getStatus
+  			  ret["error"] = true
+  			end
 			rescue Exception=>e
 				#@obj.log.logException "Exception in getTranseData: #{e.message}",e
 				raise e
@@ -150,38 +159,92 @@ module ManageEngine
 
 		# Generates DB metric
 		def getDBData(tracker, tdata, exceptionInfo)
-		  while (tracker != nil)
-        tdata["db"] = getDBData(tracker.child, tdata, exceptionInfo)
-		    
-		    if tracker.kind_of?(ManageEngine::Tracker::DatabaseTracker)
-          if tdata["db"] == nil
-            tdata["db"] = 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
-          
-          tdata["db"].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
+		  if (tracker != nil)
+		    children = tracker.children
+	      children.each do |child|
+            tdata["db"] = getDBData(child, tdata, exceptionInfo)
+            if child.kind_of?(ManageEngine::Tracker::DatabaseTracker)
+                  if tdata["db"] == nil
+                    tdata["db"] = Array.new
+                  end
+                  queryInfo = child.getQueryInfo
+                  sqlStrip = queryInfo[0] + "/" + queryInfo[1] + "/dummydb"
+                  ret ={"rt"=>child.duration, "sql"=>child.getRawQuery,
+                        "sql-strip"=>sqlStrip, "name"=>child.name, "operation"=>queryInfo[0]}
+                  
+                  if (child.error?)
+                    ret["error"] = true
+                  end
+                  
+              tdata["db"].push(ret)
+            end ## DBTracker check
+            
+#            updateComponentData(child, tdata)
+            if (child.error?)
+              updateExceptionMetric(child.error, tdata) # <= previously it was 'ret'
+              updateExceptionInfo(exceptionInfo, child.endtime.to_i, child.error)
+            end
+	        end #end of children iteration
+
+#        tdata["db"] = getDBData(tracker.child, tdata, exceptionInfo)
+#		    
+#		    if tracker.kind_of?(ManageEngine::Tracker::DatabaseTracker)
+#          if tdata["db"] == nil
+#            tdata["db"] = 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
+#          
+#          tdata["db"].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 ## if tracker nil
 		  
 		  tdata["db"]
 		end
 
+		def updateComponentData (tracker, tdata)
+		  begin
+		      compData = tdata["comp"]
+		      if (compData == nil)
+		        compData = Hash.new
+		        tdata["comp"] = compData
+		      end
+		      info = compData[tracker.component]
+		      if (info == nil) 
+		        info = Hash.new
+		        compData[tracker.component] = info
+		        info[@obj.constants.component_name] = tracker.component
+		        info[@obj.constants.component_time] = tracker.duration
+		        info[@obj.constants.component_count] = 1
+	          if (tracker.error?) 
+              info[@obj.constants.component_error_count] = 1
+	          end
+		      else
+		          info[@obj.constants.component_time] += tracker.duration
+              info[@obj.constants.component_count] += 1
+              if (tracker.error?) 
+                info[@obj.constants.component_error_count] += 1
+              end
+		      end
+		  rescue Exception=>e
+		  end
+		end
+		
 		def updateExceptionMetric (exception, tdata)
 		  excData = tdata["exception"]
 		  if (excData == nil)
@@ -197,7 +260,8 @@ module ManageEngine
 #			{"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 = roottracker.getTxnName
-			det = {"thread_name"=>"rorthread","s_time"=>trans[0],"t_name"=>path,"r_time"=>trans[3],"thread_id"=>141}
+			det = {"s_time"=>trans[0],"t_name"=>path,"r_time"=>trans[3]}
+		  det = det.merge(roottracker.getTraceInfo)
 			
 			exception = trans[5] != nil ? trans[5][@obj.constants.mf_exception_st] : nil
 			if (exception != nil)
@@ -213,54 +277,54 @@ module ManageEngine
 			top
 		end
 		
-		def getTrace(rootTracker)
-		  trace = Array.new
-		  traceDetails(rootTracker, trace)
-		  
-		  return trace[0]
-		end
-
-		def traceDetails tracker, traceArr
-		  
-		  siblingDuration = 0
-		  
-		  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
-		  
-		  return siblingDuration
-		end
-
-
-		def updateExclusiveTrace data
-			childs = data[6]
-			childs.each do |arr|
-				data[4] = data[4] - (updateExclusiveTrace arr)[3]
-			end
-			data
-		end
+#		def getTrace(rootTracker)
+#		  trace = Array.new
+#		  traceDetails(rootTracker, trace)
+#		  
+#		  return trace[0]
+#		end
+#
+#		def traceDetails tracker, traceArr
+#		  
+#		  siblingDuration = 0
+#		  
+#		  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
+#		  
+#		  return siblingDuration
+#		end
+#
+#
+#		def updateExclusiveTrace data
+#			childs = data[6]
+#			childs.each do |arr|
+#				data[4] = data[4] - (updateExclusiveTrace arr)[3]
+#			end
+#			data
+#		end
 
 
 	end

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

@@ -24,34 +24,37 @@ module ManageEngine
         'Rails'
       end
       
-      # https://edgeguides.rubyonrails.org/active_support_instrumentation.html#rails-framework-hooks
-      
       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]
-            # request = payload[:request]
-            # request.original_url  => returns http://www.example.com/articles?page=2
-            # request.request_method
-          @railsTracker = ManageEngine::Tracker::RootTracker.new("#{payload[:controller]}.#{payload[:action]}", start.to_f * 1000)
-          @railsTracker.url=(path)
-          @railsTracker = ManageEngine::Agent::TrackerHandler.invokeTracker(@railsTracker)
+          result = payload[:path].partition("?")
+          railsTracker = ManageEngine::Tracker::RootTracker.new("#{payload[:controller]}.#{payload[:action]}", start.to_f * 1000)
+          railsTracker.url=(result[0])
+          railsTracker.queryString(result[2]) # even if value not available empty string will be returned
+          railsTracker.http_method(payload[:method])
+          railsTracker.http_params(payload[:params])
+            
+          railsTracker = ManageEngine::Agent::TrackerHandler.invokeTracker(railsTracker)
+          Thread.current[:railsTracker] = 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)
-              # TODO: payload[:status]
-              @railsTracker.setStatus(500) # By default, set 500 as status for error txns
+          begin
+            railsTracker = Thread.current[:railsTracker]
+            if (railsTracker != nil)
+              railsTracker.finish(finish.to_f * 1000)
+              railsTracker.setStatus(payload[:status])
+              exception = payload[:exception_object]
+              if exception != nil
+                railsTracker.setError(exception)
+              end
+              ManageEngine::Agent::TrackerHandler.exitTracker(railsTracker)
             end
-            ManageEngine::Agent::TrackerHandler.exitTracker(@railsTracker)
+          rescue Exception=>e
+            @obj.log.logException("Unable to process controller event #{name}. Exception: " ,e)
           end
         end
         

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

@@ -265,7 +265,18 @@ class APMWorker
   			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
-  			res[1][@obj.constants.error_rt] += dat[1][@obj.constants.error_rt]
+  			
+  			# error_rt merge 
+  			res_error_rt = res[1][@obj.constants.error_rt];
+  			dat_error_rt = dat[1][@obj.constants.error_rt];
+  			if (res_error_rt != nil)
+  			  if (dat_error_rt != nil)
+            res[1][@obj.constants.error_rt] = res_error_rt + dat_error_rt;
+          end
+        elsif (dat_error_rt != nil)
+          res[1][@obj.constants.error_rt] = dat_errror_rt;
+        end
+  			  
   			resExcepData = res[1][@obj.constants.mf_logmetric]
   			excepData = dat[1][@obj.constants.mf_logmetric]
   			if (resExcepData == nil)
@@ -296,7 +307,18 @@ class APMWorker
         rtData[3] = rtData[3]+dat[0][3]
         rtData[4] = rtData[4]+dat[0][4]
         res[0] = rtData
-        res[1][@obj.constants.error_rt] += dat[1][@obj.constants.error_rt]
+        
+        # error_rt merge 
+        res_error_rt = res[1][@obj.constants.error_rt];
+        dat_error_rt = dat[1][@obj.constants.error_rt];
+        if (res_error_rt != nil)
+          if (dat_error_rt != nil)
+            res[1][@obj.constants.error_rt] = res_error_rt + dat_errror_rt;
+          end
+        elsif (dat_error_rt != nil)
+          res[1][@obj.constants.error_rt] = dat_errror_rt;
+        end         
+        
         resExcepData = res[1][@obj.constants.mf_logmetric]
         excepData = dat[1][@obj.constants.mf_logmetric]
         if (resExcepData == nil)

data/lib/agent/trackers/database_tracker.rb

@@ -2,6 +2,11 @@ module ManageEngine
   module Tracker
     class DatabaseTracker < DefaultTracker
       
+      def initialize(name = "unknown", time = ManageEngine::APMObjectHolder.instance.util.currenttimemillis)
+        super(name, time)
+        @component = "DATABASE"
+      end
+      
       def sql(query)
         @query = format(query.dup)
       end
@@ -48,10 +53,28 @@ module ManageEngine
         
         begin
           tableName = case sqlArr[0]
-                 when "select" then sqlArr[sqlArr.index("from")+1]
-                 when "insert" then sqlArr[sqlArr.index("into")+1]
+                 when "select" then 
+                   fromIndex = sqlArr.index("from");
+                   if(fromIndex != nil)
+                     sqlArr[fromIndex+1]
+                   else
+                     "-" 
+                   end
+                 when "insert" then 
+                    intoIndex = sqlArr.index("into");
+                   if(intoIndex != nil)
+                     sqlArr[intoIndex+1]
+                   else
+                     "-" 
+                   end
                  when "update" then sqlArr[1]
-                 when "delete" then sqlArr[sqlArr.index("from")+1]
+                 when "delete" then
+                   fromIndex = sqlArr.index("from");
+                   if(fromIndex != nil)
+                     sqlArr[fromIndex+1]
+                   else
+                     "-" 
+                   end
                  when "create" then sqlArr[1] + sqlArr[2]
                  when "alter" then sqlArr[1] + sqlArr[2]
                  when "drop" then sqlArr[1] + sqlArr[2]
@@ -59,11 +82,12 @@ module ManageEngine
                  when "describe" then sqlArr[1] 
                  else "-"
                  end
-          
+          @signature = sqlArr[0] + " - " + tableName
           return [sqlArr[0], tableName]
   
         rescue Exception=>e
           @logger.logException "Error processing query #{sql} Exception: #{e.message}",e
+          @signature = sqlArr[0] + " - "
           return [sqlArr[0], '-']
         end
       end
@@ -102,6 +126,13 @@ module ManageEngine
         "#{@name} - #{@query}"
       end
       
+      def  getTrace
+        trace = super
+        if (@signature != nil)
+          trace[1] = @signature
+        end
+        trace
+      end
     end
   end
 end

data/lib/agent/trackers/default_tracker.rb

@@ -3,11 +3,13 @@ module ManageEngine
     
     class DefaultTracker
       
-    attr_accessor :name, :error, :endtime, :starttime, :child, :sibling
+    attr_accessor :name, :error, :endtime, :starttime, :component,  :children, :parent
       
-      def initialize(name = "unknonwn", time = ManageEngine::APMObjectHolder.instance.util.currenttimemillis)
+      def initialize(name = "unknown", time = ManageEngine::APMObjectHolder.instance.util.currenttimemillis)
         @starttime = time.to_i
         @name = name
+        @component = "APP CODE"
+        @children = Array.new
         @logger = ManageEngine::APMObjectHolder.instance.log
       end
       
@@ -15,6 +17,17 @@ module ManageEngine
         @endtime = time.to_i
       end
       
+      def setParent(parentTracker)
+        @parent = parentTracker
+        if parentTracker != nil
+          parentTracker.children[parentTracker.children.length]=self
+        end
+      end
+      
+      def component
+        @component
+      end
+      
       def error?
         @error != nil
       end
@@ -56,6 +69,24 @@ module ManageEngine
         end
       end
       
+      def getTrace
+        trace = Array.new(7)
+        trace[0] = @starttime
+        trace[1] = @name
+        trace[2] = @component
+        trace[3] = duration()
+        trace[4] = trace[3] #exclusive time
+        trace[5] = getAdditionalInfo()
+        if (children.length > 0)
+          trace[6] = Array.new
+          children.each do |child|
+            trace[4] -= child.duration() #computing exclusive time of parent
+            trace[6].push(child.getTrace())
+          end
+        end # children exists check
+        trace
+      end # getTrace
+      
     end
     
   end

data/lib/agent/trackers/root_tracker.rb

@@ -34,13 +34,19 @@ module ManageEngine
       end
       
       def queryString(querystring)
-        @queryString = querystring
+        if (!querystring.empty?)
+          @queryString = querystring
+        end
       end
       
       def setStatus(httpcode)
         @status = httpcode
       end
       
+      def getStatus
+        @status
+      end
+      
       def addCustomParam key, value
         if (@params == nil)
           @params = Hash.new
@@ -52,20 +58,19 @@ module ManageEngine
         @params = param
       end
       
-      def getAdditionalInfo
-        info = super
-        if (@http_method != nil && @queryString != nil && @status != nil)
-          if (info == nil)
-            info = Hash.new
-          end
+      def getTraceInfo
+        info = Hash.new
+        if (@http_method != nil) #&& @queryString != nil && @status != nil
           info["http_method_name"] = @http_method
+        end
+        if (@queryString != nil)
           info["http_query_str"] = @queryString
+          info["http_input_params"] = nil
+        end
+        if (@status != nil)
           info["httpcode"] = @status
         end
         if (@params != nil)
-          if (info == nil)
-            info = Hash.new
-          end
           info["custom_params"] = @params
         end
         info

data/lib/agent/util/am_constants.rb

@@ -7,6 +7,7 @@ module ManageEngine
 		attr_reader :licence_exceeds,:licence_expired,:unmanage_agent,:manage_agent,:agent_config_updated,:error_notfound,:error_server,:delete_agent,:response_code,:custom_config_info, :agent_specific_info
 		attr_reader :mf_transaction,:mf_separator,:mf_db,:mf_apdex,:mf_http,:mf_bckgrnd,:mf_namespace,:mf_name,:mf_all,:agent_store,:agent_lock,:mf_overflow
 		attr_reader :error_rt, :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
+		attr_reader :components,:component_name,:component_time,:component_count,:component_error_count,:component_isExternal,:component_ext_host,:component_ext_port,:component_ext_ip,:httpstatus
 		attr_reader :en_alphabets, :en_numerals
 		
 		def initialize
@@ -88,6 +89,17 @@ module ManageEngine
 			@mf_http = "http"
 			@mf_bckgrnd = "bckgrnd"
 
+			@components = "components"
+			@component_name = "name"
+			@component_time = "rt"
+			@component_count = "ct"
+			@component_error_count = "error"
+			@component_isExternal = "isExt"
+			@component_ext_host = "host"
+			@component_ext_port = "port"
+			@component_ext_ip = "ip"
+			
+      @httpstatus = "httpcode"
 			@error_rt = "error_rt"
       @mf_logmetric = "logmetric"
       @mf_logmetric_warning = "warning"

data/lib/agent/version.rb

@@ -6,8 +6,8 @@
 
 module ManageEngine
   class APMInsight
-    VERSION = '1.9.1'
+    VERSION = '1.9.3'
     MAJOR_VERSION = '1.9'
-    MINOR_VERSION = '1'
+    MINOR_VERSION = '3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: site24x7_apminsight
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.9.3
 platform: ruby
 authors:
 - Adithyan P
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-26 00:00:00.000000000 Z
+date: 2024-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -97,7 +97,6 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- conf/apminsight.conf
 - lib/agent/am_objectholder.rb
 - lib/agent/api/custom_tracker.rb
 - lib/agent/configuration/am_configuration.rb
@@ -135,7 +134,7 @@ files:
 homepage: https://www.site24x7.com/help/apm/ruby-agent.html
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -150,8 +149,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.0
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 3
 summary: Site24x7 APMInsight gives you end-to-end web-transaction awareness of Rails
   applications enabling you to isolate performance issues and resolve them quickly.

data/conf/apminsight.conf

@@ -1,86 +0,0 @@
-# $Id$
-#
-###################  APM Insight Agent Configuration File  ###################
-#
-#This file contains configuration options for APM Insight agent installation in your Application Server.
-#
-#NOTE: Though the properties can be defined in any different order, it is advisable to maintain
-#the below order for related properties and ease of reference.
-#
-#All the configuration options defaults to factory configuration if commented or not supported values
-
-#License key of your Site24x7 APM Insight account.
-license.key=
-
-#Logical name of your application. Say for example you have "Order Processing" applications running in
-#10 instances of Tomcat server. Specify the name as "Order Processing" for the name in all the 10 
-#instances while deploying the agent. Site24x7 will group the data from 10 instances of
-#Tomcat and provide response time, throughput etc. 
-application.name=My Application
-
-#APM Insight agent communicates to the Site24x7 through the HTTP/HTTPS protocol.
-#Specify Proxy server configuration when there is a proxy server between APM Insight agent and
-#Site24x7 server. 
-#
-behind.proxy=false
-#proxy.server.host=proxyserver
-#proxy.server.port=proxyport
-#proxy.auth.username=proxyuser
-#proxy.auth.password=proxypassword
-
-#Application Server HTTP/HTTPS listening port.Say for example when you are deploying the agent in Tomcat
-#Server running in 8080 port, specify the value as 8080.
-#[Mandatory]
-agent.server.port=8080
-
-#The Apdex (Application Performance Index) threshold is used to calculate application performance score.
-#More at http://www.apdex.org. 
-#A Transaction is said to be satisfied, if the response time is equal to or below the apdex.threshold.
-#A Transaction is said to be tolerating, if  the response time is greater than apdex.threshold and less 
-#than 4 times of apdex.threshold. A Transaction is said to be frustrated, if the response time is greater
-#than 4 times of apdex.threshold. Say for example when you specify the value as 2, transactions with response
-#time less than 2 seconds is considered as satisfied, transactions with response time greater than 2 and
-#less than 8 is considered as tolerating and transactions with response time greater than 8 seconds is 
-#considered as frustrating.
-#default value: 0.5 (second)
-apdex.threshold=0.5
-
-#Whether SQL queries getting executed in your application need to be tracked or not.
-#default value: true
-sql.capture.enabled=true
-
-#Whether the transaction trace is enabled or not. Setting this value to true will send the trace of the
-#slow transaction.
-#default value: true
-transaction.trace.enabled=true
-
-#Threshold to construct the trace for slow transactions. Transaction Traces violating this threshold will be 
-#collected and sent to the server. Used to analyze and troubleshoot the Transaction by the user.
-#default value: 2 (second)
-transaction.trace.threshold=2
-
-#Enabling this option will parametrize all SQL Queries in Slow Transaction Traces (if sql.capture.enabled 
-#set to true & transaction.trace.enabled set to true). Disabling this option will give you the real query
-#with actual parameters. It is recommended to enable this option if there are queries getting executed
-#using confidential parameters like credit card number, passwords, etc.
-#default value: true
-transaction.trace.sql.parametrize=true
-
-#Threshold value to generate a stack trace to identify the caller who executed a slow query. This stack 
-#trace is sent to the server for the user to analyze and troubleshoot
-#default value: 3 (second)
-transaction.trace.sql.stacktrace.threshold=3
-
-#Stop listening transactions with specified URL pattern.
-transaction.skip.listening=*.css, *.js, *.gif, *.jpg, *.jpeg, *.bmp, *.png, *.ico
-
-#Directory where agent logs information separately.
-#Defaults to the directory where apminsight-javaagent.jar is installed. 
-#Use forward slash(/) as path separator.
-#apminsight.log.dir=./apminsight/logs
-
-#The log level at which the APM Insight agent should record logging 
-#information. The levels are SEVERE, WARNING, INFO, FINE in the order 
-#respectively. Defaults to the level INFO if commented or mentioned 
-#incorrectly.
-apminsight.log.level=INFO