oneapm_rpm 1.1.2 → 1.1.3

data/lib/one_apm/frameworks/rails3.rb

@@ -31,6 +31,7 @@ module OneApm
             include OneApm::Agent::Instrumentation::TransactionBase::Shim
           end
         end
+
       end
     end
   end

data/lib/one_apm/frameworks/rails4.rb

@@ -6,15 +6,11 @@ module OneApm
   class Probe
     module Frameworks
       class Rails4 < OneApm::Probe::Frameworks::Rails3
+
         def rails_gem_list
-          Bundler.rubygems.all_specs.map do |gem|
-            "#{gem.name} (#{gem.version})"
-          end
+          Bundler.rubygems.all_specs.map {|gem| "#{gem.name} (#{gem.version})" }
         end
 
-        def append_plugin_list
-          # Rails 4 does not allow plugins
-        end
       end
     end
   end

data/lib/one_apm/frameworks/ruby.rb

@@ -4,9 +4,13 @@ module OneApm
   class Probe
     module Frameworks
       class Ruby < OneApm::Probe
+
         def env
-          @env ||= ENV['ONEAPM_ENV'] || ENV['RUBY_ENV'] ||
-                   ENV['RAILS_ENV']   || ENV['RACK_ENV'] || 'development'
+          @env ||= ENV['ONEAPM_ENV'] ||
+                   ENV['RUBY_ENV']   ||
+                   ENV['RAILS_ENV']  ||
+                   ENV['RACK_ENV']   ||
+                   'development'
         end
 
         def root
@@ -15,6 +19,7 @@ module OneApm
 
         def init_config(options={})
         end
+
       end
     end
   end

data/lib/one_apm/frameworks/sinatra.rb

@@ -5,8 +5,7 @@ require 'one_apm/frameworks/ruby'
 module OneApm
   class Probe
     module Frameworks
-      class Sinatra < OneApm::Probe::Frameworks::Ruby
-      end
+      class Sinatra < OneApm::Probe::Frameworks::Ruby; end
     end
   end
 end

data/lib/one_apm/inst/3rd/active_merchant.rb

@@ -10,7 +10,7 @@ LibraryDetection.defer do
   end
 
   executes do
-    ::OneApm::Agent.logger.info 'Installing ActiveMerchant instrumentation'
+    OneApm::Manager.logger.info 'Installing ActiveMerchant instrumentation'
   end
 
   executes do

data/lib/one_apm/inst/3rd/acts_as_solr.rb

@@ -10,7 +10,7 @@ module OneApm
             begin
               parse_query_without_oneapm(*args)
             ensure
-              OneApm::Agent.instance.transaction_sampler.notice_nosql(args.first.inspect, (Time.now - t0).to_f) rescue nil
+              OneApm::Manager.agent.transaction_sampler.notice_nosql(args.first.inspect, (Time.now - t0).to_f) rescue nil
             end
           end
         end
@@ -39,7 +39,7 @@ LibraryDetection.defer do
   end
 
   executes do
-    ::OneApm::Agent.logger.info 'Installing ActsAsSolr instrumentation'
+    OneApm::Manager.logger.info 'Installing ActsAsSolr instrumentation'
   end
 
   executes do

data/lib/one_apm/inst/3rd/authlogic.rb

@@ -10,7 +10,7 @@ LibraryDetection.defer do
   end
 
   executes do
-    ::OneApm::Agent.logger.info 'Installing Authlogic instrumentation'
+    OneApm::Manager.logger.info 'Installing Authlogic instrumentation'
   end
 
   executes do

data/lib/one_apm/inst/3rd/sunspot.rb

@@ -8,7 +8,7 @@ LibraryDetection.defer do
   end
 
   executes do
-    ::OneApm::Agent.logger.info 'Installing Rails Sunspot instrumentation'
+    OneApm::Manager.logger.info 'Installing Rails Sunspot instrumentation'
   end
 
   executes do

data/lib/one_apm/inst/background_job/active_job.rb

@@ -8,7 +8,7 @@ LibraryDetection.defer do
   end
 
   executes do
-    ::OneApm::Agent.logger.info 'Installing ActiveJob instrumentation'
+    OneApm::Manager.logger.info 'Installing ActiveJob instrumentation'
 
     ::ActiveJob::Base.around_enqueue do |job, block|
       ::OneApm::Agent::Instrumentation::ActiveJobHelper.enqueue(job, block)

data/lib/one_apm/inst/background_job/delayed_job.rb

@@ -4,15 +4,15 @@ LibraryDetection.defer do
   @name = :delayed_job
 
   depends_on do
-    !OneApm::Agent.config[:disable_dj]
+    !OneApm::Manager.config[:disable_dj]
   end
 
   depends_on do
-    defined?(::Delayed) && defined?(::Delayed::Worker) && !OneApm::Agent.config[:disable_dj]
+    defined?(::Delayed) && defined?(::Delayed::Worker) && !OneApm::Manager.config[:disable_dj]
   end
 
   executes do
-    ::OneApm::Agent.logger.info 'Installing DelayedJob instrumentation'
+    OneApm::Manager.logger.info 'Installing DelayedJob instrumentation'
   end
 
   executes do
@@ -29,7 +29,7 @@ LibraryDetection.defer do
           install_oneapm_job_tracer
           OneApm::Probe.instance.init_plugin :dispatcher => :delayed_job
         else
-          OneApm::Agent.logger.warn("Did not find a Delayed::Job class responding to invoke_job, aborting DJ instrumentation")
+          OneApm::Manager.logger.warn("Did not find a Delayed::Job class responding to invoke_job, aborting DJ instrumentation")
         end
       end
 

data/lib/one_apm/inst/background_job/event_machine_standalone.rb

@@ -4,11 +4,11 @@ LibraryDetection.defer do
   named :event_machine_standalone
 
   depends_on do
-    OneApm::Agent.config[:event_machine_standalone] && defined?(::EventMachine)
+    OneApm::Manager.config[:event_machine_standalone] && defined?(::EventMachine)
   end
 
   executes do
-    OneApm::Agent.logger.info 'Installing EventMachine Standalone Mode instrumentation'
+    OneApm::Manager.logger.info 'Installing EventMachine Standalone Mode instrumentation'
 
     module EventMachine
 

data/lib/one_apm/inst/background_job/resque.rb

@@ -4,12 +4,12 @@ LibraryDetection.defer do
   @name = :resque
 
   depends_on do
-    defined?(::Resque::Job) && !OneApm::Agent.config[:disable_resque]  &&
+    defined?(::Resque::Job) && !OneApm::Manager.config[:disable_resque]  &&
       !OneApm::LanguageSupport.using_version?('1.9.1')
   end
 
   executes do
-    ::OneApm::Agent.logger.info 'Installing Resque instrumentation'
+    OneApm::Manager.logger.info 'Installing Resque instrumentation'
   end
 
   executes do
@@ -25,14 +25,14 @@ LibraryDetection.defer do
                 :class_name => self.name,
                 :category => 'OtherTransaction/ResqueJob') do
 
-                if OneApm::Agent.config[:'resque.capture_params']
-                  OneApm::Agent.add_custom_parameters(:job_arguments => args)
+                if OneApm::Manager.config[:'resque.capture_params']
+                  OneApm::Manager.add_custom_parameters(:job_arguments => args)
                 end
 
                 yield(*args)
               end
             ensure
-              OneApm::Agent.instance.flush_pipe_data
+              OneApm::Manager.agent.flush_pipe_data
             end
           end
         end
@@ -64,10 +64,10 @@ LibraryDetection.defer do
       # Resque::Worker#fork isn't around in Resque 2.x
       if OneApm::VersionNumber.new(::Resque::VERSION) < OneApm::VersionNumber.new("2.0.0")
         ::Resque::Worker.class_eval do
-          if OneApm::Agent.config[:'resque.use_harvest_lock']
-            ::OneApm::Agent.logger.info 'Installing Resque harvest/fork synchronization'
+          if OneApm::Manager.config[:'resque.use_harvest_lock']
+            OneApm::Manager.logger.info 'Installing Resque harvest/fork synchronization'
             def fork_with_oneapm(*args, &block)
-              OneApm::Agent.instance.synchronize_with_harvest do
+              OneApm::Manager.agent.synchronize_with_harvest do
                 fork_without_oneapm(*args, &block)
 
                 # Reached in parent, not expected in the child since Resque
@@ -82,21 +82,21 @@ LibraryDetection.defer do
       end
 
       ::Resque.before_first_fork do
-        OneApm::Agent.start(:dispatcher   => :resque,
+        OneApm::Manager.start(:dispatcher   => :resque,
                                      :sync_startup => true,
                                      :start_channel_listener => true)
       end
 
       ::Resque.before_fork do |job|
         if ENV['FORK_PER_JOB'] != 'false'
-          OneApm::Agent::PipeChannelManager.register_report_channel(job.object_id)
+          OneApm::Support::ForkedProcessChannel.register_report_channel(job.object_id)
         end
       end
 
       ::Resque.after_fork do |job|
         # Only suppress reporting Instance/Busy for forked children
         # Traced errors UI relies on having the parent process report that metric
-        OneApm::Agent.instance.after_fork(:report_to_channel => job.object_id,
+        OneApm::Manager.agent.after_fork(:report_to_channel => job.object_id,
                                    :report_instance_busy => false)
       end
     end

data/lib/one_apm/inst/background_job/sidekiq.rb

@@ -4,11 +4,11 @@ LibraryDetection.defer do
   @name = :sidekiq
 
   depends_on do
-    defined?(::Sidekiq) && !OneApm::Agent.config[:disable_sidekiq]
+    defined?(::Sidekiq) && !OneApm::Manager.config[:disable_sidekiq]
   end
 
   executes do
-    ::OneApm::Agent.logger.info 'Installing Sidekiq instrumentation'
+    OneApm::Manager.logger.info 'Installing Sidekiq instrumentation'
   end
 
   executes do
@@ -25,8 +25,8 @@ LibraryDetection.defer do
         end
 
         perform_action_with_oneapm_trace(trace_args) do
-          if OneApm::Agent.config[:'sidekiq.capture_params']
-            OneApm::Agent.add_custom_parameters(:job_arguments => msg['args'])
+          if OneApm::Manager.config[:'sidekiq.capture_params']
+            OneApm::Manager.add_custom_parameters(:job_arguments => msg['args'])
           end
           yield
         end
@@ -50,7 +50,7 @@ LibraryDetection.defer do
           :category => 'OtherTransaction/SidekiqJob'
         }
       rescue => e
-        OneApm::Agent.logger.error("Failure during deserializing YAML for Sidekiq::Extensions::DelayedClass", e)
+        OneApm::Manager.logger.error("Failure during deserializing YAML for Sidekiq::Extensions::DelayedClass", e)
         OneApm::SidekiqInstrumentation.default_trace_args(msg)
       end
     end

data/lib/one_apm/inst/dispatcher/passenger.rb

@@ -8,18 +8,18 @@ LibraryDetection.defer do
   end
 
   executes do
-    ::OneApm::Agent.logger.debug "Installing Passenger event hooks."
+    OneApm::Manager.logger.debug "Installing Passenger event hooks."
 
     ::PhusionPassenger.on_event(:stopping_worker_process) do
-      ::OneApm::Agent.logger.debug "Passenger stopping this process, shutdown the agent."
-      OneApm::Agent.instance.shutdown
+      OneApm::Manager.logger.debug "Passenger stopping this process, shutdown the agent."
+      OneApm::Manager.agent.shutdown
     end
 
     ::PhusionPassenger.on_event(:starting_worker_process) do |forked|
       # We want to reset the stats from the stats engine in case any carried
       # over into the spawned process.  Don't clear them in case any were
       # cached.  We do this even in conservative spawning.
-      OneApm::Agent.instance.after_fork(:force_reconnect => true)
+      OneApm::Manager.agent.after_fork(:force_reconnect => true)
     end
   end
 end

data/lib/one_apm/inst/dispatcher/puma.rb

@@ -0,0 +1,23 @@
+# encoding: utf-8
+
+LibraryDetection.defer do
+  named :puma
+
+  depends_on do
+    defined?(::Puma) &&
+      defined?(::Puma::Const::VERSION) &&
+      ::Puma.respond_to?(:cli_config)
+  end
+
+  executes do
+    OneApm::Manager.logger.info 'Installing Puma support'
+  end
+
+  executes do
+    hooks = Puma.cli_config.options[:worker_boot] || Puma.cli_config.options[:before_worker_boot]
+
+    hooks << Proc.new do
+      OneApm::Manager.agent.after_fork(:force_reconnect => true)
+    end
+  end
+end

data/lib/one_apm/inst/dispatcher/rainbows.rb

@@ -8,14 +8,14 @@ LibraryDetection.defer do
   end
 
   executes do
-    OneApm::Agent.logger.info 'Installing Rainbows instrumentation'
+    OneApm::Manager.logger.info 'Installing Rainbows instrumentation'
   end
 
   executes do
     Rainbows::HttpServer.class_eval do
       old_worker_loop = instance_method(:worker_loop)
       define_method(:worker_loop) do |worker|
-        OneApm::Agent.instance.after_fork(:force_reconnect => true)
+        OneApm::Manager.agent.after_fork(:force_reconnect => true)
         old_worker_loop.bind(self).call(worker)
       end
     end

data/lib/one_apm/inst/framework/grape.rb

@@ -17,7 +17,7 @@ module OneApm
         def handle_transaction(endpoint, class_name)
           return unless endpoint && route = endpoint.route
           name_transaction(route, class_name)
-          capture_params(endpoint) if Agent.config[:capture_params]
+          capture_params(endpoint) if OneApm::Manager.config[:capture_params]
         end
 
         def name_transaction(route, class_name)
@@ -56,7 +56,7 @@ LibraryDetection.defer do
   named :grape
 
   depends_on do
-    ::OneApm::Agent.config[:disable_grape] == false
+    OneApm::Manager.config[:disable_grape] == false
   end
 
   depends_on do
@@ -65,7 +65,7 @@ LibraryDetection.defer do
   end
 
   executes do
-    OneApm::Agent.logger.info 'Installing Grape instrumentation'
+    OneApm::Manager.logger.info 'Installing Grape instrumentation'
     instrument_call
   end
 
@@ -79,7 +79,7 @@ LibraryDetection.defer do
             endpoint = env[::OneApm::Agent::Instrumentation::Grape::API_ENDPOINT]
             ::OneApm::Agent::Instrumentation::Grape.handle_transaction(endpoint, self.class.name)
           rescue => e
-            ::OneApm::Agent.logger.warn("Error in Grape instrumentation", e)
+            OneApm::Manager.logger.warn("Error in Grape instrumentation", e)
           end
         end
 

data/lib/one_apm/inst/framework/padrino.rb

@@ -6,12 +6,12 @@ LibraryDetection.defer do
   @name = :padrino
 
   depends_on do
-    !OneApm::Agent.config[:disable_sinatra] &&
+    !OneApm::Manager.config[:disable_sinatra] &&
       defined?(::Padrino) && defined?(::Padrino::Routing::InstanceMethods)
   end
 
   executes do
-    ::OneApm::Agent.logger.info 'Installing Padrino instrumentation'
+    OneApm::Manager.logger.info 'Installing Padrino instrumentation'
 
     # Our Padrino instrumentation relies heavily on the fact that Padrino is
     # built on Sinatra. Although it wires up a lot of its own routing logic,

data/lib/one_apm/inst/framework/sinatra.rb

@@ -8,7 +8,7 @@ LibraryDetection.defer do
   @name = :sinatra
 
   depends_on do
-    !OneApm::Agent.config[:disable_sinatra] &&
+    !OneApm::Manager.config[:disable_sinatra] &&
       defined?(::Sinatra) && defined?(::Sinatra::Base) &&
       Sinatra::Base.private_method_defined?(:dispatch!) &&
       Sinatra::Base.private_method_defined?(:process_route) &&
@@ -16,7 +16,7 @@ LibraryDetection.defer do
   end
 
   executes do
-    ::OneApm::Agent.logger.info 'Installing Sinatra instrumentation'
+    OneApm::Manager.logger.info 'Installing Sinatra instrumentation'
   end
 
   executes do
@@ -54,7 +54,7 @@ LibraryDetection.defer do
         end
       end
     else
-      ::OneApm::Agent.logger.info("Skipping auto-injection of middleware for Sinatra - requires Sinatra 1.2.1+")
+      OneApm::Manager.logger.info("Skipping auto-injection of middleware for Sinatra - requires Sinatra 1.2.1+")
     end
   end
 end
@@ -90,7 +90,7 @@ module OneApm
           end
 
           def build_with_oneapm(*args, &block)
-            unless OneApm::Agent.config[:disable_sinatra_auto_middleware]
+            unless OneApm::Manager.config[:disable_sinatra_auto_middleware]
               oneapm_middlewares.each do |middleware_class|
                 try_to_use(self, middleware_class)
               end
@@ -109,7 +109,7 @@ module OneApm
           begin
             env["oneapm.last_route"] = args[0]
           rescue => e
-            ::OneApm::Agent.logger.debug("Failed determining last route in Sinatra", e)
+            OneApm::Manager.logger.debug("Failed determining last route in Sinatra", e)
           end
 
           process_route_without_oneapm(*args, &block)
@@ -129,13 +129,13 @@ module OneApm
                 "#{self.class.name}/#{txn_name}", :sinatra)
             end
           rescue => e
-            ::OneApm::Agent.logger.debug("Failed during route_eval to set transaction name", e)
+            OneApm::Manager.logger.debug("Failed during route_eval to set transaction name", e)
           end
 
           route_eval_without_oneapm(*args, &block)
         end
 
-        def dispatch_with_oneapm #THREAD_LOCAL_ACCESS
+        def dispatch_with_oneapm
           request_params = get_request_params
           filtered_params = OneApm::Support::ParameterFiltering::apply_filters(request.env, request_params || {})
 
@@ -151,7 +151,7 @@ module OneApm
           begin
             @request.params
           rescue => e
-            OneApm::Agent.logger.debug("Failed to get params from Rack request.", e)
+            OneApm::Manager.logger.debug("Failed to get params from Rack request.", e)
             nil
           end
         end
@@ -162,7 +162,7 @@ module OneApm
           # Will only see an error raised if :show_exceptions is true, but
           # will always see them in the env hash if they occur
           had_error = env.has_key?('sinatra.error')
-          ::OneApm::Agent.notice_error(env['sinatra.error']) if had_error
+          OneApm::Manager.notice_error(env['sinatra.error']) if had_error
         end
 
         def do_not_trace?