site24x7_apminsight 1.8.2 → 1.8.3

data/lib/agent/configuration/am_configuration.rb

@@ -246,10 +246,10 @@ 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/')
-#        request = Net::HTTP::Get.new(url.path)
-#		    response = Net::HTTP.start(url.host, url.port, :read_timeout => 2) {|http| http.request(request)}
+#  		  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/')
+        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
@@ -259,10 +259,10 @@ 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')
-#        request = Net::HTTP::Get.new(url.path)
-#        response = Net::HTTP.start(url.host, url.port, :read_timeout => 2) {|http| http.request(request)}
+#        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')
+        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

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
       

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,14 +13,14 @@ 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)
       begin
-        @apmlog = Logger.new(path, 10, 5 * 1024 * 1024)
+        @apmlog = Logger.new(@apmLogPath, 10, 5 * 1024 * 1024)
         @apmlog.level = Logger::INFO
       rescue Exception => e
-        puts "Unable to create/edit the log file #{path}. Writing agent logs to STDOUT.\nError: #{e.message}"
+        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
@@ -31,6 +33,9 @@ module ManageEngine
 
 		end 
 
+		def getLogFilePath
+		  return @apmLogPath
+		end
 
 		def	getLogsPath
 			props = {}
@@ -59,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,7 +2,7 @@
 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 :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
 		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
@@ -10,25 +10,25 @@ module ManageEngine
 		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

data/lib/agent/version.rb

@@ -6,8 +6,8 @@
 
 module ManageEngine
   class APMInsight
-    VERSION = '1.8.2'
+    VERSION = '1.8.3'
     MAJOR_VERSION = '1.8'
-    MINOR_VERSION = '2'
+    MINOR_VERSION = '3'
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 8
-  - 2
-  version: 1.8.2
+  - 3
+  version: 1.8.3
 platform: ruby
 authors: 
 - Adithyan P
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2019-09-24 00:00:00 +05:30
+date: 2021-03-23 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency