site24x7_apminsight 1.5 → 1.5.1

data/lib/agent/configuration/am_configuration.rb

@@ -8,7 +8,7 @@ require 'version'
 module ManageEngine
 	class APMConfig
 		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 :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, :dbmetric_overflow_t
 		attr_reader :proxy_host,:proxy_port ,:is_secured, :logs_dir ,:connection_retry,:agent_enabled,:connect_interval,:db_operations,:txn_skip_listen, :url_merge_pattern
 		attr_accessor :app_db,:app_dispatcher,:lastupdatedtime
 		def initialize
@@ -28,15 +28,15 @@ module ManageEngine
 			end
 			@db_operations =["select","insert","update","delete"]
 			urlMergePattern
-			@obj.log.debug "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-			@obj.log.debug "APP HOME #{File.absolute_path(".")} "
-			@obj.log.debug "APP HOME #{Dir.pwd} "
-			@obj.log.debug "Agent Version : #{ManageEngine::APMInsight::VERSION}"
-			@obj.log.debug "Configuration : "
-			@obj.log.debug "Agent Name : #{@agenthost}"
-			@obj.log.debug "Agent Already Connected : #{@alreadyconnected}"
-			@obj.log.debug "Agent Enabled : #{@agent_enabled}"
-			@obj.log.debug "Allowed DB Operations : #{@db_operations}"
+			@obj.log.info "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+			@obj.log.info "APP HOME #{File.absolute_path(".")} "
+			@obj.log.info "APP HOME #{Dir.pwd} "
+			@obj.log.info "Agent Version : #{ManageEngine::APMInsight::VERSION}"
+			@obj.log.info "Configuration : "
+			@obj.log.info "Hostname : #{@agenthost}"
+			@obj.log.info "Agent Already Connected : #{@alreadyconnected}"
+			@obj.log.info "Agent Enabled : #{@agent_enabled}"
+			@obj.log.info "Allowed DB Operations : #{@db_operations}"
 			@config.each do|key,val|
 			@obj.log.info "#{key} => #{val}"
 				end
@@ -44,7 +44,7 @@ module ManageEngine
 			@url_merge_pattern.each do |key, val|
 				@obj.log.info "#{key} => #{val}"
 			end
-			@obj.log.debug "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+			@obj.log.info "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
 			@app_db="dummydb"
 			@app_dispatcher = getDispatcher
 			@lastupdatedtime=File.mtime(@obj.constants.apm_conf).to_i
@@ -155,7 +155,8 @@ module ManageEngine
 			@trans_trace_t=2
 			@sql_trace_t=3
 			@metric_overflow_t=250
-			@trace_overflow_t=60
+      @dbmetric_overflow_t=500
+			@trace_overflow_t=30
 			@site24x7url = @obj.constants.site24x7USurl #default agent communication URL
 		end
 
@@ -188,9 +189,13 @@ module ManageEngine
 			 when "proxy.auth.password" then @proxy_pass=value
 			 when "apm.protocol.https" then @is_secured=@obj.util.getBooleanValue value
 			 when "apminsight.log.dir" then @logs_dir=value
+			 when "apminsight.log.level" then @obj.log.setLevel value
 			 when "agent.connection.retry" then @connection_retry=value #Not in Conf - yet to come
-			when "agent.connection.interval" then	 @connect_interval=value#Not in Conf - yet to come
-			when "transaction.skip.listening" then @txn_skip_listen=@obj.util.getArray value.gsub("\s", ""),","
+			 when "agent.polling.interval" then	 @connect_interval=isInteger(@connect_interval, value)#Not in Conf - yet to come
+			 when "transaction.skip.listening" then @txn_skip_listen=@obj.util.getArray value.gsub("\s", ""),","
+			 when "metricstore.metric.bucket.size" then @metric_overflow_t = isInteger(@metric_overflow_t, value)
+       when "metricstore.dbmetric.bucket.size" then @dbmetric_overflow_t = isInteger(@dbmetric_overflow_t, value)
+       when "transaction.tracestore.size" then @trace_overflow_t = isInteger(@trace_overflow_t, value)
 			end
 		 end
 		end

data/lib/agent/logging/am_logger.rb

@@ -19,7 +19,7 @@ module ManageEngine
 			@apmlog.level = Logger::INFO
 			@apmlog.datetime_format = "%Y-%m-%d %H:%M:%S"	
 			@apmlog.formatter = proc do |severity, datetime, progname, msg|
-				"[#{datetime}|#{Process.pid}]:#{msg}\n"
+				"[#{datetime}|#{Process.pid}][#{severity}]:#{msg}\n"
 			end
 			@apmlog.debug("[LOGGER] APM Agent Logging Initialized")
 

data/lib/agent/metrics/am_metricsformatter.rb

@@ -172,6 +172,10 @@ module ManageEngine
 				if(@transaction.has_key?(path))
 					apx_stat = @transaction[path][0]
 				else
+					if @transaction.length == @obj.config.metric_overflow_t
+					  @obj.log.debug "Metricstore overflow. Current Size: #{@obj.config.metric_overflow_t} #{path}"
+					  return
+					end
 					apx_stat = Array.new
 					apx_stat = [0,0,0,0,0,0,0,0,0]
 				end
@@ -189,10 +193,10 @@ module ManageEngine
 				
 				@transaction[path] = [apx_stat, additionalInfo]
 				if(dbl!=nil)
-					if @db.length < @obj.config.metric_overflow_t
+					if @db.length < @obj.config.dbmetric_overflow_t
 						updatedb dbl,path
-					elsif @db.length == @obj.config.metric_overflow_t
-						#@obj.log.info "metric overflow #{@db.length} for threshold #{@obj.config.metric_overflow_t}"
+					elsif @db.length == @obj.config.dbmetric_overflow_t
+						@obj.log.debug "DB metric overflow. Current Size: #{@obj.config.dbmetric_overflow_t} #{path}"
 						#@obj.log.info "data = #{@db}"
 						of = Hash.new
 						stats = Array.new

data/lib/agent/metrics/am_metricsparser.rb

@@ -92,7 +92,7 @@ module ManageEngine
 					@obj.log.debug "dummy trace added"
 					return parseddata
 				elsif tData.length > @obj.config.trace_overflow_t
-					@obj.log.debug "trace threshold exceeded"
+					@obj.log.debug "trace threshold exceeded. Current Size: #{@obj.config.trace_overflow_t}"
 					return parseddata
 				end
 			end

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

@@ -42,7 +42,7 @@ module ManageEngine
       def apminsight_route_eval(*args, &block)
         
         # http://www.rubydoc.info/github/rack/rack/master/Rack/Request
-        url = env.has_key?('sinatra.route') ? env['sinatra.route'] : @request.path
+        url = (env.has_key?('sinatra.route') ? env['sinatra.route'] : @request.path).dup
         @obj = ManageEngine::APMObjectHolder.instance
         
         if !@obj.config.agent_enabled || !@obj.txn_util.listen?(url)

data/lib/version.rb

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

metadata

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