site24x7_apminsight 1.4 → 1.5

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/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,7 +13,8 @@ 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 "APM Insight Ruby Agent Started"

data/lib/agent/server/am_connector.rb

@@ -146,8 +146,11 @@ module ManageEngine
 							response_action srCode
 					       end
 					       if data.has_key?(@obj.constants.custom_config_info)
-							config_info = data[@obj.constants.custom_config_info]
-							update_config 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
@@ -207,9 +210,6 @@ module ManageEngine
 		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	
@@ -217,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	
@@ -225,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/active_record.rb

@@ -0,0 +1,50 @@
+require 'agent/am_objectholder'
+require 'agent/trackers/database_tracker'
+
+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.agent_enabled && @obj.config.sql_capture && payload[:name] != "SCHEMA" # Dropping internal schema related queries
+              tracker = Thread.current[:apminsight]
+              if tracker != nil
+                dbTracker = ManageEngine::Tracker::DatabaseTracker.new(payload[:name], start.to_f * 1000)
+                dbTracker.sql(payload[:sql])
+                dbTracker.params(payload[:binds])
+                dbTracker.finish(finish.to_f * 1000)
+                
+                if dbTracker.duration >= @obj.config.sql_trace_t.to_f
+                  dbTracker.sqlBacktrace(caller(10))
+                end
+                
+                exception = payload[:exception_object]
+                if exception != nil
+                  dbTracker.setError(exception)
+                end
+                
+                tracker.addChild(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 Exception=>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
 

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

@@ -1,43 +1,55 @@
-require 'agent/am_objectholder'
-require 'socket'
-module ManageEngine
-	class APMInstrumenter
-	@t =nil;
-	def initialize
-		@obj=ManageEngine::APMObjectHolder.instance
-	end
+##
+##  This is Rails framework specific tracking mechanism, they are moved to multiple files for separate tracking
+##
 
-	def doSubscribe
-		@obj=ManageEngine::APMObjectHolder.instance
-		@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
-			 ManageEngine::APMWorker.getInstance.start
-			ManageEngine::APMObjectHolder.instance.log.debug "[ Notifications for Agent ] #{Thread.current} #{id} #{name} - #{payload[:path]}"
-			#trace= caller;
-			id = "#{Thread.current}"
-			stats = Hash.new
-			stats["name"] = name;
-			stats["start"] = start.to_f * 1000;
-			stats["end"] = finish.to_f * 1000;
-			stats["id"] = id;
-			stats["payload"] = payload;
-			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;
-			ManageEngine::APMObjectHolder.instance.collector.updateTransaction(id,stats);
-		else
-			ActiveSupport::Notifications.unsubscribe @subscriber
-				@obj.log.info "[ instrumenter ] [ RETURNING NO METRICS] "
-		end
-		end
-	end
-
-	def doUnSubscribe
-		ActiveSupport::Notifications.unsubscribe @subscriber
-	end
-
-end #class
-end#module
+#require 'agent/am_objectholder'
+#require 'socket'
+#module ManageEngine
+#	class APMInstrumenter
+#	@t =nil;
+#	def initialize
+#		@obj=ManageEngine::APMObjectHolder.instance
+#	end
+#
+#	def doSubscribe
+#		@obj=ManageEngine::APMObjectHolder.instance
+#		@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
+#			 ManageEngine::APMWorker.getInstance.start
+#			ManageEngine::APMObjectHolder.instance.log.debug "[ Notifications for Agent ] #{Thread.current} #{id} #{name} - #{payload[:path]}"
+#			#trace= caller;
+#			#puts ">>> Threadlocal var : #{Thread.current[:apminsight]}"
+#			if name=="sql.active_record"
+#			  #Thread.current[:apminsight] = "#{Thread.current[:apminsight]} + #{payload[:sql]}"
+#			  if payload[:name] != "SCHEMA"
+#          @obj.log.debug ">>>>>>>> SQL: #{payload[:sql]}"
+#			  end
+#			  @obj.log.debug "~~~~~ SQL Payload: #{payload}"
+#			end
+#			id = "#{Thread.current}"
+#			stats = Hash.new
+#			stats["name"] = name;
+#			stats["start"] = start.to_f * 1000;
+#			stats["end"] = finish.to_f * 1000;
+#			stats["id"] = id;
+#			stats["payload"] = payload;
+#			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;
+#			ManageEngine::APMObjectHolder.instance.collector.updateTransaction(id,stats);
+#		else
+#			ActiveSupport::Notifications.unsubscribe @subscriber
+#				@obj.log.info "[ instrumenter ] [ RETURNING NO METRICS] "
+#		end
+#		end
+#	end
+#
+#	def doUnSubscribe
+#		ActiveSupport::Notifications.unsubscribe @subscriber
+#	end
+#
+#end #class
+#end#module

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

@@ -0,0 +1,29 @@
+require 'agent/server/instrument/rails'
+require 'agent/server/instrument/sinatra'
+require 'agent/server/instrument/active_record'
+
+module ManageEngine
+  class Environment
+    
+    SUPPORTED_FRAMEWORKS = [
+        ManageEngine::Instrumentation::RailsFramework.new,
+        ManageEngine::Instrumentation::SinatraFramework.new
+    ]
+    
+    DATABASE_INTERCEPTORS = [
+        ManageEngine::Instrumentation::ActiveRecordSQL.new
+    ]
+    
+    def detect_and_instrument
+      @framework ||= SUPPORTED_FRAMEWORKS.detect{ |framework| framework.present? }
+      @framework.instrument
+      
+      DATABASE_INTERCEPTORS.each do |interceptor|
+        if (interceptor.present?)
+          interceptor.instrument
+        end
+      end
+    end
+    
+  end
+end