site24x7_apminsight 1.9.0 → 1.9.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 6adf1511641c4e23c0e5f0a0ac71336dd62c4fe0ee23b0df46b07e804c74841a
+  data.tar.gz: 1d5dcaa91fd5e185f3592c86f686af35f33d20918297ef0f1d2deeaffa5a5c7b
+SHA512:
+  metadata.gz: 7a01e038e40a5656c0c62dd353dcb5c118bc071312612aef245fdf1d2edcf2ae4a6dded206406febda1f029b42a961b5b75758565758938dc5ee77a7e837b92c
+  data.tar.gz: 80d84c7ba2f6095adb9050040283a788242d94f7ad9e00b9141b76addbb88123fa16027de9af33723bd3a60daa9e5a01c4a75b5ea0205a0d3c009aed7f23ca3c

data/LICENSE.txt

@@ -1,4 +1,4 @@
-This License Agreement details the policy for license of Site24x7 APM Insight Ruby Agent ("Licensed Software")
+This License Agreement details the policy for license of ManageEngine APM Insight Ruby Agent ("Licensed Software")
 Please read the following license carefully, before either (i) downloading the Licensed Software from an authorized website, or (ii) installing the Licensed Software. You acknowledge that you have read this License Agreement, have understood it, and agree to be bound by its terms. If you do not agree to the terms and conditions of this Agreement, do not download or install the Licensed Software.
 
 1. LICENSE GRANT

data/README.rdoc

@@ -1,5 +1,5 @@
 APM Insight Ruby Agent
-	Site24x7 APM Insight Ruby agent gives you end-to-end web-transaction awareness enabling you to isolate performance issues and resolve them quickly. Site24x7 APM Insight requires a monitoring agent (ruby gem) to be deployed in your application server to monitor Ruby application performance. Download the latest Ruby Agent(site24x7_apminsight.gem) and deploy it in your application server. The agent collects application performance metrics and sends it to the central Site24x7 server at fixed intervals i.e. every 60 seconds. You can view them at https://site24x7.com in your accounts page.
+	Applications Manager's Ruby agent gives you end-to-end web-transaction awareness enabling you to isolate performance issues and resolve them quickly.Applications Manager requires a monitoring agent (ruby gem) to be deployed in your application server to monitor Ruby application performance. Download the latest Ruby Agent(apminsight.gem) and deploy it in your application server. The agent collects application performance metrics and sends it to the central Applications Manager server at fixed intervals i.e. every 60 seconds.
  
 Installing APM Insight Agent
 
@@ -7,13 +7,13 @@ Installing APM Insight Agent
 
     	* Install from RubyGems by using the following command in the system where Ruby is installed : 
 		
-		gem install site24x7_apminsight
+			gem install apminsight
     				
 			OR
 
-	* Download the site24x7_apminsight.gem file from your accounts page in https://site24x7.com (after sign in) or the RubyGems website and run the command 
+	    * Download the apminsight.gem file directly from our website or the RubyGems website and run the command 
 		
-			gem install site24x7_apminsight.gem
+			gem install apminsight.gem
 
 Configuration
 
@@ -21,28 +21,30 @@ Configuration
 
     	For each of your applications, add the following line to the application gemfile:
 
-        	gem 'site24x7_apminsight'
+        	gem 'apminsight'
 		
 				OR
 
     	For each of your applications, add the following line to the application initializer block:
 
-        	require 'site24x7_apminsight'
+        	require 'apminsight'
 
-	A copy of the configuration file apminsight.conf will be available in the <Gem Installed folder> /site24x7_apminsight/conf/. Configure the class name in the configuration file(include.packages), so that all the methods in that class can be instrumented and details will be reported in tracedata.
+	A copy of the configuration file apminsight.conf will be available in the <Gem Installed folder> /apminsight/conf/. Configure the class name in the configuration file(include.packages), so that all the methods in that class can be instrumented and details will be reported in tracedata.
  
 
 The following configuration options are mandatory and should be provided for the agent to be initialized:
 
-    application.name - The application's name to be displayed in Site24x7 server.
+    application.name - The application's name to be displayed in Applications Manager.
 
-    license.key - The license api key from your account page after sign in (https://site24x7.com)
+    apm.host - The host where Applications Manager is running.
+
+    apm.port - The HTTP port of Applications Manager.
 
     behind.proxy - The proxy network under which the agent is installed
 
     agent.server.port - The HTTP listening port of the Application Server.
 
-More configuration options of APM Insight Ruby Agent can be found here. https://www.site24x7.com/help/apm/apm-insight-configuration.html
+More configuration options of APM Insight Ruby Agent can be found here.
  
 Supported Environments :
 
@@ -52,16 +54,16 @@ Supported Environments :
 
 References
 
-	* Create an apminsight account in Site24x7 server (https://www.site24x7.com)
+	* Download link for Applications Manager
 
-	* Download link for site24x7_apminsight gem 
+		http://www.manageengine.com/products/applications_manager/
 
-		From your account page after valid sign in
-			or
-		http://rubygems.org/gems/site24x7_apminsight
+	* Download link for apminsight 
 
-	* Help Documentation for apminsight
+		http://www.manageengine.com/products/applications_manager/
+		http://rubygems.org/gems/apminsight
 
-		https://www.site24x7.com/help/apm/ruby-agent.html
-		https://support.site24x7.com/portal/helpcenter/site24x7/apm-insight/ruby-monitoring
+	* Help Documentation for apminsight
 
+		http://www.manageengine.com/products/applications_manager/help/APMInsight/installing-transaction-agent.html
+		

data/Rakefile

@@ -14,13 +14,13 @@ require 'rake'
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "site24x7_apminsight"
-  gem.homepage = "https://www.site24x7.com/help/apm/ruby-agent.html"
+  gem.name = "apminsight"
+  gem.homepage = "http://www.manageengine.com/products/applications_manager/ruby-webtransaction-monitoring.html"
   gem.license = "MIT"
   gem.summary = %Q{Application Performace Monitor}
   gem.description = %Q{Application Performace Monitor : Monitor the web tranasactions}
   gem.email = "apm-insight@zohocorp.com"
-  gem.authors = ["Rajalakshmi Ezhilan"]
+  gem.authors = ["Sabarinathan P"]
   gem.files=Dir.glob('lib/**/*.*')
   # dependencies defined in Gemfile
 end
@@ -48,7 +48,7 @@ Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "site24x7_apminsight #{version}"
+  rdoc.title = "apminsight #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.*')
   rdoc.rdoc_files.include('lib/agent/**/*.*')

data/VERSION

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

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
 
@@ -385,6 +385,9 @@ module ManageEngine
   		if defined?(Rainbows) then
   		  dispatcher = "rainbows"
   		end
+  		if defined?(Puma) then
+  		  dispatcher = "puma"
+  		end
   		dispatcher
 		end
 		

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/instrument/rails.rb

@@ -24,6 +24,8 @@ module ManageEngine
         'Rails'
       end
       
+      # https://edgeguides.rubyonrails.org/active_support_instrumentation.html#rails-framework-hooks
+      
       def instrument
         @obj = ManageEngine::APMObjectHolder.instance
         @obj.log.info "Instrumenting ActionController.. Rails Version: #{version}"
@@ -31,6 +33,9 @@ module ManageEngine
         
         ActiveSupport::Notifications.subscribe('start_processing.action_controller') do |name, start, finish, id, payload|
           path = payload[:path].partition("?")[0]
+            # request = payload[:request]
+            # request.original_url  => returns http://www.example.com/articles?page=2
+            # request.request_method
           @railsTracker = ManageEngine::Tracker::RootTracker.new("#{payload[:controller]}.#{payload[:action]}", start.to_f * 1000)
           @railsTracker.url=(path)
           @railsTracker = ManageEngine::Agent::TrackerHandler.invokeTracker(@railsTracker)
@@ -43,6 +48,7 @@ module ManageEngine
             exception = payload[:exception_object]
             if exception != nil
               @railsTracker.setError(exception)
+              # TODO: payload[:status]
               @railsTracker.setStatus(500) # By default, set 500 as status for error txns
             end
             ManageEngine::Agent::TrackerHandler.exitTracker(@railsTracker)

data/lib/agent/version.rb

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

metadata

@@ -1,110 +1,103 @@
---- !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.1
 platform: ruby
-authors: 
+authors:
 - Adithyan P
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2024-03-22 00:00:00 +05:30
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2024-06-26 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 +117,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 +130,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: []
-
+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
+rubygems_version: 3.0.0
 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: []
-