oneapm_rpm 1.1.2 → 1.1.3

data/lib/one_apm/support/json_wrapper.rb

@@ -25,8 +25,8 @@ module OneApm
         @backend_name   = :json
         return true
       rescue StandardError, ScriptError
-        OneApm::Agent.logger.debug "%p while loading JSON library: %s" % [ err, err.message ] if
-          defined?( OneApm::Agent ) && OneApm::Agent.respond_to?( :logger )
+        OneApm::Manager.logger.debug "%p while loading JSON library: %s" % [ err, err.message ] if
+          defined?( OneApm::Agent ) && OneApm::Manager.respond_to?( :logger )
       end
     end
 

data/lib/one_apm/support/language_support.rb

@@ -71,7 +71,7 @@ module OneApm::LanguageSupport
   end
 
   def gc_profiler_enabled?
-    if gc_profiler_usable? && ::GC::Profiler.enabled? && !::OneApm::Agent.config[:disable_gc_profiler]
+    if gc_profiler_usable? && ::GC::Profiler.enabled? && !OneApm::Manager.config[:disable_gc_profiler]
       true
     else
       false

data/lib/one_apm/support/library_detection.rb

@@ -13,7 +13,7 @@ module LibraryDetection
     if item.name
       seen_names = @items.map { |i| i.name }.compact
       if seen_names.include?(item.name)
-        OneApm::Agent.logger.warn("Refusing to re-register LibraryDetection block with name '#{item.name}'")
+        OneApm::Manager.logger.warn("Refusing to re-register LibraryDetection block with name '#{item.name}'")
         return @items
       end
     end
@@ -70,7 +70,7 @@ module LibraryDetection
         begin
           x.call
         rescue => err
-          OneApm::Agent.logger.error( "Error while installing #{self.name} instrumentation:", err )
+          OneApm::Manager.logger.error( "Error while installing #{self.name} instrumentation:", err )
           break
         end
       end
@@ -85,7 +85,7 @@ module LibraryDetection
         begin
           dep.call
         rescue => err
-          OneApm::Agent.logger.error( "Error while detecting #{self.name}:", err )
+          OneApm::Manager.logger.error( "Error while detecting #{self.name}:", err )
           false
         end
       end
@@ -100,8 +100,8 @@ module LibraryDetection
       return true if self.name.nil?
 
       key = "disable_#{self.name}".to_sym
-      if (::OneApm::Agent.config[key] == true)
-        ::OneApm::Agent.logger.debug("Not installing #{self.name} instrumentation because of configuration #{key}")
+      if (OneApm::Manager.config[key] == true)
+        OneApm::Manager.logger.debug("Not installing #{self.name} instrumentation because of configuration #{key}")
         false
       else
         true

data/lib/one_apm/support/marshaller.rb

@@ -54,7 +54,7 @@ module OneApm
             return data['return_value']
           end
         end
-        ::OneApm::Agent.logger.debug("Unexpected response from collector: #{data}")
+        OneApm::Manager.logger.debug("Unexpected response from collector: #{data}")
         nil
       end
     end

data/lib/one_apm/support/method_tracer.rb

@@ -61,7 +61,7 @@ module OneApm
       #
       # @api public
       #
-      def trace_execution_scoped(metric_names, options={}) #THREAD_LOCAL_ACCESS
+      def trace_execution_scoped(metric_names, options={})
         OneApm::Support::MethodTracer::Helpers.trace_execution_scoped(metric_names, options) do
           # Using an implicit block avoids object allocation for a &block param
           yield
@@ -76,14 +76,14 @@ module OneApm
       #
       # @api public
       #
-      def trace_execution_unscoped(metric_names, options={}) #THREAD_LOCAL_ACCESS
-        return yield unless OneApm::Agent.tl_is_execution_traced?
+      def trace_execution_unscoped(metric_names, options={})
+        return yield unless OneApm::Manager.tl_is_execution_traced?
         t0 = Time.now
         begin
           yield
         ensure
           duration = (Time.now - t0).to_f              # for some reason this is 3 usec faster than Time - Time
-          OneApm::Agent.instance.stats_engine.tl_record_unscoped_metrics(metric_names, duration)
+          OneApm::Manager.agent.stats_engine.tl_record_unscoped_metrics(metric_names, duration)
         end
       end
 
@@ -110,7 +110,7 @@ module OneApm
             end
 
             if deprecated_keys.any?
-              OneApm::Agent.logger.warn("Deprecated options when adding method tracer to #{method_name}: "+
+              OneApm::Manager.logger.warn("Deprecated options when adding method tracer to #{method_name}: "+
                 deprecated_keys.join(', '))
             end
           end
@@ -153,7 +153,7 @@ module OneApm
           # anything if the method doesn't exist.
           def oneapm_method_exists?(method_name)
             exists = method_defined?(method_name) || private_method_defined?(method_name)
-            ::OneApm::Agent.logger.error("Did not trace #{self.name}##{method_name} because that method does not exist") unless exists
+            OneApm::Manager.logger.error("Did not trace #{self.name}##{method_name} because that method does not exist") unless exists
             exists
           end
 
@@ -163,7 +163,7 @@ module OneApm
           # to help with debugging custom instrumentation.
           def traced_method_exists?(method_name, metric_name_code)
             exists = method_defined?(_traced_method_name(method_name, metric_name_code))
-            ::OneApm::Agent.logger.error("Attempt to trace a method twice with the same metric: Method = #{method_name}, Metric Name = #{metric_name_code}") if exists
+            OneApm::Manager.logger.error("Attempt to trace a method twice with the same metric: Method = #{method_name}, Metric Name = #{metric_name_code}") if exists
             exists
           end
 
@@ -172,7 +172,7 @@ module OneApm
           # instrumentation into effectively one method call overhead
           # when the agent is disabled
           def assemble_code_header(method_name, metric_name_code, options)
-            header = "return #{_untraced_method_name(method_name, metric_name_code)}(*args, &block) unless OneApm::Agent.tl_is_execution_traced?\n"
+            header = "return #{_untraced_method_name(method_name, metric_name_code)}(*args, &block) unless OneApm::Manager.tl_is_execution_traced?\n"
             header += options[:code_header].to_s
             header
           end
@@ -188,7 +188,7 @@ module OneApm
                 #{_untraced_method_name(method_name, metric_name_code)}(*args, &block)\n
               ensure
                 duration = (Time.now - t0).to_f
-                OneApm::Agent.record_metric(\"#{metric_name_code}\", duration)
+                OneApm::Manager.record_metric(\"#{metric_name_code}\", duration)
                 #{options[:code_footer]}
               end
             end"
@@ -296,7 +296,7 @@ module OneApm
           alias_method method_name, _traced_method_name(method_name, metric_name_code)
           send visibility, method_name
           send visibility, _traced_method_name(method_name, metric_name_code)
-          ::OneApm::Agent.logger.debug("Traced method: class = #{self.name},"+
+          OneApm::Manager.logger.debug("Traced method: class = #{self.name},"+
                     "method = #{method_name}, "+
                     "metric = '#{metric_name_code}'")
         end
@@ -305,11 +305,11 @@ module OneApm
         # from when they were added, or else other tracers that were added to the same method
         # may get removed as well.
         def remove_method_tracer(method_name, metric_name_code) # :nodoc:
-          return unless Agent.config[:agent_enabled]
+          return unless OneApm::Manager.config[:agent_enabled]
           if method_defined? "#{_traced_method_name(method_name, metric_name_code)}"
             alias_method method_name, "#{_untraced_method_name(method_name, metric_name_code)}"
             undef_method "#{_traced_method_name(method_name, metric_name_code)}"
-            ::OneApm::Agent.logger.debug("removed method tracer #{method_name} #{metric_name_code}\n")
+            OneApm::Manager.logger.debug("removed method tracer #{method_name} #{metric_name_code}\n")
           else
             raise "No tracer for '#{metric_name_code}' on method '#{method_name}'"
           end

data/lib/one_apm/support/method_tracer/helpers.rb

@@ -10,7 +10,7 @@ module OneApm
 
         def record_metrics(state, first_name, other_names, duration, exclusive, options)
           record_scoped_metric = options.has_key?(:scoped_metric) ? options[:scoped_metric] : true
-          stats_engine = OneApm::Agent.instance.stats_engine
+          stats_engine = OneApm::Manager.agent.stats_engine
           if record_scoped_metric
             stats_engine.record_scoped_and_unscoped_metrics(state, first_name, other_names, duration, exclusive)
           else
@@ -22,7 +22,7 @@ module OneApm
         def log_errors(code_area)
           yield
         rescue => e
-          ::OneApm::Agent.logger.error("Caught exception in #{code_area}.", e)
+          OneApm::Manager.logger.error("Caught exception in #{code_area}.", e)
         end
 
         def trace_execution_scoped_header(state, t0)
@@ -45,18 +45,18 @@ module OneApm
             exclusive = duration - frame.children_time
 
             if duration >= MAX_ALLOWED_METRIC_DURATION
-              ::OneApm::Agent.logger.log_once(:warn, "too_huge_metric:#{first_name}",
+              OneApm::Manager.logger.log_once(:warn, "too_huge_metric:#{first_name}",
                 "Ignoring metric #{first_name} with unacceptably large duration: #{duration} s")
               return
             end
 
             if duration < 0
-              ::OneApm::Agent.logger.log_once(:warn, "metric_duration_negative:#{first_name}",
+              OneApm::Manager.logger.log_once(:warn, "metric_duration_negative:#{first_name}",
                 "Metric #{first_name} has negative duration: #{duration} s")
             end
 
             if exclusive < 0
-              ::OneApm::Agent.logger.log_once(:warn, "metric_exclusive_negative:#{first_name}",
+              OneApm::Manager.logger.log_once(:warn, "metric_exclusive_negative:#{first_name}",
                 "Metric #{first_name} has negative exclusive time: duration = #{duration} s, child_time = #{frame.children_time}")
             end
 
@@ -64,7 +64,7 @@ module OneApm
           end
         end
 
-        def trace_execution_scoped(metric_names, options={}) #THREAD_LOCAL_ACCESS
+        def trace_execution_scoped(metric_names, options={})
           state = OneApm::TransactionState.tl_get
           return yield unless state.is_execution_traced?
 

data/lib/one_apm/support/system_info.rb

@@ -125,7 +125,7 @@ module OneApm
         processor_count = get_processor_info[:num_logical_processors]
 
         if processor_count.nil?
-          OneApm::Agent.logger.warn("Failed to determine processor count, assuming 1")
+          OneApm::Manager.logger.warn("Failed to determine processor count, assuming 1")
           processor_count = 1
         end
 
@@ -164,7 +164,7 @@ module OneApm
         when '/'                                            then nil
         # in a cgroup, but we don't recognize its format
         else
-          ::OneApm::Agent.logger.debug("Ignoring unrecognized cgroup ID format: '#{cpu_cgroup}'")
+          OneApm::Manager.logger.debug("Ignoring unrecognized cgroup ID format: '#{cpu_cgroup}'")
           nil
         end
       end

data/lib/one_apm/support/traced_method_stack.rb

@@ -62,8 +62,8 @@ module OneApm
           if frame == expected_frame
             return frame
           else
-            OneApm::Agent.logger.info("Unexpected frame in traced method stack: #{frame.inspect} expected to be #{expected_frame.inspect}")
-            OneApm::Agent.logger.debug do
+            OneApm::Manager.logger.info("Unexpected frame in traced method stack: #{frame.inspect} expected to be #{expected_frame.inspect}")
+            OneApm::Manager.logger.debug do
               ["Backtrace for unexpected frame: ", caller.join("\n")]
             end
           end
@@ -83,11 +83,11 @@ module OneApm
       end
 
       def sampler_enabled?
-        Agent.config[:'transaction_tracer.enabled']
+        OneApm::Manager.config[:'transaction_tracer.enabled']
       end
 
       def transaction_sampler
-        Agent.instance.transaction_sampler
+        OneApm::Manager.agent.transaction_sampler
       end
 
       def clear

data/lib/one_apm/support/vm/monotonic_gc_profiler.rb

@@ -31,7 +31,7 @@ module OneApm
               ::GC::Profiler.clear
             end
           else
-            OneApm::Agent.logger.log_once(:warn, :gc_profiler_disabled,
+            OneApm::Manager.logger.log_once(:warn, :gc_profiler_disabled,
               "Tried to measure GC time, but GC::Profiler was not enabled.")
           end
 

data/lib/one_apm/support/vm/mri_vm.rb

@@ -37,7 +37,7 @@ module OneApm
 
         def gather_gc_time(snap)
           if supports?(:gc_total_time)
-            snap.gc_total_time = OneApm::Agent.instance.monotonic_gc_profiler.total_time_s
+            snap.gc_total_time = OneApm::Manager.agent.monotonic_gc_profiler.total_time_s
           end
         end
 

data/lib/one_apm/transaction.rb

@@ -202,7 +202,7 @@ module OneApm
         if value < OneApm::Support::MethodTracer::Helpers::MAX_ALLOWED_METRIC_DURATION
           @metrics.record_unscoped(QUEUE_TIME_METRIC, value)
         else
-          ::OneApm::Agent.logger.log_once(:warn, :too_high_queue_time, "Not recording unreasonably large queue time of #{value} s")
+          OneApm::Manager.logger.log_once(:warn, :too_high_queue_time, "Not recording unreasonably large queue time of #{value} s")
         end
       end
     end
@@ -240,7 +240,7 @@ module OneApm
 
     def user_defined_rules_ignore?
       return unless uri
-      return if (rules = OneApm::Agent.config[:"rules.ignore_url_regexes"]).empty?
+      return if (rules = OneApm::Manager.config[:"rules.ignore_url_regexes"]).empty?
 
       parsed = OneApm::Support::HTTPClients::URIUtil.parse_url(uri)
       filtered_uri = OneApm::Support::HTTPClients::URIUtil.filter_uri(parsed)
@@ -249,7 +249,7 @@ module OneApm
         filtered_uri.match(rule)
       end
     rescue URI::InvalidURIError => e
-      OneApm::Agent.logger.debug("Error parsing URI: #{uri}", e)
+      OneApm::Manager.logger.debug("Error parsing URI: #{uri}", e)
       false
     end
 

data/lib/one_apm/transaction/class_methods.rb

@@ -24,7 +24,7 @@ module OneApm
 
         txn
       rescue => e
-        OneApm::Agent.logger.error("Exception during Transaction.start", e)
+        OneApm::Manager.logger.error("Exception during Transaction.start", e)
         nil
       end
 
@@ -32,7 +32,7 @@ module OneApm
         txn = state.current_transaction
 
         if txn.nil?
-          OneApm::Agent.logger.error(Transaction::FAILED_TO_STOP_MESSAGE)
+          OneApm::Manager.logger.error(Transaction::FAILED_TO_STOP_MESSAGE)
           return
         end
 
@@ -63,7 +63,7 @@ module OneApm
         :transaction_stopped
       rescue => e
         state.reset
-        OneApm::Agent.logger.error("Exception during Transaction.stop", e)
+        OneApm::Manager.logger.error("Exception during Transaction.stop", e)
         nil
       end
 

data/lib/one_apm/transaction/instance_helpers.rb

@@ -5,7 +5,7 @@ module OneApm
     module InstanceHelpers
 
       def agent
-        OneApm::Agent.instance
+        OneApm::Manager.agent
       end
 
       def transaction_sampler
@@ -43,8 +43,8 @@ module OneApm
       end
 
       def add_custom_parameters(p)
-        if OneApm::Agent.config[:high_security]
-          OneApm::Agent.logger.debug("Unable to add custom attributes #{p.keys.inspect} while in high security mode.")
+        if OneApm::Manager.config[:high_security]
+          OneApm::Manager.logger.debug("Unable to add custom attributes #{p.keys.inspect} while in high security mode.")
           return
         end
 

data/lib/one_apm/transaction/sample_buffer/synthetics_sample_buffer.rb

@@ -6,7 +6,7 @@ module OneApm
   class Transaction
     class SyntheticsSampleBuffer < TransactionSampleBuffer
       def capacity
-        OneApm::Agent.config[:'synthetics.traces_limit']
+        OneApm::Manager.config[:'synthetics.traces_limit']
       end
 
       def allow_sample?(sample)

data/lib/one_apm/transaction/sample_buffer/xray_sample_buffer.rb

@@ -12,19 +12,19 @@ module OneApm
         super
 
         # Memoize the config setting since this happens per request
-        @enabled = OneApm::Agent.config[:'xray_session.allow_traces']
-        OneApm::Agent.config.register_callback(:'xray_session.allow_traces') do |new_value|
+        @enabled = OneApm::Manager.config[:'xray_session.allow_traces']
+        OneApm::Manager.config.register_callback(:'xray_session.allow_traces') do |new_value|
           @enabled = new_value
         end
 
-        @capacity = OneApm::Agent.config[:'xray_session.max_samples']
-        OneApm::Agent.config.register_callback(:'xray_session.max_samples') do |new_value|
+        @capacity = OneApm::Manager.config[:'xray_session.max_samples']
+        OneApm::Manager.config.register_callback(:'xray_session.max_samples') do |new_value|
           @capacity = new_value
         end
       end
 
       def xray_session_collection
-        @xray_session_collection ||= OneApm::Agent.instance.agent_command_router.xray_session_collection
+        @xray_session_collection ||= OneApm::Manager.agent.agent_command_router.xray_session_collection
       end
 
       def capacity

data/lib/one_apm/transaction/thread_local_access.rb

@@ -27,7 +27,7 @@ module OneApm
 
       # Indicate that you don't want to keep the currently saved transaction
       # information
-      def abort_transaction! #THREAD_LOCAL_ACCESS
+      def abort_transaction!
         state = OneApm::TransactionState.tl_get
         txn = state.current_transaction
         txn.abort_transaction!(state) if txn
@@ -50,7 +50,7 @@ module OneApm
         if txn
           txn.notice_error(e, options)
         else
-          OneApm::Agent.instance.error_collector.notice_error(e, options)
+          OneApm::Manager.agent.error_collector.notice_error(e, options)
         end
       end
 

data/lib/one_apm/transaction/transaction_apdex.rb

@@ -8,12 +8,12 @@ module OneApm
     end
 
     def apdex_t
-      transaction_specific_apdex_t || Agent.config[:apdex_t]
+      transaction_specific_apdex_t || OneApm::Manager.config[:apdex_t]
     end
 
     def transaction_specific_apdex_t
       key = :web_transactions_apdex
-      Agent.config[key] && Agent.config[key][best_name]
+      OneApm::Manager.config[key] && OneApm::Manager.config[key][best_name]
     end
 
   end

data/lib/one_apm/transaction/transaction_finish_append.rb

@@ -40,7 +40,7 @@ module OneApm
       end
 
       def append_referring_transaction_guid_to(state, payload)
-        referring_guid = OneApm::Agent.instance.cross_app_monitor.client_referring_transaction_guid(state)
+        referring_guid = OneApm::Manager.agent.cross_app_monitor.client_referring_transaction_guid(state)
         if referring_guid
           payload[:referring_transaction_guid] = referring_guid
         end

data/lib/one_apm/transaction/transaction_jruby_functions.rb

@@ -26,8 +26,8 @@ module OneApm
 
       -1 == java_utime ? 0.0 : java_utime/1e9
     rescue => e
-      ::OneApm::Agent.logger.log_once(:warn, :jruby_cpu_time, JRUBY_CPU_TIME_ERROR, e)
-      ::OneApm::Agent.logger.debug(JRUBY_CPU_TIME_ERROR, e)
+      OneApm::Manager.logger.log_once(:warn, :jruby_cpu_time, JRUBY_CPU_TIME_ERROR, e)
+      OneApm::Manager.logger.debug(JRUBY_CPU_TIME_ERROR, e)
       nil
     end
 

data/lib/one_apm/transaction/transaction_name.rb

@@ -37,7 +37,7 @@ module OneApm
       end
 
       def log_frozen_name(name)
-        OneApm::Agent.logger.warn("Attempted to rename transaction to '#{name}' after transaction name was already frozen as '#{@frozen_name}'.")
+        OneApm::Manager.logger.warn("Attempted to rename transaction to '#{name}' after transaction name was already frozen as '#{@frozen_name}'.")
         nil
       end
 
@@ -65,7 +65,7 @@ module OneApm
       def freeze_name_and_execute_if_not_ignored
         if !name_frozen?
           name = promoted_transaction_name(best_name)
-          name = OneApm::Agent.instance.transaction_rules.rename(name)
+          name = OneApm::Manager.agent.transaction_rules.rename(name)
           @name_frozen = true
 
           if name.nil?