newrelic_rpm 4.2.0.334 → 4.3.0.335

data/lib/new_relic/agent/transaction.rb

@@ -9,6 +9,7 @@ require 'new_relic/agent/method_tracer_helpers'
 require 'new_relic/agent/transaction/attributes'
 require 'new_relic/agent/transaction/request_attributes'
 require 'new_relic/agent/transaction/tracing'
+require 'new_relic/agent/cross_app_tracing'
 
 module NewRelic
   module Agent
@@ -25,6 +26,7 @@ module NewRelic
       MIDDLEWARE_PREFIX            = 'Middleware/Rack/'.freeze
       TASK_PREFIX                  = 'OtherTransaction/Background/'.freeze
       RAKE_PREFIX                  = 'OtherTransaction/Rake/'.freeze
+      MESSAGE_PREFIX               = 'OtherTransaction/Message/'.freeze
       RACK_PREFIX                  = 'Controller/Rack/'.freeze
       SINATRA_PREFIX               = 'Controller/Sinatra/'.freeze
       GRAPE_PREFIX                 = 'Controller/Grape/'.freeze
@@ -409,6 +411,8 @@ module NewRelic
         NewRelic::Agent.instance.events.notify(:start_transaction)
         NewRelic::Agent::BusyCalculator.dispatcher_start(start_time)
 
+        ignore! if user_defined_rules_ignore?
+
         create_initial_segment @default_name
       end
 
@@ -487,7 +491,6 @@ module NewRelic
       def stop(state, end_time, outermost_frame)
         return if !state.is_execution_traced?
         freeze_name_and_execute_if_not_ignored
-        ignore! if user_defined_rules_ignore?
 
         if nesting_max_depth == 1
           outermost_frame.name = @frozen_name
@@ -520,6 +523,7 @@ module NewRelic
         record_summary_metrics(outermost_node_name, end_time)
         record_apdex(state, end_time) unless ignore_apdex?
         record_queue_time
+        record_client_application_metric state
 
         generate_payload(state, start_time, end_time)
 
@@ -775,6 +779,12 @@ module NewRelic
         end
       end
 
+      def record_client_application_metric state
+        if id = state.client_cross_app_id
+          NewRelic::Agent.record_metric "ClientApplication/#{id}/all", state.timings.app_time_in_seconds
+        end
+      end
+
       APDEX_ALL_METRIC   = 'ApdexAll'.freeze
 
       APDEX_METRIC       = 'Apdex'.freeze
@@ -785,10 +795,10 @@ module NewRelic
 
       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]
+          ignored        = NewRelic::Agent.instance.error_collector.error_is_ignored?(exception)
+          expected = options[:expected]
 
-          return true unless ignored || trace_only
+          return true unless ignored || expected
         end
         false
       end
@@ -909,6 +919,15 @@ module NewRelic
         @ignore_trace
       end
 
+      def add_message_cat_headers headers
+        state.is_cross_app_caller = true
+        CrossAppTracing.insert_message_headers headers,
+                                               guid,
+                                               cat_trip_id(state),
+                                               cat_path_hash(state),
+                                               raw_synthetics_header
+      end
+
       private
 
       def process_cpu

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

@@ -10,7 +10,7 @@ module NewRelic
         attr_accessor :name, :parent, :children_time, :transaction
         attr_writer :record_metrics, :record_scoped_metric, :record_on_finish
 
-        def initialize name=nil
+        def initialize name=nil, start_time=nil
           @name = name
           @children_time = 0.0
           @record_metrics = true
@@ -19,10 +19,11 @@ module NewRelic
           @parent = nil
           @record_on_finish = false
           @params = nil
+          @start_time = start_time if start_time
         end
 
         def start
-          @start_time = Time.now
+          @start_time ||= Time.now
         end
 
         def finish

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

@@ -0,0 +1,104 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
+require 'new_relic/agent/transaction/segment'
+require 'new_relic/agent/cross_app_tracing'
+
+module NewRelic
+  module Agent
+    class Transaction
+      class MessageBrokerSegment < Segment
+        CONSUME  = 'Consume'.freeze
+        EXCHANGE = 'Exchange'.freeze
+        NAMED    = 'Named/'.freeze
+        PRODUCE  = 'Produce'.freeze
+        QUEUE    = 'Queue'.freeze
+        PURGE    = 'Purge'.freeze
+        SLASH    = '/'.freeze
+        TEMP     = 'Temp'.freeze
+        TOPIC    = 'Topic'.freeze
+        UNKNOWN  = 'Unknown'.freeze
+
+        DESTINATION_TYPES = [
+          :exchange,
+          :queue,
+          :topic,
+          :temporary_queue,
+          :temporary_topic,
+          :unknown
+        ]
+
+        ACTIONS = {
+          consume: CONSUME,
+          produce: PRODUCE,
+          purge: PURGE
+        }
+
+        TYPES = {
+          exchange:        EXCHANGE,
+          temporary_queue: QUEUE,
+          queue:           QUEUE,
+          temporary_topic: TOPIC,
+          topic:           TOPIC,
+          unknown:         EXCHANGE
+        }
+
+        METRIC_PREFIX = 'MessageBroker/'.freeze
+
+        attr_reader :action,
+                    :destination_name,
+                    :destination_type,
+                    :library,
+                    :headers
+
+        def initialize action: nil,
+                       library: nil,
+                       destination_type: nil,
+                       destination_name: nil,
+                       headers: nil,
+                       parameters: nil,
+                       start_time: nil
+
+          # ruby 2.0.0 does not support required kwargs
+          raise ArgumentError, 'missing required argument: action' if action.nil?
+          raise ArgumentError, 'missing required argument: library' if library.nil?
+          raise ArgumentError, 'missing required argument: destination_type' if destination_type.nil?
+          raise ArgumentError, 'missing required argument: destination_name' if destination_name.nil?
+
+          @action = action
+          @library = library
+          @destination_type = destination_type
+          @destination_name = destination_name
+          @headers = headers
+          super(nil, nil, start_time)
+          params.merge! parameters if parameters
+        end
+
+        def name
+          return @name if @name
+          @name = METRIC_PREFIX + library
+          @name << SLASH << TYPES[destination_type] << SLASH << ACTIONS[action] << SLASH
+
+          if destination_type == :temporary_queue || destination_type == :temporary_topic
+            @name << TEMP
+          else
+            @name << NAMED << destination_name
+          end
+
+          @name
+        end
+
+        def transaction= t
+          super
+          if headers && transaction && action == :produce && record_metrics? && CrossAppTracing.cross_app_enabled?
+            transaction.add_message_cat_headers headers
+          end
+        rescue => e
+          NewRelic::Agent.logger.error "Error during message header processing", e
+        end
+
+      end
+    end
+  end
+end

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

@@ -13,9 +13,9 @@ module NewRelic
         # initialize it as an array that would be empty, have one item, or many items.
         attr_reader :unscoped_metrics
 
-        def initialize name = nil, unscoped_metrics=nil
+        def initialize name=nil, unscoped_metrics=nil, start_time=nil
           @unscoped_metrics = unscoped_metrics
-          super name
+          super name, start_time
         end
 
         def record_metrics

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

@@ -5,6 +5,7 @@
 require 'new_relic/agent/transaction/segment'
 require 'new_relic/agent/transaction/datastore_segment'
 require 'new_relic/agent/transaction/external_request_segment'
+require 'new_relic/agent/transaction/message_broker_segment'
 
 module NewRelic
   module Agent
@@ -13,9 +14,7 @@ module NewRelic
         module ClassMethods
           def start_segment name, unscoped_metrics=nil
             segment = Segment.new name, unscoped_metrics
-            segment.start
-            add_segment segment
-            segment
+            start_and_add_segment segment
           end
 
           UNKNOWN_PRODUCT = "Unknown".freeze
@@ -25,20 +24,50 @@ module NewRelic
             product ||= UNKNOWN_PRODUCT
             operation ||= UNKNOWN_OPERATION
             segment = DatastoreSegment.new product, operation, collection, host, port_path_or_id, database_name
-            segment.start
-            add_segment segment
-            segment
+            start_and_add_segment segment
           end
 
           def start_external_request_segment library, uri, procedure
             segment = ExternalRequestSegment.new library, uri, procedure
+            start_and_add_segment segment
+          end
+
+          # @api private
+          #
+          def start_message_broker_segment(action: nil,
+                                           library: nil,
+                                           destination_type: nil,
+                                           destination_name: nil,
+                                           headers: nil,
+                                           parameters: nil,
+                                           start_time: nil)
+
+            # ruby 2.0.0 does not support required kwargs
+            raise ArgumentError, 'missing required argument: action' if action.nil?
+            raise ArgumentError, 'missing required argument: library' if library.nil?
+            raise ArgumentError, 'missing required argument: destination_type' if destination_type.nil?
+            raise ArgumentError, 'missing required argument: destination_name' if destination_name.nil?
+
+            segment = MessageBrokerSegment.new(
+              action: action,
+              library: library,
+              destination_type: destination_type,
+              destination_name: destination_name,
+              headers: headers,
+              parameters: parameters,
+              start_time: start_time
+            )
+            start_and_add_segment segment
+          end
+
+          private
+
+          def start_and_add_segment segment
             segment.start
             add_segment segment
             segment
           end
 
-          private
-
           def add_segment segment
             state = NewRelic::Agent::TransactionState.tl_get
             if (txn = state.current_transaction) && state.is_execution_traced?

data/lib/new_relic/agent/transaction_state.rb

@@ -27,7 +27,7 @@ module NewRelic
         state
       end
 
-      def self.tl_clear_for_testing
+      def self.tl_clear
         Thread.current[:newrelic_transaction_state] = nil
       end
 

data/lib/new_relic/latest_changes.rb

@@ -9,7 +9,7 @@ module NewRelic
     end
 
     FOOTER = <<'EOS'
-    See https://github.com/newrelic/rpm/blob/master/CHANGELOG for a full list of
+    See https://github.com/newrelic/rpm/blob/master/CHANGELOG.md for a full list of
     changes.
 EOS
 

data/lib/new_relic/version.rb

@@ -11,7 +11,7 @@ module NewRelic
     end
 
     MAJOR = 4
-    MINOR = 2
+    MINOR = 3
     TINY  = 0
 
     begin

data/newrelic_rpm.gemspec

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

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 4.2.0.334
+  version: 4.3.0.335
 platform: ruby
 authors:
-- Tim Krajcar
 - Matthew Wear
 - Kenichi Nakamura
 - Chris Pine
+- Dana Scheider
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-18 00:00:00.000000000 Z
+date: 2017-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -239,6 +239,7 @@ files:
 - lib/new_relic/agent/instrumentation/active_record_subscriber.rb
 - lib/new_relic/agent/instrumentation/acts_as_solr.rb
 - lib/new_relic/agent/instrumentation/authlogic.rb
+- lib/new_relic/agent/instrumentation/bunny.rb
 - lib/new_relic/agent/instrumentation/controller_instrumentation.rb
 - lib/new_relic/agent/instrumentation/curb.rb
 - lib/new_relic/agent/instrumentation/data_mapper.rb
@@ -289,6 +290,7 @@ files:
 - lib/new_relic/agent/javascript_instrumentor.rb
 - lib/new_relic/agent/log_once.rb
 - lib/new_relic/agent/memory_logger.rb
+- lib/new_relic/agent/messaging.rb
 - lib/new_relic/agent/method_tracer.rb
 - lib/new_relic/agent/method_tracer_helpers.rb
 - lib/new_relic/agent/new_relic_service.rb
@@ -332,6 +334,7 @@ files:
 - lib/new_relic/agent/transaction/attributes.rb
 - lib/new_relic/agent/transaction/datastore_segment.rb
 - lib/new_relic/agent/transaction/external_request_segment.rb
+- lib/new_relic/agent/transaction/message_broker_segment.rb
 - lib/new_relic/agent/transaction/request_attributes.rb
 - lib/new_relic/agent/transaction/segment.rb
 - lib/new_relic/agent/transaction/slowest_sample_buffer.rb