oneapm_rpm 1.3.6 → 1.3.7.rc1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTExMGZiZWY1OWJhYjhkMDA3OGU5ZGYzODg2OTdjNDhjMTUzOTVjZA==
+    MmM5MDg1YzYyMWM0ZGNiZTdiNzY2OTBhYmZmNDIzODIwOGExNGVjNg==
   data.tar.gz: !binary |-
-    ODM2MDJmYTM0ZWQ3NDZkMWE1YTA1ZDQ1MGJhMDU2Mjk2MDc1NmMyYg==
+    NTY4ZjZhNzI3MWIwYmNhMDJhNTg1MDVhMTk2MzgzMWU2ODM5ZjQzMg==
 SHA512:
   metadata.gz: !binary |-
-    MDg1ZmFhMDA5YjcyYjQzYTFhZmQzN2RhNGFhM2E0ZjIxOWM4ZTFmYTY0ZDUw
-    N2QzYmRhOTk1ZDhhNmNmMjM0MzA4Y2Y3MGE2NzcyYTFhMmE2ZThiMTRlM2Fk
-    OTEwMDdkYmRkOGI2OGY0ZDFjODlhY2RmMTc5NjQxNzE2ZmIyZTg=
+    OTBjMTIxZTlkZTMzODM4YjdlNzgxMWM4MjY3ZGFlNzM2YjM3MTJkYjFiNDhl
+    NjBkNWZlMzA0NGQzZDZhMGRmNjVlZTQxMDg1NzRmMmM0YjRlOWU5MTc0ZTEw
+    OWMyZmZmZjViNjQ5OTg3YmNmZTExOTIzYTYxNTMwM2M3ZjdkNDg=
   data.tar.gz: !binary |-
-    ODkxOGFjYmMyZjZlOTczYjdiODFmNDhjZDRkMzYxMjA0Mzc3ZDRmY2I4NjNm
-    YmQxYjZmODMwNDNiZjE0OThlZmJiNjQ3NTgxMDY5YTcwMDkxMDk3MTYyZjIw
-    NjBhMTczNWU3NjU2MDI3YzM2NmZjNjg5M2VjODhiZDFmN2ZiMjQ=
+    NjJkYWQzZDNiMjczMTVjMGJhMjgzMzAzMzFhN2MyNWNkNjIyZWJiMDg0OTM2
+    N2ZkYzgxMjRhNzkxYTQ2NDE3MjNhNjEwYWU2YTA0Y2IzYWUyNjFhZWQ1MWYy
+    YTAyMmJhZmY0M2MxZDIyMGZmYzU5MWY5YmRmNmQ3NzQ4NmFjM2Y=

data/lib/one_apm/agent/agent/start_worker_thread.rb

@@ -5,9 +5,9 @@ module OneApm
     class Agent
       module StartWorkerThread
 
-        MIN_ALLOWED_REPORT_PERIOD = 1.0
-        UTILIZATION_REPORT_PERIOD = 30 * 60
-        LOG_ONCE_KEYS_RESET_PERIOD = 60.0
+        OA_MIN_ALLOWED_REPORT_PERIOD = 1.0
+        OA_UTILIZATION_REPORT_PERIOD = 30 * 60
+        OA_LOG_ONCE_KEYS_RESET_PERIOD = 60.0
 
         def start_worker_thread(connection_options = {})
           if disable = OneApm::Manager.config[:disable_harvest_thread]
@@ -44,14 +44,14 @@ module OneApm
 
           @event_loop.fire_every(Manager.config[:data_report_period],       :report_data)
           @event_loop.fire_every(report_period_for(:analytic_event_data), :report_event_data)
-          @event_loop.fire_every(LOG_ONCE_KEYS_RESET_PERIOD,              :reset_log_once_keys)
+          @event_loop.fire_every(OA_LOG_ONCE_KEYS_RESET_PERIOD,              :reset_log_once_keys)
           @event_loop.fire_every(Manager.config[:data_report_period],       :detect_config)
 
           if OneApm::Manager.config[:collect_utilization] && !in_resque_child_process?
             @event_loop.on(:report_utilization_data) { transmit_utilization_data }
 
             @event_loop.fire(:report_utilization_data)
-            @event_loop.fire_every(UTILIZATION_REPORT_PERIOD, :report_utilization_data)
+            @event_loop.fire_every(OA_UTILIZATION_REPORT_PERIOD, :report_utilization_data)
           end
 
           @event_loop.run
@@ -68,9 +68,9 @@ module OneApm
             period = OneApm::Manager.config[:data_report_period]
             OneApm::Manager.logger.warn("Could not find configured period for #{method}, falling back to data_report_period (#{period} s)")
           end
-          if period < MIN_ALLOWED_REPORT_PERIOD
-            OneApm::Manager.logger.warn("Configured #{config_key} was #{period}, but minimum allowed is #{MIN_ALLOWED_REPORT_PERIOD}, using #{MIN_ALLOWED_REPORT_PERIOD}.")
-            period = MIN_ALLOWED_REPORT_PERIOD
+          if period < OA_MIN_ALLOWED_REPORT_PERIOD
+            OneApm::Manager.logger.warn("Configured #{config_key} was #{period}, but minimum allowed is #{OA_MIN_ALLOWED_REPORT_PERIOD}, using #{OA_MIN_ALLOWED_REPORT_PERIOD}.")
+            period = OA_MIN_ALLOWED_REPORT_PERIOD
           end
           period
         end

data/lib/one_apm/agent/cross_app/cross_app_monitor.rb

@@ -16,7 +16,7 @@ module OneApm
 
       ONEAPM_ID_HEADER_KEY      = 'HTTP_X_ONEAPM_ID'.freeze
       ONEAPM_TXN_HEADER_KEY     = 'HTTP_X_ONEAPM_TRANSACTION'.freeze
-      CONTENT_LENGTH_HEADER_KEY = 'HTTP_CONTENT_LENGTH'.freeze
+      OA_CONTENT_LENGTH_HEADER_KEY = 'HTTP_CONTENT_LENGTH'.freeze
 
       def on_finished_configuring(events)
         register_event_listeners(events)
@@ -163,7 +163,7 @@ module OneApm
       end
 
       def content_length_from_request(request)
-        request[CONTENT_LENGTH_HEADER_KEY] || -1
+        request[OA_CONTENT_LENGTH_HEADER_KEY] || -1
       end
 
       def hash_transaction_name(identifier)

data/lib/one_apm/agent/cross_app/cross_app_tracing.rb

@@ -20,7 +20,7 @@ module OneApm
       OA_SYNTHETICS_HEADER = 'X-OneApm-Synthetics'
 
       # The index of the transaction GUID in the appdata header of responses
-      APPDATA_TXN_GUID_INDEX = 5
+      OA_APPDATA_TXN_GUID_INDEX = 5
 
 
       ###############
@@ -200,7 +200,7 @@ module OneApm
       def add_cat_transaction_trace_parameters( response )
         appdata = extract_appdata( response )
         transaction_sampler.add_segment_parameters( \
-          :transaction_guid => appdata[APPDATA_TXN_GUID_INDEX] )
+          :transaction_guid => appdata[OA_APPDATA_TXN_GUID_INDEX] )
       end
 
 

data/lib/one_apm/agent/database.rb

@@ -6,7 +6,7 @@ require 'one_apm/agent/database/obfuscator'
 require 'one_apm/agent/database/postgres_explain_obfuscator'
 
 module OneApm
-  MYSQL_EXPLAIN_COLUMNS = [
+  OA_MYSQL_EXPLAIN_COLUMNS = [
                            "Id",
                            "Select Type",
                            "Table",
@@ -21,7 +21,7 @@ module OneApm
 
   module Agent
     module Database
-      MAX_QUERY_LENGTH = 16384
+      OA_MAX_QUERY_LENGTH = 16384
 
       extend self
 
@@ -30,8 +30,8 @@ module OneApm
       end
 
       def truncate_query(query)
-        if query.length > (MAX_QUERY_LENGTH - 4)
-          query[0..MAX_QUERY_LENGTH - 4] + '...'
+        if query.length > (OA_MAX_QUERY_LENGTH - 4)
+          query[0..OA_MAX_QUERY_LENGTH - 4] + '...'
         else
           query
         end
@@ -60,10 +60,10 @@ module OneApm
         end
       end
 
-      RECORD_FOR = [:raw, :obfuscated].freeze
+      OA_RECORD_FOR = [:raw, :obfuscated].freeze
 
       def should_record_sql?(config_section=:transaction_tracer)
-        RECORD_FOR.include?(record_sql_method(config_section))
+        OA_RECORD_FOR.include?(record_sql_method(config_section))
       end
 
       def should_collect_explain_plans?(config_section=:transaction_tracer)
@@ -94,7 +94,7 @@ module OneApm
         return explain_plan || []
       end
 
-      SUPPORTED_ADAPTERS_FOR_EXPLAIN = %w[postgres postgresql mysql2 mysql sqlite].freeze
+      OA_SUPPORTED_ADAPTERS_FOR_EXPLAIN = %w[postgres postgresql mysql2 mysql sqlite].freeze
 
       def explain_statement(statement, config, &explainer)
         return unless is_select?(statement)
@@ -110,7 +110,7 @@ module OneApm
         end
 
         adapter = adapter_from_config(config)
-        if !SUPPORTED_ADAPTERS_FOR_EXPLAIN.include?(adapter)
+        if !OA_SUPPORTED_ADAPTERS_FOR_EXPLAIN.include?(adapter)
           OneApm::Manager.logger.debug("Not collecting explain plan because an unknown connection adapter ('#{adapter}') was used.")
           return
         end
@@ -136,14 +136,14 @@ module OneApm
         end
       end
 
-      QUERY_PLAN = 'QUERY PLAN'.freeze
+      OA_QUERY_PLAN = 'QUERY PLAN'.freeze
 
       def process_explain_results_postgres(results)
         if results.is_a?(String)
           query_plan_string = results
         else
           lines = []
-          results.each { |row| lines << row[QUERY_PLAN] }
+          results.each { |row| lines << row[OA_QUERY_PLAN] }
           query_plan_string = lines.join("\n")
         end
 
@@ -152,7 +152,7 @@ module OneApm
         end
         values = query_plan_string.split("\n").map { |line| [line] }
 
-        [[QUERY_PLAN], values]
+        [[OA_QUERY_PLAN], values]
       end
 
       def string_explain_plan_results(results)
@@ -185,11 +185,11 @@ module OneApm
         [headers, values]
       end
 
-      SQLITE_EXPLAIN_COLUMNS = %w[addr opcode p1 p2 p3 p4 p5 comment]
+      OA_SQLITE_EXPLAIN_COLUMNS = %w[addr opcode p1 p2 p3 p4 p5 comment]
 
       def process_explain_results_sqlite(results)
         return string_explain_plan_results(results) if results.is_a?(String)
-        headers = SQLITE_EXPLAIN_COLUMNS
+        headers = OA_SQLITE_EXPLAIN_COLUMNS
         values  = []
         results.each do |row|
           values << headers.map { |h| row[h] }
@@ -210,7 +210,7 @@ module OneApm
         end
       end
 
-      KNOWN_OPERATIONS = [
+      OA_KNOWN_OPERATIONS = [
         'alter',
         'select',
         'update',
@@ -224,13 +224,13 @@ module OneApm
         'call'
       ]
 
-      SQL_COMMENT_REGEX = Regexp.new('/\*.*?\*/', Regexp::MULTILINE).freeze
+      OA_SQL_COMMENT_REGEX = Regexp.new('/\*.*?\*/', Regexp::MULTILINE).freeze
 
       def parse_operation_from_query(sql)
-        sql = sql.gsub(SQL_COMMENT_REGEX, '')
+        sql = sql.gsub(OA_SQL_COMMENT_REGEX, '')
         if sql =~ /(\w+)/
           op = $1.downcase
-          return op if KNOWN_OPERATIONS.include?(op)
+          return op if OA_KNOWN_OPERATIONS.include?(op)
         end
       end
 

data/lib/one_apm/agent/database/obfuscation_helpers.rb

@@ -19,56 +19,56 @@ module OneApm
         # Reversing the query string before obfuscation allows us to get around
         # the fact that a \' appearing within a string may or may not terminate
         # the string, because we know that a string cannot *start* with a \'.
-        REVERSE_SINGLE_QUOTES_REGEX = /'(?:''|'\\|[^'])*'/
-        REVERSE_ANY_QUOTES_REGEX    = /'(?:''|'\\|[^'])*'|"(?:""|"\\|[^"])*"/
+        OA_REVERSE_SINGLE_QUOTES_REGEX = /'(?:''|'\\|[^'])*'/
+        OA_REVERSE_ANY_QUOTES_REGEX    = /'(?:''|'\\|[^'])*'|"(?:""|"\\|[^"])*"/
 
-        NUMERICS_REGEX = /\b\d+\b/
+        OA_NUMERICS_REGEX = /\b\d+\b/
 
         # We take a conservative, overly-aggressive approach to obfuscating
         # comments, and drop everything from the query after encountering any
         # character sequence that could be a comment initiator. We do this after
         # removal of string literals to avoid accidentally over-obfuscating when
         # a string literal contains a comment initiator.
-        SQL_COMMENT_REGEX = Regexp.new('(?:/\*|--|#).*', Regexp::MULTILINE).freeze
+        OA_SQL_COMMENT_REGEX = Regexp.new('(?:/\*|--|#).*', Regexp::MULTILINE).freeze
 
         # We use these to check whether the query contains any quote characters
         # after obfuscation. If so, that's a good indication that the original
         # query was malformed, and so our obfuscation can't reliabily find
         # literals. In such a case, we'll replace the entire query with a
         # placeholder.
-        LITERAL_SINGLE_QUOTE = "'".freeze
-        LITERAL_DOUBLE_QUOTE = '"'.freeze
+        OA_LITERAL_SINGLE_QUOTE = "'".freeze
+        OA_LITERAL_DOUBLE_QUOTE = '"'.freeze
 
-        PLACEHOLDER = '?'.freeze
+        OA_PLACEHOLDER = '?'.freeze
 
         def obfuscate_single_quote_literals(sql)
           obfuscated = sql.reverse
-          obfuscated.gsub!(REVERSE_SINGLE_QUOTES_REGEX, PLACEHOLDER)
+          obfuscated.gsub!(OA_REVERSE_SINGLE_QUOTES_REGEX, OA_PLACEHOLDER)
           obfuscated.reverse!
           obfuscated
         end
 
         def obfuscate_quoted_literals(sql)
           obfuscated = sql.reverse
-          obfuscated.gsub!(REVERSE_ANY_QUOTES_REGEX, PLACEHOLDER)
+          obfuscated.gsub!(OA_REVERSE_ANY_QUOTES_REGEX, OA_PLACEHOLDER)
           obfuscated.reverse!
           obfuscated
         end
 
         def obfuscate_numeric_literals(sql)
-          sql.gsub(NUMERICS_REGEX, PLACEHOLDER)
+          sql.gsub(OA_NUMERICS_REGEX, OA_PLACEHOLDER)
         end
 
         def remove_comments(sql)
-          sql.gsub(SQL_COMMENT_REGEX, PLACEHOLDER)
+          sql.gsub(OA_SQL_COMMENT_REGEX, OA_PLACEHOLDER)
         end
 
         def contains_single_quotes?(str)
-          str.include?(LITERAL_SINGLE_QUOTE)
+          str.include?(OA_LITERAL_SINGLE_QUOTE)
         end
 
         def contains_quotes?(str)
-          str.include?(LITERAL_SINGLE_QUOTE) || str.include?(LITERAL_DOUBLE_QUOTE)
+          str.include?(OA_LITERAL_SINGLE_QUOTE) || str.include?(OA_LITERAL_DOUBLE_QUOTE)
         end
       end
     end

data/lib/one_apm/agent/database/obfuscator.rb

@@ -11,8 +11,8 @@ module OneApm
 
         attr_reader :obfuscator
 
-        QUERY_TOO_LARGE_MESSAGE     = "Query too large (over 16k characters) to safely obfuscate"
-        FAILED_TO_OBFUSCATE_MESSAGE = "Failed to obfuscate SQL query - quote characters remained after obfuscation"
+        OA_QUERY_TOO_LARGE_MESSAGE     = "Query too large (over 16k characters) to safely obfuscate"
+        OA_FAILED_TO_OBFUSCATE_MESSAGE = "Failed to obfuscate SQL query - quote characters remained after obfuscation"
 
         def initialize
           reset
@@ -47,7 +47,7 @@ module OneApm
 
         def default_sql_obfuscator(sql)
           if sql[-3,3] == '...'
-            return QUERY_TOO_LARGE_MESSAGE
+            return OA_QUERY_TOO_LARGE_MESSAGE
           end
 
           stmt = sql.kind_of?(Statement) ? sql : Statement.new(sql)
@@ -59,13 +59,13 @@ module OneApm
             obfuscated = obfuscate_quoted_literals(obfuscated)
             obfuscated = remove_comments(obfuscated)
             if contains_quotes?(obfuscated)
-              obfuscated = FAILED_TO_OBFUSCATE_MESSAGE
+              obfuscated = OA_FAILED_TO_OBFUSCATE_MESSAGE
             end
           else
             obfuscated = obfuscate_single_quote_literals(obfuscated)
             obfuscated = remove_comments(obfuscated)
             if contains_single_quotes?(obfuscated)
-              obfuscated = FAILED_TO_OBFUSCATE_MESSAGE
+              obfuscated = OA_FAILED_TO_OBFUSCATE_MESSAGE
             end
           end
 

data/lib/one_apm/agent/database/postgres_explain_obfuscator.rb

@@ -12,8 +12,8 @@ module OneApm
         # Note that this regex can't be shared with the ones in the
         # Database::Obfuscator class because here we don't look for
         # backslash-escaped strings (and those regexes are backwards).
-        QUOTED_STRINGS_REGEX = /'(?:[^']|'')*'|"(?:[^"]|"")*"/
-        LABEL_LINE_REGEX     = /^([^:\n]*:\s+).*$/.freeze
+        OA_QUOTED_STRINGS_REGEX = /'(?:[^']|'')*'|"(?:[^"]|"")*"/
+        OA_LABEL_LINE_REGEX     = /^([^:\n]*:\s+).*$/.freeze
 
         def obfuscate(explain)
           # First, we replace all single-quoted strings.
@@ -28,7 +28,7 @@ module OneApm
           # Note also that we make no special provisions for backslash-escaped
           # single quotes (\') because these are canonicalized to two single
           # quotes ('') in the explain output.
-          explain.gsub!(QUOTED_STRINGS_REGEX) do |match|
+          explain.gsub!(OA_QUOTED_STRINGS_REGEX) do |match|
             match.start_with?('"') ? match : '?'
           end
 
@@ -36,7 +36,7 @@ module OneApm
           # All parts of the query that can appear in the explain output are
           # prefixed with "<label>: ", so we want to preserve the label, but
           # remove the rest of the line.
-          explain.gsub!(LABEL_LINE_REGEX,   '\1?')
+          explain.gsub!(OA_LABEL_LINE_REGEX,   '\1?')
           explain
         end
       end

data/lib/one_apm/agent/datastore/metric_helper.rb

@@ -4,15 +4,15 @@ module OneApm
   module Agent
     module Datastore
       module MetricHelper
-        ROLLUP_METRIC        = "Datastore/all".freeze
-        WEB_ROLLUP_METRIC    = "Datastore/allWeb".freeze
-        OTHER_ROLLUP_METRIC  = "Datastore/allOther".freeze
-        DEFAULT_PRODUCT_NAME = "ActiveRecord".freeze
-        OTHER = "Other".freeze
+        OA_ROLLUP_METRIC        = "Datastore/all".freeze
+        OA_WEB_ROLLUP_METRIC    = "Datastore/allWeb".freeze
+        OA_OTHER_ROLLUP_METRIC  = "Datastore/allOther".freeze
+        OA_DEFAULT_PRODUCT_NAME = "ActiveRecord".freeze
+        OA_OTHER = "Other".freeze
 
-        ALL = "all".freeze
-        ALL_WEB = "allWeb".freeze
-        ALL_OTHER = "allOther".freeze
+        OA_ALL = "all".freeze
+        OA_ALL_WEB = "allWeb".freeze
+        OA_ALL_OTHER = "allOther".freeze
 
         def self.statement_metric_for(product, collection, operation)
           "Datastore/statement/#{product}/#{collection}/#{operation}"
@@ -36,9 +36,9 @@ module OneApm
 
         def self.all_suffix
           if OneApm::Transaction.recording_web_transaction?
-            ALL_WEB
+            OA_ALL_WEB
           else
-            ALL_OTHER
+            OA_ALL_OTHER
           end
         end
 
@@ -56,7 +56,7 @@ module OneApm
             product_suffixed_rollup(product, suffix),
             product_rollup(product),
             suffixed_rollup(suffix),
-            ROLLUP_METRIC
+            OA_ROLLUP_METRIC
           ]
 
           metrics.unshift statement_metric_for(product, collection, operation) if collection
@@ -65,7 +65,7 @@ module OneApm
         end
 
         def self.metrics_from_sql(product, sql)
-          operation = OneApm::Agent::Database.parse_operation_from_query(sql) || OTHER
+          operation = OneApm::Agent::Database.parse_operation_from_query(sql) || OA_OTHER
           metrics_for(product, operation)
         end
 

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

@@ -8,9 +8,9 @@ module OneApm
       module Mongo
         module CommandFormatter
 
-          OBFUSCATE_KEYS   = [ 'filter', 'query',  ].freeze
-          BLACKLISTED_KEYS = [ 'deletes', 'documents', 'updates' ].freeze
-          OBFUSCATE_NOSQL_KEYS = [ 'filter', 'query', 'deletes', 'documents', 'updates' ].freeze
+          OA_OBFUSCATE_KEYS   = [ 'filter', 'query',  ].freeze
+          OA_BLACKLISTED_KEYS = [ 'deletes', 'documents', 'updates' ].freeze
+          OA_OBFUSCATE_NOSQL_KEYS = [ 'filter', 'query', 'deletes', 'documents', 'updates' ].freeze
 
 
           def self.format(event, status)
@@ -24,8 +24,8 @@ module OneApm
             }
 
             event.command.each do |key, value|
-              next if BLACKLISTED_KEYS.include?(key)
-              if OBFUSCATE_KEYS.include?(key)
+              next if OA_BLACKLISTED_KEYS.include?(key)
+              if OA_OBFUSCATE_KEYS.include?(key)
                 obfuscated = obfuscate(value)
                 result[key] = obfuscated if obfuscated
               else
@@ -40,7 +40,7 @@ module OneApm
             header = "db.#{event.command.values.first}.#{event.command_name}"
             obfuscate_sql = []
             event.command.each do |key, value|
-              if OBFUSCATE_NOSQL_KEYS.include?(key)
+              if OA_OBFUSCATE_NOSQL_KEYS.include?(key)
                 if value.is_a?(Array)
                   value.each do |val|
                     obfuscate_sql << "(#{obfuscate_json(val)})"

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

@@ -55,10 +55,10 @@ module OneApm
             []
           end
 
-          MONGO_PRODUCT_NAME = "MongoDB".freeze
+          OA_MONGO_PRODUCT_NAME = "MongoDB".freeze
 
           def self.build_metrics(name, collection)
-            OneApm::Agent::Datastore::MetricHelper.metrics_for(MONGO_PRODUCT_NAME,
+            OneApm::Agent::Datastore::MetricHelper.metrics_for(OA_MONGO_PRODUCT_NAME,
                                                                   name,
                                                                   collection)
           end
@@ -67,7 +67,7 @@ module OneApm
             payload[:collection] == '$cmd' && payload[:selector]
           end
 
-          NAMES_IN_SELECTOR = [
+          OA_NAMES_IN_SELECTOR = [
             :findandmodify,
 
             "aggregate",
@@ -88,7 +88,7 @@ module OneApm
 
           def self.command_key_from_selector(payload)
             selector = payload[:selector]
-            NAMES_IN_SELECTOR.find do |check_name|
+            OA_NAMES_IN_SELECTOR.find do |check_name|
               selector.key?(check_name)
             end
           end
@@ -102,14 +102,14 @@ module OneApm
             end
           end
 
-          CMD_COLLECTION = "$cmd".freeze
+          OA_CMD_COLLECTION = "$cmd".freeze
 
           def self.get_collection_from_selector(command_key, payload)
             if command_key
               payload[:selector][command_key]
             else
               OneApm::Manager.increment_metric("Supportability/Mongo/UnknownCollection")
-              CMD_COLLECTION
+              OA_CMD_COLLECTION
             end
           end