site24x7_apminsight 1.7.3.0 → 1.8.5

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.8.2

data/lib/agent/am_objectholder.rb

@@ -19,22 +19,28 @@ module ManageEngine
 		@@objects = nil
 		#Don't Change the Order of Initialize
 		def initializeObjects
-			@agent_initialized	=		false
-			@shutdown 			=		false
-			@constants 			= 		ManageEngine::APMConstants.new
-			@log 				= 		ManageEngine::APMLogger.new
-			@util 				=		ManageEngine::APMUtil.new
-			@util.setLogger @log
-			@config 			= 		ManageEngine::APMConfig.new
-			@connector 			= 		ManageEngine::APMConnector.new
-			@store 				=	 	ManageEngine::APMMetricsStore.new
-			@collector			=		ManageEngine::APMMetricsCollector.new
-      @txn_util = ManageEngine::TransactionUtil.new
-			@formatter 			= 		ManageEngine::APMMetricsFormatter.new
-			@parser 			= 		ManageEngine::APMMetricsParser.new
-			@agent 				= 		ManageEngine::APMAgent.new
-			@last_dispatch_time	=		@@objects.util.currenttimemillis
-			@@objects.log.debug "[APMObjectHolder] [ All Objects Initialized ] "
+      begin
+        @agent_initialized  =   false
+        @shutdown       =   false
+        @constants      =     ManageEngine::APMConstants.new
+        @log        =     ManageEngine::APMLogger.new
+        @util         =   ManageEngine::APMUtil.new
+        @util.setLogger @log
+        @config       =     ManageEngine::APMConfig.new
+        @connector      =     ManageEngine::APMConnector.new
+        @store        =   ManageEngine::APMMetricsStore.new
+        @collector      =   ManageEngine::APMMetricsCollector.new
+        @txn_util = ManageEngine::TransactionUtil.new
+        @formatter      =     ManageEngine::APMMetricsFormatter.new
+        @parser       =     ManageEngine::APMMetricsParser.new
+        @agent        =     ManageEngine::APMAgent.new
+        @last_dispatch_time =   @@objects.util.currenttimemillis
+        @@objects.log.debug "[APMObjectHolder] [ All Objects Initialized ] "
+      rescue Exception => e
+        puts "Error initializing APM Insight Ruby agent. #{e.message}"
+        @shutdown = true
+        @agent_initialized = false
+      end
 		end
 
   		def self.instance

data/lib/agent/configuration/am_configuration.rb

@@ -3,7 +3,7 @@ require 'json'
 require 'socket'
 require 'net/http'
 require 'agent/am_objectholder'
-require 'version'
+require 'agent/version'
 
 module ManageEngine
 	class APMConfig
@@ -24,7 +24,7 @@ module ManageEngine
 			@alreadyconnected = checkAgentInfo
 			@site24x7 = checkLicenseFile
 			if (@site24x7)
-			  @site24x7url = @license_key.start_with?('eu_') ? @obj.constants.site24x7EUurl : @license_key.start_with?('cn_') ? @obj.constants.site24x7CNurl : @license_key.start_with?('au_') ? @obj.constants.site24x7AUurl : @license_key.start_with?('in_') ? @obj.constants.site24x7INurl : @obj.constants.site24x7USurl
+			  @site24x7url = @license_key.start_with?('eu_') ? @obj.constants.site24x7EUurl : @license_key.start_with?('cn_') ? @obj.constants.site24x7CNurl : @license_key.start_with?('au_') ? @obj.constants.site24x7AUurl : @license_key.start_with?('in_') ? @obj.constants.site24x7INurl : @license_key.start_with?('gd_') ? @obj.constants.site24x7GDurl : @obj.constants.site24x7USurl
 			end
 			@db_operations =["select","insert","update","delete"]
 			urlMergePattern
@@ -58,6 +58,7 @@ module ManageEngine
 					#conf file exists in APPlication Home
 						@obj.log.debug "Config File Exists. It is read from #{@obj.constants.apm_conf}"
 					@config = @obj.util.readProperties(@obj.constants.apm_conf)
+          secureConfFile "#{@obj.constants.apm_conf}"
 				else
 				  gemSpecs = Gem.loaded_specs[@obj.constants.s247_apm_gem]
 				  if (gemSpecs == nil)
@@ -72,13 +73,14 @@ module ManageEngine
 						#copied sucessfully
 						@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)
+            secureConfFile "#{@obj.constants.apm_conf}"
 					else
 						#Problem in copying, so reading props from Conf file in Gem Location
 						@obj.log.warn "Config File not copied. It is read from #{gem_conf}"
 						@config = @obj.util.readProperties(gem_conf)
+            secureConfFile gem_conf
 					end
 				end
-				
 			rescue Exception=>e
 				@obj.log.info "[Exception] Problem in Reading Configuration File : \n File : #{@obj.constants.apm_conf}"
 				@obj.log.logException "#{e.message}",e
@@ -87,6 +89,14 @@ module ManageEngine
 			end
 		end
 
+		def secureConfFile(file)
+		  begin
+		    File.chmod(0600, file)
+		  rescue Exception => e
+		    @obj.log.warn "Unable to secure the conf file #{file}"
+		  end
+		end
+		
 		def checkAgentInfo
 			if FileTest.exists?(@obj.constants.agent_conf)
 				@obj.log.debug "Status : Agent Already Connected"
@@ -138,6 +148,8 @@ module ManageEngine
 			@instance_id = props["agent.id"]
 			@agent_enabled= @obj.util.getBooleanValue props["agent.enabled"]
 			@obj.util.writeProperties(@obj.constants.agent_conf,props)
+			
+			secureConfFile(@obj.constants.agent_conf)
 		end
 
 		def initValues
@@ -246,7 +258,9 @@ module ManageEngine
 		def getHostType
 		  begin
   		  # Check for AWS environment
-  		  response = Net::HTTP.get_response(URI('http://169.254.169.254/latest/meta-data/'))
+		    url = URI.parse('http://169.254.169.254/latest/meta-data/') # AWS metadata url
+        request = Net::HTTP::Get.new(url.path)
+		    response = Net::HTTP.start(url.host, url.port, :read_timeout => 2) {|http| http.request(request)}
   		  if (response.kind_of? Net::HTTPOK)
   		    @hostType = "AWS"
   		    return @hostType
@@ -256,7 +270,9 @@ module ManageEngine
       
       begin
   		  #Check for Azure environment
-        response = Net::HTTP.get_response(URI('http://169.254.169.254/metadata/v1/maintenance'))
+        url = URI.parse('http://169.254.169.254/metadata/v1/maintenance') # Azure metadata url
+        request = Net::HTTP::Get.new(url.path)
+        response = Net::HTTP.start(url.host, url.port, :read_timeout => 2) {|http| http.request(request)}
         if (response.kind_of? Net::HTTPOK)
           @hostType = "AZURE"
           return @hostType
@@ -264,6 +280,15 @@ module ManageEngine
 		  rescue Exception => e
 		  end
 		  
+      begin
+        # Check for Heroku env. In the backgroud it is using AWS EC2, hence sending as AWS
+        if (ENV.has_key?('DYNO') || ENV.has_key?('STACK'))
+          @hostType = "AWS"
+          return @hostType
+        end
+      rescue Exception => e
+      end
+		  
       @hostType = nil
 		end
 		

data/lib/agent/handler/sequence_book.rb

@@ -3,7 +3,7 @@ require 'agent/metrics/exception_record'
 module APMInsight
   module Agent
     class SequenceBook
-      attr_reader :openTracker, :closedTracker, :rootTracker, :trackerCount, :exceptionBag, :listenFlag
+      attr_reader :openTracker, :closedTracker, :rootTracker, :trackerCount, :closedTrackerCount, :exceptionBag, :listenFlag
       
       def initialize
         @rootTracker = createDummyTracker()
@@ -11,6 +11,7 @@ module APMInsight
         @openTracker = nil
         
         @trackerCount = 0
+        @closedTrackerCount = 0
         @listenFlag = -1
 #        @exceptionBag = Array.new
       end
@@ -54,6 +55,7 @@ module APMInsight
       end
       
       def closeTracker tracker
+        @closedTrackerCount += 1
         @closedTracker = tracker
         tracker.sibling = nil
         @openTracker = nil
@@ -61,12 +63,16 @@ module APMInsight
         # Marks end of transaction
         if @rootTracker == tracker
           if @listenFlag < 1 || (@listenFlag >= 1 && @trackerCount > 1)
-            
-            sequenceBag = Hash.new
-            sequenceBag["roottracker"] = @rootTracker
-            sequenceBag["exceptions"] = @exceptionBag
-            
-            ManageEngine::APMObjectHolder.instance.collector.updateTransaction(@rootTracker.url, sequenceBag)
+            # if some trackers are not closed, while processing the metrics, it may go into infinite loop
+            if (@closedTrackerCount - @trackerCount) == 0
+              sequenceBag = Hash.new
+              sequenceBag["roottracker"] = @rootTracker
+              sequenceBag["exceptions"] = @exceptionBag
+              
+              ManageEngine::APMObjectHolder.instance.collector.updateTransaction(@rootTracker.url, sequenceBag)
+            else
+              ManageEngine::APMObjectHolder.instance.log.warn "Some trackers are not closed, dropping the metrics for #{@rootTracker.url}"
+            end
           end
           closeSequence()
         end
@@ -76,6 +82,7 @@ module APMInsight
         @rootTracker = nil
         @openTracker = @closedTracker = nil
         @trackerCount = 0
+        @closedTrackerCount = 0
         Thread.current[:apminsight] = nil
       end
       
@@ -84,8 +91,10 @@ module APMInsight
           if @exceptionBag == nil
             @exceptionBag = Set.new
           end
-          exceptionRecord = ::APMInsight::Errors::ExceptionRecord.new(exception)
-          @exceptionBag.add(exceptionRecord)
+          if (@exceptionBag.size() < 10)
+            exceptionRecord = ::APMInsight::Errors::ExceptionRecord.new(exception)
+            @exceptionBag.add(exceptionRecord)
+          end
         rescue Exception=>e
         end
       end
@@ -99,7 +108,8 @@ module APMInsight
       end
       
       def checkAndArrestSequence
-        if ++@trackerCount == 1000
+        @trackerCount += 1
+        if @trackerCount == 1000
           @listenFlag = 1
         end
         

data/lib/agent/logging/am_logger.rb

@@ -4,6 +4,8 @@ require "logger"
 module ManageEngine
 	class APMLogger
 		@apmlog=nil;
+		@apmLogPath=nil;
+		
 		def initialize
 			@obj=ManageEngine::APMObjectHolder.instance
 			path = getLogsPath
@@ -11,13 +13,19 @@ module ManageEngine
 			if  Dir[path] == []
 				Dir.mkdir(path)
 			end
-			path= path + '/apm.log'
+			@apmLogPath= path + '/apm.log'
 			#puts "#{path}"
 #			file = open(path, File::WRONLY | File::APPEND | File::CREAT)
-			@apmlog = Logger.new(path, 10, 5 * 1024 * 1024)
-			#	@apmlog = Logger.new(file)
-			@apmlog.level = Logger::INFO
-			@apmlog.datetime_format = "%Y-%m-%d %H:%M:%S"	
+      begin
+        @apmlog = Logger.new(@apmLogPath, 10, 5 * 1024 * 1024)
+        @apmlog.level = Logger::INFO
+      rescue Exception => e
+        puts "Unable to create/edit the log file #{@apmLogPath}. Writing agent logs to STDOUT.\nError: #{e.message}"
+        @apmlog = Logger.new(STDOUT)
+        @apmlog.level = Logger::WARN
+      end
+      # @apmlog = Logger.new(file)
+      @apmlog.datetime_format = "%Y-%m-%d %H:%M:%S" 
 			@apmlog.formatter = proc do |severity, datetime, progname, msg|
 				"[#{datetime}|#{Process.pid}][#{severity}]:#{msg}\n"
 			end
@@ -25,6 +33,9 @@ module ManageEngine
 
 		end 
 
+		def getLogFilePath
+		  return @apmLogPath
+		end
 
 		def	getLogsPath
 			props = {}
@@ -53,7 +64,7 @@ module ManageEngine
 			if props["apminsight.log.dir"]!=nil
 				return props["apminsight.log.dir"]
 			else
-				return "./log"
+				return @obj.constants.conf_location+"log"
 			end
 
 		end

data/lib/agent/server/am_agent.rb

@@ -17,7 +17,8 @@ module ManageEngine
 				
 				doDispatcherActions
 				doCollect
-				puts "APM Insight Ruby Agent Started"
+				puts "APM Insight Ruby Agent Started. Agent files are located at #{@obj.constants.conf_location}"
+				puts "Agent log file apm.log is generated at #{@obj.log.getLogFilePath}"
 			else
 				@obj.log.info "Agent Initialization Failed - Going to shutdown"
 				#While parsing the response from /arh/connect we set instrumenter to nil on delete request

data/lib/agent/server/am_connector.rb

@@ -109,14 +109,14 @@ module ManageEngine
 				#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.license_key != nil || @obj.config.is_secured)
+		def getScheme(con, url)
+			if(url.to_s.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.use_ssl=true

data/lib/agent/trackers/default_tracker.rb

@@ -28,7 +28,12 @@ module ManageEngine
       end
       
       def duration
-        (@endtime - @starttime).to_i
+        begin
+          (@endtime - @starttime).to_i
+        rescue Exception=>e
+          @logger.warn "Name: #{name} Starttime: #{starttime} Endtime: #{endtime}"
+          raise e
+        end
       end
       
       def ==(obj)

data/lib/agent/util/am_constants.rb

@@ -2,33 +2,33 @@
 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,:mergepattern_conf
-		attr_reader :site24x7USurl, :site24x7EUurl, :site24x7CNurl, :site24x7INurl, :site24x7AUurl
+		attr_reader :conf_location, :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,:mergepattern_conf
+		attr_reader :site24x7USurl, :site24x7EUurl, :site24x7CNurl, :site24x7INurl, :site24x7AUurl, :site24x7GDurl
 		attr_reader :licence_exceeds,:licence_expired,:unmanage_agent,:manage_agent,:agent_config_updated,:error_notfound,:error_server,:delete_agent,:response_code,:custom_config_info, :agent_specific_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
 		attr_reader :en_alphabets, :en_numerals
 		
 		def initialize
-			
+		  @conf_location=ENV.has_key?('APMINSIGHT_HOME') ? ENV['APMINSIGHT_HOME']+"/" : "./"
 			#File path for APM Conf file
-			@apm_gem="apminsight"
-			@s247_apm_gem="site24x7_apminsight"
+			@apm_gem=@conf_location + "apminsight"
+			@s247_apm_gem=@conf_location + "site24x7_apminsight"
 			
 			#File path for APM Conf file
-			@apm_conf="apminsight.conf"
+			@apm_conf=@conf_location + "apminsight.conf"
 
 			#file path for agent id, enable details
-			@agent_conf="apminsight.info"
+			@agent_conf=@conf_location + "apminsight.info"
 
 			#file path for agent data store lock
-			@agent_lock="apminsight.lock"
+			@agent_lock=@conf_location + "apminsight.lock"
 			
 			#file path for agent data store lock
-			@agent_store="apminsight.store"
+			@agent_store=@conf_location + "apminsight.store"
 			
 			#file name for url merge patterns
-			@mergepattern_conf="transaction_merge_patterns.conf"
+			@mergepattern_conf=@conf_location + "transaction_merge_patterns.conf"
 
 
 			#Timeout for opening Connections
@@ -53,8 +53,9 @@ module ManageEngine
 			@site24x7USurl = "https://plusinsight.site24x7.com/"
 			@site24x7EUurl = "https://plusinsight.site24x7.eu/"
       @site24x7CNurl = "https://plusinsight.site24x7.cn/"
-      @site24x7AUurl = "https://plusinsight.site24x7.au/"
+      @site24x7AUurl = "https://plusinsight.site24x7.net.au/"
       @site24x7INurl = "https://plusinsight.site24x7.in/"
+      @site24x7GDurl = "https://gdplusinsight.site24x7.com/"
 			
 			#Response Codes 
 			@licence_expired = 701

data/lib/{version.rb → agent/version.rb}

@@ -6,8 +6,8 @@
 
 module ManageEngine
   class APMInsight
-    VERSION = '1.7.3.0'
-    MAJOR_VERSION = '1.7'
-    MINOR_VERSION = '3.0'
+    VERSION = '1.8.5'
+    MAJOR_VERSION = '1.8'
+    MINOR_VERSION = '5'
   end
 end

data/site24x7-agent.gemspec

@@ -3,7 +3,7 @@
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
-require './lib/version'
+require './lib/agent/version'
 require 'date'
 
 Gem::Specification.new do |s|
@@ -28,7 +28,6 @@ Gem::Specification.new do |s|
   	'VERSION', 
   	'site24x7-agent.gemspec', 
   	'conf/apminsight.conf', 
-  	'lib/version.rb', 
   	'lib/site24x7_apminsight.rb', 
   	'lib/agent/**/*'
   ]

metadata

@@ -4,10 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 7
-  - 3
-  - 0
-  version: 1.7.3.0
+  - 8
+  - 5
+  version: 1.8.5
 platform: ruby
 authors: 
 - Adithyan P
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2018-12-28 00:00:00 +05:30
+date: 2021-06-29 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -105,7 +104,6 @@ files:
 - VERSION
 - site24x7-agent.gemspec
 - conf/apminsight.conf
-- lib/version.rb
 - lib/site24x7_apminsight.rb
 - lib/agent/am_objectholder.rb
 - lib/agent/api/custom_tracker.rb
@@ -135,6 +133,7 @@ files:
 - lib/agent/util/am_constants.rb
 - lib/agent/util/am_util.rb
 - lib/agent/util/transaction_util.rb
+- lib/agent/version.rb
 has_rdoc: true
 homepage: https://www.site24x7.com/help/apm/ruby-agent.html
 licenses: []