oneapm_rpm 1.3.6 → 1.3.7.rc1

data/lib/one_apm/transaction/metric_constants.rb

@@ -3,43 +3,43 @@
 module OneApm
   class Transaction
 
-    SUBTRANSACTION_PREFIX        = 'Nested/'.freeze
-    CONTROLLER_PREFIX            = 'Controller/'.freeze
-    MIDDLEWARE_PREFIX            = 'Middleware/Rack/'.freeze
-    TASK_PREFIX                  = 'OtherTransaction/Background/'.freeze
-    RACK_PREFIX                  = 'WebTransaction/Rack/'.freeze
-    SINATRA_PREFIX               = 'WebTransaction/Sinatra/'.freeze
-    GRAPE_PREFIX                 = 'WebTransaction/Grape/'.freeze
-    OTHER_TRANSACTION_PREFIX     = 'OtherTransaction/'.freeze
-    WEB_TRANSACTION_PREFIX       = 'WebTransaction/'.freeze
+    OA_SUBTRANSACTION_PREFIX        = 'Nested/'.freeze
+    OA_CONTROLLER_PREFIX            = 'Controller/'.freeze
+    OA_MIDDLEWARE_PREFIX            = 'Middleware/Rack/'.freeze
+    OA_TASK_PREFIX                  = 'OtherTransaction/Background/'.freeze
+    OA_RACK_PREFIX                  = 'WebTransaction/Rack/'.freeze
+    OA_SINATRA_PREFIX               = 'WebTransaction/Sinatra/'.freeze
+    OA_GRAPE_PREFIX                 = 'WebTransaction/Grape/'.freeze
+    OA_OTHER_TRANSACTION_PREFIX     = 'OtherTransaction/'.freeze
+    OA_WEB_TRANSACTION_PREFIX       = 'WebTransaction/'.freeze  
 
-    CONTROLLER_MIDDLEWARE_PREFIX = 'Controller/Middleware/Rack'.freeze
+    OA_CONTROLLER_OA_MIDDLEWARE_PREFIX = 'Controller/Middleware/Rack'.freeze
 
-    WEB_SUMMARY_METRIC   = 'WebTransaction'.freeze
-    OTHER_SUMMARY_METRIC = 'OtherTransaction/all'.freeze
+    OA_WEB_SUMMARY_METRIC   = 'WebTransaction'.freeze
+    OA_OTHER_SUMMARY_METRIC = 'OtherTransaction/all'.freeze
 
-    APDEX_S = 'S'.freeze
-    APDEX_T = 'T'.freeze
-    APDEX_F = 'F'.freeze
-    APDEX_METRIC = 'Apdex'.freeze
+    OA_APDEX_S = 'S'.freeze
+    OA_APDEX_T = 'T'.freeze
+    OA_APDEX_F = 'F'.freeze
+    OA_APDEX_METRIC = 'Apdex'.freeze
 
-    QUEUE_TIME_METRIC = 'WebFrontend/QueueTime'.freeze
+    OA_QUEUE_TIME_METRIC = 'WebFrontend/QueueTime'.freeze
 
-    NESTED_TRACE_STOP_OPTIONS    = { :metric => true }.freeze
-    WEB_TRANSACTION_CATEGORIES   = [:controller, :uri, :rack, :sinatra, :grape, :middleware].freeze
-    TRANSACTION_NAMING_SOURCES   = [:child, :api].freeze
+    OA_NESTED_TRACE_STOP_OPTIONS    = { :metric => true }.freeze
+    OA_WEB_TRANSACTION_CATEGORIES   = [:controller, :uri, :rack, :sinatra, :grape, :middleware].freeze
+    OA_TRANSACTION_NAMING_SOURCES   = [:child, :api].freeze
 
-    MIDDLEWARE_SUMMARY_METRICS   = ['Middleware/all'.freeze].freeze
-    EMPTY_SUMMARY_METRICS        = [].freeze
+    OA_MIDDLEWARE_SUMMARY_METRICS   = ['Middleware/all'.freeze].freeze
+    OA_EMPTY_SUMMARY_METRICS        = [].freeze
 
-    TRACE_OPTIONS_SCOPED         = {:metric => true, :scoped_metric => true}.freeze
-    TRACE_OPTIONS_UNSCOPED       = {:metric => true, :scoped_metric => false}.freeze
+    OA_TRACE_OPTIONS_SCOPED         = {:metric => true, :scoped_metric => true}.freeze
+    OA_TRACE_OPTIONS_UNSCOPED       = {:metric => true, :scoped_metric => false}.freeze
     
-    TRACE_IGNORE_OPTIONS         = {:metric => false}.freeze
+    OA_TRACE_IGNORE_OPTIONS         = {:metric => false}.freeze
     
-    UNKNOWN_METRIC = '(unknown)'.freeze
+    OA_UNKNOWN_METRIC = '(unknown)'.freeze
 
-    FAILED_TO_STOP_MESSAGE = "Failed during Transaction.stop because there is no current transaction"
+    OA_FAILED_TO_STOP_MESSAGE = "Failed during Transaction.stop because there is no current transaction"
 
   end
 end

data/lib/one_apm/transaction/sample_buffer/developer_mode_sample_buffer.rb

@@ -6,7 +6,7 @@ module OneApm
   class Transaction
     class DeveloperModeSampleBuffer < TransactionSampleBuffer
 
-      CAPACITY = 100
+      OA_CAPACITY = 100
 
       def capacity
         max_capacity
@@ -15,11 +15,11 @@ module OneApm
       # Dev mode is allowed more than the typical upper limit.
       # Sidestep normal cap by overriding max_capacity.
       def max_capacity
-        CAPACITY
+        OA_CAPACITY
       end
 
       def harvest_samples
-        NO_SAMPLES
+        OA_NO_SAMPLES
       end
 
       def enabled?

data/lib/one_apm/transaction/sample_buffer/force_persist_sample_buffer.rb

@@ -6,10 +6,10 @@ module OneApm
   class Transaction
     class ForcePersistSampleBuffer < TransactionSampleBuffer
 
-      CAPACITY = 10
+      OA_CAPACITY = 10
 
       def capacity
-        CAPACITY
+        OA_CAPACITY
       end
 
       def allow_sample?(sample)

data/lib/one_apm/transaction/sample_buffer/slowest_sample_buffer.rb

@@ -6,10 +6,10 @@ module OneApm
   class Transaction
     class SlowestSampleBuffer < TransactionSampleBuffer
 
-      CAPACITY = 1
+      OA_CAPACITY = 1
 
       def capacity
-        CAPACITY
+        OA_CAPACITY
       end
 
       def allow_sample?(sample)

data/lib/one_apm/transaction/sample_buffer/transaction_sample_buffer.rb

@@ -5,8 +5,8 @@ module OneApm
     class TransactionSampleBuffer
       attr_reader :samples
 
-      SINGLE_BUFFER_MAX = 20
-      NO_SAMPLES = [].freeze
+      OA_SINGLE_BUFFER_MAX = 20
+      OA_NO_SAMPLES = [].freeze
 
       def initialize
         @samples = []
@@ -68,7 +68,7 @@ module OneApm
       # A typical buffer should NOT override this method (although we do for
       # odd things like dev-mode)
       def max_capacity
-        capacity > SINGLE_BUFFER_MAX ? SINGLE_BUFFER_MAX : capacity
+        capacity > OA_SINGLE_BUFFER_MAX ? OA_SINGLE_BUFFER_MAX : capacity
       end
 
       # Our default truncation strategy is to keep max_capacity

data/lib/one_apm/transaction/segment.rb

@@ -15,11 +15,11 @@ module OneApm
 
       attr_accessor :metric_name
 
-      UNKNOWN_SEGMENT_NAME = '<unknown>'.freeze
+      OA_UNKNOWN_SEGMENT_NAME = '<unknown>'.freeze
 
       def initialize(timestamp, metric_name, segment_id=nil)
         @entry_timestamp = timestamp
-        @metric_name     = metric_name || UNKNOWN_SEGMENT_NAME
+        @metric_name     = metric_name || OA_UNKNOWN_SEGMENT_NAME
         @segment_id      = segment_id  || object_id
       end
 

data/lib/one_apm/transaction/transaction_finish_append.rb

@@ -31,9 +31,9 @@ module OneApm
 
         bucket = apdex_bucket(duration)
         bucket_str = case bucket
-        when :apdex_s then Transaction::APDEX_S
-        when :apdex_t then Transaction::APDEX_T
-        when :apdex_f then Transaction::APDEX_F
+        when :apdex_s then Transaction::OA_APDEX_S
+        when :apdex_t then Transaction::OA_APDEX_T
+        when :apdex_f then Transaction::OA_APDEX_F
         else nil
         end
         payload[:apdex_perf_zone] = bucket_str if bucket_str

data/lib/one_apm/transaction/transaction_jruby_functions.rb

@@ -15,7 +15,7 @@ module OneApm
       end
     end
 
-    JRUBY_CPU_TIME_ERROR = "Error calculating JRuby CPU Time".freeze
+    OA_JRUBY_CPU_TIME_ERROR = "Error calculating JRuby CPU Time".freeze
 
     def jruby_cpu_time
       return nil unless @@java_classes_loaded
@@ -26,8 +26,8 @@ module OneApm
 
       -1 == java_utime ? 0.0 : java_utime/1e9
     rescue => e
-      OneApm::Manager.logger.log_once(:warn, :jruby_cpu_time, JRUBY_CPU_TIME_ERROR, e)
-      OneApm::Manager.logger.debug(JRUBY_CPU_TIME_ERROR, e)
+      OneApm::Manager.logger.log_once(:warn, :jruby_cpu_time, OA_JRUBY_CPU_TIME_ERROR, e)
+      OneApm::Manager.logger.debug(OA_JRUBY_CPU_TIME_ERROR, e)
       nil
     end
 

data/lib/one_apm/transaction/transaction_name.rb

@@ -56,7 +56,7 @@ module OneApm
 
       def best_name
         @frozen_name  || @overridden_name ||
-          @default_name || Transaction::UNKNOWN_METRIC
+          @default_name || Transaction::OA_UNKNOWN_METRIC
       end
 
       def name_set?
@@ -64,8 +64,8 @@ module OneApm
       end
 
       def promoted_transaction_name(name)
-        if name.start_with?(Transaction::MIDDLEWARE_PREFIX)
-          "#{Transaction::WEB_TRANSACTION_PREFIX}#{name}"
+        if name.start_with?(Transaction::OA_MIDDLEWARE_PREFIX)
+          "#{Transaction::OA_WEB_TRANSACTION_PREFIX}#{name}"
         else
           name
         end

data/lib/one_apm/transaction/transaction_namer.rb

@@ -8,13 +8,13 @@ module OneApm
     def self.prefix_for_category(txn, category = nil)
       category ||= (txn && txn.category)
       case category
-      when :controller then ::OneApm::Transaction::WEB_TRANSACTION_PREFIX
-      when :task       then ::OneApm::Transaction::TASK_PREFIX
-      when :rack       then ::OneApm::Transaction::RACK_PREFIX
-      when :uri        then ::OneApm::Transaction::WEB_TRANSACTION_PREFIX
-      when :sinatra    then ::OneApm::Transaction::SINATRA_PREFIX
-      when :middleware then ::OneApm::Transaction::MIDDLEWARE_PREFIX
-      when :grape      then ::OneApm::Transaction::GRAPE_PREFIX
+      when :controller then ::OneApm::Transaction::OA_WEB_TRANSACTION_PREFIX
+      when :task       then ::OneApm::Transaction::OA_TASK_PREFIX
+      when :rack       then ::OneApm::Transaction::OA_RACK_PREFIX
+      when :uri        then ::OneApm::Transaction::OA_WEB_TRANSACTION_PREFIX
+      when :sinatra    then ::OneApm::Transaction::OA_SINATRA_PREFIX
+      when :middleware then ::OneApm::Transaction::OA_MIDDLEWARE_PREFIX
+      when :grape      then ::OneApm::Transaction::OA_GRAPE_PREFIX
       else "#{category.to_s}/" # for internal use only
       end
     end

data/lib/one_apm/transaction/transaction_sample_builder.rb

@@ -115,15 +115,15 @@ module OneApm
       @current_segment = nil
     end
 
-    TT_THRESHOLD_KEY = :'transaction_tracer.transaction_threshold'
+    OA_TT_THRESHOLD_KEY = :'transaction_tracer.transaction_threshold'
 
     def transaction_trace_threshold
       state = TransactionState.tl_get
-      source_class = OneApm::Manager.config.source(TT_THRESHOLD_KEY).class
+      source_class = OneApm::Manager.config.source(OA_TT_THRESHOLD_KEY).class
       if source_class == Configuration::DefaultSource && state.current_transaction
         state.current_transaction.apdex_t * 4
       else
-        OneApm::Manager.config[TT_THRESHOLD_KEY]
+        OneApm::Manager.config[OA_TT_THRESHOLD_KEY]
       end
     end
 

data/lib/one_apm/transaction/transaction_summary.rb

@@ -4,8 +4,8 @@ module OneApm
   class Transaction
 
     def summary_metrics
-      if @frozen_name.start_with?(WEB_TRANSACTION_PREFIX)
-        [WEB_SUMMARY_METRIC]
+      if @frozen_name.start_with?(OA_WEB_TRANSACTION_PREFIX)
+        [OA_WEB_SUMMARY_METRIC]
       else
         background_summary_metrics
       end
@@ -14,14 +14,14 @@ module OneApm
     def background_summary_metrics
       segments = @frozen_name.split('/')
       if segments.size > 2
-        ["OtherTransaction/#{segments[1]}/all", OTHER_SUMMARY_METRIC]
+        ["OtherTransaction/#{segments[1]}/all", OA_OTHER_SUMMARY_METRIC]
       else
         []
       end
     end
 
     def needs_middleware_summary_metrics?(name)
-      name.start_with?(MIDDLEWARE_PREFIX)
+      name.start_with?(OA_MIDDLEWARE_PREFIX)
     end
 
   end

data/lib/one_apm/transaction/transaction_timings.rb

@@ -16,7 +16,7 @@ module OneApm
     end
 
     def transaction_name_or_unknown
-      transaction_name || OneApm::Transaction::UNKNOWN_METRIC
+      transaction_name || OneApm::Transaction::OA_UNKNOWN_METRIC
     end
 
     def start_time_as_time

data/lib/one_apm/version.rb

@@ -5,9 +5,10 @@ module OneApm
 
     MAJOR = 1
     MINOR = 3
-    TINY  = 6
+    TINY  = 7
+    TAG   = 'rc1'
 
-    STRING = [MAJOR, MINOR, TINY].compact.join('.')
+    STRING = [MAJOR, MINOR, TINY, TAG].compact.join('.')
 
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oneapm_rpm
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.3.7.rc1
 platform: ruby
 authors:
 - oneapm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-13 00:00:00.000000000 Z
+date: 2016-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -429,6 +429,7 @@ files:
 - lib/one_apm/rack/developer_mode/views/oneapm/slide.tmpl
 - lib/one_apm/rack/developer_mode/views/oneapm/threads.html.erb
 - lib/one_apm/rack/middleware_base.rb
+- lib/one_apm/rack/middleware_helper.rb
 - lib/one_apm/rack/middleware_hooks.rb
 - lib/one_apm/rack/middleware_tracing.rb
 - lib/one_apm/rack/middleware_wrapper.rb