oneapm_rpm 1.1.2 → 1.1.3

data/lib/one_apm/collector/containers/agent_command_router.rb

@@ -22,7 +22,7 @@ module OneApm
         @thread_profiler_session = OneApm::Collector::Commands::ThreadProfilerSession.new(@backtrace_service)
         @xray_session_collection = OneApm::Collector::Commands::XraySessionCollection.new(@backtrace_service, event_listener)
 
-        @handlers['restart'] = Proc.new { OneApm::Agent.restart }
+        @handlers['restart'] = Proc.new { OneApm::Manager.restart }
         @handlers['start_profiler'] = Proc.new { |cmd| thread_profiler_session.handle_start_command(cmd) }
         @handlers['stop_profiler']  = Proc.new { |cmd| thread_profiler_session.handle_stop_command(cmd) }
         @handlers['active_xray_sessions'] = Proc.new { |cmd| xray_session_collection.handle_active_xray_sessions(cmd) }
@@ -33,7 +33,7 @@ module OneApm
       end
 
       def one_apm_service
-        OneApm::Agent.instance.service
+        OneApm::Manager.agent.service
       end
 
       def check_for_and_handle_agent_commands
@@ -89,16 +89,16 @@ module OneApm
 
       def log_profiles(profiles)
         if profiles.empty?
-          ::OneApm::Agent.logger.debug "No thread profiles with data found to send."
+          OneApm::Manager.logger.debug "No thread profiles with data found to send."
         else
           profile_descriptions = profiles.map { |p| p.to_log_description }
-          ::OneApm::Agent.logger.debug "Sending thread profiles [#{profile_descriptions.join(", ")}]"
+          OneApm::Manager.logger.debug "Sending thread profiles [#{profile_descriptions.join(", ")}]"
         end
       end
 
       def get_agent_commands
         commands = one_apm_service.get_agent_commands
-        OneApm::Agent.logger.info "Received get_agent_commands = #{commands.inspect}" if commands.any?
+        OneApm::Manager.logger.info "Received get_agent_commands = #{commands.inspect}" if commands.any?
         commands.map {|collector_command| OneApm::Collector::Commands::AgentCommand.new(collector_command)}
       end
 
@@ -120,7 +120,7 @@ module OneApm
           call_handler_for(agent_command)
           return success
         rescue AgentCommandError => e
-          OneApm::Agent.logger.debug(e)
+          OneApm::Manager.logger.debug(e)
           error(e)
         end
       end
@@ -146,7 +146,7 @@ module OneApm
       end
 
       def unrecognized_agent_command(agent_command)
-        OneApm::Agent.logger.debug("Unrecognized agent command #{agent_command.inspect}")
+        OneApm::Manager.logger.debug("Unrecognized agent command #{agent_command.inspect}")
       end
     end
   end

data/lib/one_apm/collector/containers/custom_event_aggregator.rb

@@ -16,14 +16,14 @@ module OneApm
 
       def initialize
         @lock         = Mutex.new
-        @buffer       = OneApm::Agent::SampledBuffer.new(OneApm::Agent.config[DEFAULT_CAPACITY_KEY])
+        @buffer       = OneApm::Agent::SampledBuffer.new(OneApm::Manager.config[DEFAULT_CAPACITY_KEY])
         @type_strings = Hash.new { |hash, key| hash[key] = key.to_s.freeze }
         register_config_callbacks
       end
 
       def register_config_callbacks
-        OneApm::Agent.config.register_callback(DEFAULT_CAPACITY_KEY) do |max_samples|
-          OneApm::Agent.logger.debug "CustomEventAggregator max_samples set to #{max_samples}"
+        OneApm::Manager.config.register_callback(DEFAULT_CAPACITY_KEY) do |max_samples|
+          OneApm::Manager.logger.debug "CustomEventAggregator max_samples set to #{max_samples}"
           @lock.synchronize do
             @buffer.capacity = max_samples
           end
@@ -63,9 +63,9 @@ module OneApm
       def note_dropped_events(captured_count, dropped_count)
         total_count = captured_count + dropped_count
         if dropped_count > 0
-          OneApm::Agent.logger.warn("Dropped #{dropped_count} custom events out of #{total_count}.")
+          OneApm::Manager.logger.warn("Dropped #{dropped_count} custom events out of #{total_count}.")
         end
-        engine = OneApm::Agent.instance.stats_engine
+        engine = OneApm::Manager.agent.stats_engine
         engine.tl_record_supportability_metric_count("Events/Customer/Seen"   ,    total_count)
         engine.tl_record_supportability_metric_count("Events/Customer/Sent"   , captured_count)
         engine.tl_record_supportability_metric_count("Events/Customer/Dropped",  dropped_count)
@@ -84,7 +84,7 @@ module OneApm
       end
 
       def note_dropped_event(type)
-        ::OneApm::Agent.logger.log_once(:warn, "dropping_event_of_type:#{type}",
+        OneApm::Manager.logger.log_once(:warn, "dropping_event_of_type:#{type}",
           "Invalid event type name '#{type}', not recording.")
         @buffer.note_dropped
       end

data/lib/one_apm/collector/containers/error_collector.rb

@@ -24,13 +24,13 @@ module OneApm
         # lookup of exception class names to ignore.  Hash for fast access
         @ignore = {}
 
-        initialize_ignored_errors(Agent.config[:'error_collector.ignore_errors'])
+        initialize_ignored_errors(Manager.config[:'error_collector.ignore_errors'])
         @lock = Mutex.new
 
-        Agent.config.register_callback(:'error_collector.enabled') do |config_enabled|
-          ::OneApm::Agent.logger.debug "Errors will #{config_enabled ? '' : 'not '}be sent to the OneApm service."
+        OneApm::Manager.config.register_callback(:'error_collector.enabled') do |config_enabled|
+          OneApm::Manager.logger.debug "Errors will #{config_enabled ? '' : 'not '}be sent to the OneApm service."
         end
-        Agent.config.register_callback(:'error_collector.ignore_errors') do |ignore_errors|
+        OneApm::Manager.config.register_callback(:'error_collector.ignore_errors') do |ignore_errors|
           initialize_ignored_errors(ignore_errors)
         end
       end
@@ -43,7 +43,7 @@ module OneApm
       end
 
       def enabled?
-        Agent.config[:'error_collector.enabled']
+        OneApm::Manager.config[:'error_collector.enabled']
       end
 
       def disabled?
@@ -83,7 +83,7 @@ module OneApm
       def ignore(errors)
         errors.each do |error|
           @ignore[error] = true
-          ::OneApm::Agent.logger.debug("Ignoring errors of type '#{error}'")
+          OneApm::Manager.logger.debug("Ignoring errors of type '#{error}'")
         end
       end
 
@@ -106,7 +106,7 @@ module OneApm
         def error_is_ignored?(error)
           error && filtered_error?(error)
         rescue => e
-          OneApm::Agent.logger.error("Error '#{error}' will NOT be ignored. Exception '#{e}' while determining whether to ignore or not.", e)
+          OneApm::Manager.logger.error("Error '#{error}' will NOT be ignored. Exception '#{e}' while determining whether to ignore or not.", e)
           false
         end
 
@@ -149,7 +149,7 @@ module OneApm
           blamed_metric = blamed_metric_name(txn, options)
           metric_names << blamed_metric if blamed_metric
 
-          stats_engine = OneApm::Agent.instance.stats_engine
+          stats_engine = OneApm::Manager.agent.stats_engine
           stats_engine.record_unscoped_metrics(state, metric_names) do |stats|
             stats.increment_count
           end
@@ -180,7 +180,7 @@ module OneApm
         # If anything else is left over, we treat it like a custom param
         def custom_params_from_opts(options)
           # If anything else is left over, treat it like a custom param:
-          if Agent.config[:'error_collector.capture_attributes']
+          if OneApm::Manager.config[:'error_collector.capture_attributes']
             fetch_from_options(options, :custom_params, {}).merge(options)
           else
             {}
@@ -192,7 +192,7 @@ module OneApm
         # returns nil
         def request_params_from_opts(options)
           value = options.delete(:request_params)
-          if Agent.config[:capture_params]
+          if OneApm::Manager.config[:capture_params]
             value
           else
             nil
@@ -247,7 +247,7 @@ module OneApm
         # the maximum limit, and logs a warning if we are over the limit.
         def over_queue_limit?(message)
           over_limit = (@errors.reject{|err| err.is_internal}.length >= MAX_ERROR_QUEUE_LENGTH)
-          ::OneApm::Agent.logger.warn("The error reporting queue has reached #{MAX_ERROR_QUEUE_LENGTH}. The error detail for this and subsequent errors will not be transmitted to OneApm until the queued errors have been sent: #{message}") if over_limit
+          OneApm::Manager.logger.warn("The error reporting queue has reached #{MAX_ERROR_QUEUE_LENGTH}. The error detail for this and subsequent errors will not be transmitted to OneApm until the queued errors have been sent: #{message}") if over_limit
           over_limit
         end
 
@@ -276,14 +276,14 @@ module OneApm
       #
       # If anything is left over, it's added to custom params
       # If exception is nil, the error count is bumped and no traced error is recorded
-      def notice_error(exception, options={}) #THREAD_LOCAL_ACCESS
+      def notice_error(exception, options={})
         state = ::OneApm::TransactionState.tl_get
 
         return if skip_notice_error?(state, exception)
         tag_as_seen(state, exception)
 
         increment_error_count!(state, exception, options)
-        OneApm::Agent.instance.events.notify(:notice_error, exception, options)
+        OneApm::Manager.agent.events.notify(:notice_error, exception, options)
 
         action_path       = fetch_from_options(options, :metric, "")
         exception_options = error_params_from_options(options).merge(exception_info(exception))
@@ -291,7 +291,7 @@ module OneApm
 
         exception
       rescue => e
-        ::OneApm::Agent.logger.warn("Failure when capturing error '#{exception}':", e)
+        OneApm::Manager.logger.warn("Failure when capturing error '#{exception}':", e)
       end
 
       # *Use sparingly for difficult to track bugs.*
@@ -307,7 +307,7 @@ module OneApm
         return unless exception.class < OneApm::Agent::InternalAgentError
 
         # Log 'em all!
-        OneApm::Agent.logger.info(exception)
+        OneApm::Manager.logger.info(exception)
 
         @lock.synchronize do
           # Already seen this class once? Bail!
@@ -320,7 +320,7 @@ module OneApm
           @errors << noticed_error
         end
       rescue => e
-        OneApm::Agent.logger.info("Unable to capture internal agent error due to an exception:", e)
+        OneApm::Manager.logger.info("Unable to capture internal agent error due to an exception:", e)
       end
 
       def merge!(errors)

data/lib/one_apm/collector/containers/sql_sampler.rb

@@ -4,9 +4,6 @@ require 'zlib'
 require 'base64'
 require 'digest/md5'
 
-require 'one_apm/agent'
-require 'one_apm/probe'
-
 module OneApm
   module Collector
     # This class contains the logic of recording slow SQL traces, which may
@@ -49,8 +46,8 @@ module OneApm
       end
 
       def enabled?
-        Agent.config[:'slow_sql.enabled'] &&
-          Agent.config[:'transaction_tracer.enabled'] &&
+        OneApm::Manager.config[:'slow_sql.enabled'] &&
+          OneApm::Manager.config[:'transaction_tracer.enabled'] &&
           OneApm::Agent::Database.should_record_sql?(:slow_sql)
       end
 
@@ -63,7 +60,7 @@ module OneApm
           guid = state.transaction_sample_builder.sample.guid
         end
 
-        if Agent.config[:'slow_sql.enabled'] && state.sql_sampler_transaction_data
+        if OneApm::Manager.config[:'slow_sql.enabled'] && state.sql_sampler_transaction_data
           state.sql_sampler_transaction_data.set_transaction_info(uri, guid)
         end
       end
@@ -82,7 +79,7 @@ module OneApm
         data.set_transaction_name(name)
         if data.sql_data.size > 0
           @samples_lock.synchronize do
-            ::OneApm::Agent.logger.debug "Examining #{data.sql_data.size} slow transaction sql statement(s)"
+            OneApm::Manager.logger.debug "Examining #{data.sql_data.size} slow transaction sql statement(s)"
             save_slow_sql data
           end
         end
@@ -147,13 +144,13 @@ module OneApm
       #
       # @api public
       #
-      def notice_sql(sql, metric_name, config, duration, state=nil, &explainer) #THREAD_LOCAL_ACCESS sometimes
+      def notice_sql(sql, metric_name, config, duration, state=nil, &explainer)
         state ||= OneApm::TransactionState.tl_get
         data = state.sql_sampler_transaction_data
         return unless data
 
         if state.is_sql_recorded?
-          if duration > Agent.config[:'slow_sql.explain_threshold']
+          if duration > OneApm::Manager.config[:'slow_sql.explain_threshold']
             backtrace = caller
             backtrace.reject! { |t| t.include?('one_apm') }
             data.sql_data << SlowSql.new(OneApm::Agent::Database.capture_query(sql),
@@ -297,11 +294,11 @@ module OneApm
       end
 
       def need_to_obfuscate?
-        Agent.config[:'slow_sql.record_sql'].to_s == 'obfuscated'
+        OneApm::Manager.config[:'slow_sql.record_sql'].to_s == 'obfuscated'
       end
 
       def need_to_explain?
-        Agent.config[:'slow_sql.explain_enabled']
+        OneApm::Manager.config[:'slow_sql.explain_enabled']
       end
 
       include OneApm::Coerce

data/lib/one_apm/collector/containers/transaction_event_aggregator.rb

@@ -31,8 +31,8 @@ class OneApm::Collector::TransactionEventAggregator
     @enabled       = false
     @notified_full = false
 
-    @samples            = ::OneApm::Agent::SampledBuffer.new(OneApm::Agent.config[:'analytics_events.max_samples_stored'])
-    @synthetics_samples = ::OneApm::Agent::SyntheticsEventBuffer.new(OneApm::Agent.config[:'synthetics.events_limit'])
+    @samples            = ::OneApm::Agent::SampledBuffer.new(OneApm::Manager.config[:'analytics_events.max_samples_stored'])
+    @synthetics_samples = ::OneApm::Agent::SyntheticsEventBuffer.new(OneApm::Manager.config[:'synthetics.events_limit'])
 
     event_listener.subscribe(:transaction_finished, &method(:on_transaction_finished))
     self.register_config_callbacks
@@ -80,10 +80,10 @@ class OneApm::Collector::TransactionEventAggregator
     end
   end
 
-  def record_sampling_rate(request_count, sample_count) #THREAD_LOCAL_ACCESS
+  def record_sampling_rate(request_count, sample_count)
     request_count_lifetime = @samples.seen_lifetime
     sample_count_lifetime = @samples.captured_lifetime
-    OneApm::Agent.logger.debug("Sampled %d / %d (%.1f %%) requests this cycle, %d / %d (%.1f %%) since startup" % [
+    OneApm::Manager.logger.debug("Sampled %d / %d (%.1f %%) requests this cycle, %d / %d (%.1f %%) since startup" % [
       sample_count,
       request_count,
       (sample_count.to_f / request_count * 100.0),
@@ -92,7 +92,7 @@ class OneApm::Collector::TransactionEventAggregator
       (sample_count_lifetime.to_f / request_count_lifetime * 100.0)
     ])
 
-    engine = OneApm::Agent.instance.stats_engine
+    engine = OneApm::Manager.agent.stats_engine
     engine.tl_record_supportability_metric_count("TransactionEventAggregator/requests", request_count)
     engine.tl_record_supportability_metric_count("TransactionEventAggregator/samples", sample_count)
   end
@@ -100,30 +100,30 @@ class OneApm::Collector::TransactionEventAggregator
   def record_dropped_synthetics(synthetics_dropped)
     return unless synthetics_dropped > 0
 
-    OneApm::Agent.logger.debug("Synthetics transaction event limit (#{@samples.capacity}) reached. Further synthetics events this harvest period dropped.")
+    OneApm::Manager.logger.debug("Synthetics transaction event limit (#{@samples.capacity}) reached. Further synthetics events this harvest period dropped.")
 
-    engine = OneApm::Agent.instance.stats_engine
+    engine = OneApm::Manager.agent.stats_engine
     engine.tl_record_supportability_metric_count("TransactionEventAggregator/synthetics_events_dropped", synthetics_dropped)
   end
 
   def register_config_callbacks
-    OneApm::Agent.config.register_callback(:'analytics_events.max_samples_stored') do |max_samples|
-      OneApm::Agent.logger.debug "TransactionEventAggregator max_samples set to #{max_samples}"
+    OneApm::Manager.config.register_callback(:'analytics_events.max_samples_stored') do |max_samples|
+      OneApm::Manager.logger.debug "TransactionEventAggregator max_samples set to #{max_samples}"
       self.synchronize { @samples.capacity = max_samples }
     end
 
-    OneApm::Agent.config.register_callback(:'synthetics.events_limit') do |max_samples|
-      OneApm::Agent.logger.debug "TransactionEventAggregator limit for synthetics events set to #{max_samples}"
+    OneApm::Manager.config.register_callback(:'synthetics.events_limit') do |max_samples|
+      OneApm::Manager.logger.debug "TransactionEventAggregator limit for synthetics events set to #{max_samples}"
       self.synchronize { @synthetics_samples.capacity = max_samples }
     end
 
-    OneApm::Agent.config.register_callback(:'analytics_events.enabled') do |enabled|
+    OneApm::Manager.config.register_callback(:'analytics_events.enabled') do |enabled|
       @enabled = enabled
     end
   end
 
   def notify_full
-    OneApm::Agent.logger.debug "Transaction event capacity of #{@samples.capacity} reached, beginning sampling"
+    OneApm::Manager.logger.debug "Transaction event capacity of #{@samples.capacity} reached, beginning sampling"
     @notified_full = true
   end
 
@@ -221,7 +221,7 @@ class OneApm::Collector::TransactionEventAggregator
   end
 
   def append_http_response_code(sample, payload)
-    unless OneApm::Agent.config[:disable_rack_middleware]
+    unless OneApm::Manager.config[:disable_rack_middleware]
       optionally_append(HTTP_RESPONSE_CODE_KEY, :http_response_code, sample, payload)
     end
   end
@@ -240,7 +240,7 @@ class OneApm::Collector::TransactionEventAggregator
 
   def create_custom_parameters(payload)
     custom_params = {}
-    if ::OneApm::Agent.config[:'analytics_events.capture_attributes']
+    if OneApm::Manager.config[:'analytics_events.capture_attributes']
       custom_params.merge!(event_params(payload[:custom_params] || {}))
     end
     custom_params

data/lib/one_apm/collector/containers/transaction_sampler.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-require 'one_apm/agent'
-require 'one_apm/probe'
 require 'one_apm/transaction/transaction_sample_builder'
 require 'one_apm/transaction/sample_buffer/force_persist_sample_buffer'
 require 'one_apm/transaction/sample_buffer/slowest_sample_buffer'
@@ -45,24 +43,24 @@ module OneApm
         # any 'honest-to-god'-multithreaded system
         @samples_lock = Mutex.new
 
-        Agent.config.register_callback(:'transaction_tracer.enabled') do |enabled|
+        OneApm::Manager.config.register_callback(:'transaction_tracer.enabled') do |enabled|
           if enabled
-            threshold = Agent.config[:'transaction_tracer.transaction_threshold']
-            ::OneApm::Agent.logger.debug "Transaction tracing threshold is #{threshold} seconds."
+            threshold = OneApm::Manager.config[:'transaction_tracer.transaction_threshold']
+            OneApm::Manager.logger.debug "Transaction tracing threshold is #{threshold} seconds."
           else
-            ::OneApm::Agent.logger.debug "Transaction traces will not be sent to the OneApm service."
+            OneApm::Manager.logger.debug "Transaction traces will not be sent to the OneApm service."
           end
         end
 
-        Agent.config.register_callback(:'transaction_tracer.record_sql') do |config|
+        OneApm::Manager.config.register_callback(:'transaction_tracer.record_sql') do |config|
           if config == 'raw'
-            ::OneApm::Agent.logger.warn("Agent is configured to send raw SQL to the service")
+            OneApm::Manager.logger.warn("Agent is configured to send raw SQL to the service")
           end
         end
       end
 
       def enabled?
-        Agent.config[:'transaction_tracer.enabled']
+        OneApm::Manager.config[:'transaction_tracer.enabled']
       end
 
       def on_start_transaction(state, start_time, uri=nil)
@@ -95,7 +93,7 @@ module OneApm
       end
 
       def custom_parameters_from_transaction(txn)
-        if Agent.config[:'transaction_tracer.capture_attributes']
+        if OneApm::Manager.config[:'transaction_tracer.capture_attributes']
           txn.custom_parameters
         else
           {}
@@ -200,7 +198,7 @@ module OneApm
       # Appends a backtrace to a segment if that segment took longer
       # than the specified duration
       def append_backtrace(segment, duration)
-        if duration >= Agent.config[:'transaction_tracer.stack_trace_threshold']
+        if duration >= OneApm::Manager.config[:'transaction_tracer.stack_trace_threshold']
           segment[:backtrace] = caller.join("\n")
         end
       end
@@ -219,7 +217,7 @@ module OneApm
       #
       # @api public
       #
-      def notice_sql(sql, config, duration, state=nil, &explainer) #THREAD_LOCAL_ACCESS sometimes
+      def notice_sql(sql, config, duration, state=nil, &explainer)
         # some statements (particularly INSERTS with large BLOBS
         # may be very large; we should trim them to a maximum usable length
         state ||= OneApm::TransactionState.tl_get
@@ -256,18 +254,18 @@ module OneApm
       #
       # @api public
       #
-      def notice_nosql(key, duration) #THREAD_LOCAL_ACCESS
+      def notice_nosql(key, duration)
         builder = tl_builder
         notice_extra_data(builder, key, duration, :key)
       end
 
-      def notice_nosql_statement(statement, duration) #THREAD_LOCAL_ACCESS
+      def notice_nosql_statement(statement, duration)
         builder = tl_builder
         notice_extra_data(builder, statement, duration, :statement)
       end
 
       # Set parameters on the current segment.
-      def add_segment_parameters(params) #THREAD_LOCAL_ACCESS
+      def add_segment_parameters(params)
         builder = tl_builder
         return unless builder
         params.each { |k,v| builder.current_segment[k] = v }
@@ -289,7 +287,7 @@ module OneApm
           begin
             sample.prepare_to_send!
           rescue => e
-            OneApm::Agent.logger.error("Failed to prepare transaction trace. Error: ", e)
+            OneApm::Manager.logger.error("Failed to prepare transaction trace. Error: ", e)
             false
           else
             true