site24x7_apminsight 1.8.8 → 1.9.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 6adf1511641c4e23c0e5f0a0ac71336dd62c4fe0ee23b0df46b07e804c74841a
+  data.tar.gz: 1d5dcaa91fd5e185f3592c86f686af35f33d20918297ef0f1d2deeaffa5a5c7b
+SHA512:
+  metadata.gz: 7a01e038e40a5656c0c62dd353dcb5c118bc071312612aef245fdf1d2edcf2ae4a6dded206406febda1f029b42a961b5b75758565758938dc5ee77a7e837b92c
+  data.tar.gz: 80d84c7ba2f6095adb9050040283a788242d94f7ad9e00b9141b76addbb88123fa16027de9af33723bd3a60daa9e5a01c4a75b5ea0205a0d3c009aed7f23ca3c

data/LICENSE.txt

@@ -1,4 +1,4 @@
-This License Agreement details the policy for license of Site24x7 APM Insight Ruby Agent ("Licensed Software")
+This License Agreement details the policy for license of ManageEngine 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
-	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.
+	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.
  
 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 site24x7_apminsight
+			gem install apminsight
     				
 			OR
 
-	* 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 
+	    * Download the apminsight.gem file directly from our website or the RubyGems website and run the command 
 		
-			gem install site24x7_apminsight.gem
+			gem install apminsight.gem
 
 Configuration
 
@@ -21,28 +21,30 @@ Configuration
 
     	For each of your applications, add the following line to the application gemfile:
 
-        	gem 'site24x7_apminsight'
+        	gem 'apminsight'
 		
 				OR
 
     	For each of your applications, add the following line to the application initializer block:
 
-        	require 'site24x7_apminsight'
+        	require 'apminsight'
 
-	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.
+	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.
  
 
 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 Site24x7 server.
+    application.name - The application's name to be displayed in Applications Manager.
 
-    license.key - The license api key from your account page after sign in (https://site24x7.com)
+    apm.host - The host where Applications Manager is running.
+
+    apm.port - The HTTP port of Applications Manager.
 
     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. https://www.site24x7.com/help/apm/apm-insight-configuration.html
+More configuration options of APM Insight Ruby Agent can be found here.
  
 Supported Environments :
 
@@ -52,16 +54,16 @@ Supported Environments :
 
 References
 
-	* Create an apminsight account in Site24x7 server (https://www.site24x7.com)
+	* Download link for Applications Manager
 
-	* Download link for site24x7_apminsight gem 
+		http://www.manageengine.com/products/applications_manager/
 
-		From your account page after valid sign in
-			or
-		http://rubygems.org/gems/site24x7_apminsight
+	* Download link for apminsight 
 
-	* Help Documentation for apminsight
+		http://www.manageengine.com/products/applications_manager/
+		http://rubygems.org/gems/apminsight
 
-		https://www.site24x7.com/help/apm/ruby-agent.html
-		https://support.site24x7.com/portal/helpcenter/site24x7/apm-insight/ruby-monitoring
+	* Help Documentation for apminsight
 
+		http://www.manageengine.com/products/applications_manager/help/APMInsight/installing-transaction-agent.html
+		

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 = "site24x7_apminsight"
-  gem.homepage = "https://www.site24x7.com/help/apm/ruby-agent.html"
+  gem.name = "apminsight"
+  gem.homepage = "http://www.manageengine.com/products/applications_manager/ruby-webtransaction-monitoring.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 = ["Rajalakshmi Ezhilan"]
+  gem.authors = ["Sabarinathan P"]
   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 = "site24x7_apminsight #{version}"
+  rdoc.title = "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

@@ -180,7 +180,7 @@ module ManageEngine
 			@metric_overflow_t=250
       @dbmetric_overflow_t=500
 			@trace_overflow_t=30
-			@site24x7url = @obj.constants.site24x7USurl #default agent communication URL
+			#@site24x7url = @obj.constants.site24x7USurl #default agent communication URL
       @delayedStart = false
 		end
 
@@ -385,6 +385,9 @@ module ManageEngine
   		if defined?(Rainbows) then
   		  dispatcher = "rainbows"
   		end
+  		if defined?(Puma) then
+  		  dispatcher = "puma"
+  		end
   		dispatcher
 		end
 		

data/lib/agent/handler/sequence_book.rb

@@ -62,7 +62,7 @@ module APMInsight
         
         # Marks end of transaction
         if @rootTracker == tracker
-          if @listenFlag < 1 || (@listenFlag >= 1 && @trackerCount > 1)
+          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
               sequenceBag = Hash.new

data/lib/agent/metrics/am_metricsformatter.rb

@@ -17,8 +17,10 @@ module ManageEngine
 				@apdex_threshold = @obj.config.apdex_t * 1000
 				#@obj.log.info "[FORMAT]"
 				@transaction = Hash.new
+				@bgTransaction = Hash.new
 				@db = Hash.new
 				@instance = Hash.new
+				@bginstance = Hash.new
 				@dbinstance = Hash.new
 				@dboperations = Hash.new
 				@keystoremove = Array.new
@@ -27,6 +29,7 @@ module ManageEngine
 					updatetransaction value
 				end
 				updateinstance
+				updatebginstance
 				updatedbinstance
 
 				@transaction.each do |key,value|
@@ -39,6 +42,16 @@ module ManageEngine
 					result.push(valArr)
 				end
 
+				@bgTransaction.each do |key,value|
+              res = Hash.new
+              res[@obj.constants.mf_namespace] = key
+              res[@obj.constants.mf_name] = @obj.constants.mf_bckgrnd
+              valArr= Array.new
+              valArr[0] =res
+              valArr[1] =value
+              result.push(valArr)
+            end
+            
 				@db.each do |key,value|
 					#puts "#{key} == #{value}"
 					res = Hash.new
@@ -58,6 +71,15 @@ module ManageEngine
 					valArr[1] =value
 					result.push(valArr)
 				end
+				@bginstance.each do |key,value|
+          res = Hash.new
+          res[@obj.constants.mf_namespace] = ""
+          res[@obj.constants.mf_name] =   @obj.constants.mf_bckgrnd
+          valArr= Array.new
+          valArr[0] =res
+          valArr[1] =value
+          result.push(valArr)
+        end
 				@dbinstance.each do |key,value|
 					res = Hash.new
 					res[@obj.constants.mf_namespace] = ""
@@ -95,8 +117,13 @@ module ManageEngine
 		end
 
 		def updateinstance
+		  if (@transaction.size == 0)
+		    return
+		  end 
+		  
 			ins_apdx = [0,-1,-1,0,0,0,0,0,0]
 			logmetric = Hash.new
+			error_rt = 0
 			@transaction.each do |key,value|
 			  apdexValue = value[0]
 			  ins_apdx[0] += apdexValue[0]
@@ -117,7 +144,10 @@ module ManageEngine
 				ins_apdx[6] += apdexValue[6]	
 				ins_apdx[7] += apdexValue[7]	
 				ins_apdx[8] += apdexValue[8]
-				
+				ert =  value[1][@obj.constants.error_rt]
+				if (ert != nil)
+				  error_rt += ert
+				end
 				exceptions = value[1][@obj.constants.mf_logmetric]
 				if (exceptions != nil)
   				exceptions.each do |name, count|
@@ -129,9 +159,48 @@ module ManageEngine
 			  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}]
+			@instance[":apdex"]=[ins_apdx, {@obj.constants.mf_logmetric=>logmetric, @obj.constants.error_rt=>error_rt}]
 		end
 
+		def updatebginstance
+      if (@bgTransaction.size == 0)
+        return
+      end 
+      
+      stats = [0,-1,-1,0,0]
+      logmetric = Hash.new
+      error_rt = 0
+      @bgTransaction.each do |key,value|
+        txnValue = value[0]
+        stats[0] += txnValue[0]
+        if stats[1] == -1
+          stats[1] = txnValue[1]
+          stats[2] = txnValue[2]
+        else
+          if(txnValue[1]<stats[1])
+            stats[1] = txnValue[1]
+          end
+          if (txnValue[2]>stats[2])
+            stats[2] = txnValue[2]
+          end
+        end
+        stats[3] += txnValue[3]
+        stats[4] += txnValue[4]  
+        
+        ert =  value[1][@obj.constants.error_rt]
+        if (ert != nil)
+          error_rt += ert
+        end
+        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
+      @bginstance[":bckgrnd"]=[stats, {@obj.constants.mf_logmetric=>logmetric, @obj.constants.error_rt=>error_rt}]
+    end
+    
 		def updatedbinstance
 			cnt = 0;
 			rt = 0;
@@ -166,42 +235,91 @@ module ManageEngine
 				exc = d["exception"]
 
 				rt = pl["rt"].round(2)
-				path = @obj.constants.mf_transaction + @obj.constants.mf_separator + pl["path"]
-
-
-				apx_stat =  nil
-				additionalInfo = nil
-				if(@transaction.has_key?(path))
-					apx_stat = @transaction[path][0]
-					additionalInfo = @transaction[path][1]
-				else
-					if @transaction.length == @obj.config.metric_overflow_t
-					  @obj.log.debug "Metricstore overflow. Current Size: #{@obj.config.metric_overflow_t} #{path}"
-					  return
-					end
-					apx_stat = Array.new
-					apx_stat = [0,0,0,0,0,0,0,0,0]
-					additionalInfo = Hash.new
-				end
+#				path = @obj.constants.mf_transaction + @obj.constants.mf_separator + pl["path"]
+				  path = pl["path"]
 				
-				if (pl.has_key?("error"))
-				  apx_stat[8] += 1
-				else
-				  apx_stat = apxarray apx_stat,rt
-				end
+				if (pl["type"] == @obj.constants.mf_http)
+  				apx_stat =  nil
+  				additionalInfo = nil
+  				if(@transaction.has_key?(path))
+  					apx_stat = @transaction[path][0]
+  					additionalInfo = @transaction[path][1]
+  				else
+  					if @transaction.length == @obj.config.metric_overflow_t
+  					  @obj.log.debug "Metricstore overflow. Current Size: #{@obj.config.metric_overflow_t} #{path}"
+  					  return
+  					end
+  					
+  					apx_stat = Array.new
+  					apx_stat = [0,0,0,0,0,0,0,0,0]
+  					additionalInfo = Hash.new
+  				end
+  				
+  				if (pl.has_key?("error"))
+  				  apx_stat[8] += 1
+  				  if (additionalInfo[@obj.constants.error_rt] == nil)
+              additionalInfo[@obj.constants.error_rt] = rt
+            else
+              additionalInfo[@obj.constants.error_rt] += rt
+            end
+  				else
+  				  apx_stat = apxarray apx_stat,rt
+  				end
 				
-				if (exc != nil)
-				  logmetric = additionalInfo[@obj.constants.mf_logmetric]
-				  if (logmetric == nil)
-            additionalInfo[@obj.constants.mf_logmetric] = exc
-				  else
-            exc.each do |name, count|
-              logmetric[name] = logmetric[name].to_i + count
+  				if (exc != nil)
+  				  logmetric = additionalInfo[@obj.constants.mf_logmetric]
+  				  if (logmetric == nil)
+              additionalInfo[@obj.constants.mf_logmetric] = exc
+  				  else
+              exc.each do |name, count|
+                logmetric[name] = logmetric[name].to_i + count
+              end
+            end
+  				end
+  				
+  				@transaction[path] = [apx_stat, additionalInfo]		
+        else
+          stat =  nil
+          additionalInfo = nil
+          if(@bgTransaction.has_key?(path))
+            stat = @bgTransaction[path][0]
+            additionalInfo = @bgTransaction[path][1]
+          else
+            if @bgTransaction.length == @obj.config.metric_overflow_t
+              @obj.log.debug "Metricstore overflow. Current Size: #{@obj.config.metric_overflow_t} #{path}"
+              return
             end
+            
+            stat = Array.new
+            stat = [0,0,0,0,0]
+            additionalInfo = Hash.new
           end
-				end
-				
-				@transaction[path] = [apx_stat, additionalInfo]
+          
+          if (pl.has_key?("error"))
+            stat[4] += 1
+            if (additionalInfo[@obj.constants.error_rt] == nil)
+              additionalInfo[@obj.constants.error_rt] = rt
+            else
+              additionalInfo[@obj.constants.error_rt] += rt
+            end
+          else
+            stat = updatert stat,rt
+          end
+        
+          if (exc != nil)
+            logmetric = additionalInfo[@obj.constants.mf_logmetric]
+            if (logmetric == nil)
+              additionalInfo[@obj.constants.mf_logmetric] = exc
+            else
+              exc.each do |name, count|
+                logmetric[name] = logmetric[name].to_i + count
+              end
+            end
+          end
+          
+          @bgTransaction[path] = [stat, additionalInfo]   
+        end
+  		 
 				if(dbl!=nil)
 					if @db.length < @obj.config.dbmetric_overflow_t
 						updatedb dbl,path

data/lib/agent/metrics/am_metricsparser.rb

@@ -95,7 +95,7 @@ module ManageEngine
 			end
 			begin
 			trdata = getTrace(rootTracker)
-			trac = updateTrace(rootTracker.url, trdata, exceptionInfo)
+			trac = updateTrace(rootTracker, trdata, exceptionInfo)
 			if(parseddata.has_key?("trace-data"))
 				traceData = parseddata["trace-data"];
 				traceData.push(trac);
@@ -136,7 +136,7 @@ module ManageEngine
   				ret = tdata["td"]
   				ret["rt"] = ret["rt"] + rootTracker.duration
   			else
-  				ret = {"rt"=> rootTracker.duration, "path"=>rootTracker.url}
+  				ret = {"rt"=> rootTracker.duration, "path"=>rootTracker.getTxnName, "type"=>rootTracker.getTxnType}
   				if (rootTracker.error?)
   				  ret["error"] = true
   				end
@@ -193,10 +193,10 @@ module ManageEngine
 		  excData[@obj.constants.mf_logmetric_warning] = excData[@obj.constants.mf_logmetric_warning].to_i + 1
 		end
 		
-		def updateTrace(url, trans, exceptionInfo)
+		def updateTrace(roottracker, 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 + url
+			path = roottracker.getTxnName
 			det = {"thread_name"=>"rorthread","s_time"=>trans[0],"t_name"=>path,"r_time"=>trans[3],"thread_id"=>141}
 			
 			exception = trans[5] != nil ? trans[5][@obj.constants.mf_exception_st] : nil

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

@@ -2,6 +2,8 @@ require 'agent/server/instrument/rails'
 require 'agent/server/instrument/sinatra'
 require 'agent/server/instrument/active_record'
 require 'agent/server/instrument/action_view'
+require 'agent/server/instrument/sidekiq_server'
+require 'agent/server/instrument/puma'
 
 module ManageEngine
   class Environment
@@ -16,7 +18,9 @@ module ManageEngine
     ]
     
     OTHER_INTERCEPTORS = [
-        ManageEngine::Instrumentation::ActionView.new
+        ManageEngine::Instrumentation::ActionView.new,
+        ManageEngine::Instrumentation::SidekiqServer.new,
+        ManageEngine::Instrumentation::PumaWorker.new
     ]
     
     def detect_and_instrument

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

@@ -0,0 +1,39 @@
+module ManageEngine
+  module Instrumentation
+    class PumaWorker
+      
+      def present?
+          defined?(Puma::Server)
+        end
+        
+        def version
+          Puma::Const::PUMA_VERSION
+        end
+        
+        def env
+          ENV['RACK_ENV'] || ENV['RAILS_ENV'] || 'development'
+        end
+        
+        def name
+          'Puma Worker'
+        end
+        
+        def instrument
+          ManageEngine::APMObjectHolder.instance.log.info "Instrumenting Puma server workers. Version: #{version}"
+            Puma::Server.class_eval do
+                include ManageEngine::Instrumentation::PumaRun
+                alias original_run run
+                alias run agent_run
+            end
+        end
+    end
+    
+    module PumaRun
+      def agent_run(*args, &block)
+        ::ManageEngine::APMObjectHolder.instance.agent.doCollect
+        original_run(*args, &block)
+      end
+    end
+    
+  end
+end

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

@@ -24,6 +24,8 @@ 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}"
@@ -31,6 +33,9 @@ module ManageEngine
         
         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)
@@ -43,6 +48,7 @@ module ManageEngine
             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
             end
             ManageEngine::Agent::TrackerHandler.exitTracker(@railsTracker)

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

@@ -0,0 +1,38 @@
+require 'agent/am_objectholder'
+require 'agent/trackers/default_tracker'
+
+module ManageEngine
+  module Instrumentation
+    class SidekiqClient
+      include Sidekiq::ClientMiddleware if defined?(Sidekiq::ClientMiddleware)
+            
+      def call(worker, msg, queue, *_)
+            tracker = nil
+            result = nil
+            begin
+                # https://github.com/sidekiq/sidekiq/blob/main/lib/sidekiq/middleware/chain.rb
+                # Check comment section
+              jobName = msg["class"]
+              tracker = ManageEngine::Tracker::DefaultTracker.new("Sidekiq - " + msg["class"] + " - Job Id: " + msg["jid"])
+              tracker = ManageEngine::Agent::TrackerHandler.invokeTracker(tracker)
+            rescue Exception=>e
+              ManageEngine::APMObjectHolder.instance.log.info "Exception while creating tracker for sidekiq_client #{e}"
+            end
+            begin
+              result = yield
+            rescue Exception=>e
+              if (tracker != nil)
+                tracker.setError(e)
+              end
+              raise e
+            ensure
+            if tracker != nil
+              tracker.finish
+              ManageEngine::Agent::TrackerHandler.exitTracker(tracker)
+            end
+          end
+          result
+        end
+    end
+  end
+end

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

@@ -0,0 +1,66 @@
+require 'agent/am_objectholder'
+require 'agent/trackers/root_tracker'
+require 'agent/server/instrument/sidekiq_client'
+
+module ManageEngine
+  module Instrumentation
+    class SidekiqServer
+         include Sidekiq::ServerMiddleware if defined?(Sidekiq::ServerMiddleware)
+          
+          def present?
+            defined?(::Sidekiq::ServerMiddleware)
+           end
+            
+            def version
+             Sidekiq::VERSION
+            end
+            
+            def name
+              'Sidekiq'
+            end
+            
+            def instrument
+              ::Sidekiq.configure_server do |config|            
+                config.server_middleware do |chain|
+                  chain.add(ManageEngine::Instrumentation::SidekiqServer)
+                end
+              end
+              ::Sidekiq.configure_client do |config|            
+                  config.client_middleware do |chain|
+                    chain.add(ManageEngine::Instrumentation::SidekiqClient)
+                  end
+                end
+              ManageEngine::APMObjectHolder.instance.log.info "Instrumenting #{name}  Version: #{version}"
+            end
+            
+          def call(worker, msg, queue, *_)
+            tracker = nil
+            begin
+                # https://github.com/sidekiq/sidekiq/blob/main/lib/sidekiq/middleware/chain.rb
+                # Check comment section
+              jobName = msg["class"]+".perform"
+              tracker = ManageEngine::Tracker::RootTracker.new(jobName + " jid: " + msg["jid"])
+              tracker.url = jobName
+              tracker.setTxnType(ManageEngine::APMObjectHolder.instance.constants.mf_bckgrnd)
+              #tracker.addAdditionalInfo(msg)
+              tracker = ManageEngine::Agent::TrackerHandler.invokeTracker(tracker)
+            rescue Exception=>e
+              ManageEngine::APMObjectHolder.instance.log.info "Exception while creating tracker for sidekiq_server #{e}"
+            end
+            begin
+              yield
+            rescue Exception=>e
+              if (tracker != nil)
+                tracker.setError(e)
+              end
+              raise e
+            ensure
+            if tracker != nil
+              tracker.finish
+              ManageEngine::Agent::TrackerHandler.exitTracker(tracker)
+            end
+          end
+        end
+    end
+  end
+end

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

@@ -231,6 +231,8 @@ class APMWorker
 				if tdata.has_key?(name)
 					if (sd[0]["name"]=="apdex")
 						tdata[name][1] = mapdx(tdata[name][1],sd[1])
+					elsif (sd[0]["name"]=="bckgrnd")
+						tdata[name][1] = mapbg(tdata[name][1],sd[1])  
 					else
 						tdata[name][1] = mapdb(tdata[name][1],sd[1])
 					end
@@ -263,7 +265,7 @@ 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]
   			resExcepData = res[1][@obj.constants.mf_logmetric]
   			excepData = dat[1][@obj.constants.mf_logmetric]
   			if (resExcepData == nil)
@@ -281,6 +283,36 @@ class APMWorker
 			res
 		end
 
+		def mapbg res,dat
+      begin
+        rtData = res[0];
+        rtData[0] = rtData[0]+dat[0][0];
+        if dat[0][1]<rtData[1]
+          rtData[1]=dat[0][1]
+        end
+        if dat[0][2]>rtData[2]
+          rtData[2]=dat[0][2]
+        end
+        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]
+        resExcepData = res[1][@obj.constants.mf_logmetric]
+        excepData = dat[1][@obj.constants.mf_logmetric]
+        if (resExcepData == nil)
+            resExcepData = excepData
+        else
+          if (excepData != nil)
+            resExcepData = resExcepData.merge(excepData){|key, oldval, newval| newval + oldval}
+          end
+        end
+        
+        res[1][@obj.constants.mf_logmetric] = resExcepData != nil ? resExcepData : Hash.new
+        rescue Exception=>e
+          @obj.log.logException "Exception while merging bg data",e
+        end
+      res
+    end
 		def mapdb res,dat
 			res[0] = res[0]+dat[0];
 				if dat[1]<res[1]

data/lib/agent/trackers/database_tracker.rb

@@ -63,7 +63,7 @@ module ManageEngine
           return [sqlArr[0], tableName]
   
         rescue Exception=>e
-          @logger.logException "#{e.message}",e
+          @logger.logException "Error processing query #{sql} Exception: #{e.message}",e
           return [sqlArr[0], '-']
         end
       end

data/lib/agent/trackers/root_tracker.rb

@@ -4,12 +4,27 @@ module ManageEngine
   module Tracker
     class RootTracker < DefaultTracker
       
-      attr_accessor :status, :url
+      attr_accessor :status, :url, :txnType
       
       def url=(url = "unknown")
         @url = ManageEngine::APMObjectHolder.instance.txn_util.normalizeName(url)
       end
       
+      def getTxnName
+        ManageEngine::APMObjectHolder.instance.constants.mf_transaction + getTxnType() + ManageEngine::APMObjectHolder.instance.constants.mf_separator + @url
+      end
+      
+      def setTxnType(type)
+        @txnType=type
+      end
+      
+      def getTxnType
+        if (@txnType == nil)
+          @txnType = ManageEngine::APMObjectHolder.instance.constants.mf_http
+        end
+        @txnType
+      end
+      
       def http_method(method)
         @http_method = method
       end
@@ -26,6 +41,17 @@ module ManageEngine
         @status = httpcode
       end
       
+      def addCustomParam key, value
+        if (@params == nil)
+          @params = Hash.new
+        end
+        @params[key] = value
+      end
+      
+      def addAdditionalInfo param
+        @params = param
+      end
+      
       def getAdditionalInfo
         info = super
         if (@http_method != nil && @queryString != nil && @status != nil)
@@ -36,6 +62,12 @@ module ManageEngine
           info["http_query_str"] = @queryString
           info["httpcode"] = @status
         end
+        if (@params != nil)
+          if (info == nil)
+            info = Hash.new
+          end
+          info["custom_params"] = @params
+        end
         info
       end
     end

data/lib/agent/util/am_constants.rb

@@ -5,8 +5,8 @@ module ManageEngine
 		attr_reader :conf_location, :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,:mergepattern_conf
 		attr_reader :site24x7USurl, :site24x7EUurl, :site24x7CNurl, :site24x7INurl, :site24x7AUurl, :site24x7GDurl, :site24x7JPurl, :site24x7CAurl, :site24x7SAurl, :site24x7UKurl, :site24x7HDFCurl
 		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_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
+		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 :en_alphabets, :en_numerals
 		
 		def initialize
@@ -82,10 +82,13 @@ module ManageEngine
 			@mf_all = "all"
 
 			@mf_separator = "/"
-			@mf_transaction = "transaction" + @mf_separator + "http"
+			@mf_transaction = "transaction" + @mf_separator
 			@mf_db = "db"
 			@mf_overflow = "0verf10w"
+			@mf_http = "http"
+			@mf_bckgrnd = "bckgrnd"
 
+			@error_rt = "error_rt"
       @mf_logmetric = "logmetric"
       @mf_logmetric_warning = "warning"
       @mf_err_st = "err_st"

data/lib/agent/version.rb

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

metadata

@@ -1,110 +1,103 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: site24x7_apminsight
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 8
-  - 8
-  version: 1.8.8
+version: !ruby/object:Gem::Version
+  version: 1.9.1
 platform: ruby
-authors: 
+authors:
 - Adithyan P
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2024-01-31 00:00:00 +05:30
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2024-06-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: shoulda
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: jeweler
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 6
-        - 4
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 1.6.4
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rcov
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.4
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rails
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
-  version_requirements: *id005
-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
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+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
 email: apm-insight@zohocorp.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - LICENSE.txt
 - README.rdoc
 - Rakefile
 - VERSION
-- site24x7-agent.gemspec
 - conf/apminsight.conf
-- lib/site24x7_apminsight.rb
 - lib/agent/am_objectholder.rb
 - lib/agent/api/custom_tracker.rb
 - lib/agent/configuration/am_configuration.rb
@@ -124,7 +117,10 @@ files:
 - lib/agent/server/instrument/am_apm.rb
 - lib/agent/server/instrument/am_instrumenter.rb
 - lib/agent/server/instrument/environment.rb
+- lib/agent/server/instrument/puma.rb
 - lib/agent/server/instrument/rails.rb
+- lib/agent/server/instrument/sidekiq_client.rb
+- lib/agent/server/instrument/sidekiq_server.rb
 - lib/agent/server/instrument/sinatra.rb
 - lib/agent/server/worker/am_worker.rb
 - lib/agent/trackers/database_tracker.rb
@@ -134,37 +130,33 @@ files:
 - lib/agent/util/am_util.rb
 - lib/agent/util/transaction_util.rb
 - lib/agent/version.rb
-has_rdoc: true
+- 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: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 3.0.0
 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. To monitor Rails application performance, download and deploy Ruby agent(site24x7_apminsight.gem) 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
+summary: 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.gem)
+  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
 test_files: []
-