apminsight 1.0.1 → 1.8.2

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.8.2

data/apm-agent.gemspec

@@ -0,0 +1,64 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+require './lib/agent/version'
+require 'date'
+
+Gem::Specification.new do |s|
+  s.name = "apminsight"
+  s.version = ManageEngine::APMInsight::VERSION
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Adithyan P"]
+  s.date = Date.today.to_s
+  s.description = "ManageEngine Applications Manager APM Insight 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 Applications Manager's Ruby agent(apminsight) in your Application Server. This agent allows you to send information about Ruby applications. You can install APM Insight Agent via Rubygems or download it from Applications Manager's website: http://www.manageengine.com/products/applications_manager/apm-insight-agent-installation.html"
+
+  s.email = "apm-insight@zohocorp.com"
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+    
+  s.files = Dir[
+  	'LICENSE.txt', 
+  	'README.rdoc', 
+  	'Rakefile', 
+  	'VERSION', 
+  	'apm-agent.gemspec', 
+  	'conf/apminsight.conf', 
+  	'lib/apminsight.rb', 
+  	'lib/agent/**/*'
+  ]
+  
+  s.homepage = "http://www.manageengine.com/products/applications_manager/ruby-webtransaction-monitoring.html"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.15"
+  s.summary = "ManageEngine Applications Manager APM Insight 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 Applications Manager's Ruby agent(apminsight) in your Application Server. This agent allows you to send information about Ruby applications. You can install APM Insight Agent via Rubygems or download it from Applications Manager's website : http://www.manageengine.com/products/applications_manager/apm-insight-agent-installation.html"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<rails>, [">= 3.0.0"])
+    else
+      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<rails>, [">= 3.0.0"])
+    end
+  else
+    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<rails>, [">= 3.0.0"])
+  end
+end
+

data/conf/apminsight.conf

@@ -9,6 +9,9 @@
 #
 #All the configuration options defaults to factory configuration if commented or not supported values
 
+#License key of your Applications Manager.
+license.key=
+
 #Logical name of your application.Say for example you have "Order Processing" applications running in
 #10 instances of Tomcat server. Specify the name as "Order Processing" for the name in all the 10 
 #instances while deploying the agent. Applications Manager will group the data from 10 instances of
@@ -16,16 +19,9 @@
 application.name=My Application
 
 #Name of the host or IPV4 address where the Applications Manager is installed and running.
+#For Enterprise Edition of Applications Manager provide Managed Server's host or IPV4 address
 #[Mandatory]
-apm.host=localhost
-
-#Whether the data to the Applications Manager should be sent through HTTPS protocol.
-#default value: false
-apm.protocol.https=false
-
-#HTTP/HTTPS Port of the Applications Manager.(Specify HTTPS port if apm.protocol.https is true)
-#[Mandatory]
-apm.port=9090
+apm.host=http://localhost:9090/
 
 #APM Insight agent communicates to the Applications Manager through the HTTP/HTTPS protocol.
 #Specify Proxy server configuration when there is a proxy server between APM Insight agent and
@@ -64,17 +60,19 @@ apdex.threshold=0.5
 sql.capture.enabled=true
 
 #Whether the transaction trace is enabled or not. Setting this value to true will send the trace of the
-#slow transaction.
+#slow web transaction.
 #default value: true
 transaction.trace.enabled=true
 
-#Threshold to construct the trace for slow transactions. Transaction Traces violating this threshold will be 
+#Threshold to construct the trace for slow web transactions. Transaction Traces violating this threshold will be 
 #collected and sent to the server. Used to analyze and troubleshoot the Transaction by the user.
 #default value: 2 (second)
 transaction.trace.threshold=2
 
-#When the sql query capturing is enabled(set to true), should the queries in traces be parameterized?
-#Meaning, strip all the literal values from the sql statement
+#Enabling this option will parametrize all SQL Queries in Slow Transaction Traces (if sql.capture.enabled 
+#set to true & transaction.trace.enabled set to true). Disabling this option will give you the real query
+#with actual parameters. It is recommended to enable this option if there are queries getting executed
+#using confidential parameters like credit card number, passwords, etc.
 #default value: true
 transaction.trace.sql.parametrize=true
 
@@ -83,23 +81,16 @@ transaction.trace.sql.parametrize=true
 #default value: 3 (second)
 transaction.trace.sql.stacktrace.threshold=3
 
-#The packages which also needs to be instrumented. By Default, APM Insight does not instrument all the class
-#loaded in the JVM. eg: configuring com/test/customimpl/.* will include all the packages & classes that
-#starts with com.test.customimpl. It is best if this is enabled only in the testing/staging environment.
-#Use comma(,) to separate multiple entries.
-#include.packages=
-
-#Sampling counter.Say for example when you specify the value as 20, agent will track one in 20 transactions.
-#default value: 1 (request)
-transaction.tracking.request.interval=1
+#Stop listening transactions with specified URL pattern.
+transaction.skip.listening=*.css, *.js, *.gif, *.jpg, *.jpeg, *.bmp, *.png, *.ico
 
 #Directory where agent logs information separately.
 #Defaults to the directory where apminsight-javaagent.jar is installed. 
-#Use backward slash(/) as path separator.
+#Use forward slash(/) as path separator.
 #apminsight.log.dir=./apminsight/logs
 
 #The log level at which the APM Insight agent should record logging 
 #information. The levels are SEVERE, WARNING, INFO, FINE in the order 
 #respectively. Defaults to the level INFO if commented or mentioned 
 #incorrectly.
-apminsight.log.level=INFO
+apminsight.log.level=INFO

data/lib/agent/am_objectholder.rb

@@ -9,32 +9,38 @@ require "agent/metrics/am_metricscollector"
 require "agent/metrics/am_metricstore"
 require "agent/metrics/am_metricsformatter"
 require "agent/metrics/am_metricsparser"
-require "agent/server/instrument/am_instrumenter"
+require "agent/util/transaction_util"
 
 module ManageEngine
 
 	class APMObjectHolder
-		attr_reader :config,:log,:util,:constants,:shutdown,:connector,:agent,:collector
-		attr_accessor :shutdown,:agent_initialized,:last_dispatch_time,:instrumenter,:store,:formatter,:parser
+		attr_reader :config,:log,:util,:constants,:shutdown,:connector,:agent,:collector, :txn_util
+		attr_accessor :shutdown,:agent_initialized,:last_dispatch_time,:store,:formatter,:parser
 		@@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
-			@instrumenter 		= 		ManageEngine::APMInstrumenter.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/api/custom_tracker.rb

@@ -0,0 +1,79 @@
+require 'agent/handler/custom_api_handler'
+
+module APMInsight
+  module API
+    module CustomTracker
+      
+      def self.included clazz
+        clazz.extend CustomMethodTracker
+      end
+      
+      module CustomMethodTracker
+        # @api public
+        def track_method(method_name)
+          
+          # Check whether the method exists
+          return unless method_defined?(method_name) || private_method_defined?(method_name)
+          
+          # Check whether the method is already instrumented
+          return if is_instrumented?(method_name)
+          
+          # Injecting code into the class
+          class_eval(get_instrumentation_code(method_name), __FILE__, __LINE__)
+          
+          # Setting alias to invoke agent methods
+          alias_method "original_#{method_name}", "#{method_name}"
+          alias_method "#{method_name}", "apminsight_#{method_name}"
+          
+          # TODO: set visibility 
+  #        visibility = instance_method_visibility(self, method_name)
+  #        send visibility, method_name
+  #        send visibility, "apminsight_#{method_name}"
+        end
+        
+        
+        def is_instrumented?(method_name)
+          method_name = "apminsight_#{method_name}"
+          return method_defined?(method_name)
+        end
+        
+        # TODO: Capture exception, attach tracker
+        # TODO: Create agent handler and call respective methods like in java agent
+        def get_instrumentation_code(method_name)
+          "def apminsight_#{method_name}(*args, &block)
+              tracker = ::APMInsight::API::CustomAPIHandler.invokeTracker \"\#{self.class.name}.#{method_name}\"
+              begin
+                original_#{method_name}(*args, &block)
+              rescue Exception=>e
+                if tracker != nil
+                  tracker.setError e
+                end
+                raise e
+              ensure
+                ::APMInsight::API::CustomAPIHandler.exitTracker tracker
+              end
+          end"
+        end
+        
+#        def instance_method_visibility(klass, method_name)
+#          if klass.private_instance_methods.map{|s|s.to_sym}.include? method_name.to_sym
+#            :private
+#          elsif klass.protected_instance_methods.map{|s|s.to_sym}.include? method_name.to_sym
+#            :protected
+#          else
+#            :public
+#          end
+#        end
+      end #CustomMethodTracker
+      
+      def self.trackException(exception)
+        return unless exception != nil
+        
+        # Check for active transaction
+        # Associate exception to current transaction
+        ::APMInsight::API::CustomAPIHandler.track_exception(exception)
+      end
+      
+    end #CustomTracker
+  end #API
+end

data/lib/agent/configuration/am_configuration.rb

@@ -1,14 +1,15 @@
 require 'rubygems'
 require 'json'
 require 'socket'
-require 'rails'
+require 'net/http'
 require 'agent/am_objectholder'
+require 'agent/version'
 
 module ManageEngine
 	class APMConfig
-		attr_reader :agenthost,:agentport,:instance_id,:alreadyconnected,:apmhost,:apmport
-		attr_reader :appname,:proxyneeded, :apdex_t, :trans_trace, :trans_trace_t, :sql_capture, :sql_capture_params, :sql_trace_t,:proxy_user,:proxy_pass
-		attr_reader :proxy_host,:proxy_port ,:is_secured, :logs_dir ,:connection_retry,:agent_enabled,:connect_interval,:db_operations,:include_packages
+		attr_reader :agenthost,:agentport,:instance_id,:alreadyconnected,:apmhost,:apmport,:license_key,:site24x7, :site24x7url, :hostType
+		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
 			@obj = ManageEngine::APMObjectHolder.instance
@@ -21,19 +22,31 @@ module ManageEngine
 			@instance_id  = 0
 			@agent_enabled = false
 			@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
+			end
 			@db_operations =["select","insert","update","delete"]
-			@obj.log.debug "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-			@obj.log.debug "APP HOME #{File.absolute_path(".")} "
-			@obj.log.debug "APP HOME #{Dir.pwd} "
-			@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}"
-			@config.each do|key,val|
-			@obj.log.info "#{key} => #{val}"
-				end
-			@obj.log.debug "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+			urlMergePattern
+			@hostType = getHostType
+			@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 "Host Type: #{@hostType}"
+			@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
+			@obj.log.info "URL Merge Patterns"
+			@url_merge_pattern.each do |key, val|
+				@obj.log.info "#{key} => #{val}"
+			end
+			@obj.log.info "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
 			@app_db="dummydb"
 			@app_dispatcher = getDispatcher
 			@lastupdatedtime=File.mtime(@obj.constants.apm_conf).to_i
@@ -41,23 +54,27 @@ module ManageEngine
 		
 		def configureFile
 			begin
-				gem_conf = Gem.loaded_specs[@obj.constants.apm_gem].full_gem_path
-				#gem_conf = File.join(gem_conf, 'lib')
-				gem_conf = File.join(gem_conf, 'conf')
-				gem_conf = File.join(gem_conf, 'apminsight.conf')
 				if(FileTest.exists?(@obj.constants.apm_conf))
 					#conf file exists in APPlication Home
-						@obj.log.debug "Config File Read from #{@obj.constants.apm_conf}"
+						@obj.log.debug "Config File Exists. It is read from #{@obj.constants.apm_conf}"
 					@config = @obj.util.readProperties(@obj.constants.apm_conf)
 				else
+				  gemSpecs = Gem.loaded_specs[@obj.constants.s247_apm_gem]
+				  if (gemSpecs == nil)
+				    gemSpecs = Gem.loaded_specs[@obj.constants.apm_gem]
+				  end
+					gem_conf = gemSpecs.full_gem_path
+					#gem_conf = File.join(gem_conf, 'lib')
+					gem_conf = File.join(gem_conf, 'conf')
+					gem_conf = File.join(gem_conf, 'apminsight.conf')
 					#conf file not exists in APPlications Home. So 1. copy it for gem locations
 					if @obj.util.copyFiles gem_conf,@obj.constants.apm_conf
 						#copied sucessfully
-						@obj.log.debug "Config File Read from #{@obj.constants.apm_conf}"
+						@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)
 					else
 						#Problem in copying, so reading props from Conf file in Gem Location
-						@obj.log.debug "Config File Read from #{gem_conf}"
+						@obj.log.warn "Config File not copied. It is read from #{gem_conf}"
 						@config = @obj.util.readProperties(gem_conf)
 					end
 				end
@@ -74,7 +91,17 @@ module ManageEngine
 			if FileTest.exists?(@obj.constants.agent_conf)
 				@obj.log.debug "Status : Agent Already Connected"
 				props = @obj.util.readProperties(@obj.constants.agent_conf)
-				@instance_id = props["agent.id"]
+				instance_id = props["agent.id"]
+				
+				if (instance_id == nil || instance_id == "")
+				  # If instance id is not found or empty, it means the apminsight.info is being modified by user
+				  # Ignore all its entry
+				  @obj.log.warn "File: #{@obj.constants.agent_conf} is corrupted. Agent will continue ignoring these values."
+				  return false
+				else
+				  @instance_id = instance_id
+				end
+				
 				@agent_enabled= @obj.util.getBooleanValue props["agent.enabled"]
 				true
 			else
@@ -83,6 +110,30 @@ module ManageEngine
 			end
 		end
 
+		def checkLicenseFile
+			if(@license_key != nil)
+				@obj.log.info "License key is not null. Connecting to site24x7"
+				@obj.constants.setLicenseKey @license_key
+				true
+			else
+				@obj.log.info "License key is null. Connecting to APPManager"
+				false
+			end
+
+		end
+		
+		def urlMergePattern
+			@url_merge_pattern = Hash.new
+			begin
+				if (FileTest.exists?(@obj.constants.mergepattern_conf))
+					@url_merge_pattern=@obj.util.readProperties(@obj.constants.mergepattern_conf)
+				end
+			rescue Exception => e
+				@obj.log.info "[Exception] Problem in Reading Configuration File : \n File : #{@obj.constants.mergepattern_conf}"
+				@obj.log.logException "#{e.message}",e
+			end
+		end
+
 		def updateAgentInfoFile(props)
 			@instance_id = props["agent.id"]
 			@agent_enabled= @obj.util.getBooleanValue props["agent.enabled"]
@@ -102,18 +153,30 @@ module ManageEngine
 			@connection_retry = 0
 			@connect_interval = 60
 			@apdex_t=0.5
-			@include_packages=Array.new
+			@txn_skip_listen=Array.new
 			@trans_trace_t=2
 			@sql_trace_t=3
+			@metric_overflow_t=250
+      @dbmetric_overflow_t=500
+			@trace_overflow_t=30
+			@site24x7url = @obj.constants.site24x7USurl #default agent communication URL
 		end
 
 		def assignConfig
 		initValues
 		 @config.each do |key,value|
+		 	 value = checkAndGetEnvValue(value)
 			 case key
 			 when "application.name" then @appname=value
+			                              if (ENV.has_key?('APM_APPLICATION_NAME'))
+			                                @appname = ENV['APM_APPLICATION_NAME']
+			                              end
 			 when "apm.host" then @apmhost=value
 			 when "apm.port" then @apmport=isInteger(@apmport,value)
+			 when "license.key" then @license_key=value
+			                         if (@license_key.empty? && ENV.has_key?('S247_LICENSE_KEY'))
+			                           @license_key = ENV['S247_LICENSE_KEY']
+			                         end
 			 when "behind.proxy" then @proxyneeded=@obj.util.getBooleanValue value
 			 when "agent.server.port" then @agentport=isInteger(@agentport,value)
 			 when "apdex.threshold" then @apdex_t=isFloat(@apdex_t,value)
@@ -123,24 +186,103 @@ module ManageEngine
 			 when "transaction.trace.sql.parametrize" then @sql_capture_params=@obj.util.getBooleanValue value
 			 when "transaction.trace.sql.stacktrace.threshold" then @sql_trace_t=isFloat(@sql_trace_t,value)
 			 when "proxy.server.host" then @proxy_host=value
-			 when "proxy.server.port" then @proxy_port=value
+			 when "proxy.server.port" then @proxy_port=isInteger(@proxy_port,value)
 			 when "proxy.auth.username" then @proxy_user=value
-			 when "proxy.auth.password" then @proxy_pass=value
-			 when "apminsight.secure" then @is_secured=@obj.util.getBooleanValue value
+			 when "proxy.auth.password" then @proxy_pass=@obj.util.decrypt value, @license_key
+			                                    if (@proxy_pass == nil)
+			                                      @proxy_pass = value
+			                                    end
+			 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 "include.packages" then @include_packages=@obj.util.getArray value,","
+			 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
+     store_encrypted_data(@config)
+		end
+		
+		#Checks whether the given value is Environment Variable
+		def checkAndGetEnvValue(data)
+		  begin
+  			value = "#{data}"[/\{(.*)\}/,1]
+  			if (value != nil && ENV.has_key?(value))
+  				return data.gsub(/\{.*\}/, ENV[value])
+			  end
+			rescue Exception=>e
+			end
+			return data
 		end
 
+		def store_encrypted_data config
+		  data = config["proxy.auth.password"]
+		  if (data != nil && @obj.util.decrypt(data, @license_key) == nil) # checking whether data is already encrypted
+		    begin
+		      file_contents = ""
+          conf_file = File.open(@obj.constants.apm_conf, 'r')
+          conf_file.read.each_line do |line|
+            if line.start_with?("proxy.auth.password")
+              file_contents += "proxy.auth.password=" + @obj.util.encrypt(config["proxy.auth.password"], @license_key)
+            else
+              file_contents += line
+            end
+            #file_contents += "\n"
+          end #end of do read loop
+          conf_file.close
+          conf_file = File.open(@obj.constants.apm_conf, "w+")
+          conf_file.puts file_contents
+          conf_file.close
+          file_contents = nil # clearing memory
+		    rescue Exception=>e
+		      @obj.log.logException "Error while encrypting file", e
+		    end
+		  end # if already encrypted
+		end
+		
+		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)}
+  		  if (response.kind_of? Net::HTTPOK)
+  		    @hostType = "AWS"
+  		    return @hostType
+  		  end
+      rescue Exception => e
+      end
+      
+      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)}
+        if (response.kind_of? Net::HTTPOK)
+          @hostType = "AZURE"
+          return @hostType
+        end
+		  rescue Exception => e
+		  end
+		  
+      @hostType = nil
+		end
+		
 		def getAgentInfo
 			data =  Hash.new
 			agentdata = Hash.new
-			agentdata = {"application.type"=>"RUBY","application.name"=>@appname,"hostname"=>@agenthost,"port"=>@agentport,"agent.version"=>"1.0"}
+			agentdata = {"application.type"=>"RUBY","application.name"=>@appname,"hostname"=>@agenthost,"port"=>@agentport,"agent.version"=>ManageEngine::APMInsight::MAJOR_VERSION}
+		  if (@hostType != nil)
+		    agentdata["host.type"]=@hostType
+		  end
 			data["agent_info"]=agentdata
 			data["environment"]=getEnvData
+			data["custom_config_info"]=getAgentConfigData
 			data
 		end
 
@@ -150,19 +292,49 @@ module ManageEngine
 			ENV.to_hash.each do |key, value|
 				env[key] = value
 			end
-			env["Application Path"]="#{Rails.root}"
+			#env["Application Path"]="#{Rails.root}"
 			rescue Exception=>e
 			end
 			env
 		end
 			
+		def getAgentConfigData
+			agentconfig = Hash.new
+			agentconfig["last.modified.time"]=@lastupdatedtime*1000
+			agentconfig["apdex.threshold"]=@apdex_t
+			agentconfig["sql.capture.enabled"]=0
+			if @sql_capture
+				agentconfig["sql.capture.enabled"]=1
+			end
+			agentconfig["transaction.trace.enabled"]=0
+			if @trans_trace
+				agentconfig["transaction.trace.enabled"]=1
+			end
+			agentconfig["transaction.trace.threshold"]=@trans_trace_t
+			agentconfig["transaction.trace.sql.parametrize"]=0
+			if @sql_capture_params
+				agentconfig["transaction.trace.sql.parametrize"]=1
+			end
+			agentconfig["transaction.trace.sql.stacktrace.threshold"]=@sql_trace_t
+			agentconfig["transaction.tracking.request.interval"]=1
+			agentconfig
+		end
 
 		def getDispatcher
-		dispatcher = "unknown"
-		if defined?(PhusionPassenger) then
-			dispatcher = "passenger"
-		end
-		dispatcher
+		  
+		  @obj.log.info "Server: #{ENV['SERVER_SOFTWARE']}"
+		  
+  		dispatcher = "unknown"
+  		if defined?(PhusionPassenger) then
+  			dispatcher = "passenger"
+  		end
+  		if defined?(Unicorn) then
+  		  dispatcher = "unicorn"
+  		end
+  		if defined?(Rainbows) then
+  		  dispatcher = "rainbows"
+  		end
+  		dispatcher
 		end
 		
 		def isInteger default,value
@@ -184,6 +356,46 @@ module ManageEngine
 			end
 		end
 
+		def update_config configInfo
+			filepath = @obj.constants.apm_conf
+			f = "apminsight.conf.new"
+			begin
+				propsFile=File.open(filepath, 'r')
+				file = File.new(f,"w+")
+	      			propsFile.read.each_line do |line|
+        			line.strip!
+        			if (line[0] != ?# and line[0] != ?=)
+          				i = line.index('=')
+        	  			if (i)
+						key1 = line[0..i - 1].strip
+						if configInfo.has_key?(key1)
+							file.puts "#{key1}=#{configInfo[key1]}\n"
+						else
+							file.puts "#{line}\n"
+						end
+	          			else
+						file.puts "#{line}\n"
+         				end
+				else
+					file.puts "#{line}\n"
+        			end
+      	  		end
+			rescue Exception=>e
+				@obj.log.info "Problem in Reading / Writing Property File :  #{e.message} "
+				@obj.log.error "#{e.backtrace}"
+			ensure
+					propsFile.close
+					file.close
+			end
+			res = @obj.util.copyFiles f, filepath
+			if res
+				@obj.log.info "copyFiles result = #{res}"
+				#delete apminsight.conf.new has to be done
+			end
+			configureFile
+			assignConfig
+		end
+
 
 	end#c
 end#m