site24x7_apminsight 1.5.1 → 1.5.2

data/lib/agent/logging/am_logger.rb

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

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

@@ -27,8 +27,9 @@ module ManageEngine
         @obj.log.info "Instrumenting ActionController.. Rails Version: #{version}"
         
         ActiveSupport::Notifications.subscribe('start_processing.action_controller') do |name, start, finish, id, payload|
-          if @obj.config.agent_enabled && @obj.txn_util.listen?(payload[:path])
-            url = "#{payload[:path]} #{payload[:controller]}##{payload[:action]}"
+          path = payload[:path].partition("?")[0]
+          if @obj.config.agent_enabled && @obj.txn_util.listen?(path)
+            url = "#{path} #{payload[:controller]}##{payload[:action]}"
             railsTracker = ManageEngine::Tracker::RootTracker.new(url, start.to_f * 1000)
             Thread.current[:apminsight] = railsTracker
           end

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

@@ -242,18 +242,36 @@ class APMWorker
 
 
 		def mapdx res,dat
-			res[0] = res[0]+dat[0];
-			if dat[1]<res[1]
-				res[1]=dat[1]
-			end
-			if dat[2]>res[2]
-				res[2]=dat[2]
-			end
-			res[3] = res[3]+dat[3]
-			res[5] = res[5]+dat[5]
-			res[6] = res[6]+dat[6]
-			res[7] = res[7]+dat[7]
-			res[4] = (res[5].to_f + (res[6].to_f/2).to_f).to_f/res[3].to_f
+		  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[5] = rtData[5]+dat[0][5]
+  			rtData[6] = rtData[6]+dat[0][6]
+  			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
+  			
+  			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 data",e
+  			end
 			res
 		end
 
@@ -266,6 +284,7 @@ class APMWorker
 				res[2]=dat[2]
 			end
 			res[3] = res[3]+dat[3]
+			res[4] = res[4]+dat[4]
 			res
 		end
 	

data/lib/version.rb

@@ -6,8 +6,8 @@
 
 module ManageEngine
   class APMInsight
-    VERSION = '1.5.1'
+    VERSION = '1.5.2'
     MAJOR_VERSION = '1.5'
-    MINOR_VERSION = '1'
+    MINOR_VERSION = '2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: site24x7_apminsight
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-03 00:00:00.000000000Z
+date: 2017-09-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &22963920 !ruby/object:Gem::Requirement
+  requirement: &21882576 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22963920
+  version_requirements: *21882576
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &23401392 !ruby/object:Gem::Requirement
+  requirement: &22320048 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *23401392
+  version_requirements: *22320048
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &23748876 !ruby/object:Gem::Requirement
+  requirement: &22667532 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *23748876
+  version_requirements: *22667532
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &23913468 !ruby/object:Gem::Requirement
+  requirement: &22832124 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23913468
+  version_requirements: *22832124
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &23932512 !ruby/object:Gem::Requirement
+  requirement: &22851168 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *23932512
+  version_requirements: *22851168
 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)