oneapm_rpm 1.1.2 → 1.1.3

data/lib/one_apm/{agent/pipe/pipe_service.rb → collector/forked_process_service.rb}

@@ -2,18 +2,18 @@
 
 module OneApm
   module Agent
-    class PipeService
+    class ForkedProcessService
       attr_reader :channel_id, :buffer, :pipe
       attr_accessor :request_timeout, :agent_id, :collector
 
       def initialize(channel_id)
         @channel_id = channel_id
         @collector = OneApm::Support::Server.new(:name => 'parent', :port => 0)
-        @pipe = OneApm::Agent::PipeChannelManager.channels[@channel_id]
+        @pipe = OneApm::Support::ForkedProcessChannel.channels[@channel_id]
         if @pipe && @pipe.parent_pid != $$
           @pipe.after_fork_in_child
         else
-          OneApm::Agent.logger.error("No communication channel to parent process.")
+          OneApm::Manager.logger.error("No communication channel to parent process.")
         end
       end
 

data/lib/one_apm/collector/stats_engine/gc_profiler.rb

@@ -42,8 +42,8 @@ module OneApm
           end
         end
 
-        def self.record_gc_metric(call_count, elapsed) #THREAD_LOCAL_ACCESS
-          OneApm::Agent.instance.stats_engine.tl_record_scoped_and_unscoped_metrics(gc_metric_name, GC_ROLLUP) do |stats|
+        def self.record_gc_metric(call_count, elapsed)
+          OneApm::Manager.agent.stats_engine.tl_record_scoped_and_unscoped_metrics(gc_metric_name, GC_ROLLUP) do |stats|
             stats.call_count           += call_count
             stats.total_call_time      += elapsed
             stats.total_exclusive_time += elapsed
@@ -86,7 +86,7 @@ module OneApm
           end
 
           def call_time_s
-            OneApm::Agent.instance.monotonic_gc_profiler.total_time_s
+            OneApm::Manager.agent.monotonic_gc_profiler.total_time_s
           end
 
           def call_count

data/lib/one_apm/collector/stats_engine/metric_stats.rb

@@ -13,7 +13,7 @@ module OneApm
         # metric_names may be either a single name, or an array of names.
         #
         # This is an internal method, subject to change at any time. Client apps
-        # and gems should use the public API (OneApm::Agent.record_metric)
+        # and gems should use the public API (OneApm::Manager.record_metric)
         # instead.
         #
         # There are four ways to use this method:
@@ -65,7 +65,7 @@ module OneApm
         # Like tl_record_unscoped_metrics, but records a scoped metric as well.
         #
         # This is an internal method, subject to change at any time. Client apps
-        # and gems should use the public API (OneApm::Agent.record_metric)
+        # and gems should use the public API (OneApm::Manager.record_metric)
         # instead.
         #
         # The given scoped_metric will be recoded as both a scoped *and* an
@@ -106,7 +106,7 @@ module OneApm
         end
 
         # This method is deprecated and not thread safe, and should not be used
-        # by any new client code. Use OneApm::Agent.record_metric instead.
+        # by any new client code. Use OneApm::Manager.record_metric instead.
         #
         # Lookup the Stats object for a given unscoped metric, returning a new
         # Stats object if one did not exist previously.
@@ -119,7 +119,7 @@ module OneApm
         end
 
         # This method is deprecated and not thread safe, and should not be used
-        # by any new client code. Use OneApm::Agent.record_metric instead.
+        # by any new client code. Use OneApm::Manager.record_metric instead.
         #
         # If scoped_metric_only is true, only a scoped metric is created (used
         # by rendering metrics which by definition are per controller only)

data/lib/one_apm/collector/stats_engine/stats_hash.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# A Hash-descended class for storing metric data in the OneApm Agent.
+# A Hash-descended class for storing metric data in the OneApm OneApm::Manager.
 #
 # Keys are OneApm::MetricSpec objects.
 # Values are OneApm::Metrics::Stats objects.
@@ -56,7 +56,7 @@ module OneApm
           rescue NoMethodError => e
             # This only happen in the case of a corrupted default_proc
             # Side-step it manually, notice the issue, and carry on....
-            OneApm::Agent.instance.error_collector. \
+            OneApm::Manager.agent.error_collector. \
               notice_agent_error(StatsHashLookupError.new(e, self, metric_spec))
 
             stats = OneApm::Metrics::Stats.new

data/lib/one_apm/configuration.rb

@@ -99,7 +99,7 @@ module OneApm
         when YamlSource         then @yaml_source          = source
         when DefaultSource      then @default_source       = source
         else
-          OneApm::Agent.logger.warn("Invalid config format; config will be ignored: #{source}")
+          OneApm::Manager.logger.warn("Invalid config format; config will be ignored: #{source}")
         end
 
         reset_cache
@@ -148,7 +148,7 @@ module OneApm
           begin
             transform.call(value)
           rescue => e
-            ::OneApm::Agent.logger.error("Error applying transformation for #{key}, falling back to #{value}.", e)
+            OneApm::Manager.logger.error("Error applying transformation for #{key}, falling back to #{value}.", e)
             raise e
           end
         else
@@ -182,7 +182,7 @@ module OneApm
       end
 
       def notify_finished_configuring
-        OneApm::Agent.instance.events.notify(:finished_configuring)
+        OneApm::Manager.agent.events.notify(:finished_configuring)
       end
 
       def finished_configuring?
@@ -196,7 +196,7 @@ module OneApm
             begin
               thawed_layer[k] = instance_eval(&v) if v.respond_to?(:call)
             rescue => e
-              ::OneApm::Agent.logger.debug("#{e.class.name} : #{e.message} - when accessing config key #{k}")
+              OneApm::Manager.logger.debug("#{e.class.name} : #{e.message} - when accessing config key #{k}")
               thawed_layer[k] = nil
             end
             thawed_layer.delete(:config)
@@ -227,9 +227,9 @@ module OneApm
       end
 
       def app_names
-        case OneApm::Agent.config[:app_name]
-        when Array then OneApm::Agent.config[:app_name]
-        when String then OneApm::Agent.config[:app_name].split(';')
+        case OneApm::Manager.config[:app_name]
+        when Array then OneApm::Manager.config[:app_name]
+        when String then OneApm::Manager.config[:app_name].split(';')
         else []
         end
       end
@@ -241,19 +241,19 @@ module OneApm
       MAX_LABEL_LENGTH = 255
 
       def parsed_labels
-        case OneApm::Agent.config[:labels]
+        case OneApm::Manager.config[:labels]
         when String
           parse_labels_from_string
         else
           parse_labels_from_dictionary
         end
       rescue => e
-        OneApm::Agent.logger.error(PARSING_LABELS_FAILURE, e)
+        OneApm::Manager.logger.error(PARSING_LABELS_FAILURE, e)
         []
       end
 
       def parse_labels_from_string
-        labels = OneApm::Agent.config[:labels]
+        labels = OneApm::Manager.config[:labels]
         label_pairs = break_label_string_into_pairs(labels)
         make_label_hash(label_pairs, labels)
       end
@@ -286,7 +286,7 @@ module OneApm
         pairs = Array(pairs)
 
         unless valid_label_pairs?(pairs)
-          OneApm::Agent.logger.warn("#{MALFORMED_LABELS_WARNING}: #{labels||pairs}")
+          OneApm::Manager.logger.warn("#{MALFORMED_LABELS_WARNING}: #{labels||pairs}")
           return []
         end
 
@@ -307,7 +307,7 @@ module OneApm
           else
             msg = "Label name longer than the allowed #{MAX_LABEL_LENGTH} will be truncated. Name = '#{text}'"
           end
-          OneApm::Agent.logger.warn(msg)
+          OneApm::Manager.logger.warn(msg)
           text[0..MAX_LABEL_LENGTH-1]
         else
           text
@@ -316,7 +316,7 @@ module OneApm
 
       def limit_number_of_labels(pairs)
         if pairs.length > MAX_LABEL_COUNT
-          OneApm::Agent.logger.warn("Too many labels defined. Only taking first #{MAX_LABEL_COUNT}")
+          OneApm::Manager.logger.warn("Too many labels defined. Only taking first #{MAX_LABEL_COUNT}")
           pairs[0...64]
         else
           pairs
@@ -330,7 +330,7 @@ module OneApm
       end
 
       def parse_labels_from_dictionary
-        make_label_hash(OneApm::Agent.config[:labels])
+        make_label_hash(OneApm::Manager.config[:labels])
       end
 
       # Generally only useful during initial construction and tests
@@ -356,7 +356,7 @@ module OneApm
         # flattened.inspect) is expensive enough that we don't want to do it
         # unless we're actually going to be logging the message based on our
         # current log level.
-        ::OneApm::Agent.logger.debug do
+        OneApm::Manager.logger.debug do
           "Updating config (#{direction}) from #{source.class}. Results: #{flattened.inspect}"
         end
       end
@@ -409,7 +409,7 @@ module OneApm
           const = constantize(class_name)
 
           unless const
-            OneApm::Agent.logger.warn "Configuration referenced undefined constant: #{class_name}"
+            OneApm::Manager.logger.warn "Configuration referenced undefined constant: #{class_name}"
           end
 
           const

data/lib/one_apm/configuration/autostart.rb

@@ -12,13 +12,13 @@ module OneApm
       end
 
       def blacklisted_constants?
-        blacklisted?(OneApm::Agent.config[:'autostart.blacklisted_constants']) do |name|
+        blacklisted?(OneApm::Manager.config[:'autostart.blacklisted_constants']) do |name|
           OneApm::LanguageSupport.constant_is_defined?(name)
         end
       end
 
       def blacklisted_executables?
-        blacklisted?(OneApm::Agent.config[:'autostart.blacklisted_executables']) do |bin|
+        blacklisted?(OneApm::Manager.config[:'autostart.blacklisted_executables']) do |bin|
           File.basename($0) == bin
         end
       end
@@ -31,10 +31,10 @@ module OneApm
         tasks = begin
                   ::Rake.application.top_level_tasks
                 rescue => e
-                  ::OneApm::Agent.logger.debug("Not in Rake environment so skipping blacklisted_rake_tasks check: #{e}")
+                  OneApm::Manager.logger.debug("Not in Rake environment so skipping blacklisted_rake_tasks check: #{e}")
                   []
                 end
-        !(tasks & ::OneApm::Agent.config[:'autostart.blacklisted_rake_tasks'].split(/\s*,\s*/)).empty?
+        !(tasks & OneApm::Manager.config[:'autostart.blacklisted_rake_tasks'].split(/\s*,\s*/)).empty?
       end
     end
   end

data/lib/one_apm/configuration/default_source.rb

@@ -6,7 +6,7 @@ module OneApm
     # Helper since default Procs are evaluated in the context of this module
     def self.value_of(key)
       Proc.new do
-        OneApm::Agent.config[key]
+        OneApm::Manager.config[key]
       end
     end
 
@@ -51,7 +51,7 @@ module OneApm
 
       def self.config_path
         Proc.new {
-          found_path = OneApm::Agent.config[:config_search_paths].detect do |file|
+          found_path = OneApm::Manager.config[:config_search_paths].detect do |file|
             File.expand_path(file) if File.exists? file
           end
           found_path || ""
@@ -71,7 +71,7 @@ module OneApm
             when 4
               :rails4
             else
-              ::OneApm::Agent.logger.error "Detected unsupported Rails version #{Rails::VERSION::STRING}"
+              OneApm::Manager.logger.error "Detected unsupported Rails version #{Rails::VERSION::STRING}"
             end
           when defined?(::Sinatra) && defined?(::Sinatra::Base) then :sinatra
           when defined?(::OneApm::IA) then :external
@@ -82,15 +82,15 @@ module OneApm
 
       def self.agent_enabled
         Proc.new {
-          OneApm::Agent.config[:enabled] &&
-          OneApm::Agent.config[:monitor_mode] &&
+          OneApm::Manager.config[:enabled] &&
+          OneApm::Manager.config[:monitor_mode] &&
           OneApm::Configuration::Autostart.agent_should_start?
         }
       end
 
       def self.audit_log_path
         Proc.new {
-          File.join(OneApm::Agent.config[:log_file_path], 'oneapm_audit.log')
+          File.join(OneApm::Manager.config[:log_file_path], 'oneapm_audit.log')
         }
       end
 
@@ -121,15 +121,15 @@ module OneApm
       # set. Once JS errors are GA, browser_monitoring.loader can stop
       # being dynamic.
       def self.browser_monitoring_loader
-        Proc.new { OneApm::Agent.config[:js_errors_beta] ? "full" : "rum"}
+        Proc.new { OneApm::Manager.config[:js_errors_beta] ? "full" : "rum"}
       end
 
       def self.transaction_tracer_transaction_threshold
-        Proc.new { OneApm::Agent.config[:apdex_t] * 4 }
+        Proc.new { OneApm::Manager.config[:apdex_t] * 4 }
       end
 
       def self.port
-        Proc.new { OneApm::Agent.config[:ssl] ? 443 : 80 }
+        Proc.new { OneApm::Manager.config[:ssl] ? 443 : 80 }
       end
 
       def self.rules_ignore

data/lib/one_apm/configuration/environment_source.rb

@@ -93,7 +93,7 @@ module OneApm
             self[config_key] = true
           end
         else
-          OneApm::Agent.logger.info("#{environment_key} does not have a corresponding configuration setting (#{config_key} does not exist).")
+          OneApm::Manager.logger.info("#{environment_key} does not have a corresponding configuration setting (#{config_key} does not exist).")
           self[config_key] = value
         end
       end

data/lib/one_apm/configuration/high_security_source.rb

@@ -46,7 +46,7 @@ module OneApm
         end
 
         if result != original_value
-          OneApm::Agent.logger.info("Disabling setting #{key}='#{original_value}' because high security mode is enabled. Value will be '#{result}'")
+          OneApm::Manager.logger.info("Disabling setting #{key}='#{original_value}' because high security mode is enabled. Value will be '#{result}'")
         end
 
         result

data/lib/one_apm/configuration/yaml_source.rb

@@ -17,12 +17,12 @@ module OneApm
           @file_path = validate_config_file_path(path)
           return unless @file_path
 
-          OneApm::Agent.logger.info("Reading configuration from #{path} (#{Dir.pwd})")
+          OneApm::Manager.logger.info("Reading configuration from #{path} (#{Dir.pwd})")
           raw_file = File.read(@file_path)
           erb_file = process_erb(raw_file)
           config   = process_yaml(erb_file, env, config, @file_path)
         rescue ScriptError, StandardError => e
-          ::OneApm::Agent.logger.error("Failed to read or parse configuration file at #{path}", e)
+          OneApm::Manager.logger.error("Failed to read or parse configuration file at #{path}", e)
         end
 
         substitute_transaction_threshold(config)
@@ -46,13 +46,13 @@ module OneApm
 
       def warn_missing_config_file(path)
         based_on        = 'unknown'
-        source          = ::OneApm::Agent.config.source(:config_path)
+        source          = OneApm::Manager.config.source(:config_path)
         candidate_paths = [path]
 
         case source
         when DefaultSource
           based_on = 'defaults'
-          candidate_paths = OneApm::Agent.config[:config_search_paths].map do |p|
+          candidate_paths = OneApm::Manager.config[:config_search_paths].map do |p|
             File.expand_path(p)
           end
         when EnvironmentSource
@@ -61,7 +61,7 @@ module OneApm
           based_on = 'API call'
         end
 
-        OneApm::Agent.logger.warn(
+        OneApm::Manager.logger.warn(
           "No configuration file found. Working directory = #{Dir.pwd}",
           "Looked in these locations (based on #{based_on}): #{candidate_paths.join(", ")}"
         )
@@ -81,7 +81,7 @@ module OneApm
 
           ERB.new(file).result(binding)
         rescue ScriptError, StandardError => e
-          ::OneApm::Agent.logger.error("Failed ERB processing configuration file. This is typically caused by a Ruby error in <% %> templating blocks in your oneapm.yml file.", e)
+          OneApm::Manager.logger.error("Failed ERB processing configuration file. This is typically caused by a Ruby error in <% %> templating blocks in your oneapm.yml file.", e)
           nil
         end
       end
@@ -89,7 +89,7 @@ module OneApm
       def process_yaml(file, env, config, path)
         if file
           confighash = with_yaml_engine { YAML.load(file) }
-          ::OneApm::Agent.logger.error("Config file at #{path} doesn't include a '#{env}' section!") unless confighash.key?(env)
+          OneApm::Manager.logger.error("Config file at #{path} doesn't include a '#{env}' section!") unless confighash.key?(env)
 
           config = confighash[env] || {}
         end

data/lib/one_apm/errors/noticed_error.rb

@@ -47,7 +47,7 @@ class OneApm::NoticedError
     @message = @message[0..4095] if @message.length > 4096
 
     # replace error message if enabled
-    if OneApm::Agent.config[:'strip_exception_messages.enabled'] &&
+    if OneApm::Manager.config[:'strip_exception_messages.enabled'] &&
        !self.class.passes_message_whitelist(exception.class)
       @message = STRIPPED_EXCEPTION_REPLACEMENT_MESSAGE
     end
@@ -64,7 +64,7 @@ class OneApm::NoticedError
   end
 
   def self.passes_message_whitelist(exception_class)
-    OneApm::Agent.config.stripped_exceptions_whitelist.any? do |klass|
+    OneApm::Manager.config.stripped_exceptions_whitelist.any? do |klass|
       exception_class <= klass
     end
   end

data/lib/one_apm/frameworks/external.rb

@@ -6,9 +6,11 @@ module OneApm
   class Probe
     module Frameworks
       class External < OneApm::Probe::Frameworks::Ruby
+
         def init_config(options={})
           super
         end
+
       end
     end
   end

data/lib/one_apm/frameworks/rails.rb

@@ -11,10 +11,6 @@ module OneApm
           @env ||= RAILS_ENV.dup
         end
 
-        # Rails can return an empty string from this method, causing
-        # the agent not to start even when it is properly in a rails 3
-        # application, so we test the value to make sure it actually
-        # has contents, and bail to the parent class if it is empty.
         def root
           root = rails_root.to_s
           if !root.empty?
@@ -36,23 +32,17 @@ module OneApm
           end
         end
 
-        # In versions of Rails prior to 2.0, the rails config was only available to
-        # the init.rb, so it had to be passed on from there.  This is a best effort to
-        # find a config and use that.
-        def init_config(options={})
+        def init_config(options = {})
           @config = options[:config]
 
           if rails_config && ::Rails.configuration.respond_to?(:after_initialize)
             rails_config.after_initialize do
-              # This will insure we load all the instrumentation as late as possible.
               LibraryDetection.detect!
             end
           end
 
-          if !Agent.config[:agent_enabled]
-            # Might not be running if it does not think mongrel, thin, passenger, etc
-            # is running, if it thinks it's a rake task, or if the agent_enabled is false.
-            ::OneApm::Agent.logger.info("OneApm Agent not running.")
+          if !Manager.config[:agent_enabled]
+            OneApm::Manager.logger.info("OneApm Agent not running.")
           else
             install_browser_monitoring(rails_config)
             install_agent_hooks(rails_config)
@@ -67,22 +57,22 @@ module OneApm
             require 'one_apm/rack/middleware_hooks'
             return unless OneApm::Rack::MiddlewareHooks.needed?
             config.middleware.use OneApm::Rack::MiddlewareHooks
-            ::OneApm::Agent.logger.debug("Installed OneApm Agent Hooks middleware")
+            OneApm::Manager.logger.debug("Installed OneApm Agent Hooks middleware")
           rescue => e
-            ::OneApm::Agent.logger.warn("Error installing OneApm Agent Hooks middleware", e)
+            OneApm::Manager.logger.warn("Error installing OneApm Agent Hooks middleware", e)
           end
         end
 
         def install_browser_monitoring(config)
           return if @browser_monitoring_installed
           @browser_monitoring_installed = true
-          return if config.nil? || !config.respond_to?(:middleware) || !Agent.config[:'browser_monitoring.auto_instrument']
+          return if config.nil? || !config.respond_to?(:middleware) || !Manager.config[:'browser_monitoring.auto_instrument']
           begin
             require 'one_apm/rack/browser_monitoring'
             config.middleware.use OneApm::Rack::BrowserMonitoring
-            ::OneApm::Agent.logger.debug("Installed OneApm Browser Monitoring middleware")
+            OneApm::Manager.logger.debug("Installed OneApm Browser Monitoring middleware")
           rescue => e
-            ::OneApm::Agent.logger.warn("Error installing OneApm Browser Monitoring middleware", e)
+            OneApm::Manager.logger.warn("Error installing OneApm Browser Monitoring middleware", e)
           end
         end