oneapm_rpm 1.1.2 → 1.1.3

data/lib/one_apm/agent/datastores/metric_helper.rb

@@ -71,7 +71,7 @@ module OneApm
 
         # Allow Transaction#with_database_metric_name to override our
         # collection and operation
-        def self.overridden_operation_and_collection #THREAD_LOCAL_ACCESS
+        def self.overridden_operation_and_collection
           state = OneApm::TransactionState.tl_get
           txn   = state.current_transaction
           txn ? txn.instrumentation_state[:datastore_override] : nil

data/lib/one_apm/agent/datastores/mongo/metric_translator.rb

@@ -51,7 +51,7 @@ module OneApm
 
             build_metrics(name, collection)
           rescue => e
-            OneApm::Agent.logger.debug("Failure during Mongo metric generation", e)
+            OneApm::Manager.logger.debug("Failure during Mongo metric generation", e)
             []
           end
 
@@ -97,7 +97,7 @@ module OneApm
             if command_key
               command_key.to_sym
             else
-              OneApm::Agent.increment_metric("Supportability/Mongo/UnknownCollection")
+              OneApm::Manager.increment_metric("Supportability/Mongo/UnknownCollection")
               payload[:selector].first.first unless command_key
             end
           end
@@ -108,7 +108,7 @@ module OneApm
             if command_key
               payload[:selector][command_key]
             else
-              OneApm::Agent.increment_metric("Supportability/Mongo/UnknownCollection")
+              OneApm::Manager.increment_metric("Supportability/Mongo/UnknownCollection")
               CMD_COLLECTION
             end
           end

data/lib/one_apm/agent/datastores/mongo/statement_formatter.rb

@@ -23,7 +23,7 @@ module OneApm
           ]
 
           def self.format(statement, operation)
-            return nil unless OneApm::Agent.config[:'mongo.capture_queries']
+            return nil unless OneApm::Manager.config[:'mongo.capture_queries']
 
             result = { :operation => operation }
 
@@ -41,7 +41,7 @@ module OneApm
           end
 
           def self.obfuscate(statement)
-            statement = Obfuscator.obfuscate_statement(statement) if OneApm::Agent.config[:'mongo.obfuscate_queries']
+            statement = Obfuscator.obfuscate_statement(statement) if OneApm::Manager.config[:'mongo.obfuscate_queries']
             statement
           end
         end

data/lib/one_apm/agent/harvester.rb

@@ -6,10 +6,7 @@ module OneApm
 
       attr_accessor :starting_pid
 
-      # Inject target for after_fork call to avoid spawning thread in tests
-      def initialize(events, after_forker = OneApm::Agent)
-        # We intentionally don't set our pid as started at this point.
-        # Startup routines must call mark_started when they consider us set!
+      def initialize(events, after_forker = OneApm::Manager)
         @starting_pid = nil
         @after_forker = after_forker
 
@@ -33,11 +30,11 @@ module OneApm
       end
 
       def restart_in_children_enabled?
-        OneApm::Agent.config[:restart_thread_in_children]
+        OneApm::Manager.config[:restart_thread_in_children]
       end
 
       def harvest_thread_enabled?
-        !OneApm::Agent.config[:disable_harvest_thread]
+        !OneApm::Manager.config[:disable_harvest_thread]
       end
 
       def restart_harvest_thread

data/lib/one_apm/agent/inbound_request_monitor.rb

@@ -14,14 +14,14 @@ module OneApm
       end
 
       def setup_obfuscator
-        @obfuscator = OneApm::Agent::Obfuscator.new(OneApm::Agent.config[:encoding_key])
+        @obfuscator = OneApm::Agent::Obfuscator.new(OneApm::Manager.config[:encoding_key])
       end
 
       def deserialize_header(encoded_header, key)
         decoded_header = obfuscator.deobfuscate(encoded_header)
         OneApm::JSONWrapper.load(decoded_header)
       rescue => err
-        OneApm::Agent.logger.debug("Failure deserializing encoded header '#{key}' in #{self.class}, #{err.class}, #{err.message}")
+        OneApm::Manager.logger.debug("Failure deserializing encoded header '#{key}' in #{self.class}, #{err.class}, #{err.message}")
         nil
       end
 

data/lib/one_apm/agent/javascript_instrumentor.rb

@@ -16,75 +16,75 @@ module OneApm
       end
 
       def log_configuration
-        OneApm::Agent.logger.debug("JS agent loader requested: #{OneApm::Agent.config[:'browser_monitoring.loader']}",
-                                     "JS agent loader debug: #{OneApm::Agent.config[:'browser_monitoring.debug']}",
-                                     "JS agent loader version: #{OneApm::Agent.config[:'browser_monitoring.loader_version']}")
+        OneApm::Manager.logger.debug("JS agent loader requested: #{OneApm::Manager.config[:'browser_monitoring.loader']}",
+                                     "JS agent loader debug: #{OneApm::Manager.config[:'browser_monitoring.debug']}",
+                                     "JS agent loader version: #{OneApm::Manager.config[:'browser_monitoring.loader_version']}")
 
-        if !OneApm::Agent.config[:'rum.enabled']
-          OneApm::Agent.logger.debug("Real User Monitoring is disabled for this agent. Edit your configuration to change this.")
+        if !OneApm::Manager.config[:'rum.enabled']
+          OneApm::Manager.logger.debug("Real User Monitoring is disabled for this agent. Edit your configuration to change this.")
         end
       end
 
       def enabled?
-        Agent.config[:'rum.enabled'] && !!Agent.config[:beacon]
+        OneApm::Manager.config[:'rum.enabled'] && !!Manager.config[:beacon]
       end
 
       def obfuscator
-        @obfuscator ||= OneApm::Agent::Obfuscator.new(OneApm::Agent.config[:license_key], RUM_KEY_LENGTH)
+        @obfuscator ||= OneApm::Agent::Obfuscator.new(OneApm::Manager.config[:license_key], RUM_KEY_LENGTH)
       end
 
       def js_enabled_and_ready?
         if !enabled?
-          ::OneApm::Agent.logger.log_once(:debug, :js_agent_disabled,
+          OneApm::Manager.logger.log_once(:debug, :js_agent_disabled,
                                             "JS agent instrumentation is disabled.")
           false
         elsif missing_config?(:js_agent_loader)
-          ::OneApm::Agent.logger.log_once(:debug, :missing_js_agent_loader,
+          OneApm::Manager.logger.log_once(:debug, :missing_js_agent_loader,
                                             "Missing :js_agent_loader. Skipping browser instrumentation.")
           false
         elsif missing_config?(:beacon)
-          ::OneApm::Agent.logger.log_once(:debug, :missing_beacon,
+          OneApm::Manager.logger.log_once(:debug, :missing_beacon,
                                             "Beacon configuration not received (yet?). Skipping browser instrumentation.")
           false
         elsif missing_config?(:browser_key)
-          ::OneApm::Agent.logger.log_once(:debug, :missing_browser_key,
+          OneApm::Manager.logger.log_once(:debug, :missing_browser_key,
                                             "Browser key is not set. Skipping browser instrumentation.")
           false
         else
           true
         end
       rescue => e
-        ::OneApm::Agent.logger.debug "Failure during 'js_enabled_and_ready?'", e
+        OneApm::Manager.logger.debug "Failure during 'js_enabled_and_ready?'", e
         false
       end
 
       def insert_js?(state)
         if !state.current_transaction
-          ::OneApm::Agent.logger.debug "Not in transaction. Skipping browser instrumentation."
+          OneApm::Manager.logger.debug "Not in transaction. Skipping browser instrumentation."
           false
         elsif !state.is_transaction_traced?
-          ::OneApm::Agent.logger.debug "Transaction is not traced. Skipping browser instrumentation."
+          OneApm::Manager.logger.debug "Transaction is not traced. Skipping browser instrumentation."
           false
         elsif !state.is_execution_traced?
-          ::OneApm::Agent.logger.debug "Execution is not traced. Skipping browser instrumentation."
+          OneApm::Manager.logger.debug "Execution is not traced. Skipping browser instrumentation."
           false
         elsif state.current_transaction.ignore_enduser?
-          ::OneApm::Agent.logger.debug "Ignore end user for this transaction is set. Skipping browser instrumentation."
+          OneApm::Manager.logger.debug "Ignore end user for this transaction is set. Skipping browser instrumentation."
           false
         else
           true
         end
       rescue => e
-        ::OneApm::Agent.logger.debug "Failure during insert_js", e
+        OneApm::Manager.logger.debug "Failure during insert_js", e
         false
       end
 
       def missing_config?(key)
-        value = OneApm::Agent.config[key]
+        value = OneApm::Manager.config[key]
         value.nil? || value.empty?
       end
 
-      def browser_timing_header #THREAD_LOCAL_ACCESS
+      def browser_timing_header
         return '' unless js_enabled_and_ready? # fast exit
 
         state = OneApm::TransactionState.tl_get
@@ -96,12 +96,12 @@ module OneApm
 
         bt_config + browser_timing_loader
       rescue => e
-        ::OneApm::Agent.logger.debug "Failure during RUM browser_timing_header construction", e
+        OneApm::Manager.logger.debug "Failure during RUM browser_timing_header construction", e
         ''
       end
 
       def browser_timing_loader
-        html_safe_if_needed("\n<script type=\"text/javascript\" src=\"#{Agent.config[:js_agent_loader]}\"></script>")
+        html_safe_if_needed("\n<script type=\"text/javascript\" src=\"#{Manager.config[:js_agent_loader]}\"></script>")
       end
 
       def browser_timing_config(state)
@@ -133,14 +133,14 @@ module OneApm
         timings = state.timings
 
         data = {
-          BEACON_KEY           => OneApm::Agent.config[:beacon],
-          ERROR_BEACON_KEY     => OneApm::Agent.config[:error_beacon],
-          LICENSE_KEY_KEY      => OneApm::Agent.config[:browser_key],
-          APPLICATIONID_KEY    => OneApm::Agent.config[:application_id],
+          BEACON_KEY           => OneApm::Manager.config[:beacon],
+          ERROR_BEACON_KEY     => OneApm::Manager.config[:error_beacon],
+          LICENSE_KEY_KEY      => OneApm::Manager.config[:browser_key],
+          APPLICATIONID_KEY    => OneApm::Manager.config[:application_id],
           TRANSACTION_NAME_KEY => obfuscator.obfuscate(timings.transaction_name_or_unknown),
           QUEUE_TIME_KEY       => timings.queue_time_in_millis,
           APPLICATION_TIME_KEY => timings.app_time_in_millis,
-          AGENT_KEY            => OneApm::Agent.config[:js_agent_file]
+          AGENT_KEY            => OneApm::Manager.config[:js_agent_file]
         }
 
         add_ssl_for_http(data)
@@ -150,7 +150,7 @@ module OneApm
       end
 
       def add_ssl_for_http(data)
-        ssl_for_http = OneApm::Agent.config[:'browser_monitoring.ssl_for_http']
+        ssl_for_http = OneApm::Manager.config[:'browser_monitoring.ssl_for_http']
         unless ssl_for_http.nil?
           data[SSL_FOR_HTTP_KEY] = ssl_for_http
         end
@@ -165,7 +165,7 @@ module OneApm
       end
 
       def include_custom_parameters?(txn)
-        has_custom_parameters?(txn) && OneApm::Agent.config[:'browser_monitoring.capture_attributes']
+        has_custom_parameters?(txn) && OneApm::Manager.config[:'browser_monitoring.capture_attributes']
       end
 
       def has_custom_parameters?(txn)

data/lib/one_apm/agent/sampler.rb

@@ -29,7 +29,7 @@ module OneApm
         def enabled?
           if @name
             config_key = "disable_#{@name}_sampler"
-            !(Agent.config[config_key])
+            !(Manager.config[config_key])
           else
             true
           end

data/lib/one_apm/agent/sampler_collection.rb

@@ -23,9 +23,6 @@ module OneApm
         self.any? { |s| s.class == sampler_class }
       end
 
-      # adds samplers to the sampler collection so that they run every
-      # minute. This is dynamically recognized by any class that
-      # subclasses OneApm::Agent::Sampler
       def load_samplers
         Sampler.sampler_classes.each do |subclass|
           add_sampler(subclass)
@@ -38,8 +35,8 @@ module OneApm
             sampler.poll
             false
           rescue => e
-            ::OneApm::Agent.logger.warn("Removing #{sampler} from list", e)
-            true # remove the bad sampler
+            OneApm::Manager.logger.warn("Removing #{sampler} from list", e)
+            true
           end
         end
       end
@@ -51,14 +48,14 @@ module OneApm
           sampler = sampler_class.new
           sampler.setup_events(@event_listener) if sampler.respond_to?(:setup_events)
           @samplers << sampler
-          ::OneApm::Agent.logger.debug("Registered #{sampler_class.name} for harvest time sampling.")
+          OneApm::Manager.logger.debug("Registered #{sampler_class.name} for harvest time sampling.")
         else
-          ::OneApm::Agent.logger.debug("#{sampler_class.name} not supported on this platform.")
+          OneApm::Manager.logger.debug("#{sampler_class.name} not supported on this platform.")
         end
       rescue OneApm::Agent::Sampler::Unsupported => e
-        ::OneApm::Agent.logger.info("#{sampler_class.name} not available: #{e}")
+        OneApm::Manager.logger.info("#{sampler_class.name} not available: #{e}")
       rescue => e
-        ::OneApm::Agent.logger.error("Error registering sampler:", e)
+        OneApm::Manager.logger.error("Error registering sampler:", e)
       end
     end
   end

data/lib/one_apm/agent/samplers/cpu_sampler.rb

@@ -31,12 +31,12 @@ module OneApm
             systemtime = t.stime - @last_stime
 
             if systemtime >= 0
-              OneApm::Agent.record_metric("CPU/System Time", systemtime)
-              OneApm::Agent.record_metric("CPU/System/Utilization", systemtime / (elapsed * @processor_count))
+              OneApm::Manager.record_metric("CPU/System Time", systemtime)
+              OneApm::Manager.record_metric("CPU/System/Utilization", systemtime / (elapsed * @processor_count))
             end
             if usertime >= 0
-              OneApm::Agent.record_metric("CPU/User Time", usertime)
-              OneApm::Agent.record_metric("CPU/User/Utilization", usertime / (elapsed * @processor_count))
+              OneApm::Manager.record_metric("CPU/User Time", usertime)
+              OneApm::Manager.record_metric("CPU/User/Utilization", usertime / (elapsed * @processor_count))
             end
           end
           @last_utime = t.utime

data/lib/one_apm/agent/samplers/delayed_job_sampler.rb

@@ -23,17 +23,17 @@ module OneApm
         end
 
         def initialize
-          raise Unsupported, "DJ queue sampler disabled" if Agent.config[:disable_dj]
+          raise Unsupported, "DJ queue sampler disabled" if OneApm::Manager.config[:disable_dj]
           raise Unsupported, "DJ queue sampling unsupported with backend '#{::Delayed::Worker.backend}'" unless self.class.supported_backend?
           raise Unsupported, "No DJ worker present. Skipping DJ queue sampler" unless OneApm::DelayedJobInjection.worker_name
         end
 
         def record_failed_jobs(value)
-          OneApm::Agent.record_metric("Workers/DelayedJob/failed_jobs", value)
+          OneApm::Manager.record_metric("Workers/DelayedJob/failed_jobs", value)
         end
 
         def record_locked_jobs(value)
-          OneApm::Agent.record_metric("Workers/DelayedJob/locked_jobs", value)
+          OneApm::Manager.record_metric("Workers/DelayedJob/locked_jobs", value)
         end
 
         FAILED_QUERY = 'failed_at is not NULL'.freeze
@@ -73,7 +73,7 @@ module OneApm
           counts << record_counts_by("priority")
 
           all_metric = "Workers/DelayedJob/queue_length/all"
-          OneApm::Agent.record_metric(all_metric, counts.max)
+          OneApm::Manager.record_metric(all_metric, counts.max)
         end
 
         QUEUE_QUERY_CONDITION = 'run_at <= ? and failed_at is NULL'.freeze
@@ -84,7 +84,7 @@ module OneApm
             all_count += count
             column_val = "default" if column_val.nil? || column_val == ""
             metric = "Workers/DelayedJob/queue_length/#{metric_segment}/#{column_val}"
-            OneApm::Agent.record_metric(metric, count)
+            OneApm::Manager.record_metric(metric, count)
           end
           all_count
         end

data/lib/one_apm/agent/samplers/memory_sampler.rb

@@ -18,10 +18,10 @@ module OneApm
           elsif platform =~ /linux/
             @sampler = ProcStatus.new
             if !@sampler.can_run?
-              ::OneApm::Agent.logger.debug "Error attempting to use /proc/#{$$}/status file for reading memory. Using ps command instead."
+              OneApm::Manager.logger.debug "Error attempting to use /proc/#{$$}/status file for reading memory. Using ps command instead."
               @sampler = ShellPS.new("ps -o rsz")
             else
-              ::OneApm::Agent.logger.debug "Using /proc/#{$$}/status for reading process memory."
+              OneApm::Manager.logger.debug "Using /proc/#{$$}/status for reading process memory."
             end
           elsif platform =~ /darwin9/ # 10.5
             @sampler = ShellPS.new("ps -o rsz")
@@ -55,7 +55,7 @@ module OneApm
         def poll
           sample = @sampler.get_sample
           if sample
-            OneApm::Agent.record_metric("Memory/Used", sample)
+            OneApm::Manager.record_metric("Memory/Used", sample)
           end
         end
 
@@ -71,12 +71,12 @@ module OneApm
             begin
               m = get_memory
               if m.nil?
-                ::OneApm::Agent.logger.warn "Unable to get the resident memory for process #{$$}.  Disabling memory sampler."
+                OneApm::Manager.logger.warn "Unable to get the resident memory for process #{$$}.  Disabling memory sampler."
                 @broken = true
               end
               return m
             rescue => e
-              ::OneApm::Agent.logger.warn "Unable to get the resident memory for process #{$$}. Disabling memory sampler.", e
+              OneApm::Manager.logger.warn "Unable to get the resident memory for process #{$$}. Disabling memory sampler.", e
               @broken = true
               return nil
             end

data/lib/one_apm/agent/samplers/object_sampler.rb

@@ -14,7 +14,7 @@ module OneApm
 
         def poll
           live_objects = ObjectSpace.live_objects
-          OneApm::Agent.record_metric("GC/objects", live_objects)
+          OneApm::Manager.record_metric("GC/objects", live_objects)
         end
       end
     end

data/lib/one_apm/agent/samplers/vm_sampler.rb

@@ -47,7 +47,7 @@ module OneApm
           end
         end
 
-        def record_gc_runs_metric(snapshot, txn_count) #THREAD_LOCAL_ACCESS
+        def record_gc_runs_metric(snapshot, txn_count)
           if snapshot.gc_total_time || snapshot.gc_runs
             if snapshot.gc_total_time
               gc_time = snapshot.gc_total_time - @last_snapshot.gc_total_time.to_f
@@ -56,7 +56,7 @@ module OneApm
               gc_runs = snapshot.gc_runs - @last_snapshot.gc_runs
             end
             wall_clock_time = snapshot.taken_at - @last_snapshot.taken_at
-            OneApm::Agent.instance.stats_engine.tl_record_unscoped_metrics(GC_RUNS_METRIC) do |stats|
+            OneApm::Manager.agent.stats_engine.tl_record_unscoped_metrics(GC_RUNS_METRIC) do |stats|
               stats.call_count           += txn_count
               stats.total_call_time      += gc_runs if gc_runs
               stats.total_exclusive_time += gc_time if gc_time
@@ -66,19 +66,19 @@ module OneApm
           end
         end
 
-        def record_delta(snapshot, key, metric, txn_count) #THREAD_LOCAL_ACCESS
+        def record_delta(snapshot, key, metric, txn_count)
           value = snapshot.send(key)
           if value
             delta = value - @last_snapshot.send(key)
-            OneApm::Agent.instance.stats_engine.tl_record_unscoped_metrics(metric) do |stats|
+            OneApm::Manager.agent.stats_engine.tl_record_unscoped_metrics(metric) do |stats|
               stats.call_count      += txn_count
               stats.total_call_time += delta
             end
           end
         end
 
-        def record_gauge_metric(metric_name, value) #THREAD_LOCAL_ACCESS
-          OneApm::Agent.instance.stats_engine.tl_record_unscoped_metrics(metric_name) do |stats|
+        def record_gauge_metric(metric_name, value)
+          OneApm::Manager.agent.stats_engine.tl_record_unscoped_metrics(metric_name) do |stats|
             stats.call_count      = value
             stats.sum_of_squares  = 1
           end

data/lib/one_apm/agent/synthetics_monitor.rb

@@ -14,7 +14,7 @@ module OneApm
         events.subscribe(:before_call, &method(:on_before_call))
       end
 
-      def on_before_call(request) #THREAD_LOCAL_ACCESS
+      def on_before_call(request)
         encoded_header = request[SYNTHETICS_HEADER_KEY]
         return unless encoded_header
 
@@ -37,7 +37,7 @@ module OneApm
 
       def is_trusted?(incoming_payload)
         account_id = incoming_payload[1]
-        OneApm::Agent.config[:trusted_account_ids].include?(account_id)
+        OneApm::Manager.config[:trusted_account_ids].include?(account_id)
       end
 
       def is_valid_payload?(incoming_payload)