newrelic_rpm 3.16.2.321 → 3.16.3.323

data/lib/new_relic/agent/threading/backtrace_service.rb

@@ -26,6 +26,7 @@ module NewRelic
         def initialize(event_listener=nil)
           @profiles = {}
           @buffer = {}
+          @last_poll = nil
 
           # synchronizes access to @profiles and @buffer above
           @lock = Mutex.new

data/lib/new_relic/agent/transaction.rb

@@ -792,15 +792,18 @@ module NewRelic
       APDEX_TXN_METRIC_PREFIX       = 'Apdex/'.freeze
       APDEX_OTHER_TXN_METRIC_PREFIX = 'ApdexOther/Transaction/'.freeze
 
-      def had_error?
-        @exceptions.each do |exception, _|
-          return true unless NewRelic::Agent.instance.error_collector.error_is_ignored?(exception)
+      def had_error_affecting_apdex?
+        @exceptions.each do |exception, options|
+          ignored    = NewRelic::Agent.instance.error_collector.error_is_ignored?(exception)
+          trace_only = options[:trace_only]
+
+          return true unless ignored || trace_only
         end
         false
       end
 
       def apdex_bucket(duration, current_apdex_t)
-        self.class.apdex_bucket(duration, had_error?, current_apdex_t)
+        self.class.apdex_bucket(duration, had_error_affecting_apdex?, current_apdex_t)
       end
 
       def record_apdex(state, end_time=Time.now)

data/lib/new_relic/agent/transaction/attributes.rb

@@ -25,6 +25,7 @@ module NewRelic
 
           @custom_destinations = {}
           @agent_destinations = {}
+          @already_warned_count_limit = nil
         end
 
         def add_agent_attribute(key, value, default_destinations)

data/lib/new_relic/agent/transaction/trace_node.rb

@@ -12,14 +12,17 @@ module NewRelic
         attr_reader :exit_timestamp
         attr_reader :parent_node
 
-        attr_accessor :metric_name
+        attr_accessor :metric_name, :params
 
         UNKNOWN_NODE_NAME = '<unknown>'.freeze
 
         def initialize(timestamp, metric_name)
           @entry_timestamp = timestamp
           @metric_name     = metric_name || UNKNOWN_NODE_NAME
+          @exit_timestamp  = nil
           @called_nodes    = nil
+          @params          = {}
+          @parent_node     = nil
         end
 
         # sets the final timestamp on a node to indicate the exit
@@ -42,7 +45,7 @@ module NewRelic
           [ NewRelic::Helper.time_to_millis(@entry_timestamp),
             NewRelic::Helper.time_to_millis(@exit_timestamp),
             NewRelic::Coerce.string(@metric_name),
-            (@params || {}) ] +
+            params ] +
             [ (@called_nodes ? @called_nodes.map{|s| s.to_array} : []) ]
         end
 
@@ -116,14 +119,6 @@ module NewRelic
           params[key]
         end
 
-        def params
-          @params ||= {}
-        end
-
-        def params=(p)
-          @params = p
-        end
-
         # call the provided block for this node and each
         # of the called nodes
         def each_node(&block)

data/lib/new_relic/agent/transaction_state.rb

@@ -38,6 +38,7 @@ module NewRelic
         @traced_method_stack = TracedMethodStack.new
         @current_transaction = nil
         @record_tt = nil
+        @record_sql = nil
       end
 
       # This starts the timer for the transaction.

data/lib/new_relic/agent/worker_loop.rb

@@ -20,10 +20,11 @@ module NewRelic
         @should_run = true
         @next_invocation_time = Time.now
         @period = 60.0
-        @duration = opts[:duration] if opts[:duration]
-        @limit = opts[:limit] if opts[:limit]
+        @duration = opts[:duration]
+        @limit = opts[:limit]
         @iterations = 0
         @propagate_errors = opts.fetch(:propagate_errors, false)
+        @deadline = nil
       end
 
       # Reset state that is changed by running the worker loop

data/lib/new_relic/cli/commands/deployments.rb

@@ -30,6 +30,9 @@ class NewRelic::Cli::Deployments < NewRelic::Cli::Command
   #
   def initialize command_line_args
     @control = NewRelic::Control.instance
+    @environment = nil
+    @changelog   = nil
+    @user        = nil
     super(command_line_args)
     @description ||= @leftover && @leftover.join(" ")
     @user ||= ENV['USER']

data/lib/new_relic/cli/commands/install.rb

@@ -22,8 +22,9 @@ class NewRelic::Cli::Install < NewRelic::Cli::Command
   #
   attr_reader :dest_dir, :license_key, :generated_for_user, :quiet, :src_file, :app_name
   def initialize command_line_args={}
+    @dest_dir = nil
     super command_line_args
-    if !@dest_dir
+    if @dest_dir.nil?
       # Install a newrelic.yml file into the local config directory.
       if File.directory? "config"
         @dest_dir = "config"

data/lib/new_relic/control/frameworks/rails.rb

@@ -69,7 +69,7 @@ module NewRelic
         end
 
         def install_agent_hooks(config)
-          return if @agent_hooks_installed
+          return if defined?(@agent_hooks_installed) && @agent_hooks_installed
           @agent_hooks_installed = true
           return if config.nil? || !config.respond_to?(:middleware)
           begin
@@ -83,7 +83,7 @@ module NewRelic
         end
 
         def install_browser_monitoring(config)
-          return if @browser_monitoring_installed
+          return if defined?(@browser_monitoring_installed) && @browser_monitoring_installed
           @browser_monitoring_installed = true
           return if config.nil? || !config.respond_to?(:middleware) || !Agent.config[:'browser_monitoring.auto_instrument']
           begin
@@ -96,8 +96,8 @@ module NewRelic
         end
 
         def install_developer_mode(rails_config)
-          return if @installed
-          @installed = true
+          return if defined?(@developer_mode_installed) && @developer_mode_installed
+          @developer_mode_installed = true
           if rails_config && rails_config.respond_to?(:middleware)
             begin
               require 'new_relic/rack/developer_mode'

data/lib/new_relic/helper.rb

@@ -47,9 +47,5 @@ module NewRelic
     def time_to_millis(time)
       (time.to_f * 1000).round
     end
-
-    def milliseconds_to_seconds(milliseconds)
-      milliseconds / 1000.0
-    end
   end
 end

data/lib/new_relic/metric_data.rb

@@ -12,6 +12,7 @@ module NewRelic
     attr_accessor :stats
 
     def initialize(metric_spec, stats)
+      @original_spec = nil
       @metric_spec = metric_spec
       self.stats = stats
     end

data/lib/new_relic/noticed_error.rb

@@ -57,6 +57,8 @@ class NewRelic::NoticedError
       @message = STRIPPED_EXCEPTION_REPLACEMENT_MESSAGE
     end
 
+    @attributes_from_notice_error = nil
+    @attributes = nil
     @timestamp = timestamp
   end
 

data/lib/new_relic/version.rb

@@ -12,7 +12,7 @@ module NewRelic
 
     MAJOR = 3
     MINOR = 16
-    TINY  = 2
+    TINY  = 3
 
     begin
       require File.join(File.dirname(__FILE__), 'build')

data/lib/tasks/config.rake

@@ -23,7 +23,7 @@ namespace :newrelic do
 
     def output(format)
       config_hash = build_config_hash
-      sections = flatten_config_hash(config_hash)
+      flatten_config_hash(config_hash)
 
       puts build_erb(format).result(binding)
     end

data/lib/tasks/tests.rake

@@ -1,6 +1,6 @@
 begin
   require 'rake/testtask'
-rescue LoadError => e
+rescue LoadError
 end
 
 if defined? Rake::TestTask

data/lib/tasks/versions.rake

@@ -33,8 +33,8 @@ namespace :newrelic do
     end
 
     def write_versions(title, type, erb)
-      anchor = title.downcase.gsub(" ", "_")
-      versions = versions_for_type(type)
+      title.downcase.gsub(" ", "_")
+      versions_for_type(type)
       puts erb.result(binding).gsub(/^ *$/, '')
     end
 

data/newrelic_rpm.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.version = NewRelic::VERSION::STRING
   s.required_ruby_version = '>= 1.8.7'
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.authors = [ "Tim Krajcar", "Matthew Wear", "Katherine Wu", "Caito Scherr", "Kenichi Nakamura" ]
+  s.authors = [ "Tim Krajcar", "Matthew Wear", "Katherine Wu", "Kenichi Nakamura" ]
   s.date = Time.now.strftime('%Y-%m-%d')
   s.licenses    = ['New Relic', 'MIT', 'Ruby']
   s.description = <<-EOS

data/test/agent_helper.rb

@@ -330,7 +330,7 @@ end
 
 def refute_contains_request_params(attributes)
   attributes.keys.each do |key|
-    refute_match /^request\.parameters\./, key.to_s
+    refute_match(/^request\.parameters\./, key.to_s)
   end
 end
 
@@ -622,18 +622,13 @@ def cross_agent_tests_dir
   File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', 'cross_agent_tests'))
 end
 
-def replace_camelcase(contents)
-  { "callCount" => "call_count" }.each_pair do |original, replacement|
-    contents.gsub!(original, replacement)
-  end
-  contents
-end
-
 def load_cross_agent_test(name)
   test_file_path = File.join(cross_agent_tests_dir, "#{name}.json")
   data = File.read(test_file_path)
-  data = replace_camelcase(data)
-  NewRelic::JSONWrapper.load(data)
+  data.gsub!('callCount', 'call_count')
+  data = NewRelic::JSONWrapper.load(data)
+  data.each { |testcase| testcase['testname'].gsub! ' ', '_' if String === testcase['testname'] }
+  data
 end
 
 def each_cross_agent_test(options)

data/test/fixtures/cross_agent_tests/docker_container_id/README.md

@@ -1,6 +1,6 @@
-These tests cover parsing of Docker container IDs on Linux hosts out of 
+These tests cover parsing of Docker container IDs on Linux hosts out of
 `/proc/self/cgroup` (or `/proc/<pid>/cgroup` more generally).
 
-The `cases.json` file lists each filename in this directory containing 
+The `cases.json` file lists each filename in this directory containing
 example `/proc/self/cgroup` content, and the expected Docker container ID that
 should be parsed from that file.

data/test/fixtures/cross_agent_tests/labels.json

@@ -18,11 +18,11 @@
     "name":        "multiple_labels_with_leading_and_trailing_whitespaces",
     "labelString": "   Data Center   : East Coast  ;   Deployment Flavor    :  Integration Environment   ",
     "warning":     false,
-    "expected":    [ 
+    "expected":    [
         { "label_type": "Data Center", "label_value": "East Coast" },
         { "label_type": "Deployment Flavor", "label_value": "Integration Environment" }
     ]
-  }, 
+  },
   {
     "name":        "single",
     "labelString": "Server:East",
@@ -53,7 +53,7 @@
   {
     "name":        "truncation",
     "labelString": "KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK:VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV",
-    "warning":     false,
+    "warning":     true,
     "expected":    [ {
       "label_type":  "KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
       "label_value": "VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV"
@@ -62,19 +62,27 @@
   {
     "name":        "single_label_key_to_be_truncated_with_leading_and_trailing_whitespaces",
     "labelString": "           123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345TTTTT       :value",
-    "warning":     false,
-    "expected":    [ 
+    "warning":     true,
+    "expected":    [
         { "label_type": "123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345", "label_value": "value" }
     ]
-  }, 
+  },
   {
     "name":        "single_label_value_to_be_truncated_with_leading_and_trailing_whitespaces",
     "labelString": "key:           123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345TTTTT       ",
+    "warning":     true,
+    "expected":    [
+        { "label_type": "key", "label_value": "123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345" }
+    ]
+  },
+  {
+    "name":        "utf8",
+    "labelString": "kéÿ:vãlüê",
     "warning":     false,
-    "expected":    [ 
-        { "label_type": "key", "label_value": "123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345" } 
+    "expected":    [
+        { "label_type": "kéÿ", "label_value": "vãlüê" }
     ]
-  }, 
+  },
   {
     "name":        "failed_no_delimiters",
     "labelString": "Server",
@@ -129,5 +137,59 @@
       { "label_type": "50", "label_value": "50" }, { "label_type": "51", "label_value": "51" }, { "label_type": "52", "label_value": "52" }, { "label_type": "53", "label_value": "53" }, { "label_type": "54", "label_value": "54" },
       { "label_type": "55", "label_value": "55" }, { "label_type": "56", "label_value": "56" }, { "label_type": "57", "label_value": "57" }, { "label_type": "58", "label_value": "58" }, { "label_type": "59", "label_value": "59" },
       { "label_type": "60", "label_value": "60" }, { "label_type": "61", "label_value": "61" }, { "label_type": "62", "label_value": "62" }, { "label_type": "63", "label_value": "63" } ]
+  },
+  {
+    "name":        "trailing_semicolons",
+    "labelString": "foo:bar;;",
+    "warning":     false,
+    "expected":    [ { "label_type": "foo", "label_value": "bar" } ]
+  },
+  {
+    "name":        "leading_semicolons",
+    "labelString": ";;foo:bar",
+    "warning":     false,
+    "expected":    [ { "label_type": "foo", "label_value": "bar" } ]
+  },
+  {
+    "name":        "empty_label",
+    "labelString": "foo:bar;;zip:zap",
+    "warning":     true,
+    "expected":    []
+  },
+  {
+    "name":        "trailing_colons",
+    "labelString": "foo:bar;:",
+    "warning":     true,
+    "expected":    []
+  },
+  {
+    "name":        "leading_colons",
+    "labelString": ":;foo:bar",
+    "warning":     true,
+    "expected":    []
+  },
+  {
+    "name":        "empty_pair",
+    "labelString": " : ",
+    "warning":     true,
+    "expected":    []
+  },
+  {
+    "name":        "empty_pair_in_middle_of_string",
+    "labelString": "foo:bar; : ;zip:zap",
+    "warning":     true,
+    "expected":    []
+  },
+  {
+    "name": "long_multibyte_utf8",
+    "labelString": "foo:€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€",
+    "warning": true,
+    "expected": [ { "label_type": "foo", "label_value": "€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€" } ]
+  },
+  {
+    "name": "long_4byte_utf8",
+    "labelString": "foo:𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆",
+    "warning": true,
+    "expected": [ { "label_type": "foo", "label_value": "𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆𝌆"}]
   }
 ]

data/test/fixtures/cross_agent_tests/rules.json

@@ -19,7 +19,7 @@
     ]
   },
   {
-    "testname":"replace first",
+    "testname":"replace segment",
     "rules":[{"match_expression":"^/userid/.*/folderid",          "replacement":"/userid/*/folderid/*",          "ignore":false, "eval_order":1},
              {"match_expression":"/need_not_be_first_segment/.*", "replacement":"*/need_not_be_first_segment/*", "ignore":false, "eval_order":2}],
     "tests":

data/test/fixtures/cross_agent_tests/synthetics/README.md

@@ -19,7 +19,7 @@ The `settings` hash contains a number of key-value pairs that the agent will nee
 | Name | Meaning |
 | ---- | ------- |
 | `agentEncodingKey`| The encoding key used by the agent for deobfuscation of the Synthetics request header. |
-| `syntheticsEncodingKey` | The encoding key used by Synthetics to obfuscate the Synthetics request header. In most tests, `encodingKey` and `syntheticsEncodingKey` are the same. |
+| `syntheticsEncodingKey` | The encoding key used by Synthetics to obfuscate the Synthetics request header. In most tests, `agentEncodingKey` and `syntheticsEncodingKey` are the same. |
 | `transactionGuid` | The GUID of the simulated transaction. In a non-simulated transaction, this will be randomly generated. But, for testing purposes, you should assign this value as the GUID, since the tests will check for this value to be set in the `nr.guid` attribute of the Transaction Event. |
 | `trustedAccountIds` | A list of accounts ids that the agent trusts. If the Synthetics request contains a non-trusted account id, it is an invalid request.|
 
@@ -30,7 +30,7 @@ The input for each test is a Synthetics request header. The test fixture file sh
 | Name | Meaning |
 | ---- | ------- |
 | `inputHeaderPayload` | A decoded form of the contents of the `X-NewRelic-Synthetics` request header. |
-| `inputObfuscatedHeader` | An obfuscated form of the `X-NewRelic-Synthetics` request header. If you obfuscate `syntheticsHeaderPayload` using the CAT obfuscation algorithm, this should be the output. |
+| `inputObfuscatedHeader` | An obfuscated form of the `X-NewRelic-Synthetics` request header. If you obfuscate `inputHeaderPayload` using the `syntheticsEncodingKey`, this should be the output. |
 
 ## Outputs
 

data/test/fixtures/cross_agent_tests/synthetics/synthetics.json

@@ -87,7 +87,7 @@
   {
     "name": "invalid_synthetics_request_unsupported_version",
     "settings": {
-      "encodingKey": "1234567890123456789012345678901234567890",
+      "agentEncodingKey": "1234567890123456789012345678901234567890",
       "syntheticsEncodingKey": "1234567890123456789012345678901234567890",
       "transactionGuid": "9323dc260548ed0e",
       "trustedAccountIds": [
@@ -133,7 +133,7 @@
   {
     "name": "invalid_synthetics_request_untrusted_account_id",
     "settings": {
-      "encodingKey": "1234567890123456789012345678901234567890",
+      "agentEncodingKey": "1234567890123456789012345678901234567890",
       "syntheticsEncodingKey": "1234567890123456789012345678901234567890",
       "transactionGuid": "9323dc260548ed0e",
       "trustedAccountIds": [
@@ -179,7 +179,7 @@
   {
     "name": "invalid_synthetics_request_mismatched_encoding_key",
     "settings": {
-      "encodingKey": "0000000000000000000000000000000000000000",
+      "agentEncodingKey": "0000000000000000000000000000000000000000",
       "syntheticsEncodingKey": "1234567890123456789012345678901234567890",
       "transactionGuid": "9323dc260548ed0e",
       "trustedAccountIds": [
@@ -225,7 +225,7 @@
   {
     "name": "invalid_synthetics_request_too_few_header_elements",
     "settings": {
-      "encodingKey": "1234567890123456789012345678901234567890",
+      "agentEncodingKey": "1234567890123456789012345678901234567890",
       "syntheticsEncodingKey": "1234567890123456789012345678901234567890",
       "transactionGuid": "9323dc260548ed0e",
       "trustedAccountIds": [
@@ -270,7 +270,7 @@
   {
     "name": "invalid_synthetics_request_too_many_header_elements",
     "settings": {
-      "encodingKey": "1234567890123456789012345678901234567890",
+      "agentEncodingKey": "1234567890123456789012345678901234567890",
       "syntheticsEncodingKey": "1234567890123456789012345678901234567890",
       "transactionGuid": "9323dc260548ed0e",
       "trustedAccountIds": [