oneapm_rpm 1.1.2 → 1.1.3

data/lib/one_apm/inst/rails/action_web_service.rb

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

data/lib/one_apm/inst/rails/errors.rb

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

data/lib/one_apm/inst/rails3/action_controller.rb

@@ -16,7 +16,7 @@ module OneApm
             end
           end
 
-          def process_action(*args) #THREAD_LOCAL_ACCESS
+          def process_action(*args)
             perform_action_with_oneapm_trace(:category   => :controller,
                                              :name       => self.action_name,
                                              :path       => oneapm_metric_path,
@@ -69,7 +69,7 @@ LibraryDetection.defer do
   end
 
   executes do
-    ::OneApm::Agent.logger.info 'Installing Rails 3 Controller instrumentation'
+    OneApm::Manager.logger.info 'Installing Rails 3 Controller instrumentation'
   end
 
   executes do
@@ -87,11 +87,11 @@ LibraryDetection.defer do
   end
 
   depends_on do
-    !OneApm::Agent.config[:disable_view_instrumentation]
+    !OneApm::Manager.config[:disable_view_instrumentation]
   end
 
   executes do
-    ::OneApm::Agent.logger.info 'Installing Rails 3.0 view instrumentation'
+    OneApm::Manager.logger.info 'Installing Rails 3.0 view instrumentation'
   end
 
   executes do
@@ -128,11 +128,11 @@ LibraryDetection.defer do
   end
 
   depends_on do
-    !OneApm::Agent.config[:disable_view_instrumentation]
+    !OneApm::Manager.config[:disable_view_instrumentation]
   end
 
   executes do
-    ::OneApm::Agent.logger.info 'Installing Rails 3.1/3.2 view instrumentation'
+    OneApm::Manager.logger.info 'Installing Rails 3.1/3.2 view instrumentation'
   end
 
   executes do

data/lib/one_apm/inst/rails3/errors.rb

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

data/lib/one_apm/inst/rails4/action_controller.rb

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

data/lib/one_apm/inst/rails4/action_controller_subscriber.rb

@@ -7,7 +7,7 @@ module OneApm
     module Instrumentation
       class ActionControllerSubscriber < EventedSubscriber
 
-        def start(name, id, payload) #THREAD_LOCAL_ACCESS
+        def start(name, id, payload)
           state = TransactionState.tl_get
           request = state.request
           event = ControllerEvent.new(name, Time.now, nil, id, payload, request)
@@ -19,13 +19,13 @@ module OneApm
             # if this transaction is ignored, make sure child
             # transaction are also ignored
             state.current_transaction.ignore! if state.current_transaction
-            OneApm::Agent.instance.push_trace_execution_flag(false)
+            OneApm::Manager.agent.push_trace_execution_flag(false)
           end
         rescue => e
           log_notification_error(e, name, 'start')
         end
 
-        def finish(name, id, payload) #THREAD_LOCAL_ACCESS
+        def finish(name, id, payload)
           event = pop_event(id)
           event.payload.merge!(payload)
 
@@ -34,7 +34,7 @@ module OneApm
           if state.is_execution_traced? && !event.ignored?
             stop_transaction(state, event)
           else
-            Agent.instance.pop_trace_execution_flag
+            OneApm::Manager.agent.pop_trace_execution_flag
           end
         rescue => e
           log_notification_error(e, name, 'finish')

data/lib/one_apm/inst/rails4/action_view.rb

@@ -9,12 +9,12 @@ LibraryDetection.defer do
   end
 
   depends_on do
-    !OneApm::Agent.config[:disable_view_instrumentation] &&
+    !OneApm::Manager.config[:disable_view_instrumentation] &&
       !OneApm::Agent::Instrumentation::ActionViewSubscriber.subscribed?
   end
 
   executes do
-    ::OneApm::Agent.logger.info 'Installing Rails 4 view instrumentation'
+    OneApm::Manager.logger.info 'Installing Rails 4 view instrumentation'
   end
 
   executes do

data/lib/one_apm/inst/rails4/action_view_subscriber.rb

@@ -7,7 +7,7 @@ module OneApm
   module Agent
     module Instrumentation
       class ActionViewSubscriber < EventedSubscriber
-        def start(name, id, payload) #THREAD_LOCAL_ACCESS
+        def start(name, id, payload)
           event = RenderEvent.new(name, Time.now, nil, id, payload)
           push_event(event)
 
@@ -21,7 +21,7 @@ module OneApm
           log_notification_error(e, name, 'start')
         end
 
-        def finish(name, id, payload) #THREAD_LOCAL_ACCESS
+        def finish(name, id, payload)
           event = pop_event(id)
 
           state = OneApm::TransactionState.tl_get
@@ -35,9 +35,9 @@ module OneApm
           log_notification_error(e, name, 'finish')
         end
 
-        def record_metrics(event, frame) #THREAD_LOCAL_ACCESS
+        def record_metrics(event, frame)
           exclusive = event.duration - frame.children_time
-          OneApm::Agent.instance.stats_engine.tl_record_scoped_and_unscoped_metrics(
+          OneApm::Manager.agent.stats_engine.tl_record_scoped_and_unscoped_metrics(
             event.metric_name, nil, event.duration, exclusive)
         end
 

data/lib/one_apm/inst/rails4/active_record_subscriber.rb

@@ -11,15 +11,15 @@ module OneApm
       class ActiveRecordSubscriber < EventedSubscriber
         CACHED_QUERY_NAME = 'CACHE'.freeze unless defined? CACHED_QUERY_NAME
 
-        def start(name, id, payload) #THREAD_LOCAL_ACCESS
+        def start(name, id, payload)
           return if payload[:name] == CACHED_QUERY_NAME
-          return unless OneApm::Agent.tl_is_execution_traced?
+          return unless OneApm::Manager.tl_is_execution_traced?
           super
         rescue => e
           log_notification_error(e, name, 'start')
         end
 
-        def finish(name, id, payload) #THREAD_LOCAL_ACCESS
+        def finish(name, id, payload)
           return if payload[:name] == CACHED_QUERY_NAME
           state = OneApm::TransactionState.tl_get
           return unless state.is_execution_traced?
@@ -48,12 +48,12 @@ module OneApm
           # enter transaction trace segment
           frame = stack.push_frame(state, :active_record, event.time)
 
-          OneApm::Agent.instance.transaction_sampler \
+          OneApm::Manager.agent.transaction_sampler \
             .notice_sql(event.payload[:sql], config,
                         Helper.milliseconds_to_seconds(event.duration),
                         state, &method(:get_explain_plan))
 
-          OneApm::Agent.instance.sql_sampler \
+          OneApm::Manager.agent.sql_sampler \
             .notice_sql(event.payload[:sql], metric, config,
                         Helper.milliseconds_to_seconds(event.duration),
                         state, &method(:get_explain_plan))
@@ -62,7 +62,7 @@ module OneApm
           stack.pop_frame(state, frame, metric, event.end)
         end
 
-        def record_metrics(event) #THREAD_LOCAL_ACCESS
+        def record_metrics(event)
           base = base_metric(event)
 
           other_metrics = ActiveRecordHelper.rollup_metrics_for(base)
@@ -71,7 +71,7 @@ module OneApm
           end
           other_metrics.compact!
 
-          OneApm::Agent.instance.stats_engine.tl_record_scoped_and_unscoped_metrics(
+          OneApm::Manager.agent.stats_engine.tl_record_scoped_and_unscoped_metrics(
             base, other_metrics,
             Helper.milliseconds_to_seconds(event.duration)
           )

data/lib/one_apm/inst/rails4/errors.rb

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

data/lib/one_apm/inst/rails_middleware.rb

@@ -10,11 +10,11 @@ LibraryDetection.defer do
   end
 
   depends_on do
-    !::OneApm::Agent.config[:disable_rack_middleware]
+    !OneApm::Manager.config[:disable_rack_middleware]
   end
 
   executes do
-    ::OneApm::Agent.logger.info("Installing Rails 3+ middleware instrumentation")
+    OneApm::Manager.logger.info("Installing Rails 3+ middleware instrumentation")
 
     module ActionDispatch
       class MiddlewareStack

data/lib/one_apm/inst/support/evented_subscriber.rb

@@ -34,8 +34,8 @@ module OneApm
         def log_notification_error(error, name, event_type)
           # These are important enough failures that we want the backtraces
           # logged at error level, hence the explicit log_exception call.
-          OneApm::Agent.logger.error("Error during #{event_type} callback for event '#{name}':")
-          OneApm::Agent.logger.log_exception(:error, error)
+          OneApm::Manager.logger.error("Error during #{event_type} callback for event '#{name}':")
+          OneApm::Manager.logger.log_exception(:error, error)
         end
 
         def push_event(event)

data/lib/one_apm/inst/support/queue_time.rb

@@ -37,7 +37,7 @@ module OneApm
           end
 
           if earliest && earliest > now
-            OneApm::Agent.logger.debug("Negative queue time detected, treating as zero: start=#{earliest.to_f} > now=#{now.to_f}")
+            OneApm::Manager.logger.debug("Negative queue time detected, treating as zero: start=#{earliest.to_f} > now=#{now.to_f}")
             earliest = now
           end
 

data/lib/one_apm/inst/transaction_base.rb

@@ -79,7 +79,7 @@ module OneApm
             if options.empty?
               oneapm_write_attr property, true
             elsif !options.is_a?(Hash)
-              ::OneApm::Agent.logger.error "oneapm_#{property} takes an optional hash with :only and :except lists of actions (illegal argument type '#{options.class}')"
+              OneApm::Manager.logger.error "oneapm_#{property} takes an optional hash with :only and :except lists of actions (illegal argument type '#{options.class}')"
             else
               oneapm_write_attr property, options
             end
@@ -156,7 +156,7 @@ module OneApm
             with_method_name, without_method_name = build_method_names(traced_method, punctuation)
 
             if already_added_transaction_tracer?(self, with_method_name)
-              ::OneApm::Agent.logger.warn("Transaction tracer already in place for class = #{self.name}, method = #{method.to_s}, skipping")
+              OneApm::Manager.logger.warn("Transaction tracer already in place for class = #{self.name}, method = #{method.to_s}, skipping")
               return
             end
 
@@ -176,7 +176,7 @@ module OneApm
             send visibility, method
             send visibility, with_method_name
 
-            ::OneApm::Agent.logger.debug("Traced transaction: class = #{self.name}, method = #{method.to_s}, options = #{options.inspect}")
+            OneApm::Manager.logger.debug("Traced transaction: class = #{self.name}, method = #{method.to_s}, options = #{options.inspect}")
           end
 
           def parse_punctuation(method)
@@ -282,7 +282,7 @@ module OneApm
         #
         # @api public
         #
-        def perform_action_with_oneapm_trace(*args, &block) #THREAD_LOCAL_ACCESS
+        def perform_action_with_oneapm_trace(*args, &block)
           state = OneApm::TransactionState.tl_get
           state.request = oneapm_request(args)
 
@@ -290,7 +290,7 @@ module OneApm
 
           if skip_tracing
             state.current_transaction.ignore! if state.current_transaction
-            OneApm::Agent.disable_all_tracing { return yield }
+            OneApm::Manager.disable_all_tracing { return yield }
           end
 
           # This method has traditionally taken a variable number of arguments, but the
@@ -307,7 +307,7 @@ module OneApm
             begin
               yield
             rescue => e
-              OneApm::Agent.notice_error(e)
+              OneApm::Manager.notice_error(e)
               raise
             end
 

data/lib/one_apm/logger/agent_logger.rb

@@ -5,7 +5,7 @@ require 'singleton'
 require 'one_apm/support/hostname'
 
 module OneApm
-  module Agent
+  module Logger
     class AgentLogger
 
       attr_reader :already_logged
@@ -115,7 +115,7 @@ module OneApm
       def create_log(root, override_logger)
         if !override_logger.nil?
           @log = override_logger
-        elsif ::OneApm::Agent.config[:agent_enabled] == false
+        elsif OneApm::Manager.config[:agent_enabled] == false
           create_null_logger
         else
           if wants_stdout?
@@ -127,12 +127,12 @@ module OneApm
       end
 
       def create_log_to_file(root)
-        path = find_or_create_file_path(::OneApm::Agent.config[:log_file_path], root)
+        path = find_or_create_file_path(OneApm::Manager.config[:log_file_path], root)
         if path.nil?
           @log = ::Logger.new(STDOUT)
-          warn("Error creating log directory #{::OneApm::Agent.config[:log_file_path]}, using standard out for logging.")
+          warn("Error creating log directory #{OneApm::Manager.config[:log_file_path]}, using standard out for logging.")
         else
-          file_path = "#{path}/#{::OneApm::Agent.config[:log_file_name]}"
+          file_path = "#{path}/#{OneApm::Manager.config[:log_file_name]}"
           begin
             @log = ::Logger.new(file_path)
           rescue => e
@@ -143,7 +143,7 @@ module OneApm
       end
 
       def create_null_logger
-        @log = ::OneApm::Agent::NullLogger.new
+        @log = ::OneApm::Logger::NullLogger.new
       end
 
       def clear_already_logged
@@ -151,7 +151,7 @@ module OneApm
       end
 
       def wants_stdout?
-        ::OneApm::Agent.config[:log_file_path].upcase == "STDOUT"
+        OneApm::Manager.config[:log_file_path].upcase == "STDOUT"
       end
 
       def find_or_create_file_path(path_setting, root)
@@ -165,7 +165,7 @@ module OneApm
       end
 
       def set_log_level!
-        @log.level = AgentLogger.log_level_for(::OneApm::Agent.config[:log_level])
+        @log.level = AgentLogger.log_level_for(OneApm::Manager.config[:log_level])
       end
 
       LOG_LEVELS = {

data/lib/one_apm/logger/audit_logger.rb

@@ -5,10 +5,10 @@ require 'fileutils'
 require 'one_apm/support/hostname'
 
 module OneApm
-  module Agent
+  module Logger
     class AuditLogger
       def initialize
-        @enabled = OneApm::Agent.config[:'audit_log.enabled']
+        @enabled = OneApm::Manager.config[:'audit_log.enabled']
         @encoder = OneApm::Support::Encoders::Identity
       end
 
@@ -34,9 +34,9 @@ module OneApm
           @log.info("REQUEST BODY: #{request_body}")
         end
       rescue StandardError, SystemStackError, SystemCallError => e
-        ::OneApm::Agent.logger.warn("Failed writing to audit log", e)
+        OneApm::Manager.logger.warn("Failed writing to audit log", e)
       rescue Exception => e
-        ::OneApm::Agent.logger.warn("Failed writing to audit log with exception. Re-raising in case of interupt.", e)
+        OneApm::Manager.logger.warn("Failed writing to audit log with exception. Re-raising in case of interupt.", e)
         raise
       end
 
@@ -45,14 +45,14 @@ module OneApm
         if path
           @log = ::Logger.new(path)
           @log.formatter = create_log_formatter
-          ::OneApm::Agent.logger.info("Audit log enabled at '#{path}'")
+          OneApm::Manager.logger.info("Audit log enabled at '#{path}'")
         else
-          @log = OneApm::Agent::NullLogger.new
+          @log = OneApm::Logger::NullLogger.new
         end
       end
 
       def ensure_log_path
-        path = File.expand_path(OneApm::Agent.config[:'audit_log.path'])
+        path = File.expand_path(OneApm::Manager.config[:'audit_log.path'])
         log_dir = File.dirname(path)
 
         begin
@@ -60,7 +60,7 @@ module OneApm
           FileUtils.touch(path)
         rescue SystemCallError => e
           msg = "Audit log disabled, failed opening log at '#{path}': #{e}"
-          ::OneApm::Agent.logger.warn(msg)
+          OneApm::Manager.logger.warn(msg)
           path = nil
         end
 

data/lib/one_apm/logger/memory_logger.rb

@@ -3,7 +3,7 @@
 # Base class for startup logging and testing in multiverse
 
 module OneApm
-  module Agent
+  module Logger
     class MemoryLogger
       def initialize
         @messages = []

data/lib/one_apm/logger/null_logger.rb

@@ -1,9 +1,7 @@
 # encoding: utf-8
 
-# A stub object that we can use in place of a real Logger instance when
-# the agent is disabled.
 module OneApm
-  module Agent
+  module Logger
     class NullLogger
       def fatal(*args); end
       def error(*args); end