oneapm_rpm 1.3.6 → 1.3.7.rc1

data/lib/one_apm/agent/datastore/mongo/obfuscator.rb

@@ -6,9 +6,9 @@ module OneApm
       module Mongo
         module Obfuscator
 
-          WHITELIST = [:operation].freeze
+          OA_WHITELIST = [:operation].freeze
 
-          def self.obfuscate_statement(source, whitelist=WHITELIST)
+          def self.obfuscate_statement(source, whitelist=OA_WHITELIST)
             obfuscated = {}
             source.each do |key, value|
               if whitelist.include?(key)

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

@@ -8,7 +8,7 @@ module OneApm
       module Mongo
         module StatementFormatter
 
-          PLAINTEXT_KEYS = [
+          OA_PLAINTEXT_KEYS = [
             :database,
             :collection,
             :operation,
@@ -18,7 +18,7 @@ module OneApm
             :order
           ]
 
-          OBFUSCATE_KEYS = [
+          OA_OBFUSCATE_KEYS = [
             :selector
           ]
 
@@ -27,11 +27,11 @@ module OneApm
 
             result = { :operation => operation }
 
-            PLAINTEXT_KEYS.each do |key|
+            OA_PLAINTEXT_KEYS.each do |key|
               result[key] = statement[key] if statement.key?(key)
             end
 
-            OBFUSCATE_KEYS.each do |key|
+            OA_OBFUSCATE_KEYS.each do |key|
               if statement.key?(key) && statement[key]
                 obfuscated = obfuscate(statement[key])
                 result[key] = obfuscated if obfuscated

data/lib/one_apm/agent/javascript_instrumentor.rb

@@ -9,7 +9,7 @@ module OneApm
     class JavascriptInstrumentor
       include OneApm::Coerce
 
-      RUM_KEY_LENGTH = 13
+      OA_RUM_KEY_LENGTH = 13
 
       def initialize(event_listener)
         event_listener.subscribe(:finished_configuring, &method(:log_configuration))
@@ -30,7 +30,7 @@ module OneApm
       end
 
       def obfuscator
-        @obfuscator ||= OneApm::Agent::Obfuscator.new(OneApm::Manager.config[:license_key], RUM_KEY_LENGTH)
+        @obfuscator ||= OneApm::Agent::Obfuscator.new(OneApm::Manager.config[:license_key], OA_RUM_KEY_LENGTH)
       end
 
       def js_enabled_and_ready?
@@ -121,30 +121,30 @@ module OneApm
         ''
       end
 
-      BEACON_KEY           = "beacon".freeze
-      ERROR_BEACON_KEY     = "errorBeacon".freeze
-      LICENSE_KEY_KEY      = "licenseKey".freeze
-      APPLICATIONID_KEY    = "applicationID".freeze
-      TRANSACTION_NAME_KEY = "transactionName".freeze
-      QUEUE_TIME_KEY       = "queueTime".freeze
-      APPLICATION_TIME_KEY = "applicationTime".freeze
-      AGENT_KEY            = "agent".freeze
-      USER_ATTRIBUTES_KEY  = "userAttributes".freeze
-      SSL_FOR_HTTP_KEY     = "sslForHttp".freeze
+      OA_BEACON_KEY           = "beacon".freeze
+      OA_ERROR_BEACON_KEY     = "errorBeacon".freeze
+      OA_LICENSE_KEY_KEY      = "licenseKey".freeze
+      OA_APPLICATIONID_KEY    = "applicationID".freeze
+      OA_TRANSACTION_NAME_KEY = "transactionName".freeze
+      OA_QUEUE_TIME_KEY       = "queueTime".freeze
+      OA_APPLICATION_TIME_KEY = "applicationTime".freeze
+      OA_AGENT_KEY            = "agent".freeze
+      OA_USER_ATTRIBUTES_KEY  = "userAttributes".freeze
+      OA_SSL_FOR_HTTP_KEY     = "sslForHttp".freeze
 
       # NOTE: Internal prototyping may override this, so leave name stable!
       def data_for_js_agent(state)
         timings = state.timings
 
         data = {
-          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::Manager.config[:js_agent_file]
+          OA_BEACON_KEY           => OneApm::Manager.config[:beacon],
+          OA_ERROR_BEACON_KEY     => OneApm::Manager.config[:error_beacon],
+          OA_LICENSE_KEY_KEY      => OneApm::Manager.config[:browser_key],
+          OA_APPLICATIONID_KEY    => OneApm::Manager.config[:application_id],
+          OA_TRANSACTION_NAME_KEY => obfuscator.obfuscate(timings.transaction_name_or_unknown),
+          OA_QUEUE_TIME_KEY       => timings.queue_time_in_millis,
+          OA_APPLICATION_TIME_KEY => timings.app_time_in_millis,
+          OA_AGENT_KEY            => OneApm::Manager.config[:js_agent_file]
         }
 
         add_ssl_for_http(data)
@@ -156,7 +156,7 @@ module OneApm
       def add_ssl_for_http(data)
         ssl_for_http = OneApm::Manager.config[:'browser_monitoring.ssl_for_http']
         unless ssl_for_http.nil?
-          data[SSL_FOR_HTTP_KEY] = ssl_for_http
+          data[OA_SSL_FOR_HTTP_KEY] = ssl_for_http
         end
       end
 
@@ -165,7 +165,7 @@ module OneApm
 
         params = event_params(txn.custom_parameters)
         json = OneApm::JSONWrapper.dump(params)
-        data[USER_ATTRIBUTES_KEY] = obfuscator.obfuscate(json)
+        data[OA_USER_ATTRIBUTES_KEY] = obfuscator.obfuscate(json)
       end
 
       def include_custom_parameters?(txn)

data/lib/one_apm/agent/synthetics_monitor.rb

@@ -5,20 +5,20 @@ require 'one_apm/agent/inbound_request_monitor'
 module OneApm
   module Agent
     class SyntheticsMonitor < InboundRequestMonitor
-      SYNTHETICS_HEADER_KEY  = 'HTTP_X_ONEAPM_SYNTHETICS'.freeze
+      OA_SYNTHETICS_HEADER_KEY  = 'HTTP_X_ONEAPM_SYNTHETICS'.freeze
 
-      SUPPORTED_VERSION = 1
-      EXPECTED_PAYLOAD_LENGTH = 5
+      OA_SUPPORTED_VERSION = 1
+      OA_EXPECTED_PAYLOAD_LENGTH = 5
 
       def on_finished_configuring(events)
         events.subscribe(:before_call, &method(:on_before_call))
       end
 
       def on_before_call(request)
-        encoded_header = request[SYNTHETICS_HEADER_KEY]
+        encoded_header = request[OA_SYNTHETICS_HEADER_KEY]
         return unless encoded_header
 
-        incoming_payload = deserialize_header(encoded_header, SYNTHETICS_HEADER_KEY)
+        incoming_payload = deserialize_header(encoded_header, OA_SYNTHETICS_HEADER_KEY)
 
         return unless incoming_payload &&
             is_valid_payload?(incoming_payload) &&
@@ -32,7 +32,7 @@ module OneApm
       end
 
       def is_supported_version?(incoming_payload)
-        incoming_payload.first == SUPPORTED_VERSION
+        incoming_payload.first == OA_SUPPORTED_VERSION
       end
 
       def is_trusted?(incoming_payload)
@@ -41,7 +41,7 @@ module OneApm
       end
 
       def is_valid_payload?(incoming_payload)
-        incoming_payload.length == EXPECTED_PAYLOAD_LENGTH
+        incoming_payload.length == OA_EXPECTED_PAYLOAD_LENGTH
       end
     end
   end

data/lib/one_apm/agent/threading/thread_profile.rb

@@ -106,12 +106,12 @@ module OneApm
           end
         end
 
-        THREAD_PROFILER_NODES = 20_000
+        OA_THREAD_PROFILER_NODES = 20_000
 
         include OneApm::Coerce
 
         def generate_traces
-          convert_N_trace_nodes_to_arrays(THREAD_PROFILER_NODES)
+          convert_N_trace_nodes_to_arrays(OA_THREAD_PROFILER_NODES)
 
           {
             "OTHER"      => @traces[:other     ].as_array,

data/lib/one_apm/collector/collector/http_connection.rb

@@ -5,7 +5,7 @@ module OneApm
 
         # These include Errno connection errors, and all indicate that the
         # underlying TCP connection may be in a bad state.
-        CONNECTION_ERRORS = [Timeout::Error, EOFError, SystemCallError, SocketError].freeze
+        OA_CONNECTION_ERRORS = [Timeout::Error, EOFError, SystemCallError, SocketError].freeze
 
         def invoke_remote(method, payload = [], options = {})
           start_ts = Time.now
@@ -40,7 +40,7 @@ module OneApm
         # The path on the server that we should post our data to
         def remote_method_uri(method, format)
           params = {'run_id' => @agent_id, 'marshal_format' => format}
-          uri = "/tpm/agent.do?PROTOCOL_VERSION=#{PROTOCOL_VERSION}&license_key=#{@license_key}&method=#{method}"
+          uri = "/tpm/agent.do?PROTOCOL_VERSION=#{OA_PROTOCOL_VERSION}&license_key=#{@license_key}&method=#{method}"
           uri << '&' + params.map do |k,v|
             next unless v
             "#{k}=#{v}"
@@ -75,7 +75,7 @@ module OneApm
             OneApm::TimerLib.timeout(@request_timeout) do
               response = conn.request(request)
             end
-          rescue *CONNECTION_ERRORS => e
+          rescue *OA_CONNECTION_ERRORS => e
             close_shared_connection
             if attempts < max_attempts
               OneApm::Manager.logger.debug("Retrying request to #{opts[:collector]}#{opts[:uri]} after #{e}")
@@ -98,7 +98,7 @@ module OneApm
             else
               session_without_keepalive(&block)
             end
-          rescue *CONNECTION_ERRORS => e
+          rescue *OA_CONNECTION_ERRORS => e
             elapsed = Time.now - t0
             raise OneApm::ServerConnectionException, "Recoverable error connecting to #{@collector} after #{elapsed} seconds: #{e}"
           ensure

data/lib/one_apm/collector/collector_service.rb

@@ -16,7 +16,7 @@ module OneApm
       include OneApm::Collector::CollectorService::ServerMethods
       include OneApm::Collector::CollectorService::HttpConnection
 
-      PROTOCOL_VERSION = 1
+      OA_PROTOCOL_VERSION = 1
 
       attr_accessor :request_timeout, :agent_id
       attr_reader :collector,:marshaller, :metric_id_cache

data/lib/one_apm/collector/commands/thread_profiler_session.rb

@@ -29,7 +29,7 @@ module OneApm
         def start(agent_command)
           OneApm::Manager.logger.debug("Starting Thread Profiler.")
           profile = @backtrace_service.subscribe(
-            OneApm::Agent::Threading::BacktraceService::ALL_TRANSACTIONS,
+            OneApm::Agent::Threading::BacktraceService::OA_ALL_TRANSACTIONS,
             agent_command.arguments
           )
 
@@ -40,8 +40,8 @@ module OneApm
         def stop(report_data)
           return unless running?
           OneApm::Manager.logger.debug("Stopping Thread Profiler.")
-          @finished_profile = @backtrace_service.harvest(OneApm::Agent::Threading::BacktraceService::ALL_TRANSACTIONS)
-          @backtrace_service.unsubscribe(OneApm::Agent::Threading::BacktraceService::ALL_TRANSACTIONS)
+          @finished_profile = @backtrace_service.harvest(OneApm::Agent::Threading::BacktraceService::OA_ALL_TRANSACTIONS)
+          @backtrace_service.unsubscribe(OneApm::Agent::Threading::BacktraceService::OA_ALL_TRANSACTIONS)
           @finished_profile = nil if !report_data
         end
 
@@ -59,7 +59,7 @@ module OneApm
         end
 
         def running?
-          @backtrace_service.subscribed?(OneApm::Agent::Threading::BacktraceService::ALL_TRANSACTIONS)
+          @backtrace_service.subscribed?(OneApm::Agent::Threading::BacktraceService::OA_ALL_TRANSACTIONS)
         end
 
         def ready_to_harvest?

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

@@ -126,15 +126,15 @@ module OneApm
         end
       end
 
-      SUCCESS_RESULT = {}.freeze
-      ERROR_KEY = "error"
+      OA_SUCCESS_RESULT = {}.freeze
+      OA_ERROR_KEY = "error"
 
       def success
-        SUCCESS_RESULT
+        OA_SUCCESS_RESULT
       end
 
       def error(err)
-        { ERROR_KEY => err.message }
+        { OA_ERROR_KEY => err.message }
       end
 
       def call_handler_for(agent_command)

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

@@ -7,22 +7,22 @@ module OneApm
     class CustomEventAggregator
       include OneApm::Coerce
 
-      TYPE             = 'type'.freeze
-      TIMESTAMP        = 'timestamp'.freeze
-      EVENT_PARAMS_CTX = 'recording custom event'.freeze
-      EVENT_TYPE_REGEX = /^[a-zA-Z0-9:_ ]+$/.freeze
+      OA_TYPE             = 'type'.freeze
+      OA_TIMESTAMP        = 'timestamp'.freeze
+      OA_EVENT_PARAMS_CTX = 'recording custom event'.freeze
+      OA_EVENT_TYPE_REGEX = /^[a-zA-Z0-9:_ ]+$/.freeze
 
-      DEFAULT_CAPACITY_KEY = :'custom_insights_events.max_samples_stored'
+      OA_DEFAULT_CAPACITY_KEY = :'custom_insights_events.max_samples_stored'
 
       def initialize
         @lock         = Mutex.new
-        @buffer       = OneApm::Agent::SampledBuffer.new(OneApm::Manager.config[DEFAULT_CAPACITY_KEY])
+        @buffer       = OneApm::Agent::SampledBuffer.new(OneApm::Manager.config[OA_DEFAULT_CAPACITY_KEY])
         @type_strings = Hash.new { |hash, key| hash[key] = key.to_s.freeze }
         register_config_callbacks
       end
 
       def register_config_callbacks
-        OneApm::Manager.config.register_callback(DEFAULT_CAPACITY_KEY) do |max_samples|
+        OneApm::Manager.config.register_callback(OA_DEFAULT_CAPACITY_KEY) do |max_samples|
           OneApm::Manager.logger.debug "CustomEventAggregator max_samples set to #{max_samples}"
           @lock.synchronize do
             @buffer.capacity = max_samples
@@ -32,14 +32,14 @@ module OneApm
 
       def record(type, attributes)
         type = @type_strings[type]
-        unless type =~ EVENT_TYPE_REGEX
+        unless type =~ OA_EVENT_TYPE_REGEX
           note_dropped_event(type)
           return false
         end
 
         event = [
-          { TYPE => type, TIMESTAMP => Time.now.to_i },
-          event_params(attributes, EVENT_PARAMS_CTX)
+          { OA_TYPE => type, OA_TIMESTAMP => Time.now.to_i },
+          event_params(attributes, OA_EVENT_PARAMS_CTX)
         ]
 
         stored = @lock.synchronize do

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

@@ -13,7 +13,7 @@ module OneApm
       # Maximum possible length of the queue - defaults to 20, may be
       # made configurable in the future. This is a tradeoff between
       # memory and data retention
-      MAX_ERROR_QUEUE_LENGTH = 20 unless defined? MAX_ERROR_QUEUE_LENGTH
+      OA_MAX_ERROR_QUEUE_LENGTH = 20 unless defined? OA_MAX_ERROR_QUEUE_LENGTH
 
       attr_accessor :errors
 
@@ -122,7 +122,7 @@ module OneApm
         end
 
         def blamed_metric_name(txn, options)
-          if options[:metric] && options[:metric] != OneApm::Transaction::UNKNOWN_METRIC
+          if options[:metric] && options[:metric] != OneApm::Transaction::OA_UNKNOWN_METRIC
             "Errors/#{options[:metric]}"
           else
             "Errors/#{txn.best_name}" if txn
@@ -247,8 +247,8 @@ module OneApm
         # checks the size of the error queue to make sure we are under
         # the maximum limit, and logs a warning if we are over the limit.
         def over_queue_limit?(message)
-          over_limit = (@errors.reject{|err| err.is_internal}.length >= MAX_ERROR_QUEUE_LENGTH)
-          OneApm::Manager.logger.warn("The error reporting queue has reached #{MAX_ERROR_QUEUE_LENGTH}. The error detail for this and subsequent errors will not be transmitted to OneApm until the queued errors have been sent: #{message}") if over_limit
+          over_limit = (@errors.reject{|err| err.is_internal}.length >= OA_MAX_ERROR_QUEUE_LENGTH)
+          OneApm::Manager.logger.warn("The error reporting queue has reached #{OA_MAX_ERROR_QUEUE_LENGTH}. The error detail for this and subsequent errors will not be transmitted to OneApm until the queued errors have been sent: #{message}") if over_limit
           over_limit
         end
 

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

@@ -34,7 +34,7 @@ module OneApm
       # this is for unit tests only
       attr_reader :sql_traces
 
-      MAX_SAMPLES = 10
+      OA_MAX_SAMPLES = 10
 
       def initialize
         @sql_traces = {}
@@ -119,7 +119,7 @@ module OneApm
 
       # this should always be called under the @samples_lock
       def has_room?
-        @sql_traces.size < MAX_SAMPLES
+        @sql_traces.size < OA_MAX_SAMPLES
       end
 
       # this should always be called under the @samples_lock

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

@@ -6,24 +6,24 @@ class OneApm::Collector::TransactionEventAggregator
   include OneApm::Coerce, MonitorMixin
 
   # The type field of the sample
-  SAMPLE_TYPE                    = 'Transaction'.freeze
+  OA_SAMPLE_TYPE                    = 'Transaction'.freeze
 
   # Strings for static keys of the sample structure
-  TYPE_KEY                       = 'type'.freeze
-  TIMESTAMP_KEY                  = 'timestamp'.freeze
-  NAME_KEY                       = 'name'.freeze
-  DURATION_KEY                   = 'duration'.freeze
-  HTTP_RESPONSE_CODE_KEY         = 'httpResponseCode'.freeze
-  GUID_KEY                       = 'bw.guid'.freeze
-  REFERRING_TRANSACTION_GUID_KEY = 'bw.referringTransactionGuid'.freeze
-  CAT_TRIP_ID_KEY                = 'bw.tripId'.freeze
-  CAT_PATH_HASH_KEY              = 'bw.pathHash'.freeze
-  CAT_REFERRING_PATH_HASH_KEY    = 'bw.referringPathHash'.freeze
-  CAT_ALTERNATE_PATH_HASHES_KEY  = 'bw.alternatePathHashes'.freeze
-  APDEX_PERF_ZONE_KEY            = 'bw.apdexPerfZone'.freeze
-  SYNTHETICS_RESOURCE_ID_KEY     = "bw.syntheticsResourceId".freeze
-  SYNTHETICS_JOB_ID_KEY          = "bw.syntheticsJobId".freeze
-  SYNTHETICS_MONITOR_ID_KEY      = "bw.syntheticsMonitorId".freeze
+  OA_TYPE_KEY                       = 'type'.freeze
+  OA_TIMESTAMP_KEY                  = 'timestamp'.freeze
+  OA_NAME_KEY                       = 'name'.freeze
+  OA_DURATION_KEY                   = 'duration'.freeze
+  OA_HTTP_RESPONSE_CODE_KEY         = 'httpResponseCode'.freeze
+  OA_GUID_KEY                       = 'bw.guid'.freeze
+  OA_REFERRING_TRANSACTION_GUID_KEY = 'bw.referringTransactionGuid'.freeze
+  OA_CAT_TRIP_ID_KEY                = 'bw.tripId'.freeze
+  OA_CAT_PATH_HASH_KEY              = 'bw.pathHash'.freeze
+  OA_CAT_REFERRING_PATH_HASH_KEY    = 'bw.referringPathHash'.freeze
+  OA_CAT_ALTERNATE_PATH_HASHES_KEY  = 'bw.alternatePathHashes'.freeze
+  OA_APDEX_PERF_ZONE_KEY            = 'bw.apdexPerfZone'.freeze
+  OA_SYNTHETICS_RESOURCE_ID_KEY     = "bw.syntheticsResourceId".freeze
+  OA_SYNTHETICS_JOB_ID_KEY          = "bw.syntheticsJobId".freeze
+  OA_SYNTHETICS_MONITOR_ID_KEY      = "bw.syntheticsMonitorId".freeze
 
   def initialize(event_listener)
     super()
@@ -141,7 +141,7 @@ class OneApm::Collector::TransactionEventAggregator
   def append_event(event)
     main_event, _ = event
 
-    if main_event.include?(SYNTHETICS_RESOURCE_ID_KEY)
+    if main_event.include?(OA_SYNTHETICS_RESOURCE_ID_KEY)
       # Try adding to synthetics buffer. If anything is rejected, give it a
       # shot in the main transaction events (where it may get sampled)
       result, rejected = @synthetics_samples.append_with_reject(event)
@@ -157,13 +157,13 @@ class OneApm::Collector::TransactionEventAggregator
   def self.map_metric(metric_name, to_add={})
     to_add.values.each(&:freeze)
 
-    mappings = OVERVIEW_SPECS.fetch(metric_name, {})
+    mappings = OA_OVERVIEW_SPECS.fetch(metric_name, {})
     mappings.merge!(to_add)
 
-    OVERVIEW_SPECS[metric_name] = mappings
+    OA_OVERVIEW_SPECS[metric_name] = mappings
   end
 
-  OVERVIEW_SPECS = {}
+  OA_OVERVIEW_SPECS = {}
 
   # All Transactions
   # Don't need to use the transaction-type specific metrics since this is
@@ -187,7 +187,7 @@ class OneApm::Collector::TransactionEventAggregator
 
   def append_metrics(txn_metrics, sample)
     if txn_metrics
-      OVERVIEW_SPECS.each do |(name, extracted_values)|
+      OA_OVERVIEW_SPECS.each do |(name, extracted_values)|
         if txn_metrics.has_key?(name)
           stat = txn_metrics[name]
           extracted_values.each do |value_name, key_name|
@@ -200,21 +200,21 @@ class OneApm::Collector::TransactionEventAggregator
 
   def create_main_event(payload)
     sample = {
-      TIMESTAMP_KEY => float(payload[:start_timestamp]),
-      NAME_KEY      => string(payload[:name]),
-      DURATION_KEY  => float(payload[:duration]),
-      TYPE_KEY      => SAMPLE_TYPE,
+      OA_TIMESTAMP_KEY => float(payload[:start_timestamp]),
+      OA_NAME_KEY      => string(payload[:name]),
+      OA_DURATION_KEY  => float(payload[:duration]),
+      OA_TYPE_KEY      => OA_SAMPLE_TYPE,
     }
     append_metrics(payload[:metrics], sample)
-    optionally_append(GUID_KEY,                       :guid, sample, payload)
-    optionally_append(REFERRING_TRANSACTION_GUID_KEY, :referring_transaction_guid, sample, payload)
-    optionally_append(CAT_TRIP_ID_KEY,                :cat_trip_id, sample, payload)
-    optionally_append(CAT_PATH_HASH_KEY,              :cat_path_hash, sample, payload)
-    optionally_append(CAT_REFERRING_PATH_HASH_KEY,    :cat_referring_path_hash, sample, payload)
-    optionally_append(APDEX_PERF_ZONE_KEY,            :apdex_perf_zone, sample, payload)
-    optionally_append(SYNTHETICS_RESOURCE_ID_KEY,     :synthetics_resource_id, sample, payload)
-    optionally_append(SYNTHETICS_JOB_ID_KEY,          :synthetics_job_id, sample, payload)
-    optionally_append(SYNTHETICS_MONITOR_ID_KEY,      :synthetics_monitor_id, sample, payload)
+    optionally_append(OA_GUID_KEY,                       :guid, sample, payload)
+    optionally_append(OA_REFERRING_TRANSACTION_GUID_KEY, :referring_transaction_guid, sample, payload)
+    optionally_append(OA_CAT_TRIP_ID_KEY,                :cat_trip_id, sample, payload)
+    optionally_append(OA_CAT_PATH_HASH_KEY,              :cat_path_hash, sample, payload)
+    optionally_append(OA_CAT_REFERRING_PATH_HASH_KEY,    :cat_referring_path_hash, sample, payload)
+    optionally_append(OA_APDEX_PERF_ZONE_KEY,            :apdex_perf_zone, sample, payload)
+    optionally_append(OA_SYNTHETICS_RESOURCE_ID_KEY,     :synthetics_resource_id, sample, payload)
+    optionally_append(OA_SYNTHETICS_JOB_ID_KEY,          :synthetics_job_id, sample, payload)
+    optionally_append(OA_SYNTHETICS_MONITOR_ID_KEY,      :synthetics_monitor_id, sample, payload)
     append_http_response_code(sample, payload)
     append_cat_alternate_path_hashes(sample, payload)
     sample
@@ -222,13 +222,13 @@ class OneApm::Collector::TransactionEventAggregator
 
   def append_http_response_code(sample, payload)
     unless OneApm::Manager.config[:disable_rack_middleware]
-      optionally_append(HTTP_RESPONSE_CODE_KEY, :http_response_code, sample, payload)
+      optionally_append(OA_HTTP_RESPONSE_CODE_KEY, :http_response_code, sample, payload)
     end
   end
 
   def append_cat_alternate_path_hashes(sample, payload)
     if payload.include?(:cat_alternate_path_hashes)
-      sample[CAT_ALTERNATE_PATH_HASHES_KEY] = payload[:cat_alternate_path_hashes].sort.join(',')
+      sample[OA_CAT_ALTERNATE_PATH_HASHES_KEY] = payload[:cat_alternate_path_hashes].sort.join(',')
     end
   end