site24x7_apminsight 1.9.0 → 1.9.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 61471f26922c97dccfc1294d9565f8be9009b4031c6b75a41f776628c3a6295e
+  data.tar.gz: 0d34c97c8a0501b9c655fddd09decaf45c26c5be5e08c82a4046ac229a144fd4
+SHA512:
+  metadata.gz: 99cf966c504848406f8d870eadaa1947eb91af4278b864073a4820a237038ba68606524188102110d2eaef7a395e2e0ebcaa1be97c746ceb23ad64037997a5b8
+  data.tar.gz: 3ac8d504af5ed03b369ca08ff48158d6407e80f07153476647a0698f32fa90c01e05736cbf7811c9b78f11d4109c8fb2f470c5d8f5ad9ec7232f2667c611c875

data/lib/agent/configuration/am_configuration.rb

@@ -180,7 +180,7 @@ module ManageEngine
 			@metric_overflow_t=250
       @dbmetric_overflow_t=500
 			@trace_overflow_t=30
-			@site24x7url = @obj.constants.site24x7USurl #default agent communication URL
+			#@site24x7url = @obj.constants.site24x7USurl #default agent communication URL
       @delayedStart = false
 		end
 
@@ -267,6 +267,28 @@ module ManageEngine
 		end
 		
 		def getHostType
+		  begin
+		    # Checking for OpenShift
+		    if (ENV.has_key?('OPENSHIFT_BUILD_NAMESPACE'))
+		      @obj.log.info "Agent is hosted in OpenShift"
+          @hostType = "DOCKER"
+           return @hostType
+		    end
+		    # Checking for k8s env
+		    if (ENV.has_key?('KUBERNETES_SERVICE_HOST'))
+		      @obj.log.info "Agent is hosted in Kubernetes"
+		      @hostType = "DOCKER"
+		      return @hostType
+		    end
+		    # Checking for Docker
+        if (File.exist?('/.dockerenv') || File.read('/proc/1/cgroup').include?('docker'))
+          @obj.log.info "Agent is hosted in DOCKER"
+          @hostType = "DOCKER"
+          return @hostType
+        end
+		  rescue Exception => e
+		  end
+		  
 		  begin
   		  # Check for AWS environment
 		    url = URI.parse('http://169.254.169.254/latest/meta-data/') # AWS metadata url
@@ -275,6 +297,20 @@ module ManageEngine
   		  if (response.kind_of? Net::HTTPOK)
   		    @hostType = "AWS"
   		    return @hostType
+  		  elsif (response.kind_of? Net::HTTPUnauthorized)
+          uri = URI('http://169.254.169.254/latest/api/token')
+          request = Net::HTTP::Put.new(uri)
+          request['X-aws-ec2-metadata-token-ttl-seconds'] = '30'
+          response = Net::HTTP.start(uri.hostname, uri.port) {|http| http.request(request)}
+          token = response.body
+          url = URI.parse('http://169.254.169.254/latest/meta-data/instance-id') # AWS metadata url
+          request = Net::HTTP::Get.new(url.path)
+          request['X-aws-ec2-metadata-token'] = token
+          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
   		  end
       rescue Exception => e
       end
@@ -294,6 +330,7 @@ module ManageEngine
       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'))
+          @obj.log.info "Agent is hosted in Heroku"
           @hostType = "AWS"
           return @hostType
         end
@@ -385,6 +422,9 @@ module ManageEngine
   		if defined?(Rainbows) then
   		  dispatcher = "rainbows"
   		end
+  		if defined?(Puma) then
+  		  dispatcher = "puma"
+  		end
   		dispatcher
 		end
 		

data/lib/agent/logging/am_logger.rb

@@ -107,8 +107,8 @@ module ManageEngine
 
 
 		def logException(msg,e)
-			@apmlog.warn( "#{msg} => #{e.message}")
-			@apmlog.warn( "Message  : #{msg}\nTrace :\n#{e.backtrace}")
+			@apmlog.warn( "#{msg} => #{e.message} => #{e.backtrace}")
+			#@apmlog.warn( "Message  : #{msg}\nTrace :\n#{e.backtrace}")
 		end
 
 		def close

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

@@ -3,6 +3,7 @@ require 'agent/server/instrument/sinatra'
 require 'agent/server/instrument/active_record'
 require 'agent/server/instrument/action_view'
 require 'agent/server/instrument/sidekiq_server'
+require 'agent/server/instrument/puma'
 
 module ManageEngine
   class Environment
@@ -18,7 +19,8 @@ module ManageEngine
     
     OTHER_INTERCEPTORS = [
         ManageEngine::Instrumentation::ActionView.new,
-        ManageEngine::Instrumentation::SidekiqServer.new
+        ManageEngine::Instrumentation::SidekiqServer.new,
+        ManageEngine::Instrumentation::PumaWorker.new
     ]
     
     def detect_and_instrument

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

@@ -0,0 +1,39 @@
+module ManageEngine
+  module Instrumentation
+    class PumaWorker
+      
+      def present?
+          defined?(Puma::Server)
+        end
+        
+        def version
+          Puma::Const::PUMA_VERSION
+        end
+        
+        def env
+          ENV['RACK_ENV'] || ENV['RAILS_ENV'] || 'development'
+        end
+        
+        def name
+          'Puma Worker'
+        end
+        
+        def instrument
+          ManageEngine::APMObjectHolder.instance.log.info "Instrumenting Puma server workers. Version: #{version}"
+            Puma::Server.class_eval do
+                include ManageEngine::Instrumentation::PumaRun
+                alias original_run run
+                alias run agent_run
+            end
+        end
+    end
+    
+    module PumaRun
+      def agent_run(*args, &block)
+        ::ManageEngine::APMObjectHolder.instance.agent.doCollect
+        original_run(*args, &block)
+      end
+    end
+    
+  end
+end

data/lib/agent/server/worker/am_worker.rb

@@ -265,7 +265,18 @@ class APMWorker
   			rtData[7] = rtData[7]+dat[0][7]
   			rtData[4] = rtData[3] != 0 ? (rtData[5].to_f + (rtData[6].to_f/2).to_f).to_f/rtData[3].to_f : 0
   			res[0] = rtData
-  			res[1][@obj.constants.error_rt] += dat[1][@obj.constants.error_rt]
+  			
+  			# error_rt merge 
+  			res_error_rt = res[1][@obj.constants.error_rt];
+  			dat_error_rt = dat[1][@obj.constants.error_rt];
+  			if (res_error_rt != nil)
+  			  if (dat_error_rt != nil)
+            res[1][@obj.constants.error_rt] = res_error_rt + dat_error_rt;
+          end
+        elsif (dat_error_rt != nil)
+          res[1][@obj.constants.error_rt] = dat_errror_rt;
+        end
+  			  
   			resExcepData = res[1][@obj.constants.mf_logmetric]
   			excepData = dat[1][@obj.constants.mf_logmetric]
   			if (resExcepData == nil)
@@ -296,7 +307,18 @@ class APMWorker
         rtData[3] = rtData[3]+dat[0][3]
         rtData[4] = rtData[4]+dat[0][4]
         res[0] = rtData
-        res[1][@obj.constants.error_rt] += dat[1][@obj.constants.error_rt]
+        
+        # error_rt merge 
+        res_error_rt = res[1][@obj.constants.error_rt];
+        dat_error_rt = dat[1][@obj.constants.error_rt];
+        if (res_error_rt != nil)
+          if (dat_error_rt != nil)
+            res[1][@obj.constants.error_rt] = res_error_rt + dat_errror_rt;
+          end
+        elsif (dat_error_rt != nil)
+          res[1][@obj.constants.error_rt] = dat_errror_rt;
+        end         
+        
         resExcepData = res[1][@obj.constants.mf_logmetric]
         excepData = dat[1][@obj.constants.mf_logmetric]
         if (resExcepData == nil)

data/lib/agent/trackers/database_tracker.rb

@@ -48,10 +48,28 @@ module ManageEngine
         
         begin
           tableName = case sqlArr[0]
-                 when "select" then sqlArr[sqlArr.index("from")+1]
-                 when "insert" then sqlArr[sqlArr.index("into")+1]
+                 when "select" then 
+                   fromIndex = sqlArr.index("from");
+                   if(fromIndex != nil)
+                     sqlArr[fromIndex+1]
+                   else
+                     "-" 
+                   end
+                 when "insert" then 
+                    intoIndex = sqlArr.index("into");
+                   if(intoIndex != nil)
+                     sqlArr[intoIndex+1]
+                   else
+                     "-" 
+                   end
                  when "update" then sqlArr[1]
-                 when "delete" then sqlArr[sqlArr.index("from")+1]
+                 when "delete" then
+                   fromIndex = sqlArr.index("from");
+                   if(fromIndex != nil)
+                     sqlArr[fromIndex+1]
+                   else
+                     "-" 
+                   end
                  when "create" then sqlArr[1] + sqlArr[2]
                  when "alter" then sqlArr[1] + sqlArr[2]
                  when "drop" then sqlArr[1] + sqlArr[2]

data/lib/agent/version.rb

@@ -6,8 +6,8 @@
 
 module ManageEngine
   class APMInsight
-    VERSION = '1.9.0'
+    VERSION = '1.9.2'
     MAJOR_VERSION = '1.9'
-    MINOR_VERSION = '0'
+    MINOR_VERSION = '2'
   end
 end

metadata

@@ -1,110 +1,102 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: site24x7_apminsight
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 9
-  - 0
-  version: 1.9.0
+version: !ruby/object:Gem::Version
+  version: 1.9.2
 platform: ruby
-authors: 
+authors:
 - Adithyan P
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2024-03-22 00:00:00 +05:30
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2024-09-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: shoulda
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: jeweler
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 6
-        - 4
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 1.6.4
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rcov
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.4
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rails
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
-  version_requirements: *id005
-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) 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 your user account in Site24x7
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+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)
+  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
+  your user account in Site24x7
 email: apm-insight@zohocorp.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - LICENSE.txt
 - README.rdoc
 - Rakefile
 - VERSION
-- site24x7-agent.gemspec
-- conf/apminsight.conf
-- lib/site24x7_apminsight.rb
 - lib/agent/am_objectholder.rb
 - lib/agent/api/custom_tracker.rb
 - lib/agent/configuration/am_configuration.rb
@@ -124,6 +116,7 @@ files:
 - lib/agent/server/instrument/am_apm.rb
 - lib/agent/server/instrument/am_instrumenter.rb
 - lib/agent/server/instrument/environment.rb
+- lib/agent/server/instrument/puma.rb
 - lib/agent/server/instrument/rails.rb
 - lib/agent/server/instrument/sidekiq_client.rb
 - lib/agent/server/instrument/sidekiq_server.rb
@@ -136,37 +129,33 @@ files:
 - lib/agent/util/am_util.rb
 - lib/agent/util/transaction_util.rb
 - lib/agent/version.rb
-has_rdoc: true
+- lib/site24x7_apminsight.rb
+- site24x7-agent.gemspec
 homepage: https://www.site24x7.com/help/apm/ruby-agent.html
 licenses: []
-
-post_install_message: 
+metadata: {}
+post_install_message:
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.3.7
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 3
-summary: 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.gem) 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 your user account in Site24x7
+summary: 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.gem)
+  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
+  your user account in Site24x7
 test_files: []
-

data/conf/apminsight.conf

@@ -1,86 +0,0 @@
-# $Id$
-#
-###################  APM Insight Agent Configuration File  ###################
-#
-#This file contains configuration options for APM Insight agent installation in your Application Server.
-#
-#NOTE: Though the properties can be defined in any different order, it is advisable to maintain
-#the below order for related properties and ease of reference.
-#
-#All the configuration options defaults to factory configuration if commented or not supported values
-
-#License key of your Site24x7 APM Insight account.
-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. Site24x7 will group the data from 10 instances of
-#Tomcat and provide response time, throughput etc. 
-application.name=My Application
-
-#APM Insight agent communicates to the Site24x7 through the HTTP/HTTPS protocol.
-#Specify Proxy server configuration when there is a proxy server between APM Insight agent and
-#Site24x7 server. 
-#
-behind.proxy=false
-#proxy.server.host=proxyserver
-#proxy.server.port=proxyport
-#proxy.auth.username=proxyuser
-#proxy.auth.password=proxypassword
-
-#Application Server HTTP/HTTPS listening port.Say for example when you are deploying the agent in Tomcat
-#Server running in 8080 port, specify the value as 8080.
-#[Mandatory]
-agent.server.port=8080
-
-#The Apdex (Application Performance Index) threshold is used to calculate application performance score.
-#More at http://www.apdex.org. 
-#A Transaction is said to be satisfied, if the response time is equal to or below the apdex.threshold.
-#A Transaction is said to be tolerating, if  the response time is greater than apdex.threshold and less 
-#than 4 times of apdex.threshold. A Transaction is said to be frustrated, if the response time is greater
-#than 4 times of apdex.threshold. Say for example when you specify the value as 2, transactions with response
-#time less than 2 seconds is considered as satisfied, transactions with response time greater than 2 and
-#less than 8 is considered as tolerating and transactions with response time greater than 8 seconds is 
-#considered as frustrating.
-#default value: 0.5 (second)
-apdex.threshold=0.5
-
-#Whether SQL queries getting executed in your application need to be tracked or not.
-#default value: true
-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.
-#default value: true
-transaction.trace.enabled=true
-
-#Threshold to construct the trace for slow 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
-
-#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
-
-#Threshold value to generate a stack trace to identify the caller who executed a slow query. This stack 
-#trace is sent to the server for the user to analyze and troubleshoot
-#default value: 3 (second)
-transaction.trace.sql.stacktrace.threshold=3
-
-#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 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