oneapm_rpm 1.3.6 → 1.3.7.rc1

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

@@ -169,7 +169,7 @@ module OneApm
         builder.set_transaction_cpu_time(cpu_time) if builder
       end
 
-      MAX_DATA_LENGTH = 16384
+      OA_MAX_DATA_LENGTH = 16384
       # This method is used to record metadata into the currently
       # active segment like a sql query, memcache key, or Net::HTTP uri
       #
@@ -190,12 +190,12 @@ module OneApm
 
       private :notice_extra_data
 
-      # Truncates the message to `MAX_DATA_LENGTH` if needed, and
+      # Truncates the message to `OA_MAX_DATA_LENGTH` if needed, and
       # appends an ellipsis because it makes the trucation clearer in
       # the UI
       def self.truncate_message(message)
-        if message.length > (MAX_DATA_LENGTH - 4)
-          message[0..MAX_DATA_LENGTH - 4] + '...'
+        if message.length > (OA_MAX_DATA_LENGTH - 4)
+          message[0..OA_MAX_DATA_LENGTH - 4] + '...'
         else
           message
         end

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

@@ -4,7 +4,7 @@ module OneApm
   module Collector
     class UtilizationData
 
-      REMOTE_DATA_VALID_CHARS = /^[0-9a-zA-Z_ .\/-]$/.freeze
+      OA_REMOTE_DATA_VALID_CHARS = /^[0-9a-zA-Z_ .\/-]$/.freeze
 
       def harvest!
         [hostname, container_id, cpu_count, instance_type]

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

@@ -27,15 +27,15 @@ module OneApm
           OneApm::Manager.record_metric("Workers/DelayedJob/locked_jobs", value)
         end
 
-        FAILED_QUERY = 'failed_at is not NULL'.freeze
-        LOCKED_QUERY = 'locked_by is not NULL'.freeze
+        OA_FAILED_QUERY = 'failed_at is not NULL'.freeze
+        OA_LOCKED_QUERY = 'locked_by is not NULL'.freeze
 
         def failed_jobs
-          count(FAILED_QUERY)
+          count(OA_FAILED_QUERY)
         end
 
         def locked_jobs
-          count(LOCKED_QUERY)
+          count(OA_LOCKED_QUERY)
         end
 
         def count(query)
@@ -67,7 +67,7 @@ module OneApm
           OneApm::Manager.record_metric(all_metric, counts.max)
         end
 
-        QUEUE_QUERY_CONDITION = 'run_at <= ? and failed_at is NULL'.freeze
+        OA_QUEUE_QUERY_CONDITION = 'run_at <= ? and failed_at is NULL'.freeze
 
         def record_counts_by(column_name, metric_segment = column_name)
           all_count = 0
@@ -84,9 +84,9 @@ module OneApm
           now = ::Delayed::Job.db_time_now
           result = if ::ActiveRecord::VERSION::MAJOR.to_i < 4
             ::Delayed::Job.count(:group => column_name,
-                                 :conditions => [QUEUE_QUERY_CONDITION, now])
+                                 :conditions => [OA_QUEUE_QUERY_CONDITION, now])
           else
-            ::Delayed::Job.where(QUEUE_QUERY_CONDITION, now).
+            ::Delayed::Job.where(OA_QUEUE_QUERY_CONDITION, now).
                            group(column_name).
                            count
           end

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

@@ -7,15 +7,15 @@ module OneApm
   module Collector
     module Samplers
       class VMSampler < Sampler
-        GC_RUNS_METRIC                = 'RubyVM/GC/runs'.freeze
-        HEAP_LIVE_METRIC              = 'RubyVM/GC/heap_live'.freeze
-        HEAP_FREE_METRIC              = 'RubyVM/GC/heap_free'.freeze
-        THREAD_COUNT_METRIC           = 'RubyVM/Threads/all'.freeze
-        OBJECT_ALLOCATIONS_METRIC     = 'RubyVM/GC/total_allocated_object'.freeze
-        MAJOR_GC_METRIC               = 'RubyVM/GC/major_gc_count'.freeze
-        MINOR_GC_METRIC               = 'RubyVM/GC/minor_gc_count'.freeze
-        METHOD_INVALIDATIONS_METRIC   = 'RubyVM/CacheInvalidations/method'.freeze
-        CONSTANT_INVALIDATIONS_METRIC = 'RubyVM/CacheInvalidations/constant'.freeze
+        OA_GC_RUNS_METRIC                = 'RubyVM/GC/runs'.freeze
+        OA_HEAP_LIVE_METRIC              = 'RubyVM/GC/heap_live'.freeze
+        OA_HEAP_FREE_METRIC              = 'RubyVM/GC/heap_free'.freeze
+        OA_THREAD_COUNT_METRIC           = 'RubyVM/Threads/all'.freeze
+        OA_OBJECT_ALLOCATIONS_METRIC     = 'RubyVM/GC/total_allocated_object'.freeze
+        OA_MAJOR_GC_METRIC               = 'RubyVM/GC/major_gc_count'.freeze
+        OA_MINOR_GC_METRIC               = 'RubyVM/GC/minor_gc_count'.freeze
+        OA_METHOD_INVALIDATIONS_METRIC   = 'RubyVM/CacheInvalidations/method'.freeze
+        OA_CONSTANT_INVALIDATIONS_METRIC = 'RubyVM/CacheInvalidations/constant'.freeze
 
         attr_reader :transaction_count
 
@@ -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::Manager.agent.stats_engine.tl_record_unscoped_metrics(GC_RUNS_METRIC) do |stats|
+            OneApm::Manager.agent.stats_engine.tl_record_unscoped_metrics(OA_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
@@ -86,19 +86,19 @@ module OneApm
 
         def record_heap_live_metric(snapshot)
           if snapshot.heap_live
-            record_gauge_metric(HEAP_LIVE_METRIC, snapshot.heap_live)
+            record_gauge_metric(OA_HEAP_LIVE_METRIC, snapshot.heap_live)
           end
         end
 
         def record_heap_free_metric(snapshot)
           if snapshot.heap_free
-            record_gauge_metric(HEAP_FREE_METRIC, snapshot.heap_free)
+            record_gauge_metric(OA_HEAP_FREE_METRIC, snapshot.heap_free)
           end
         end
 
         def record_thread_count_metric(snapshot)
           if snapshot.thread_count
-            record_gauge_metric(THREAD_COUNT_METRIC, snapshot.thread_count)
+            record_gauge_metric(OA_THREAD_COUNT_METRIC, snapshot.thread_count)
           end
         end
 
@@ -107,11 +107,11 @@ module OneApm
           tcount = reset_transaction_count
 
           record_gc_runs_metric(snap, tcount)
-          record_delta(snap, :total_allocated_object, OBJECT_ALLOCATIONS_METRIC, tcount)
-          record_delta(snap, :major_gc_count, MAJOR_GC_METRIC, tcount)
-          record_delta(snap, :minor_gc_count, MINOR_GC_METRIC, tcount)
-          record_delta(snap, :method_cache_invalidations, METHOD_INVALIDATIONS_METRIC, tcount)
-          record_delta(snap, :constant_cache_invalidations, CONSTANT_INVALIDATIONS_METRIC, tcount)
+          record_delta(snap, :total_allocated_object, OA_OBJECT_ALLOCATIONS_METRIC, tcount)
+          record_delta(snap, :major_gc_count, OA_MAJOR_GC_METRIC, tcount)
+          record_delta(snap, :minor_gc_count, OA_MINOR_GC_METRIC, tcount)
+          record_delta(snap, :method_cache_invalidations, OA_METHOD_INVALIDATIONS_METRIC, tcount)
+          record_delta(snap, :constant_cache_invalidations, OA_CONSTANT_INVALIDATIONS_METRIC, tcount)
           record_heap_live_metric(snap)
           record_heap_free_metric(snap)
           record_thread_count_metric(snap)

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

@@ -43,22 +43,22 @@ module OneApm
         end
 
         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|
+          OneApm::Manager.agent.stats_engine.tl_record_scoped_and_unscoped_metrics(gc_metric_name, OA_GC_ROLLUP) do |stats|
             stats.call_count           += call_count
             stats.total_call_time      += elapsed
             stats.total_exclusive_time += elapsed
           end
         end
 
-        GC_ROLLUP = 'GC/Transaction/all'.freeze
-        GC_OTHER  = 'GC/Transaction/allOther'.freeze
-        GC_WEB    = 'GC/Transaction/allWeb'.freeze
+        OA_GC_ROLLUP = 'GC/Transaction/all'.freeze
+        OA_GC_OTHER  = 'GC/Transaction/allOther'.freeze
+        OA_GC_WEB    = 'GC/Transaction/allWeb'.freeze
 
         def self.gc_metric_name
           if OneApm::Transaction.recording_web_transaction?
-            GC_WEB
+            OA_GC_WEB
           else
-            GC_OTHER
+            OA_GC_OTHER
           end
         end
 

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

@@ -7,7 +7,7 @@ module OneApm
     class StatsEngine
       # Handles methods related to actual Metric collection
       module MetricStats
-        SCOPE_PLACEHOLDER = '__SCOPE__'.freeze
+        OA_SCOPE_PLACEHOLDER = '__SCOPE__'.freeze
 
         # Update the unscoped metrics given in metric_names.
         # metric_names may be either a single name, or an array of names.

data/lib/one_apm/collector/support/proc_poller.rb

@@ -5,7 +5,7 @@ module OneApm
   module Collector
     class ProcPoller < OneApm::Collector::ShellPoller
 
-      UPTIME_PATH = '/proc/uptime'.freeze
+      OA_UPTIME_PATH = '/proc/uptime'.freeze
 
       def self.enable?
         ::RUBY_PLATFORM.downcase =~ /linux/
@@ -35,7 +35,7 @@ module OneApm
       private
       # in seconds
       def uptime
-        File.read(UPTIME_PATH).split[0].to_f
+        File.read(OA_UPTIME_PATH).split[0].to_f
       end
 
       def proc_status_file

data/lib/one_apm/configuration.rb

@@ -12,7 +12,7 @@ require 'one_apm/configuration/high_security_source'
 module OneApm
   module Configuration
 
-    MASK_DEFAULTS = {
+    OA_MASK_DEFAULTS = {
       :'thread_profiler' =>         Proc.new { !OneApm::Agent::Threading::BacktraceService.is_supported? },
       :'thread_profiler.enabled' => Proc.new { !OneApm::Agent::Threading::BacktraceService.is_supported? }
     }
@@ -236,7 +236,7 @@ module OneApm
       end
 
       def apply_mask(hash)
-        MASK_DEFAULTS. \
+        OA_MASK_DEFAULTS. \
           select {|_, proc| proc.call}. \
           each {|key, _| hash.delete(key) }
         hash

data/lib/one_apm/configuration/default_source.rb

@@ -156,7 +156,7 @@ module OneApm
       end
     end
 
-    AUTOSTART_BLACKLISTED_RAKE_TASKS = [
+    OA_AUTOSTART_BLACKLISTED_RAKE_TASKS = [
       'about',
       'assets:clean',
       'assets:clobber',
@@ -350,7 +350,7 @@ module OneApm
         :description  => 'Defines a comma-delimited list of executables that should not be instrumented by the agent (e.g. \'rake,my_ruby_script.rb\').'
       },
       :'autostart.blacklisted_rake_tasks' => {
-        :default      => AUTOSTART_BLACKLISTED_RAKE_TASKS,
+        :default      => OA_AUTOSTART_BLACKLISTED_RAKE_TASKS,
         :public       => true,
         :type         => String,
         :notified     => false,

data/lib/one_apm/configuration/environment_source.rb

@@ -4,8 +4,8 @@ module OneApm
   module Configuration
     class EnvironmentSource < OneApm::Support::DottedHash
 
-      SUPPORTED_PREFIXES = /^oneapm_/i
-      SPECIAL_CASE_KEYS  = [
+      OA_SUPPORTED_PREFIXES = /^oneapm_/i
+      OA_SPECIAL_CASE_KEYS  = [
         'ONEAPM_ENV', # read by OneApm::Probe::Frameworks::Ruby
         'ONEAPM_LOG'  # read by set_log_file
       ]
@@ -64,7 +64,7 @@ module OneApm
         env_var_keys = collect_one_apm_environment_variable_keys
 
         env_var_keys.each do |key|
-          next if SPECIAL_CASE_KEYS.include?(key.upcase)
+          next if OA_SPECIAL_CASE_KEYS.include?(key.upcase)
           set_value_from_environment_variable(key)
         end
       end
@@ -99,12 +99,12 @@ module OneApm
       end
 
       def convert_environment_key_to_config_key(key)
-        stripped_key = key.gsub(SUPPORTED_PREFIXES, '').downcase.to_sym
+        stripped_key = key.gsub(OA_SUPPORTED_PREFIXES, '').downcase.to_sym
         self.alias_map[stripped_key] || stripped_key
       end
 
       def collect_one_apm_environment_variable_keys
-        ENV.keys.select { |key| key.match(SUPPORTED_PREFIXES) }
+        ENV.keys.select { |key| key.match(OA_SUPPORTED_PREFIXES) }
       end
 
     end

data/lib/one_apm/configuration/high_security_source.rb

@@ -6,11 +6,11 @@ module OneApm
   module Configuration
     class HighSecuritySource < OneApm::Support::DottedHash
 
-      OFF = "off".freeze
-      RAW = "raw".freeze
-      OBFUSCATED = "obfuscated".freeze
+      OA_OFF = "off".freeze
+      OA_RAW = "raw".freeze
+      OA_OBFUSCATED = "obfuscated".freeze
 
-      SET_TO_OBFUSCATED = [RAW, OBFUSCATED]
+      OA_SET_TO_OBFUSCATED = [OA_RAW, OA_OBFUSCATED]
 
       def initialize(local_settings)
         super({
@@ -39,10 +39,10 @@ module OneApm
 
       def record_sql_setting(local_settings, key)
         original_value  = local_settings[key]
-        result = if SET_TO_OBFUSCATED.include?(original_value)
-          OBFUSCATED
+        result = if OA_SET_TO_OBFUSCATED.include?(original_value)
+          OA_OBFUSCATED
         else
-          OFF
+          OA_OFF
         end
 
         if result != original_value

data/lib/one_apm/errors/noticed_error.rb

@@ -10,7 +10,7 @@ class OneApm::NoticedError
   attr_accessor :path, :timestamp, :params, :message, :exception_class_name
   attr_reader   :exception_id, :is_internal
 
-  STRIPPED_EXCEPTION_REPLACEMENT_MESSAGE = "Message removed by OneApm 'strip_exception_messages' setting"
+  OA_STRIPPED_EXCEPTION_REPLACEMENT_MESSAGE = "Message removed by OneApm 'strip_exception_messages' setting"
 
   def initialize(path, data, exception, timestamp = Time.now)
     @exception_id = exception.object_id
@@ -49,7 +49,7 @@ class OneApm::NoticedError
     # replace error message if enabled
     if OneApm::Manager.config[:'strip_exception_messages.enabled'] &&
        !self.class.passes_message_whitelist(exception.class)
-      @message = STRIPPED_EXCEPTION_REPLACEMENT_MESSAGE
+      @message = OA_STRIPPED_EXCEPTION_REPLACEMENT_MESSAGE
     end
 
     @timestamp = timestamp

data/lib/one_apm/inst/dispatcher/puma.rb

@@ -3,10 +3,15 @@
 LibraryDetection.defer do
   named :puma
 
+  def oa_puma_hooks
+    Puma.cli_config.options[:worker_boot] || Puma.cli_config.options[:before_worker_boot]
+  end
+
   depends_on do
     defined?(::Puma) &&
       defined?(::Puma::Const::VERSION) &&
-      ::Puma.respond_to?(:cli_config)
+      ::Puma.respond_to?(:cli_config) && 
+      !oa_puma_hooks.nil?
   end
 
   executes do
@@ -14,9 +19,7 @@ LibraryDetection.defer do
   end
 
   executes do
-    hooks = Puma.cli_config.options[:worker_boot] || Puma.cli_config.options[:before_worker_boot]
-
-    hooks << Proc.new do
+    oa_puma_hooks << Proc.new do
       OneApm::Manager.agent.after_fork(:force_reconnect => true)
     end
   end

data/lib/one_apm/inst/framework/grape.rb

@@ -8,11 +8,11 @@ module OneApm
       module Grape
         extend self
 
-        API_ENDPOINT   = 'api.endpoint'.freeze
-        FORMAT_REGEX   = /\(\/?\.(:format|json)?\)/.freeze
-        VERSION_REGEX  = /:version(\/|$)/.freeze
-        EMPTY_STRING   = ''.freeze
-        MIN_VERSION    = VersionNumber.new('0.2.0')
+        OA_API_ENDPOINT   = 'api.endpoint'.freeze
+        OA_FORMAT_REGEX   = /\(\/?\.(:format|json)?\)/.freeze
+        OA_VERSION_REGEX  = /:version(\/|$)/.freeze
+        OA_EMPTY_STRING   = ''.freeze
+        OA_MIN_VERSION    = VersionNumber.new('0.2.0')
 
         def handle_transaction(endpoint, class_name)
           return unless endpoint && route = endpoint.route
@@ -28,11 +28,11 @@ module OneApm
 
         def name_for_transaction(route, class_name)
           route_path, route_method, route_version = path_method_version_of(route)
-          action_name = route_path.sub(FORMAT_REGEX, EMPTY_STRING)
+          action_name = route_path.sub(OA_FORMAT_REGEX, OA_EMPTY_STRING)
           method_name = route_method
 
           if route_version
-            action_name = action_name.sub(VERSION_REGEX, EMPTY_STRING)
+            action_name = action_name.sub(OA_VERSION_REGEX, OA_EMPTY_STRING)
             "#{class_name}-#{route_version}#{action_name} (#{method_name})"
           else
             "#{class_name}#{action_name} (#{method_name})"
@@ -72,7 +72,7 @@ LibraryDetection.defer do
 
   depends_on do
     defined?(::Grape::VERSION) &&
-      ::OneApm::VersionNumber.new(::Grape::VERSION) >= ::OneApm::Agent::Instrumentation::Grape::MIN_VERSION
+      ::OneApm::VersionNumber.new(::Grape::VERSION) >= ::OneApm::Agent::Instrumentation::Grape::OA_MIN_VERSION
   end
 
   executes do
@@ -87,7 +87,7 @@ LibraryDetection.defer do
           response = call_without_one_apm(env)
         ensure
           begin
-            endpoint = env[::OneApm::Agent::Instrumentation::Grape::API_ENDPOINT]
+            endpoint = env[::OneApm::Agent::Instrumentation::Grape::OA_API_ENDPOINT]
             ::OneApm::Agent::Instrumentation::Grape.handle_transaction(endpoint, self.class.name)
           rescue => e
             OneApm::Manager.logger.warn("Error in Grape instrumentation", e)

data/lib/one_apm/inst/framework/sinatra/transaction_namer.rb

@@ -15,7 +15,7 @@ module OneApm
           end
 
           def initial_transaction_name(request)
-            transaction_name(OneApm::Transaction::UNKNOWN_METRIC, request)
+            transaction_name(OneApm::Transaction::OA_UNKNOWN_METRIC, request)
           end
 
           def transaction_name(route_text, request)
@@ -27,7 +27,7 @@ module OneApm
             name
           rescue => e
             OneApm::Manager.logger.debug("#{e.class} : #{e.message} - Error encountered trying to identify Sinatra transaction name")
-            OneApm::Transaction::UNKNOWN_METRIC
+            OneApm::Transaction::OA_UNKNOWN_METRIC
           end
 
           def http_verb(request)

data/lib/one_apm/inst/http_clients/curb.rb

@@ -3,11 +3,11 @@
 LibraryDetection.defer do
   named :curb
 
-  CURB_MINIMUM_VERSION = ::OneApm::VersionNumber.new("0.8.1")
+  OA_CURB_MINIMUM_VERSION = ::OneApm::VersionNumber.new("0.8.1")
 
   depends_on do
     defined?(::Curl) && defined?(::Curl::CURB_VERSION) &&
-      ::OneApm::VersionNumber.new(::Curl::CURB_VERSION) >= CURB_MINIMUM_VERSION
+      ::OneApm::VersionNumber.new(::Curl::CURB_VERSION) >= OA_CURB_MINIMUM_VERSION
   end
 
   executes do

data/lib/one_apm/inst/http_clients/excon.rb

@@ -7,8 +7,8 @@ LibraryDetection.defer do
   # - For newer versions, use the middleware mechanism Excon exposes
   # - For older versions, monkey-patch Excon::Connection#request
   #
-  # EXCON_MINIMUM_VERSION is the minimum version we attempt to instrument at all.
-  # EXCON_MIDDLEWARE_MINIMUM_VERSION is the min version we use the newer
+  # OA_EXCON_MINIMUM_VERSION is the minimum version we attempt to instrument at all.
+  # OA_EXCON_MIDDLEWARE_MINIMUM_VERSION is the min version we use the newer
   #   instrumentation for.
   #
   # Note that middlewares were added to Excon prior to 0.19, but we don't
@@ -23,8 +23,8 @@ LibraryDetection.defer do
   # so we could safely subscribe and not be clobbered by future subscribers,
   # but alas, it does not yet.
 
-  EXCON_MINIMUM_VERSION = ::OneApm::VersionNumber.new("0.10.1")
-  EXCON_MIDDLEWARE_MINIMUM_VERSION = ::OneApm::VersionNumber.new("0.19.0")
+  OA_EXCON_MINIMUM_VERSION = ::OneApm::VersionNumber.new("0.10.1")
+  OA_EXCON_MIDDLEWARE_MINIMUM_VERSION = ::OneApm::VersionNumber.new("0.19.0")
 
   depends_on do
     defined?(::Excon) && defined?(::Excon::VERSION)
@@ -32,10 +32,10 @@ LibraryDetection.defer do
 
   executes do
     excon_version = OneApm::VersionNumber.new(::Excon::VERSION)
-    if excon_version >= EXCON_MINIMUM_VERSION
+    if excon_version >= OA_EXCON_MINIMUM_VERSION
       install_excon_instrumentation(excon_version)
     else
-      OneApm::Manager.logger.warn("Excon instrumentation requires at least version #{EXCON_MINIMUM_VERSION}")
+      OneApm::Manager.logger.warn("Excon instrumentation requires at least version #{OA_EXCON_MINIMUM_VERSION}")
     end
   end
 
@@ -43,7 +43,7 @@ LibraryDetection.defer do
     require 'one_apm/agent/cross_app/cross_app_tracing'
     require 'one_apm/support/http_clients/excon_wrappers'
 
-    if excon_version >= EXCON_MIDDLEWARE_MINIMUM_VERSION
+    if excon_version >= OA_EXCON_MIDDLEWARE_MINIMUM_VERSION
       install_middleware_excon_instrumentation
     else
       install_legacy_excon_instrumentation