transaction.rb in oneapm_rpm-1.3.7.rc1

- old
+ new

@@ -90,25 +90,25 @@
       freeze_name_and_execute_if_not_ignored
       ignore! if user_defined_rules_ignore?
 
       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(
         state,
         start_time.to_f,
@@ -192,20 +192,20 @@
         total_duration  = end_time - apdex_start
 
         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
     end
 
     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
       end
     end