oneapm_rpm 1.3.6 → 1.3.7.rc1

data/lib/one_apm/support/backtrace/backtrace_node.rb

@@ -3,8 +3,8 @@
 module OneApm
   module Agent
     module Threading
-      MAX_THREAD_PROFILE_DEPTH = 500
-      UNKNOWN_LINE_NUMBER = -1
+      OA_MAX_THREAD_PROFILE_DEPTH = 500
+      OA_UNKNOWN_LINE_NUMBER = -1
 
       class BacktraceBase
         attr_reader :children
@@ -51,7 +51,7 @@ module OneApm
 
           depth = 0
           backtrace.reverse_each do |frame|
-            break if depth >= MAX_THREAD_PROFILE_DEPTH
+            break if depth >= OA_MAX_THREAD_PROFILE_DEPTH
 
             existing_node = current.find_child(frame)
             if existing_node
@@ -107,7 +107,7 @@ module OneApm
 
           file, method, line = parse_backtrace_frame(@raw_line)
 
-          @as_array << [string(file), string(method), line ? int(line) : UNKNOWN_LINE_NUMBER]
+          @as_array << [string(file), string(method), line ? int(line) : OA_UNKNOWN_LINE_NUMBER]
           @as_array << int(@runnable_count)
           @as_array << 0
           @as_array << child_arrays

data/lib/one_apm/support/backtrace/backtrace_service.rb

@@ -4,7 +4,7 @@ module OneApm
   module Agent
     module Threading
       class BacktraceService
-        ALL_TRANSACTIONS = "**ALL**".freeze
+        OA_ALL_TRANSACTIONS = "**ALL**".freeze
 
         def self.is_supported?
           RUBY_VERSION >= "1.9.2"
@@ -168,24 +168,24 @@ module OneApm
 
         # This method is expected to be called with @lock held.
         def should_buffer?(bucket)
-          bucket == :request && @profiles.keys.any? { |k| k != ALL_TRANSACTIONS }
+          bucket == :request && @profiles.keys.any? { |k| k != OA_ALL_TRANSACTIONS }
         end
 
         # This method is expected to be called with @lock held.
         def need_backtrace?(bucket)
           (
             bucket != :ignore &&
-            (@profiles[ALL_TRANSACTIONS] || should_buffer?(bucket))
+            (@profiles[OA_ALL_TRANSACTIONS] || should_buffer?(bucket))
           )
         end
 
-        MAX_BUFFER_LENGTH = 500
+        OA_MAX_BUFFER_LENGTH = 500
 
         # This method is expected to be called with @lock held.
         def buffer_backtrace_for_thread(thread, timestamp, backtrace, bucket)
           if should_buffer?(bucket)
             @buffer[thread] ||= []
-            if @buffer[thread].length < MAX_BUFFER_LENGTH
+            if @buffer[thread].length < OA_MAX_BUFFER_LENGTH
               @buffer[thread] << [timestamp, backtrace]
             else
               OneApm::Manager.increment_metric('Supportability/XraySessions/DroppedBacktraces')
@@ -195,8 +195,8 @@ module OneApm
 
         # This method is expected to be called with @lock held.
         def aggregate_global_backtrace(backtrace, bucket, thread)
-          if @profiles[ALL_TRANSACTIONS]
-            @profiles[ALL_TRANSACTIONS].aggregate(backtrace, bucket, thread)
+          if @profiles[OA_ALL_TRANSACTIONS]
+            @profiles[OA_ALL_TRANSACTIONS].aggregate(backtrace, bucket, thread)
           end
         end
 

data/lib/one_apm/support/collection_helper.rb

@@ -4,8 +4,8 @@ require 'one_apm/probe'
 
 module OneApm
   module CollectionHelper
-  DEFAULT_TRUNCATION_SIZE=16 * 1024
-  DEFAULT_ARRAY_TRUNCATION_SIZE=128
+  OA_DEFAULT_TRUNCATION_SIZE=16 * 1024
+  OA_DEFAULT_ARRAY_TRUNCATION_SIZE=128
   # Transform parameter hash into a hash whose values are strictly
   # strings
   def normalize_params(params)
@@ -25,7 +25,7 @@ module OneApm
       when String
         truncate(params)
       when Array
-        params.first(DEFAULT_ARRAY_TRUNCATION_SIZE).map{|item| normalize_params(item)}
+        params.first(OA_DEFAULT_ARRAY_TRUNCATION_SIZE).map{|item| normalize_params(item)}
     else
       truncate(flatten(params))
     end
@@ -60,7 +60,7 @@ module OneApm
       else "#<#{object.class.to_s}>"
     end
   end
-  def truncate(string, len=DEFAULT_TRUNCATION_SIZE)
+  def truncate(string, len=OA_DEFAULT_TRUNCATION_SIZE)
     case string
     when Symbol then string
     when nil then ""

data/lib/one_apm/support/event_buffer/synthetics_event_buffer.rb

@@ -27,11 +27,11 @@ module OneApm
         end
       end
 
-      TIMESTAMP = "timestamp".freeze
+      OA_TIMESTAMP = "timestamp".freeze
 
       def timestamp_for(event)
         main_event, _ = event
-        main_event[TIMESTAMP]
+        main_event[OA_TIMESTAMP]
       end
 
     end

data/lib/one_apm/support/json_marshaller.rb

@@ -6,7 +6,7 @@ module OneApm
   module Support
     class JsonMarshaller < Marshaller
 
-      OK_YAJL_VERSION = OneApm::VersionNumber.new("1.2.1")
+      OA_OK_YAJL_VERSION = OneApm::VersionNumber.new("1.2.1")
 
       def initialize
         OneApm::Manager.logger.info "Using JSON marshaller (#{OneApm::JSONWrapper.backend_name})"
@@ -16,7 +16,7 @@ module OneApm
       def warn_for_yajl
         if defined?(::Yajl)
           require 'yajl/version'
-          if OneApm::VersionNumber.new(::Yajl::VERSION) < OK_YAJL_VERSION
+          if OneApm::VersionNumber.new(::Yajl::VERSION) < OA_OK_YAJL_VERSION
             OneApm::Manager.logger.warn "Detected yajl-ruby version #{::Yajl::VERSION} which can cause segfaults with oneapm_rpm's thread profiling features. We strongly recommend you upgrade to the latest yajl-ruby version available."
           end
         end

data/lib/one_apm/support/method_tracer.rb

@@ -124,7 +124,7 @@ module OneApm
             end
           end
 
-          DEFAULT_SETTINGS = {:push_scope => true, :metric => true, :code_header => "", :code_footer => "" }.freeze
+          OA_DEFAULT_SETTINGS = {:push_scope => true, :metric => true, :code_header => "", :code_footer => "" }.freeze
 
           # Checks the provided options to make sure that they make
           # sense. Raises an error if the options are incorrect to
@@ -135,7 +135,7 @@ module OneApm
               raise TypeError.new("Error adding method tracer to #{method_name}: provided options must be a Hash")
             end
             check_for_illegal_keys!(method_name, options)
-            options = DEFAULT_SETTINGS.merge(options)
+            options = OA_DEFAULT_SETTINGS.merge(options)
             check_for_push_scope_and_metric(options)
             options
           end

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

@@ -4,7 +4,7 @@ module OneApm
   module Support
     module MethodTracer
       module Helpers
-        MAX_ALLOWED_METRIC_DURATION = 1_000_000_000 # roughly 31 years
+        OA_MAX_ALLOWED_METRIC_DURATION = 1_000_000_000 # roughly 31 years
 
         extend self
 
@@ -47,7 +47,7 @@ module OneApm
             duration = t1 - t0
             exclusive = duration - frame.children_time
 
-            if duration >= MAX_ALLOWED_METRIC_DURATION
+            if duration >= OA_MAX_ALLOWED_METRIC_DURATION
               OneApm::Manager.logger.log_once(:warn, "too_huge_metric:#{first_name}",
                 "Ignoring metric #{first_name} with unacceptably large duration: #{duration} s")
               return

data/lib/one_apm/support/obfuscator.rb

@@ -8,13 +8,13 @@ module OneApm
 
       attr_reader :key_bytes
 
-      EMPTY_KEY_BYTES = [0]
-      PACK_FORMAT = 'm'
+      OA_EMPTY_KEY_BYTES = [0]
+      OA_PACK_FORMAT = 'm'
 
       # RUM uses a shortened key, so just trim it up front
       def initialize(key, length=nil)
         if key.nil? || key.empty?
-          @key_bytes = EMPTY_KEY_BYTES
+          @key_bytes = OA_EMPTY_KEY_BYTES
         else
           @key_bytes = key.bytes.to_a
           @key_bytes = @key_bytes.first(length) if length
@@ -22,11 +22,11 @@ module OneApm
       end
 
       def obfuscate(text)
-        [ encode(text) ].pack(PACK_FORMAT).gsub(/\n/, '')
+        [ encode(text) ].pack(OA_PACK_FORMAT).gsub(/\n/, '')
       end
 
       def deobfuscate(text)
-        encode(text.unpack(PACK_FORMAT).first )
+        encode(text.unpack(OA_PACK_FORMAT).first )
       end
 
       def encode(text)

data/lib/one_apm/support/rules_engine.rb

@@ -7,8 +7,8 @@ require 'one_apm/support/rules_engine/segment_terms_rule'
 module OneApm
   module Support
     class RulesEngine
-      SEGMENT_SEPARATOR = '/'.freeze
-      LEADING_SLASH_REGEX = %r{^/}.freeze
+      OA_SEGMENT_SEPARATOR = '/'.freeze
+      OA_LEADING_SLASH_REGEX = %r{^/}.freeze
 
       include Enumerable
       extend Forwardable

data/lib/one_apm/support/rules_engine/replacement_rule.rb

@@ -36,7 +36,7 @@ module OneApm
 
         def matches?(string)
           if @each_segment
-            string.split(SEGMENT_SEPARATOR).any? do |segment|
+            string.split(OA_SEGMENT_SEPARATOR).any? do |segment|
               segment.match(@match_expression)
             end
           else
@@ -61,14 +61,14 @@ module OneApm
 
         def apply_to_each_segment(string)
           string        = string.dup
-          leading_slash = string.slice!(LEADING_SLASH_REGEX)
-          segments      = string.split(SEGMENT_SEPARATOR)
+          leading_slash = string.slice!(OA_LEADING_SLASH_REGEX)
+          segments      = string.split(OA_SEGMENT_SEPARATOR)
 
           segments.map! do |segment|
             apply_replacement(segment)
           end
 
-          "#{leading_slash}#{segments.join(SEGMENT_SEPARATOR)}"
+          "#{leading_slash}#{segments.join(OA_SEGMENT_SEPARATOR)}"
         end
 
         def <=>(other)

data/lib/one_apm/support/rules_engine/segment_terms_rule.rb

@@ -4,9 +4,9 @@ module OneApm
   module Support
     class RulesEngine
       class SegmentTermsRule
-        SEGMENT_PLACEHOLDER               = '*'.freeze
-        ADJACENT_PLACEHOLDERS_REGEX       = %r{((?:^|/)\*)(?:/\*)*}.freeze
-        ADJACENT_PLACEHOLDERS_REPLACEMENT = '\1'.freeze
+        OA_SEGMENT_PLACEHOLDER               = '*'.freeze
+        OA_ADJACENT_PLACEHOLDERS_REGEX       = %r{((?:^|/)\*)(?:/\*)*}.freeze
+        OA_ADJACENT_PLACEHOLDERS_REPLACEMENT = '\1'.freeze
 
         attr_reader :prefix, :terms
 
@@ -26,18 +26,18 @@ module OneApm
 
         def apply(string)
           rest          = string[@trim_range]
-          leading_slash = rest.slice!(LEADING_SLASH_REGEX)
+          leading_slash = rest.slice!(OA_LEADING_SLASH_REGEX)
 
-          segments = rest.split(SEGMENT_SEPARATOR)
-          segments.map! { |s| @terms.include?(s) ? s : SEGMENT_PLACEHOLDER }
+          segments = rest.split(OA_SEGMENT_SEPARATOR)
+          segments.map! { |s| @terms.include?(s) ? s : OA_SEGMENT_PLACEHOLDER }
           transformed_suffix = collapse_adjacent_placeholder_segments(segments)
 
           "#{@prefix}#{leading_slash}#{transformed_suffix}"
         end
 
         def collapse_adjacent_placeholder_segments(segments)
-          joined = segments.join(SEGMENT_SEPARATOR)
-          joined.gsub!(ADJACENT_PLACEHOLDERS_REGEX, ADJACENT_PLACEHOLDERS_REPLACEMENT)
+          joined = segments.join(OA_SEGMENT_SEPARATOR)
+          joined.gsub!(OA_ADJACENT_PLACEHOLDERS_REGEX, OA_ADJACENT_PLACEHOLDERS_REPLACEMENT)
           joined
         end
       end

data/lib/one_apm/support/supported_versions.rb

@@ -2,26 +2,24 @@
 
 module OneApm
   module Agent
-    SUPPORTED_VERSIONS =
+    OA_SUPPORTED_VERSIONS =
     {
       # Rubies
       :mri =>
       {
         :type        => :ruby,
         :name        => "MRI",
-        :supported   => ["1.8.7", "1.9.2", "1.9.3", "2.0.0", "~> 2.1.0", "~> 2.2.0" ],
+        :supported   => ["1.8.7", "1.9.2", "1.9.3", "2.0.0", "~>2.1.0", "~>2.2.0", "~>2.3.0" ],
         :deprecated  => ["1.8.6"],
         :url         => "https://www.ruby-lang.org",
         :feed        => "https://www.ruby-lang.org/en/feeds/news.rss",
-        :notes       => [
-          "1.8.7 includes support for Ruby Enterprise Edition (REE)",
-          "Last supported agent on 1.8.6 was 3.6.8.168"]
+        :notes       => ["1.8.7 includes support for Ruby Enterprise Edition (REE)"]
       },
       :jruby =>
       {
         :type        => :ruby,
         :name        => "JRuby",
-        :supported   => ["~> 1.6.0", "~> 1.7.0"],
+        :supported   => ["~>1.6.0", "~>1.7.0"],
         :url         => "http://jruby.org",
         :feed        => "http://jruby.org/atom.xml"
       },
@@ -29,7 +27,7 @@ module OneApm
       {
         :type        => :ruby,
         :name        => "Rubinius",
-        :supported   => ["~> 2.2.1"],
+        :supported   => ["~>2.2.1"],
         :url         => "http://rubini.us",
         :feed        => "http://rubini.us/feed/atom.xml"
       },
@@ -83,11 +81,10 @@ module OneApm
       :rails =>
       {
         :type        => :web,
-        :supported   => ["~>2.1.0", "~>2.2.0", "~>2.3.0", "~3.0.0", "~>3.1.0", "~>3.2.0", "~>4.0.0", "~>4.1.0", "~>4.2.0"],
-        :deprecated  => ["~>2.0.0"],
+        :supported   => ["~3.0.0", "~>3.1.0", "~>3.2.0", "~>4.0.0", "~>4.1.0", "~>4.2.0", "~>5.0.0"],
+        :deprecated  => ["~>2.3.0"],
         :url         => "https://rubygems.org/gems/rails",
-        :feed        => "https://rubygems.org/gems/rails/versions.atom",
-        :notes       => ["Last supported agent for 2.0.x was 3.6.8.168"]
+        :feed        => "https://rubygems.org/gems/rails/versions.atom"
       },
       :sinatra =>
       {
@@ -126,8 +123,7 @@ module OneApm
         :supported   => ["~>2.1.0", "~>2.2.0", "~>2.3.0", "~3.0.0", "~>3.1.0", "~>3.2.0", "~>4.0.0"],
         :deprecated  => ["~>2.0.0"],
         :url         => "https://rubygems.org/gems/activerecord",
-        :feed        => "https://rubygems.org/gems/activerecord/versions.atom",
-        :notes       => ["Last supported agent for 2.0.x was 3.6.8.168"]
+        :feed        => "https://rubygems.org/gems/activerecord/versions.atom"
       },
       :datamapper =>
       {

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

@@ -78,7 +78,7 @@ module OneApm
           Rubinius::Metrics.data[key]
         end
 
-        SUPPORTED_KEYS_GC_RBX_METRICS = [
+        OA_SUPPORTED_KEYS_GC_RBX_METRICS = [
           :gc_runs,
           :heap_live,
           :major_gc_count,

data/lib/one_apm/transaction.rb

@@ -92,21 +92,21 @@ module OneApm
 
       if @has_children
         name = Transaction.nested_transaction_name(outermost_frame.name)
-        trace_options = TRACE_OPTIONS_SCOPED
+        trace_options = OA_TRACE_OPTIONS_SCOPED
       else
         name = @frozen_name
-        trace_options = TRACE_OPTIONS_UNSCOPED
+        trace_options = OA_TRACE_OPTIONS_UNSCOPED
       end
 
-      trace_options = TRACE_IGNORE_OPTIONS if ignore_frame?(outermost_frame.name)
+      trace_options = OA_TRACE_IGNORE_OPTIONS if ignore_frame?(outermost_frame.name)
         
       # These metrics are recorded here instead of in record_summary_metrics
       # in order to capture the exclusive time associated with the outer-most
       # TT node.
       if needs_middleware_summary_metrics?(name)
-        summary_metrics_with_exclusive_time = MIDDLEWARE_SUMMARY_METRICS
+        summary_metrics_with_exclusive_time = OA_MIDDLEWARE_SUMMARY_METRICS
       else
-        summary_metrics_with_exclusive_time = EMPTY_SUMMARY_METRICS
+        summary_metrics_with_exclusive_time = OA_EMPTY_SUMMARY_METRICS
       end
 
       OneApm::Support::MethodTracer::Helpers.trace_execution_scoped_footer(
@@ -194,7 +194,7 @@ module OneApm
         apdex_bucket_global = apdex_bucket(total_duration)
         apdex_bucket_txn    = apdex_bucket(action_duration)
 
-        @metrics.record_unscoped(APDEX_METRIC, apdex_bucket_global, apdex_t)
+        @metrics.record_unscoped(OA_APDEX_METRIC, apdex_bucket_global, apdex_t)
         txn_apdex_metric = @frozen_name.gsub(/^[^\/]+\//, 'Apdex/')
         @metrics.record_unscoped(txn_apdex_metric, apdex_bucket_txn, apdex_t)
       end
@@ -203,8 +203,8 @@ module OneApm
     def record_queue_time
       value = queue_time
       if value > 0.0
-        if value < OneApm::Support::MethodTracer::Helpers::MAX_ALLOWED_METRIC_DURATION
-          @metrics.record_unscoped(QUEUE_TIME_METRIC, value)
+        if value < OneApm::Support::MethodTracer::Helpers::OA_MAX_ALLOWED_METRIC_DURATION
+          @metrics.record_unscoped(OA_QUEUE_TIME_METRIC, value)
         else
           OneApm::Manager.logger.log_once(:warn, :too_high_queue_time, "Not recording unreasonably large queue time of #{value} s")
         end

data/lib/one_apm/transaction/class_methods.rb

@@ -30,7 +30,7 @@ module OneApm
       def stop(state, end_time=Time.now)
         txn = state.current_transaction
         if txn.nil?
-          OneApm::Manager.logger.error(Transaction::FAILED_TO_STOP_MESSAGE)
+          OneApm::Manager.logger.error(Transaction::OA_FAILED_TO_STOP_MESSAGE)
           return
         end
 
@@ -42,14 +42,14 @@ module OneApm
         else
           nested_name = nested_transaction_name(nested_frame.name)
 
-          if nested_name.start_with?(Transaction::MIDDLEWARE_PREFIX)
-            summary_metrics = Transaction::MIDDLEWARE_SUMMARY_METRICS
+          if nested_name.start_with?(Transaction::OA_MIDDLEWARE_PREFIX)
+            summary_metrics = Transaction::OA_MIDDLEWARE_SUMMARY_METRICS
           else
-            summary_metrics = Transaction::EMPTY_SUMMARY_METRICS
+            summary_metrics = Transaction::OA_EMPTY_SUMMARY_METRICS
           end
 
-          options = Transaction::NESTED_TRACE_STOP_OPTIONS
-          options = Transaction::TRACE_IGNORE_OPTIONS  if txn.ignore_frame?(nested_name)
+          options = Transaction::OA_NESTED_TRACE_STOP_OPTIONS
+          options = Transaction::OA_TRACE_IGNORE_OPTIONS  if txn.ignore_frame?(nested_name)
 
           OneApm::Support::MethodTracer::Helpers.trace_execution_scoped_footer(
             state,
@@ -81,8 +81,8 @@ module OneApm
       end
 
       def nested_transaction_name(name)
-        if name.start_with?(Transaction::WEB_TRANSACTION_PREFIX) || name.start_with?(Transaction::OTHER_TRANSACTION_PREFIX)
-          "#{Transaction::SUBTRANSACTION_PREFIX}#{name}"
+        if name.start_with?(Transaction::OA_WEB_TRANSACTION_PREFIX) || name.start_with?(Transaction::OA_OTHER_TRANSACTION_PREFIX)
+          "#{Transaction::OA_SUBTRANSACTION_PREFIX}#{name}"
         else
           name
         end

data/lib/one_apm/transaction/instance_helpers.rb

@@ -21,7 +21,7 @@ module OneApm
       end
 
       def web_category?(category)
-        Transaction::WEB_TRANSACTION_CATEGORIES.include?(category)
+        Transaction::OA_WEB_TRANSACTION_CATEGORIES.include?(category)
       end
 
       def similar_category?(category)