apminsight 1.0.1 → 1.8.2

data/lib/agent/metrics/am_metricstore.rb

@@ -17,12 +17,13 @@ module ManageEngine
 			@metrics.dup
 		end
 
-		def removeData key, strt_indx,end_indx
-			if @metrics.has_key?(key)
-				val = @metrics[key]
-				val = val.drop(end_indx)
-				@metrics[key]=val
-			end
+		def removeData key
+#			if @metrics.has_key?(key)
+#				val = @metrics[key]
+#				val = val.drop(end_indx)
+#				@metrics[key]=val
+#			end
+		  @metrics.delete(key)
 		end
 
 	end

data/lib/agent/metrics/exception_record.rb

@@ -0,0 +1,24 @@
+module APMInsight
+  module Errors
+    class ExceptionRecord
+      
+      attr_reader :time, :message, :exception
+      
+      def initialize(exception, time = Time.now)
+        @time = time.to_f * 1000;
+        @message = exception.message
+        @exception = exception
+      end
+      
+      def ==(obj)
+        return obj != nil && @exception == obj.exception
+      end
+      
+      def hash
+        return @exception.hash
+      end
+      
+      
+    end
+  end
+end

data/lib/agent/server/am_agent.rb

@@ -1,5 +1,6 @@
 require "agent/am_objectholder"
 require "agent/server/worker/am_worker"
+require "agent/server/instrument/environment"
 
 require 'socket'
 
@@ -12,13 +13,16 @@ module ManageEngine
 
 			if !@obj.shutdown && @obj.agent_initialized
 				@obj.log.info "Agent Initialization - DONE"
-				@obj.instrumenter.doSubscribe
+				ManageEngine::Environment.new.detect_and_instrument
+				
 				doDispatcherActions
 				doCollect
-				puts "ManageEngine APM Ruby Agent Started"
+				puts "APM Insight Ruby Agent Started"
 			else
 				@obj.log.info "Agent Initialization Failed - Going to shutdown"
-				@obj.instrumenter.doSubscribe
+				#While parsing the response from /arh/connect we set instrumenter to nil on delete request
+				#Server startup fails when the below instruction is executed
+				#@obj.instrumenter.doUnSubscribe
 				@obj.shutdownagent
 			end
            	
@@ -34,25 +38,29 @@ module ManageEngine
 					resp = nil
 					if @obj.config.alreadyconnected
 						@obj.log.debug "[doConnect] Already Connected - Make Contact - Instance id = #{@obj.config.instance_id}"
-						resp = startConnect "?instance_id="+@obj.config.instance_id,agentInfo
+						if @obj.config.site24x7
+							resp = startConnect "?license.key="+@obj.config.license_key+"&instance_id="+@obj.config.instance_id,agentInfo
+						else
+							resp = startConnect "?instance_id="+@obj.config.instance_id,agentInfo
+						end
 					else
 						@obj.log.debug "[doConnect] Going to connect - New "
-						resp = startConnect "",agentInfo
-						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}"
+						if @obj.config.site24x7
+							resp = startConnect "?license.key="+@obj.config.license_key,agentInfo
 						else
-							@obj.log.info "[doConnect] [ Problem in connecting server] [ Going to shutdown ]"
-							@obj.shutdown=true
+							resp = startConnect "",agentInfo
 						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.info "[doConnect] Agent successfully connected - InstanceID  : #{@obj.config.instance_id}"
 					end
 
 					if(!@obj.shutdown)
@@ -82,6 +90,7 @@ module ManageEngine
 		end
 
 		def doDispatcherActions
+		  @obj.log.info "Dispatcher: #{@obj.config.app_dispatcher}"
 			case @obj.config.app_dispatcher
 				when 'passenger'
 					#starting a new process
@@ -99,6 +108,22 @@ module ManageEngine
                 		ManageEngine::APMWorker.getInstance.stop
                 		@obj.log.info "stopping_worker_process :Process ID :#{Process.pid} ---->  #$$ "
      				end
+     		when 'unicorn'
+     		   Unicorn::HttpServer.class_eval do
+     		     old_object = instance_method(:worker_loop)
+     		     define_method(:worker_loop) do |worker|
+               ::ManageEngine::APMObjectHolder.instance.agent.doCollect
+     		       old_object.bind(self).call(worker)
+     		     end
+     		   end
+				when 'rainbows'
+				  Rainbows::HttpServer.class_eval do
+           old_object = instance_method(:worker_loop)
+           define_method(:worker_loop) do |worker|
+             ::ManageEngine::APMObjectHolder.instance.agent.doCollect
+             old_object.bind(self).call(worker)
+           end
+				 end
 				else#case
 
 				end#case

data/lib/agent/server/am_connector.rb

@@ -2,7 +2,7 @@ require 'net/http'
 require 'net/https'
 require 'uri'
 require 'json'
-require "agent/server/instrument/am_instrumenter"
+#require "agent/server/instrument/am_instrumenter"
 
 module ManageEngine
 	class APMConnector
@@ -66,11 +66,25 @@ module ManageEngine
 
 		def url(uri)
 			ru=nil
-			p="http"
-			if(@obj.config.is_secured)
-				p="https"
+			p="https"
+			if(!@obj.config.is_secured)
+				p="http"
 			end			 	
-			u = p+"://"+@obj.config.apmhost+":#{@obj.config.apmport}/"+uri
+			if(@obj.config.license_key != nil)
+				if(!@obj.config.license_key.empty?)
+					if(@obj.config.apmhost != nil && !@obj.config.apmhost.empty?)
+						u = @obj.config.apmhost+uri
+					else
+						u = @obj.config.site24x7url+uri
+					end
+				else
+					#empty license key - print error
+					@obj.log.info "license key is present, but empty"
+				end
+			else
+				@obj.log.info "license key is null"
+				u = p+"://"+@obj.config.apmhost+":#{@obj.config.apmport}/"+uri
+			end
 			begin
 				ru = URI.parse(u)
 			rescue
@@ -89,19 +103,22 @@ module ManageEngine
 				@obj.log.debug "[connect] Through Proxy"
 				con = Net::HTTP::Proxy(@obj.config.proxy_host, @obj.config.proxy_port,@obj.config.proxy_user,@obj.config.proxy_pass).new(url.host, url.port)		
 			else
-				#@obj.log.info "Proxy Not Needed"
+				#@obj.log.info "Proxy Not Needed #{url.host} #{url.port}"
 				con = Net::HTTP.new(url.host, url.port)
+				#con.use_ssl=true
+				#con.verify_mode=OpenSSL::SSL::VERIFY_NONE
+				#@obj.log.info "connection = #{con}"
 			end
-			con=getScheme(con)
+			con=getScheme(con, url)
 			con.open_timeout = @obj.constants.connection_open_timeout
 			con.read_timeout = @obj.constants.connection_read_timeout
 			con
 		end
 
-		def getScheme(con)
-			if(@obj.config.is_secured)
+		def getScheme(con, url)
+			if(url.start_with?("https"))
 				#@obj.log.info "[connect] Secured"
-				con = Net::HTTP::Proxy(@obj.config.proxy_host, @obj.config.proxy_port,@obj.config.proxy_user,@obj.config.proxy_pass).new(url.host, url.port)		
+				#con = Net::HTTP::Proxy(@obj.config.proxy_host, @obj.config.proxy_port,@obj.config.proxy_user,@obj.config.proxy_pass).new(url.host, url.port)		
 				con.use_ssl=true
 				con.verify_mode=OpenSSL::SSL::VERIFY_NONE
 			end
@@ -109,7 +126,7 @@ module ManageEngine
 		end
 
 		def responseParser resp
-			if resp == Net::HTTPSuccess || Net::HTTPOK
+			if resp.kind_of? Net::HTTPOK
 				rawData = resp.body
 				if rawData.length>=2
 					rBody = JSON.parse(rawData)
@@ -123,10 +140,18 @@ module ManageEngine
 						end
 
 					end
-					if data!=nil && data.has_key?(@obj.constants.response_code)
-
-						srCode = data[@obj.constants.response_code]
-						response_action srCode
+					if data!=nil
+					       if data.has_key?(@obj.constants.response_code)
+							srCode = data[@obj.constants.response_code]
+							response_action srCode
+					       end
+					       if data.has_key?(@obj.constants.custom_config_info)
+					        config_info = data[@obj.constants.custom_config_info]
+  					       if data.has_key?(@obj.constants.agent_specific_info)
+  					         config_info = config_info.merge(data[@obj.constants.agent_specific_info])
+  					       end
+  					       update_config config_info
+					       end
 					end
 					return data
 				end
@@ -159,10 +184,32 @@ module ManageEngine
 			end
 		end
 
+		def update_config configInfo
+			existingConfigInfo = @obj.config.getAgentConfigData
+			sendUpdate = "false"
+			existingConfigInfo.each do|key,value|
+				if key != "last.modified.time"
+					newValue = configInfo[key]
+					if key == "sql.capture.enabled" || key == "transaction.trace.enabled" || key == "transaction.trace.sql.parametrize"
+						if newValue
+							newValue = 1
+						else
+							newValue = 0
+						end
+					end
+					if value != newValue
+						sendUpdate = "true"
+					end
+				end
+			end
+			if sendUpdate == "true"
+				@obj.log.info "Action from Server - Agent configuration updated from UI. Going to update the same in apminsight.conf file"
+				@obj.log.info "config info = #{configInfo}"
+				@obj.config.update_config configInfo
+			end
+		end
+
 		def unManage
-			@obj.instrumenter.doUnSubscribe
-			@obj.instrumenter =nil
-			@obj.instrumenter = ManageEngine::APMInstrumenter.new
 			uManage = Hash.new
 			uManage["agent.id"]=@obj.config.instance_id
 			uManage["agent.enabled"]=false	
@@ -170,7 +217,6 @@ module ManageEngine
 		end
 
 		def manage
-			@obj.instrumenter.doSubscribe
 			uManage = Hash.new
 			uManage["agent.id"]=@obj.config.instance_id
 			uManage["agent.enabled"]=true	
@@ -178,8 +224,6 @@ module ManageEngine
 		end
 
 		def deleteAgent
-			@obj.instrumenter.doUnSubscribe
-			@obj.instrumenter =nil
 			uManage = Hash.new
 			uManage["agent.id"]=@obj.config.instance_id
 			uManage["agent.enabled"]=false	

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

@@ -0,0 +1,64 @@
+require 'agent/am_objectholder'
+require 'agent/trackers/default_tracker'
+require 'agent/handler/tracker_handler'
+
+module ManageEngine
+  module Instrumentation
+    class ActionView
+      
+      def present?
+        defined?(::Rails)
+      end
+      
+      def name
+        'ActiveView'
+      end
+      
+      def instrument
+        @obj = ManageEngine::APMObjectHolder.instance
+        @obj.log.info "Instrumenting ActiveView"
+        
+        ActiveSupport::Notifications.subscribe('render_template.action_view') do |name, start, finish, id, payload|
+          collect_data(name, start, finish, payload)
+        end ## subscribe
+        
+        ActiveSupport::Notifications.subscribe('render_partial.action_view') do |name, start, finish, id, payload|
+          collect_data(name, start, finish, payload)
+        end ## subscribe
+        
+        ActiveSupport::Notifications.subscribe('render_collection.action_view') do |name, start, finish, id, payload|
+          collect_data(name, start, finish, payload)
+        end ## subscribe
+        
+      end  ## def instrument
+      
+      def collect_data(name, start, finish, payload)
+        begin
+          
+          if name != 'render_template.action_view'
+            name = "Partial # #{payload[:identifier]}"
+          else
+            name = "Rendering # #{payload[:identifier]}"
+          end
+          
+          tracker = ManageEngine::Tracker::DefaultTracker.new(name, start.to_f * 1000)
+          tracker = ManageEngine::Agent::TrackerHandler.invokeTracker(tracker)
+          
+          if tracker != nil
+            tracker.finish(finish.to_f * 1000)
+            
+            exception = payload[:exception_object]
+            if exception != nil
+              tracker.setError(exception)
+            end
+            
+            ManageEngine::Agent::TrackerHandler.exitTracker(tracker)
+          end
+        rescue Exception => e
+          @obj.log.logException("Error processing #{name} payload", e)
+        end
+      end ## def collect_data
+      
+    end ## class ActionView
+  end
+end

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

@@ -0,0 +1,52 @@
+require 'agent/am_objectholder'
+require 'agent/trackers/database_tracker'
+require 'agent/handler/tracker_handler'
+
+module ManageEngine
+  module Instrumentation
+    class ActiveRecordSQL
+      
+      def present?
+        defined?(::ActiveRecord::Base) && defined?(::ActiveSupport::Notifications)
+      end
+      
+      def name
+        'ActiveRecord'
+      end
+      
+      def instrument
+        @obj = ManageEngine::APMObjectHolder.instance
+        @obj.log.info "Instrumenting ActiveRecord"
+        
+        ActiveSupport::Notifications.subscribe('sql.active_record') do |name, start, finish, id, payload|
+          begin 
+            if @obj.config.sql_capture && payload[:name] != "SCHEMA" # Dropping internal schema related queries
+              dbTracker = ManageEngine::Tracker::DatabaseTracker.new(payload[:name], start.to_f * 1000)
+              dbTracker.sql(payload[:sql])
+              dbTracker.params(payload[:binds])
+              dbTracker = ManageEngine::Agent::TrackerHandler.invokeTracker(dbTracker)
+              
+              if dbTracker != nil
+                dbTracker.finish(finish.to_f * 1000)
+                
+                if dbTracker.duration >= (@obj.config.sql_trace_t.to_f * 1000)
+                  dbTracker.sqlBacktrace(caller(10))
+                end
+                
+                exception = payload[:exception_object]
+                if exception != nil
+                  dbTracker.setError(exception)
+                end
+                
+                ManageEngine::Agent::TrackerHandler.exitTracker(dbTracker)
+              end
+            end
+          rescue Exception => e
+            @obj.log.logException("Error processing #{name} payload", e)
+          end
+        end #subscribe
+      end #def instrument
+      
+    end #class ActiveRecordSQL
+  end
+end

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

@@ -1,99 +1,109 @@
-require 'agent/am_objectholder'
-@obj = ManageEngine::APMObjectHolder.instance
-class Class
-   alias old_new new
-   def new(*args, &block)
-	 result =nil;
-	 begin
-		if(block==nil || block=="")
-     		result = old_new(*args)
-		elsif
-     		result = old_new(*args,&block)
-		end
-	 rescue Excetion=>exe
-        raise exe		 
-		result = self
-	 end
-	 me_apm_injector(self,result)
-	 
-		return result
-	 end
- end
+##
+##
+# Currently disabling this class, since it will be called for every class's instance creation (Class.new is aliased here)
+# This can be used for custom instrumentation.
+##
+##
 
-def me_apm_injector(s,result)
-	begin
-		if(ManageEngine::APMObjectHolder.instance.config.include_packages.index(s.name)!=nil)
-		ms =s.instance_methods(false)
-		cms = s.methods(false)
-		begin
-			ms.each do |m|
-			if( m.to_s.index("APMTEST"))
-				return;
-			end
-			end
-			cms.each do |m|
-			if( m.to_s.index("APMTEST"))
-				return;
-			end
-			end
-		rescue Exception=>e
-			return;
-		end
-		ManageEngine::APMObjectHolder.instance.log.debug "Injection Method : #{ms} "
-		ManageEngine::APMObjectHolder.instance.log.debug "Injection Class Method : #{cms} "
-		ms.each do |m|
-		mn = m.to_s
-		#ManageEngine::APMObjectHolder.instance.log.info "ManageEngine Monitor Method : #{s.name} # #{m.to_s}"
-		omn = "APMTEST"+mn+"APMTEST"
-		s.class_eval  %{
-			alias_method :#{omn}, :#{mn}
-		def #{mn} *args, &block
-			begin
-			ActiveSupport::Notifications.instrument("apm.methodstart", {:method=>"#{mn}",:args=>args})
-			res = #{omn} *args, &block
-			ActiveSupport::Notifications.instrument("apm.methodend", {:method=>"#{mn}",:args=>args})
-			return res
-			rescue Exception => exe
-			puts "error in calling method"
-			raise exe
-			ensure
-			end
-			end
-		}
-		end#do
-		default_methods = Array.new
-		default_methods.push("_helpers");
-		default_methods.push("middleware_stack");
-		default_methods.push("helpers_path");
-		default_methods.push("_wrapper_options");
-		cms.each do |m|
-		if(default_methods.index(m.to_s)==nil)
-			mn = m.to_s
-			#ManageEngine::APMObjectHolder.instance.log.debug "ManageEngine Monitor Singleton Method : #{s.name} ---> #{m.to_s}"
-			omn = "APMTEST"+mn+"APMTEST"
-			s.instance_eval  %{
-				class << self
-					alias_method :#{omn}, :#{mn}
-				end
-				def self.#{mn} *args, &block
-				begin
-					ActiveSupport::Notifications.instrument("apm.methodstart", {:method=>"#{mn}",:args=>args})
-					res = #{omn} *args, &block
-					ActiveSupport::Notifications.instrument("apm.methodend", {:method=>"#{mn}",:args=>args})
-					return res
-				rescue Exception=>exe
-					puts "Instrument : error in calling class method"
-				raise exe
-				ensure
-				end
-				end
-			}
-		end
-		end#do
-	end#if
-	rescue Exception=>e
-		puts "Exception in instrument : #{e}"
-	ensure
-	end
-end
+
+
+
+#require 'agent/am_objectholder'
+#@obj = ManageEngine::APMObjectHolder.instance
+#class Class
+#   alias old_new new
+#   def new(*args, &block)
+#	 result =nil;
+#	 begin
+#		if(block==nil || block=="")
+#     		result = old_new(*args)
+#		elsif
+#     		result = old_new(*args,&block)
+#		end
+#	 rescue Exception=>exe
+#        raise exe		 
+#		result = self
+#	 end
+#	 me_apm_injector(self,result)
+#	 
+#		return result
+#	 end
+# end
+#
+#def me_apm_injector(s,result)
+#	begin
+#		if(ManageEngine::APMObjectHolder.instance.config.include_packages.index(s.name)!=nil)
+#		ms =s.instance_methods(false)
+#		cms = s.methods(false)
+#		begin
+#			ms.each do |m|
+#			if( m.to_s.index("APMTEST"))
+#				return;
+#			end
+#			end
+#			cms.each do |m|
+#			if( m.to_s.index("APMTEST"))
+#				return;
+#			end
+#			end
+#		rescue Exception=>e
+#			return;
+#		end
+#		ManageEngine::APMObjectHolder.instance.log.debug "Injection Method : #{ms} "
+#		ManageEngine::APMObjectHolder.instance.log.debug "Injection Class Method : #{cms} "
+#		ms.each do |m|
+#		mn = m.to_s
+#		#ManageEngine::APMObjectHolder.instance.log.info "ManageEngine Monitor Method : #{s.name} # #{m.to_s}"
+#		omn = "APMTEST"+mn+"APMTEST"
+#		s.class_eval  %{
+#			alias_method :#{omn}, :#{mn}
+#		def #{mn} *args, &block
+#			begin
+#			ActiveSupport::Notifications.instrument("apm.methodstart", {:method=>"#{mn}",:args=>args})
+#			res = #{omn} *args, &block
+#			ActiveSupport::Notifications.instrument("apm.methodend", {:method=>"#{mn}",:args=>args})
+#			return res
+#			rescue Exception => exe
+#			puts "error in calling method"
+#			raise exe
+#			ensure
+#			end
+#			end
+#		}
+#		end#do
+#		default_methods = Array.new
+#		default_methods.push("_helpers");
+#		default_methods.push("middleware_stack");
+#		default_methods.push("helpers_path");
+#		default_methods.push("_wrapper_options");
+#		cms.each do |m|
+#		if(default_methods.index(m.to_s)==nil)
+#			mn = m.to_s
+#			#ManageEngine::APMObjectHolder.instance.log.debug "ManageEngine Monitor Singleton Method : #{s.name} ---> #{m.to_s}"
+#			omn = "APMTEST"+mn+"APMTEST"
+#			s.instance_eval  %{
+#				class << self
+#					alias_method :#{omn}, :#{mn}
+#				end
+#				def self.#{mn} *args, &block
+#				begin
+#					ActiveSupport::Notifications.instrument("apm.methodstart", {:method=>"#{mn}",:args=>args})
+#					res = #{omn} *args, &block
+#					ActiveSupport::Notifications.instrument("apm.methodend", {:method=>"#{mn}",:args=>args})
+#					return res
+#				rescue Exception=>exe
+#					puts "Instrument : error in calling class method"
+#				raise exe
+#				ensure
+#				end
+#				end
+#			}
+#		end
+#		end#do
+#	end#if
+#	rescue Exception=>e
+#		puts "Exception in instrument : #{e}"
+#	ensure
+#	end
+#end