site24x7_apminsight 1.3 → 1.4

data/lib/agent/configuration/am_configuration.rb

@@ -7,7 +7,7 @@ require 'version'
 
 module ManageEngine
 	class APMConfig
-		attr_reader :agenthost,:agentport,:instance_id,:alreadyconnected,:apmhost,:apmport,:license_key,:site24x7
+		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_accessor :app_db,:app_dispatcher,:lastupdatedtime
@@ -23,6 +23,9 @@ module ManageEngine
 			@agent_enabled = false
 			@alreadyconnected = checkAgentInfo
 			@site24x7 = checkLicenseFile
+			if (@site24x7)
+			  @site24x7url = @license_key.start_with?('eu') ? @obj.constants.site24x7EUurl : @obj.constants.site24x7USurl
+			end
 			@db_operations =["select","insert","update","delete"]
 			urlMergePattern
 			@obj.log.debug "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
@@ -153,6 +156,7 @@ module ManageEngine
 			@sql_trace_t=3
 			@metric_overflow_t=250
 			@trace_overflow_t=60
+			@site24x7url = @obj.constants.site24x7USurl #default agent communication URL
 		end
 
 		def assignConfig

data/lib/agent/metrics/am_metricsformatter.rb

@@ -173,7 +173,7 @@ module ManageEngine
 
 				apx_stat =  nil
 				if(@transaction.has_key?(path))
-					apx_stat = @transaction[path]
+					apx_stat = @transaction[path][0]
 				else
 					apx_stat = Array.new
 					apx_stat = [0,0,0,0,0,0,0,0,0]
@@ -238,7 +238,7 @@ module ManageEngine
 		# Updates resp time, min rt and max rt in apdex metric
 		def updatert apx_stat,rt 
 			#	Apmagent::ApmLogger.instance.info "updatert : start"
-			apx_stat[3] =  apx_stat[3] +1
+			apx_stat[3] =  apx_stat[3] + 1
 			apx_stat[0] = apx_stat[0] + rt
 			if(apx_stat[1] == 0 || rt < apx_stat[1])
 				apx_stat[1] = rt

data/lib/agent/metrics/am_metricsparser.rb

@@ -40,7 +40,8 @@ module ManageEngine
 							                @obj.constants.mf_loginfo_level=>@obj.constants.mf_loginfo_level_warn,
 							                @obj.constants.mf_loginfo_str=>exception[1],
 							                @obj.constants.mf_loginfo_err_clz=>exception[0],
-							                @obj.constants.mf_loginfo_st=>formatStacktrace(arr["payload"][:exception_object].backtrace)}
+							                @obj.constants.mf_loginfo_st=>arr["payload"][:exception_object] != nil ?
+                                                              formatStacktrace(arr["payload"][:exception_object].backtrace) : nil}
 							    exceptionInfo.push(logInfo)
 							  end
 							  

data/lib/agent/server/am_connector.rb

@@ -75,7 +75,7 @@ module ManageEngine
 					if(@obj.config.apmhost != nil && !@obj.config.apmhost.empty?)
 						u = @obj.config.apmhost+uri
 					else
-						u = @obj.constants.site24x7url+uri
+						u = @obj.config.site24x7url+uri
 					end
 				else
 					#empty license key - print error

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

@@ -12,9 +12,9 @@ module ManageEngine
 		@obj.log.debug "[ instrumenter ] [ Subscriber for Agent ]"
 		@subscriber = ActiveSupport::Notifications.subscribe  do |name, start, finish, id, payload|
 		if(ManageEngine::APMObjectHolder.instance.config.agent_enabled)
-			rt = (finish-start).to_i
+			#rt = (finish-start).to_i
 			 ManageEngine::APMWorker.getInstance.start
-			ManageEngine::APMObjectHolder.instance.log.debug "[ Notifications for Agent ] #{Thread.current} #{id} #{name} - #{rt} - #{payload[:path]}"
+			ManageEngine::APMObjectHolder.instance.log.debug "[ Notifications for Agent ] #{Thread.current} #{id} #{name} - #{payload[:path]}"
 			#trace= caller;
 			id = "#{Thread.current}"
 			stats = Hash.new
@@ -23,7 +23,7 @@ module ManageEngine
 			stats["end"] = finish.to_f * 1000;
 			stats["id"] = id;
 			stats["payload"] = payload;
-			if (name=="sql.active_record" && (finish-start)>=(ManageEngine::APMObjectHolder.instance.config.sql_trace_t * 1000 ).to_i)
+			if (name=="sql.active_record" && (finish.to_f - start.to_f)>=(ManageEngine::APMObjectHolder.instance.config.sql_trace_t).to_f)
 				stats["trace"] = caller(20); # Taking stacktrace of depth 20
 			end
 			stats["ctime"] =ManageEngine::APMObjectHolder.instance.util.currenttimemillis;

data/lib/agent/util/am_constants.rb

@@ -2,7 +2,7 @@
 module ManageEngine
 	class APMConstants
 
-		attr_reader :apm_gem,:s247_apm_gem,:apm_conf,:agent_conf,:connection_open_timeout,:connection_read_timeout,:connect_uri,:connect_data_uri,:connect_trace_uri,:connect_config_update_uri,:site24x7url, :mergepattern_conf
+		attr_reader :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,:site24x7USurl, :site24x7EUurl, :mergepattern_conf
 		attr_reader :licence_exceeds,:licence_expired,:unmanage_agent,:manage_agent,:agent_config_updated,:error_notfound,:error_server,:delete_agent,:response_code,:custom_config_info
 		attr_reader :mf_transaction,:mf_separator,:mf_db,:mf_apdex,:mf_namespace,:mf_name,:mf_all,:agent_store,:agent_lock,:mf_overflow
 		attr_reader :mf_logmetric, :mf_logmetric_warning, :mf_exception_st, :mf_err_st, :mf_loginfo, :mf_loginfo_time, :mf_loginfo_level, :mf_loginfo_str, :mf_loginfo_err_clz, :mf_loginfo_st, :mf_loginfo_level_warn
@@ -48,8 +48,10 @@ module ManageEngine
 			@connect_config_update_uri="arh/agent_config_update?instance_id="
 			
 			#Site24x7 url for agent communication
-			@site24x7url="https://plusinsight.site24x7.com/"
+			@site24x7USurl="https://plusinsight.site24x7.com/"
 
+			@site24x7EUurl = "https://plusinsight.site24x7.eu/"
+			
 			#Response Codes 
 			@licence_expired = 701
 			@licence_exceeds = 702

data/lib/version.rb

@@ -6,8 +6,8 @@
 
 module ManageEngine
   class APMInsight
-    VERSION = '1.3'
-    MAJOR_VERSION = '1.3'
+    VERSION = '1.4'
+    MAJOR_VERSION = '1.4'
     MINOR_VERSION = '0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: site24x7_apminsight
 version: !ruby/object:Gem::Version
-  version: '1.3'
+  version: '1.4'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-25 00:00:00.000000000Z
+date: 2017-04-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &27221448 !ruby/object:Gem::Requirement
+  requirement: &23037804 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *27221448
+  version_requirements: *23037804
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &27221160 !ruby/object:Gem::Requirement
+  requirement: &23037516 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *27221160
+  version_requirements: *23037516
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &27220872 !ruby/object:Gem::Requirement
+  requirement: &23037228 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *27220872
+  version_requirements: *23037228
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &27220584 !ruby/object:Gem::Requirement
+  requirement: &23036940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *27220584
+  version_requirements: *23036940
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &27220296 !ruby/object:Gem::Requirement
+  requirement: &23036652 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *27220296
+  version_requirements: *23036652
 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)