newrelic_rpm 4.8.0.341 → 5.0.0.342

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b51f94bfacea16c929d073a557db1c96c171da40
-  data.tar.gz: 6b593714cfad1a3751dd07b410ba300fe46e4751
+SHA256:
+  metadata.gz: 10c4b8fa117aaa061a4e13071bfa6a568e03dc27b4d9a75040cbf9c5b0772749
+  data.tar.gz: 1536ab0db32670d6f604cd9c662d1b7633366e77957051e8ace104df942ed97d
 SHA512:
-  metadata.gz: 88aa0416e6c2a3f8e32b6b5536e1b4f58b5b423ce06085ba583830fca6c014c04ea318bad3b48bcc17f5f93506d27f1ac7fed3ce56fb157cfd43830650c74652
-  data.tar.gz: afc0971db514b4b76e93725c6c7b299e26a281ba0a8cee2add9aba30a149f0c20a0dc74d7d08363f4977a54c5dc90f2e897edf64d2fa658cf286cc18358cc978
+  metadata.gz: aff7fb607ba79d6f8707a8c4f99bee62dc32c87df71a8809517ed1e29ba57760f0991c241d56816dfc50af99aad98bd918f82d97365cc36882962973efe12551
+  data.tar.gz: 8f2c281d13b955a25d9b7717ed248d5dc3a230e1e42ebf4fd25ad010253cfe42ba7692b288e2d093b9cd64a84d56d7a3edc1d274207ad01402c1ea36cc62af1a

data/.travis.yml

@@ -16,6 +16,11 @@ before_install:
 
 install: bundle install
 
+addons:
+  apt:
+    packages:
+      - haveged
+
 before_script: ./test/script/before_script/install_mongodb.sh
 
 script: ./test/script/ci.sh
@@ -171,3 +176,25 @@ matrix:
       env: TYPE=UNIT ENVIRONMENT=rails31
     - rvm: jruby-9.1.13.0
       env: TYPE=UNIT ENVIRONMENT=rails32
+
+  # Travis (and only Travis) has been throwing difficult-to-reproduce
+  # errors in various JRuby tests.  These appeared after a build image
+  # update, and they seem to be unrelated to any agent code changes.
+  # So, we'll allow these specific test runs to fail while we track
+  # the issue (RUBY-1869).
+  #
+  allow_failures:
+    - rvm: jruby-9.1.13.0
+      env: TYPE=UNIT ENVIRONMENT=rails40
+    - rvm: jruby-9.1.13.0
+      env: TYPE=UNIT ENVIRONMENT=rails41
+    - rvm: jruby-9.1.13.0
+      env: TYPE=UNIT ENVIRONMENT=rails42
+    - rvm: jruby-9.1.13.0
+      env: TYPE=UNIT ENVIRONMENT=rails50
+    - rvm: jruby-9.1.13.0
+      env: TYPE=UNIT ENVIRONMENT=rails51
+    - rvm: jruby-9.1.13.0
+      env: TYPE=UNIT ENVIRONMENT=norails
+    - rvm: jruby-9.1.13.0
+      env: TYPE=FUNCTIONAL GROUP=background_2

data/CHANGELOG.md

@@ -1,5 +1,44 @@
 # New Relic Ruby Agent Release Notes #
 
+  ## v5.0.0 ##
+
+  * SSL connections to New Relic are now mandatory
+
+    Prior to this version, using an SSL connection to New Relic was
+    the default behavior, but could be overridden. SSL connections are
+    now enforced (not overrideable).
+
+  * Additional security checking before trying to explain
+    multi-statement SQL queries
+
+    Customer applications might submit SQL queries containing multiple
+    statements (e.g., SELECT * FROM table; SELECT * FROM table).  For
+    security reasons, we should not generate explain plans in this
+    situation.
+
+    Although the agent correctly skipped explain plans for these
+    queries during testing, we have added extra checks for this
+    scenario.
+
+  * Bugfix for RabbitMQ exchange names that are symbols
+
+    The agent no longer raises a TypeError when a RabbitMQ exchange
+    name is a Ruby symbol instead of a string.
+
+  * Bugfix for audit logging to stdout
+
+    Previous agents configured to log to stdout would correctly send
+    regular agent logs to stdout, but would incorrectly send audit
+    logs to a text file named "stdout".  This release corrects the
+    error.
+
+  * Bugfix for Capistrano deployment notifications on v3.7 and beyond
+
+    Starting with version 3.7, Capistrano uses a different technique
+    to determine a project's version control system.  The agent now
+    works correctly with this new behavior. Thanks to Jimmy Zhang for
+    the contribution.
+
   ## v4.8.0 ##
 
   * Initialize New Relic Agent before config initializers

data/config.dot

@@ -21,7 +21,6 @@ digraph AgentEnabled {
   "[error_collector.ignore_errors]"
   "[browser_monitoring.auto_instrument]"
   "[license_key]"
-  "[ssl]"
   "[verify_certificate]"
   "[api_host]"
   "[api_port]"
@@ -164,14 +163,12 @@ digraph AgentEnabled {
   "Control#server_from_host" -> "[host]"
   "Control#server_from_host" -> "[port]"
   "Control#server_from_host" -> "Control#convert_to_ip_address"
-  "Control#http_connection" -> "[ssl]"
   "Control#http_connection" -> "[verify_certificate]"
   "Control#http_connection" -> "Control#proxy_server"
   "Control#set_log_level!" -> "[log_level]"
   "Control#log_path" -> "[log_file_path]"
   "Control#log_path" -> "Control#log_to_stdout?"
   "Control#log_to_stdout?" -> "[log_file_path]"
-  "Control#convert_to_ip_address" -> "[ssl]"
   "Control#convert_to_ip_address" -> "[verify_certificate]"
   "Control#server" -> "Control#server_from_host"
   "Control#setup_log" -> "Control#set_log_level!"

data/lib/new_relic/agent/{throughput_monitor.rb → adaptive_sampler.rb}

@@ -4,14 +4,16 @@
 
 module NewRelic
   module Agent
-    class ThroughputMonitor
+    class AdaptiveSampler
 
-      def initialize target_samples = 10
+      def initialize target_samples = 10, interval_duration = 60
         @target = target_samples
         @seen = 0
         @seen_last = 0
         @sampled_count = 0
-        @first_cycle = true
+        @interval_duration = interval_duration
+        @first_interval = true
+        @interval_start = Time.now.to_f
         @lock = Mutex.new
       end
 
@@ -20,7 +22,8 @@ module NewRelic
       # sampled. This uses the adaptive sampling algorithm.
       def sampled?
         @lock.synchronize do
-          sampled = if @first_cycle
+          reset_if_interval_expired!
+          sampled = if @first_interval
             @sampled_count < 10
           elsif @sampled_count < @target
             rand(@seen_last) < @target
@@ -35,15 +38,6 @@ module NewRelic
         end
       end
 
-      def reset!
-        @lock.synchronize do
-          @first_cycle = false
-          @seen_last = @seen
-          @seen = 0
-          @sampled_count = 0
-        end
-      end
-
       def stats
         @lock.synchronize do
           {
@@ -54,6 +48,21 @@ module NewRelic
           }
         end
       end
+
+      private
+
+      def reset_if_interval_expired!
+        now = Time.now.to_f
+        return unless @interval_start + @interval_duration <= now
+
+        elapsed_intervals = Integer((now - @interval_start) / @interval_duration)
+        @interval_start = @interval_start + elapsed_intervals * @interval_duration
+
+        @first_interval = false
+        @seen_last = elapsed_intervals > 1 ? 0 : @seen
+        @seen = 0
+        @sampled_count = 0
+      end
     end
   end
 end

data/lib/new_relic/agent/agent.rb

@@ -30,7 +30,7 @@ require 'new_relic/agent/vm/monotonic_gc_profiler'
 require 'new_relic/agent/utilization_data'
 require 'new_relic/environment_report'
 require 'new_relic/agent/attribute_filter'
-require 'new_relic/agent/throughput_monitor'
+require 'new_relic/agent/adaptive_sampler'
 
 module NewRelic
   module Agent
@@ -63,7 +63,7 @@ module NewRelic
         @harvest_samplers          = NewRelic::Agent::SamplerCollection.new(@events)
         @monotonic_gc_profiler     = NewRelic::Agent::VM::MonotonicGCProfiler.new
         @javascript_instrumentor   = NewRelic::Agent::JavascriptInstrumentor.new(@events)
-        @throughput_monitor        = NewRelic::Agent::ThroughputMonitor.new
+        @adaptive_sampler          = NewRelic::Agent::AdaptiveSampler.new
 
         @harvester       = NewRelic::Agent::Harvester.new(@events)
         @after_fork_lock = Mutex.new
@@ -144,7 +144,7 @@ module NewRelic
         attr_reader :custom_event_aggregator
         attr_reader :transaction_event_recorder
         attr_reader :attribute_filter
-        attr_reader :throughput_monitor
+        attr_reader :adaptive_sampler
 
         def transaction_event_aggregator
           @transaction_event_recorder.transaction_event_aggregator
@@ -1154,7 +1154,6 @@ module NewRelic
             harvest_and_send_for_agent_commands
           end
         ensure
-          throughput_monitor.reset!
           NewRelic::Agent::Database.close_connections
           duration = (Time.now - now).to_f
           NewRelic::Agent.record_metric('Supportability/Harvest', duration)

data/lib/new_relic/agent/configuration/default_source.rb

@@ -113,9 +113,15 @@ module NewRelic
           }
         end
 
+        DEFAULT_LOG_DIR = 'log/'.freeze
+
         def self.audit_log_path
           Proc.new {
-            File.join(NewRelic::Agent.config[:log_file_path], 'newrelic_audit.log')
+            log_file_path = NewRelic::Agent.config[:log_file_path]
+            wants_stdout  = (log_file_path.upcase == 'STDOUT')
+            audit_log_dir = wants_stdout ? DEFAULT_LOG_DIR : log_file_path
+
+            File.join(audit_log_dir, 'newrelic_audit.log')
           }
         end
 
@@ -142,10 +148,6 @@ module NewRelic
           Proc.new { NewRelic::Agent.config[:apdex_t] * 4 }
         end
 
-        def self.port
-          Proc.new { NewRelic::Agent.config[:ssl] ? 443 : 80 }
-        end
-
         def self.profiling_available
           Proc.new {
             begin
@@ -157,6 +159,17 @@ module NewRelic
           }
         end
 
+        def self.host
+          Proc.new do
+            regex = /\A(?<identifier>.+?)x/
+            if matches = regex.match(String(NewRelic::Agent.config[:license_key]))
+              "collector.#{matches['identifier']}.nr-data.net"
+            else
+              'collector.newrelic.com'
+            end
+          end
+        end
+
         def self.convert_to_regexp_list(raw_value)
           value_list = convert_to_list(raw_value)
           value_list.map do |value|
@@ -299,14 +312,6 @@ module NewRelic
           :allowed_from_server => false,
           :description => 'If <code>true</code>, enables <a href="https://docs.newrelic.com/docs/accounts-partnerships/accounts/security/high-security">high security mode</a>. Ensure you understand the implications of high security mode before enabling this setting.'
         },
-        :ssl => {
-          :default => true,
-          :allow_nil => true,
-          :public => true,
-          :type => Boolean,
-          :allowed_from_server => false,
-          :description => 'If <code>true</code>, enables SSL for transmissions to the New Relic <a href="https://docs.newrelic.com/docs/apm/new-relic-apm/getting-started/glossary#collector">collector</a>.'
-        },
         :proxy_host => {
           :default => nil,
           :allow_nil => true,
@@ -450,7 +455,7 @@ module NewRelic
           :description => 'Specify a whitelist of exceptions you do not want the agent to strip when <a href="#strip_exception_messages-enabled">strip_exception_messages</a> is <code>true</code>. Separate exceptions with a comma. For example, <code>"ImportantException,PreserveMessageException"</code>.'
         },
         :host => {
-          :default => 'collector.newrelic.com',
+          :default => DefaultSource.host,
           :public => false,
           :type => String,
           :allowed_from_server => false,
@@ -464,7 +469,7 @@ module NewRelic
           :description => 'API host for New Relic.'
         },
         :port => {
-          :default => DefaultSource.port,
+          :default => 443,
           :public => false,
           :type => Integer,
           :allowed_from_server => false,
@@ -578,7 +583,7 @@ module NewRelic
           :description => 'Defines a name for the log file.'
         },
         :log_file_path => {
-          :default => 'log/',
+          :default => DefaultSource::DEFAULT_LOG_DIR,
           :public => true,
           :type => String,
           :allowed_from_server => false,
@@ -1082,7 +1087,7 @@ module NewRelic
           :description => 'List of trusted New Relic account IDs for the purposes of cross-application tracing. Inbound requests from applications including cross-application headers that do not come from an account in this list will be ignored.'
         },
         :"cross_application_tracer.enabled" => {
-          :default => true,
+          :default => Proc.new { !NewRelic::Agent.config[:'distributed_tracing.enabled'] },
           :public => true,
           :type => Boolean,
           :allowed_from_server => true,

data/lib/new_relic/agent/configuration/high_security_source.rb

@@ -10,8 +10,6 @@ module NewRelic
       class HighSecuritySource < DottedHash
         def initialize(local_settings)
           super({
-            :ssl => true,
-
             :capture_params           => false,
             :'resque.capture_params'  => false,
             :'sidekiq.capture_params' => false,

data/lib/new_relic/agent/database.rb

@@ -271,6 +271,11 @@ module NewRelic
             return false
           end
 
+          if multiple_queries?(@sql)
+            NewRelic::Agent.logger.debug('Unable to collect explain plan for multiple queries.')
+            return false
+          end
+
           true
         end
       end

data/lib/new_relic/agent/database/explain_plan_helpers.rb

@@ -21,6 +21,17 @@ module NewRelic
           Obfuscator.instance.obfuscate_single_quote_literals(sql) =~ /\$\d+/
         end
 
+        # SQL containing a semicolon in the middle (with something
+        # other than whitespace after it) may contain two or more
+        # queries.  It's not safe to EXPLAIN this kind of expression,
+        # since it could lead to executing unwanted SQL.
+        #
+        MULTIPLE_QUERIES = Regexp.new(';\s*\S+')
+
+        def multiple_queries?(sql)
+          sql =~ MULTIPLE_QUERIES
+        end
+
         def handle_exception_in_explain
           yield
         rescue => e

data/lib/new_relic/agent/distributed_trace_monitor.rb

@@ -17,12 +17,14 @@ module NewRelic
       end
 
       def on_before_call(request)
-        return unless CrossAppTracing.cross_app_enabled?
+        return unless NewRelic::Agent.config[:'distributed_tracing.enabled']
         return unless payload = request[NEWRELIC_TRACE_KEY]
 
         state = NewRelic::Agent::TransactionState.tl_get
         txn = state.current_transaction
-        txn.accept_distributed_trace_payload HTTP_TRANSPORT_TYPE, payload
+        if txn.accept_distributed_trace_payload payload
+          txn.distributed_trace_payload.caller_transport_type = HTTP_TRANSPORT_TYPE
+        end
       end
     end
   end

data/lib/new_relic/agent/distributed_trace_payload.rb

@@ -7,73 +7,66 @@ require 'base64'
 module NewRelic
   module Agent
     class DistributedTracePayload
-      VERSION =[0, 0].freeze
-      CALLER_TYPE = "App".freeze
+      VERSION =[0, 1].freeze
+      PARENT_TYPE = "App".freeze
       POUND = '#'.freeze
 
       # Key names for serialization
-      VERSION_KEY             = 'v'.freeze
-      DATA_KEY                = 'd'.freeze
-      CALLER_TYPE_KEY         = 'ty'.freeze
-      CALLER_ACCOUNT_KEY      = 'ac'.freeze
-      CALLER_APP_KEY          = 'ap'.freeze
-      ID_KEY                  = 'id'.freeze
-      TRIP_ID_KEY             = 'tr'.freeze
-      SAMPLED_KEY             = 'sa'.freeze
-      PARENT_IDS_KEY          = 'pa'.freeze
-      DEPTH_KEY               = 'de'.freeze
-      ORDER_KEY               = 'or'.freeze
-      TIMESTAMP_KEY           = 'ti'.freeze
-      HOST_KEY                = 'ho'.freeze
-      SYNTHETICS_KEY          = 'sy'.freeze
-      SYNTHETICS_RESOURCE_KEY = 'r'.freeze
-      SYNTHETICS_JOB_KEY      = 'j'.freeze
-      SYNTHETICS_MONITOR_KEY  = 'm'.freeze
+      VERSION_KEY                = 'v'.freeze
+      DATA_KEY                   = 'd'.freeze
+      PARENT_TYPE_KEY            = 'ty'.freeze
+      PARENT_ACCOUNT_ID_KEY      = 'ac'.freeze
+      PARENT_APP_KEY             = 'ap'.freeze
+      ID_KEY                     = 'id'.freeze
+      TRACE_ID_KEY               = 'tr'.freeze
+      SAMPLED_KEY                = 'sa'.freeze
+      PARENT_ID_KEY              = 'pa'.freeze
+      TIMESTAMP_KEY              = 'ti'.freeze
+      PRIORITY_KEY               = 'pr'.freeze
 
       # Intrinsic Keys
-      CALLER_TYPE_INTRINSIC_KEY                = "caller.type".freeze
-      CALLER_APP_INTRINSIC_KEY                 = "caller.app".freeze
-      CALLER_ACCOUNT_ID_INTRINSIC_KEY          = "caller.account".freeze
-      CALLER_TRANSPORT_TYPE_INTRINSIC_KEY      = "caller.transportType".freeze
-      CALLER_TRANSPORT_DURATION_INTRINSIC_KEY  = "caller.transportDuration".freeze
-      CALLER_HOST_INTRINSIC_KEY                = "caller.host".freeze
-      DEPTH_INTRINSIC_KEY                      = "nr.depth".freeze
-      ORDER_INTRINSIC_KEY                      = "nr.order".freeze
-      GUID_INTRINSIC_KEY                       = "nr.guid".freeze
-      REFERRING_TRANSACTION_GUID_INTRINSIC_KEY = "nr.referringTransactionGuid".freeze
+      PARENT_TYPE_INTRINSIC_KEY                = "parent.type".freeze
+      PARENT_APP_INTRINSIC_KEY                 = "parent.app".freeze
+      PARENT_ACCOUNT_ID_INTRINSIC_KEY          = "parent.account".freeze
+      PARENT_TRANSPORT_TYPE_INTRINSIC_KEY      = "parent.transportType".freeze
+      PARENT_TRANSPORT_DURATION_INTRINSIC_KEY  = "parent.transportDuration".freeze
+      GUID_INTRINSIC_KEY                       = "guid".freeze
+      TRACE_ID_INTRINSIC_KEY                   = "traceId".freeze
       TRIP_ID_INTRINSIC_KEY                    = "nr.tripId".freeze
-      PARENT_IDS_INTRINSIC_KEY                 = "nr.parentIds".freeze
+      PARENT_ID_INTRINSIC_KEY                  = "parentId".freeze
+      GRANDPARENT_ID_INTRINSIC_KEY             = "grandparentId".freeze
       COMMA                                    = ",".freeze
 
       INTRINSIC_KEYS = [
-        CALLER_TYPE_INTRINSIC_KEY,
-        CALLER_APP_INTRINSIC_KEY,
-        CALLER_ACCOUNT_ID_INTRINSIC_KEY,
-        CALLER_TRANSPORT_TYPE_INTRINSIC_KEY,
-        CALLER_TRANSPORT_DURATION_INTRINSIC_KEY,
-        CALLER_HOST_INTRINSIC_KEY,
-        DEPTH_INTRINSIC_KEY,
-        ORDER_INTRINSIC_KEY,
+        PARENT_TYPE_INTRINSIC_KEY,
+        PARENT_APP_INTRINSIC_KEY,
+        PARENT_ACCOUNT_ID_INTRINSIC_KEY,
+        PARENT_TRANSPORT_TYPE_INTRINSIC_KEY,
+        PARENT_TRANSPORT_DURATION_INTRINSIC_KEY,
         GUID_INTRINSIC_KEY,
-        REFERRING_TRANSACTION_GUID_INTRINSIC_KEY,
+        TRACE_ID_INTRINSIC_KEY,
         TRIP_ID_INTRINSIC_KEY,
-        PARENT_IDS_INTRINSIC_KEY
+        PARENT_ID_INTRINSIC_KEY,
+        GRANDPARENT_ID_INTRINSIC_KEY
       ].freeze
 
+      # Intrinsic Values
+      PARENT_TRANSPORT_TYPE_UNKNOWN = 'unknown'.freeze
+
       class << self
-        def for_transaction transaction, uri=nil
+        def for_transaction transaction
           payload = new
           return payload unless connected?
 
           payload.version = VERSION
-          payload.caller_type = CALLER_TYPE
+          payload.parent_type = PARENT_TYPE
 
           # We should not rely on the xp_id being formulated this way, but we have
           # seen nil account ids coming down in staging for some accounts
           account_id, fallback_app_id = Agent.config[:cross_process_id].split(POUND)
-          payload.caller_account_id = account_id
+          payload.parent_account_id = account_id
 
-          payload.caller_app_id =  if Agent.config[:application_id].empty?
+          payload.parent_app_id =  if Agent.config[:application_id].empty?
             fallback_app_id
           else
             Agent.config[:application_id]
@@ -81,18 +74,11 @@ module NewRelic
 
           payload.timestamp = (Time.now.to_f * 1000).round
           payload.id = transaction.guid
-          payload.trip_id = transaction.distributed_tracing_trip_id
+          payload.trace_id = transaction.trace_id
           payload.sampled = transaction.sampled?
-          payload.parent_ids = transaction.parent_ids
-          payload.depth = transaction.depth + 1
-          payload.order = transaction.order
-          payload.host = uri.host if uri
-
-          if transaction.synthetics_payload
-            payload.synthetics_resource = transaction.synthetics_payload[2]
-            payload.synthetics_job = transaction.synthetics_payload[3]
-            payload.synthetics_monitor = transaction.synthetics_payload[4]
-          end
+          payload.priority = transaction.priority
+          payload.parent_id = transaction.parent_id
+          payload.grandparent_id = transaction.grandparent_id
 
           payload
         end
@@ -103,23 +89,16 @@ module NewRelic
 
           payload = new
           payload.version           = raw_payload[VERSION_KEY]
-          payload.caller_type       = payload_data[CALLER_TYPE_KEY]
-          payload.caller_account_id = payload_data[CALLER_ACCOUNT_KEY]
-          payload.caller_app_id     = payload_data[CALLER_APP_KEY]
+          payload.parent_type       = payload_data[PARENT_TYPE_KEY]
+          payload.parent_account_id = payload_data[PARENT_ACCOUNT_ID_KEY]
+          payload.parent_app_id     = payload_data[PARENT_APP_KEY]
           payload.timestamp         = payload_data[TIMESTAMP_KEY]
           payload.id                = payload_data[ID_KEY]
-          payload.trip_id           = payload_data[TRIP_ID_KEY]
+          payload.trace_id          = payload_data[TRACE_ID_KEY]
           payload.sampled           = payload_data[SAMPLED_KEY]
-          payload.parent_ids        = payload_data[PARENT_IDS_KEY]
-          payload.depth             = payload_data[DEPTH_KEY]
-          payload.order             = payload_data[ORDER_KEY]
-          payload.host              = payload_data[HOST_KEY]
-
-          if payload_synthetics = payload_data[SYNTHETICS_KEY]
-            payload.synthetics_resource = payload_synthetics[SYNTHETICS_RESOURCE_KEY]
-            payload.synthetics_job      = payload_synthetics[SYNTHETICS_JOB_KEY]
-            payload.synthetics_monitor  = payload_synthetics[SYNTHETICS_MONITOR_KEY]
-          end
+          payload.priority          = payload_data[PRIORITY_KEY]
+          payload.parent_id         = payload_data[ID_KEY]        # Our parent ID is the caller's GUID
+          payload.grandparent_id    = payload_data[PARENT_ID_KEY] # Our grandparent ID is the caller's parent ID
 
           payload
         end
@@ -129,11 +108,15 @@ module NewRelic
           from_json decoded_payload
         end
 
-        #assigns intrinsics for the first distributed trace in a trip
-        def assign_initial_intrinsics transaction, payload
-          payload[TRIP_ID_INTRINSIC_KEY] = transaction.distributed_tracing_trip_id
-          payload[DEPTH_INTRINSIC_KEY] = transaction.depth
-          payload[PARENT_IDS_INTRINSIC_KEY] = transaction.parent_ids
+        # Assigns intrinsics for the first distributed trace in a trip
+        def assign_intrinsics_for_first_trace transaction, transaction_payload
+          transaction_payload[GUID_INTRINSIC_KEY] = transaction.guid
+          transaction_payload[TRACE_ID_INTRINSIC_KEY] = transaction.trace_id
+          transaction_payload[TRIP_ID_INTRINSIC_KEY]  = transaction.trace_id
+        end
+
+        def major_version_matches?(payload)
+          payload.version[0] == VERSION[0]
         end
 
         private
@@ -146,26 +129,22 @@ module NewRelic
       end
 
       attr_accessor :version,
-                    :caller_type,
+                    :parent_type,
                     :caller_transport_type,
-                    :caller_account_id,
-                    :caller_app_id,
+                    :parent_account_id,
+                    :parent_app_id,
                     :id,
-                    :trip_id,
+                    :trace_id,
                     :sampled,
-                    :parent_ids,
-                    :synthetics_resource,
-                    :synthetics_job,
-                    :synthetics_monitor,
-                    :order,
-                    :depth,
-                    :timestamp,
-                    :host
+                    :priority,
+                    :parent_id,
+                    :grandparent_id,
+                    :timestamp
 
       alias_method :sampled?, :sampled
 
-      def synthetics?
-        !!(synthetics_resource || synthetics_job || synthetics_monitor)
+      def initialize
+        @caller_transport_type = PARENT_TRANSPORT_TYPE_UNKNOWN
       end
 
       def to_json
@@ -174,27 +153,19 @@ module NewRelic
         }
 
         result[DATA_KEY] = {
-          CALLER_TYPE_KEY    => caller_type,
-          CALLER_ACCOUNT_KEY => caller_account_id,
-          CALLER_APP_KEY     => caller_app_id,
-          ID_KEY             => id,
-          TRIP_ID_KEY        => trip_id,
-          SAMPLED_KEY        => sampled,
-          PARENT_IDS_KEY     => parent_ids,
-          DEPTH_KEY          => depth,
-          ORDER_KEY          => order,
-          HOST_KEY           => host,
+          PARENT_TYPE_KEY       => parent_type,
+          PARENT_ACCOUNT_ID_KEY => parent_account_id,
+          PARENT_APP_KEY        => parent_app_id,
+          ID_KEY                => id,
+          TRACE_ID_KEY          => trace_id,
+          SAMPLED_KEY           => sampled,
+          PRIORITY_KEY          => priority,
+          PARENT_ID_KEY         => parent_id,
+          # GRANDPARENT_ID_KEY does not go into the outbound JSON payload;
+          # the callee will take our parent ID as its grandparent ID
           TIMESTAMP_KEY      => timestamp,
         }
 
-        if synthetics?
-          result[DATA_KEY][SYNTHETICS_KEY] = {
-            SYNTHETICS_RESOURCE_KEY => synthetics_resource,
-            SYNTHETICS_JOB_KEY      => synthetics_job,
-            SYNTHETICS_MONITOR_KEY  => synthetics_monitor
-          }
-        end
-
         JSON.dump(result)
       end
 
@@ -204,19 +175,17 @@ module NewRelic
         Base64.strict_encode64 to_json
       end
 
-      def assign_intrinsics transaction, payload
-        payload[CALLER_TYPE_INTRINSIC_KEY] = caller_type
-        payload[CALLER_APP_INTRINSIC_KEY] = caller_app_id
-        payload[CALLER_ACCOUNT_ID_INTRINSIC_KEY] = caller_account_id
-        payload[CALLER_TRANSPORT_TYPE_INTRINSIC_KEY] = caller_transport_type
-        payload[CALLER_TRANSPORT_DURATION_INTRINSIC_KEY] = transaction.transport_duration
-        payload[CALLER_HOST_INTRINSIC_KEY] = host
-        payload[DEPTH_INTRINSIC_KEY] = depth
-        payload[ORDER_INTRINSIC_KEY] = order
-        payload[GUID_INTRINSIC_KEY] = transaction.guid
-        payload[REFERRING_TRANSACTION_GUID_INTRINSIC_KEY] = id
-        payload[TRIP_ID_INTRINSIC_KEY] = trip_id
-        payload[PARENT_IDS_INTRINSIC_KEY] = parent_ids.join COMMA if parent_ids
+      def assign_intrinsics transaction, transaction_payload
+        transaction_payload[PARENT_TYPE_INTRINSIC_KEY] = parent_type
+        transaction_payload[PARENT_APP_INTRINSIC_KEY] = parent_app_id
+        transaction_payload[PARENT_ACCOUNT_ID_INTRINSIC_KEY] = parent_account_id
+        transaction_payload[PARENT_TRANSPORT_TYPE_INTRINSIC_KEY] = caller_transport_type
+        transaction_payload[PARENT_TRANSPORT_DURATION_INTRINSIC_KEY] = transaction.transport_duration
+        transaction_payload[GUID_INTRINSIC_KEY] = transaction.guid
+        transaction_payload[TRACE_ID_INTRINSIC_KEY] = trace_id
+        transaction_payload[TRIP_ID_INTRINSIC_KEY] = trace_id
+        transaction_payload[PARENT_ID_INTRINSIC_KEY] = parent_id if parent_id
+        transaction_payload[GRANDPARENT_ID_INTRINSIC_KEY] = grandparent_id if grandparent_id
       end
     end
   end