site24x7_apminsight 1.1.1 → 1.2

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.2

data/lib/agent/configuration/am_configuration.rb

@@ -52,18 +52,22 @@ module ManageEngine
 						@obj.log.debug "Config File Exists. It is read from #{@obj.constants.apm_conf}"
 					@config = @obj.util.readProperties(@obj.constants.apm_conf)
 				else
-					gem_conf = Gem.loaded_specs[@obj.constants.apm_gem].full_gem_path
+				  gemSpecs = Gem.loaded_specs[@obj.constants.s247_apm_gem]
+				  if (gemSpecs == nil)
+				    gemSpecs = Gem.loaded_specs[@obj.constants.apm_gem]
+				  end
+					gem_conf = gemSpecs.full_gem_path
 					#gem_conf = File.join(gem_conf, 'lib')
 					gem_conf = File.join(gem_conf, 'conf')
 					gem_conf = File.join(gem_conf, 'apminsight.conf')
 					#conf file not exists in APPlications Home. So 1. copy it for gem locations
 					if @obj.util.copyFiles gem_conf,@obj.constants.apm_conf
 						#copied sucessfully
-						@obj.log.debug "Config File copied. It is read from #{@obj.constants.apm_conf}"
+						@obj.log.info "Config File copied to application home directory. It is read from #{@obj.constants.apm_conf}"
 						@config = @obj.util.readProperties(@obj.constants.apm_conf)
 					else
 						#Problem in copying, so reading props from Conf file in Gem Location
-						@obj.log.debug "Config File not copied. It is read from #{gem_conf}"
+						@obj.log.warn "Config File not copied. It is read from #{gem_conf}"
 						@config = @obj.util.readProperties(gem_conf)
 					end
 				end
@@ -80,7 +84,17 @@ module ManageEngine
 			if FileTest.exists?(@obj.constants.agent_conf)
 				@obj.log.debug "Status : Agent Already Connected"
 				props = @obj.util.readProperties(@obj.constants.agent_conf)
-				@instance_id = props["agent.id"]
+				instance_id = props["agent.id"]
+				
+				if (instance_id == nil || instance_id == "")
+				  # If instance id is not found or empty, it means the apminsight.info is being modified by user
+				  # Ignore all its entry
+				  @obj.log.warn "File: #{@obj.constants.agent_conf} is corrupted. Agent will continue ignoring these values."
+				  return false
+				else
+				  @instance_id = instance_id
+				end
+				
 				@agent_enabled= @obj.util.getBooleanValue props["agent.enabled"]
 				true
 			else
@@ -145,9 +159,15 @@ module ManageEngine
 		 	 value = checkAndGetEnvValue(value)
 			 case key
 			 when "application.name" then @appname=value
+			                              if (ENV.has_key?('APM_APPLICATION_NAME'))
+			                                @appname = ENV['APM_APPLICATION_NAME']
+			                              end
 			 when "apm.host" then @apmhost=value
 			 when "apm.port" then @apmport=isInteger(@apmport,value)
 			 when "license.key" then @license_key=value
+			                         if (@license_key.empty? && ENV.has_key?('S247_LICENSE_KEY'))
+			                           @license_key = ENV['S247_LICENSE_KEY']
+			                         end
 			 when "behind.proxy" then @proxyneeded=@obj.util.getBooleanValue value
 			 when "agent.server.port" then @agentport=isInteger(@agentport,value)
 			 when "apdex.threshold" then @apdex_t=isFloat(@apdex_t,value)

data/lib/agent/metrics/am_metricsparser.rb

@@ -501,14 +501,20 @@ module ManageEngine
 					if(arr["name"]=="start_processing.action_controller")
 						traceArr = updateStartTrace arr
 						traceArr[6] = Array.new #childs
-						if stack.size()>0
-							cur = stack[stack.size()-1]							
-							c = cur[6]
-							c.push(traceArr)
-							cur[6] = c
+#						if stack.size()>0
+#							cur = stack[stack.size()-1]							
+#							c = cur[6]
+#							c.push(traceArr)
+#							cur[6] = c
+#						end
+#							stack.push(traceArr)
+
+						# Incase there are multiple "start_processing" event consider only the last notification
+						if stack.size == 0
+						  stack.push(traceArr)
+						else
+						  stack[stack.size()-1] = traceArr
 						end
-							stack.push(traceArr)
-
 						
 						traceDetails valo,stack,indx
 
@@ -537,6 +543,7 @@ module ManageEngine
 						updateTransTrace(arr,stack[stack.size()-1])
 						if(valo.size()>(indx+1))
 							#Redirection Data
+						  #Skipping all the "start_processing" event after "process_action" event
 							arr = valo[indx]
 							while (arr["name"]!="start_processing.action_controller") do 
 								indx = indx + 1

data/lib/agent/server/am_agent.rb

@@ -48,21 +48,17 @@ module ManageEngine
 						else
 							resp = startConnect "",agentInfo
 						end
-						if resp.has_key?("instance-info")
-							aData = resp["instance-info"]
-							aData["agent.id"]=aData.delete("instanceid")
-							aData["agent.enabled"]=true
-							@obj.config.updateAgentInfoFile(aData)
-							@obj.log.debug "[doConnect] Connected - InstanceID  : #{@obj.config.instance_id}"
-						else
-							@obj.log.info "[doConnect] [ Problem in connecting server] [ Going to shutdown ]"
-							@obj.shutdown=true
-						end
 					end
-
-					if resp==nil
-						@obj.log.info "[doConnect] [ Error in Response while connecting Server . [ Going to shutdown ]"
-						@obj.shutdown= true
+					
+					if (resp == nil || !resp.has_key?("instance-info"))
+					  @obj.log.info "[doConnect] [ Problem in connecting server] [ Going to shutdown ]"
+            @obj.shutdown=true
+					else
+						aData = resp["instance-info"]
+						aData["agent.id"]=aData.delete("instanceid")
+						aData["agent.enabled"]=true
+						@obj.config.updateAgentInfoFile(aData)
+						@obj.log.debug "[doConnect] Connected - InstanceID  : #{@obj.config.instance_id}"
 					end
 
 					if(!@obj.shutdown)

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

@@ -14,8 +14,8 @@ module ManageEngine
 		if(ManageEngine::APMObjectHolder.instance.config.agent_enabled)
 			rt = (finish-start).to_i
 			 ManageEngine::APMWorker.getInstance.start
-			ManageEngine::APMObjectHolder.instance.log.debug "[ Notifications for Agent ] #{Thread.current} #{id} #{name} - #{rt} - #{payload}"
-			trace= caller;
+			ManageEngine::APMObjectHolder.instance.log.debug "[ Notifications for Agent ] #{Thread.current} #{id} #{name} - #{rt} - #{payload[:path]}"
+			#trace= caller;
 			id = "#{Thread.current}"
 			stats = Hash.new
 			stats["name"] = name;
@@ -24,7 +24,7 @@ module ManageEngine
 			stats["id"] = id;
 			stats["payload"] = payload;
 			if (name=="sql.active_record" && (finish-start)>=(ManageEngine::APMObjectHolder.instance.config.sql_trace_t * 1000 ).to_i)
-				stats["trace"] = trace;
+				stats["trace"] = caller(20); # Taking stacktrace of depth 20
 			end
 			stats["ctime"] =ManageEngine::APMObjectHolder.instance.util.currenttimemillis;
 			ManageEngine::APMObjectHolder.instance.collector.updateTransaction(id,stats);

data/lib/agent/util/am_constants.rb

@@ -2,7 +2,7 @@
 module ManageEngine
 	class APMConstants
 
-		attr_reader :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,:site24x7url, :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
 		
@@ -10,6 +10,8 @@ module ManageEngine
 			
 			#File path for APM Conf file
 			@apm_gem="apminsight"
+			@s247_apm_gem="site24x7_apminsight"
+			
 			#File path for APM Conf file
 			@apm_conf="apminsight.conf"
 

data/site24x7-agent.gemspec

@@ -0,0 +1,72 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "site24x7_apminsight"
+  s.version = "1.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Adithyan P"]
+  s.date = "2016-11-21"
+  s.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"
+
+  s.email = "apm-insight@zohocorp.com"
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "site24x7-agent.gemspec",
+    "conf/apminsight.conf",
+    "lib/site24x7_apminsight.rb",
+	"lib/agent/am_objectholder.rb",
+    "lib/agent/logging/am_logger.rb",
+    "lib/agent/configuration/am_configuration.rb",
+    "lib/agent/util/am_constants.rb",
+    "lib/agent/util/am_util.rb",
+    "lib/agent/metrics/am_metricsformatter.rb",
+    "lib/agent/metrics/am_metricstore.rb",
+    "lib/agent/metrics/am_metricscollector.rb",
+    "lib/agent/metrics/am_metricsparser.rb",
+    "lib/agent/server/am_agent.rb",
+    "lib/agent/server/am_connector.rb",
+    "lib/agent/server/worker/am_worker.rb",
+    "lib/agent/server/instrument/am_apm.rb",
+    "lib/agent/server/instrument/am_instrumenter.rb",
+  ]
+  s.homepage = "https://www.site24x7.com/help/apm/ruby-agent.html"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.15"
+  s.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"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<rails>, [">= 3.0.0"])
+    else
+      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<rails>, [">= 3.0.0"])
+    end
+  else
+    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<rails>, [">= 3.0.0"])
+  end
+end
+

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: site24x7_apminsight
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: '1.2'
   prerelease: 
 platform: ruby
 authors:
-- Rajalakshmi Ezhilan
+- Adithyan P
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-30 00:00:00.000000000Z
+date: 2016-11-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &24015144 !ruby/object:Gem::Requirement
+  requirement: &22656348 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24015144
+  version_requirements: *22656348
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &24014856 !ruby/object:Gem::Requirement
+  requirement: &22656060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *24014856
+  version_requirements: *22656060
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &24014568 !ruby/object:Gem::Requirement
+  requirement: &22655772 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *24014568
+  version_requirements: *22655772
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &24014280 !ruby/object:Gem::Requirement
+  requirement: &22655484 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24014280
+  version_requirements: *22655484
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &24013992 !ruby/object:Gem::Requirement
+  requirement: &22655196 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *24013992
+  version_requirements: *22655196
 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)
@@ -83,6 +83,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- site24x7-agent.gemspec
 - conf/apminsight.conf
 - lib/site24x7_apminsight.rb
 - lib/agent/am_objectholder.rb