newrelic_rpm 4.5.0.337 → 4.6.0.338

data/lib/new_relic/agent/transaction_event_recorder.rb

@@ -22,7 +22,9 @@ module NewRelic
       def record payload
         return unless NewRelic::Agent.config[:'analytics_events.enabled']
 
-        if synthetics_event? payload
+        if sampled_event? payload
+          transaction_event_aggregator.append_sampled { create_event(payload) }
+        elsif synthetics_event? payload
           event = create_event payload
           _, rejected = synthetics_event_aggregator.append_or_reject event
           transaction_event_aggregator.append event if rejected
@@ -39,6 +41,12 @@ module NewRelic
         payload.key? :synthetics_resource_id
       end
 
+      SAMPLED_KEY = 'nr.sampled'
+
+      def sampled_event? payload
+        !!payload[SAMPLED_KEY]
+      end
+
       def drop_buffered_data
         transaction_event_aggregator.reset!
         synthetics_event_aggregator.reset!

data/lib/new_relic/agent/transaction_sampler.rb

@@ -2,10 +2,10 @@
 # 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_sample_builder'
 require 'new_relic/agent/transaction/slowest_sample_buffer'
 require 'new_relic/agent/transaction/synthetics_sample_buffer'
 require 'new_relic/agent/transaction/xray_sample_buffer'
+require 'new_relic/agent/transaction/trace_builder'
 
 module NewRelic
   module Agent
@@ -54,29 +54,6 @@ module NewRelic
         Agent.config[:'transaction_tracer.enabled']
       end
 
-      def on_start_transaction(state, start_time)
-        if enabled?
-          start_builder(state, start_time.to_f)
-        end
-      end
-
-      # This delegates to the builder to create a new open transaction node
-      # for the frame, beginning at the optionally specified time.
-      def notice_push_frame(state, time=Time.now)
-        builder = state.transaction_sample_builder
-        return unless builder
-
-        builder.trace_entry(time.to_f)
-      end
-
-      # Informs the transaction sample builder about the end of a traced frame
-      def notice_pop_frame(state, frame, time = Time.now)
-        builder = state.transaction_sample_builder
-        return unless builder
-        raise "finished already???" if builder.sample.finished
-        builder.trace_exit(frame, time.to_f)
-      end
-
       # This is called when we are done with the transaction.  We've
       # unwound the stack to the top level. It also clears the
       # transaction sample builder so that it won't continue to have
@@ -85,23 +62,11 @@ module NewRelic
       # It sets various instance variables to the finished sample,
       # depending on which settings are active. See `store_sample`
       def on_finishing_transaction(state, txn, time=Time.now)
-        last_builder = state.transaction_sample_builder
-        return unless last_builder && enabled?
-
-        state.transaction_sample_builder = nil
-        return if txn.ignore_trace?
-
-        last_builder.finish_trace(time.to_f)
-
-        last_sample = last_builder.sample
-        last_sample.transaction_name = txn.best_name
-        last_sample.uri = txn.request_path
-        last_sample.guid = txn.guid
-        last_sample.attributes = txn.attributes
+        return if !enabled? || txn.ignore_trace?
 
         @samples_lock.synchronize do
-          @last_sample = last_sample
-          store_sample(@last_sample)
+          @last_sample = txn
+          store_sample(txn)
           @last_sample
         end
       end
@@ -112,13 +77,6 @@ module NewRelic
         end
       end
 
-      # Set parameters on the current node.
-      def add_node_parameters(params) #THREAD_LOCAL_ACCESS
-        builder = tl_builder
-        return unless builder
-        params.each { |k,v| builder.current_node[k] = v }
-      end
-
       # Gather transaction traces that we'd like to transmit to the server.
       def harvest!
         return [] unless enabled?
@@ -164,7 +122,14 @@ module NewRelic
         # know, Ruby 1.8.6 :/
         result = []
         @sample_buffers.each { |buffer| result.concat(buffer.harvest_samples) }
-        result.uniq
+        result.uniq!
+        result.map! do |sample|
+          if Transaction === sample
+            Transaction::TraceBuilder.build_trace sample
+          else
+            sample
+          end
+        end
       end
 
       # reset samples without rebooting the web server (used by dev mode)
@@ -174,25 +139,6 @@ module NewRelic
           @sample_buffers.each { |sample_buffer| sample_buffer.reset! }
         end
       end
-
-      # Checks to see if the transaction sampler is disabled, if
-      # transaction trace recording is disabled by a thread local, or
-      # if execution is untraced - if so it clears the transaction
-      # sample builder from the thread local, otherwise it generates a
-      # new transaction sample builder with the stated time as a
-      # starting point and saves it in the thread local variable
-      def start_builder(state, time=nil)
-        if !enabled? || !state.is_transaction_traced? || !state.is_execution_traced?
-          state.transaction_sample_builder = nil
-        else
-          state.transaction_sample_builder ||= TransactionSampleBuilder.new(time)
-        end
-      end
-
-      # The current thread-local transaction sample builder
-      def tl_builder
-        TransactionState.tl_get.transaction_sample_builder
-      end
     end
   end
 end

data/lib/new_relic/agent/transaction_state.rb

@@ -53,7 +53,6 @@ module NewRelic
         @client_cross_app_id = nil
         @referring_transaction_info = nil
 
-        @transaction_sample_builder = nil
         @sql_sampler_transaction_data = nil
 
         @busy_entries = 0
@@ -87,9 +86,8 @@ module NewRelic
         current_transaction.guid
       end
 
-      # Current transaction stack and sample building
+      # Current transaction stack
       attr_reader   :current_transaction
-      attr_accessor :transaction_sample_builder
 
       def transaction_start_time
         current_transaction.start_time if current_transaction

data/lib/new_relic/supportability_helper.rb

@@ -21,6 +21,8 @@ module NewRelic
       :disable_sql_recording,
       :disable_transaction_tracing,
       :drop_buffered_data,
+      :get_request_metadata,
+      :get_response_metadata,
       :get_transaction_name,
       :ignore_apdex,
       :ignore_enduser,
@@ -35,6 +37,8 @@ module NewRelic
       :notice_sql,
       :notice_statement,
       :perform_action_with_newrelic_trace,
+      :process_request_metadata,
+      :process_response_metadata,
       :record_custom_event,
       :record_metric,
       :recording_web_transaction?,
@@ -42,6 +46,7 @@ module NewRelic
       :set_sql_obfuscator,
       :set_transaction_name,
       :shutdown,
+      :start_segment,
       :trace,
       :trace_execution_scoped,
       :trace_execution_unscoped,

data/lib/new_relic/version.rb

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

data/newrelic.yml

@@ -1,6 +1,6 @@
 #
 # This file configures the New Relic Agent.  New Relic monitors Ruby, Java,
-# .NET, PHP, Python and Node applications with deep visibility and low
+# .NET, PHP, Python, Node, and Go applications with deep visibility and low
 # overhead.  For more information, visit www.newrelic.com.
 #
 # Generated <%= Time.now.strftime('%B %d, %Y') %><%= ", for version #{@agent_version}" if @agent_version %>

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 = [ "Matthew Wear", "Kenichi Nakamura", "Chris Pine", "Dana Scheider" ]
+  s.authors = [ "Matthew Wear", "Chris Pine", "Dana Scheider" ]
   s.date = Time.now.strftime('%Y-%m-%d')
   s.licenses    = ['New Relic']
   s.description = <<-EOS

data/test/agent_helper.rb

@@ -55,6 +55,14 @@ def last_transaction_event
   harvest_transaction_events!.last.last
 end
 
+def harvest_error_events!
+  NewRelic::Agent.instance.error_collector.error_event_aggregator.harvest!
+end
+
+def last_error_event
+  harvest_error_events!.last.last
+end
+
 unless defined?( assert_block )
   def assert_block(*msgs)
     assert yield, *msgs
@@ -362,7 +370,8 @@ def refute_contains_request_params(attributes)
 end
 
 def last_transaction_trace
-  NewRelic::Agent.agent.transaction_sampler.last_sample
+  return unless last_sample = NewRelic::Agent.agent.transaction_sampler.last_sample
+  NewRelic::Agent::Transaction::TraceBuilder.build_trace(last_sample)
 end
 
 def last_transaction_trace_request_params
@@ -387,8 +396,7 @@ def find_last_transaction_node(transaction_sample=nil)
   if transaction_sample
     root_node = transaction_sample.root_node
   else
-    builder = NewRelic::Agent.agent.transaction_sampler.tl_builder
-    root_node = builder.current_node
+    root_node = last_transaction_trace.root_node
   end
 
   last_node = nil

metadata

@@ -1,17 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 4.5.0.337
+  version: 4.6.0.338
 platform: ruby
 authors:
 - Matthew Wear
-- Kenichi Nakamura
 - Chris Pine
 - Dana Scheider
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-22 00:00:00.000000000 Z
+date: 2017-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -207,6 +206,9 @@ files:
 - lib/new_relic/agent/datastores/mongo/statement_formatter.rb
 - lib/new_relic/agent/datastores/redis.rb
 - lib/new_relic/agent/deprecator.rb
+- lib/new_relic/agent/distributed_trace_monitor.rb
+- lib/new_relic/agent/distributed_trace_payload.rb
+- lib/new_relic/agent/distributed_trace_priority_sampled_buffer.rb
 - lib/new_relic/agent/encoding_normalizer.rb
 - lib/new_relic/agent/error_collector.rb
 - lib/new_relic/agent/error_event_aggregator.rb
@@ -215,8 +217,10 @@ files:
 - lib/new_relic/agent/event_buffer.rb
 - lib/new_relic/agent/event_listener.rb
 - lib/new_relic/agent/event_loop.rb
+- lib/new_relic/agent/external.rb
 - lib/new_relic/agent/harvester.rb
 - lib/new_relic/agent/hostname.rb
+- lib/new_relic/agent/http_clients/abstract_request.rb
 - lib/new_relic/agent/http_clients/curb_wrappers.rb
 - lib/new_relic/agent/http_clients/excon_wrappers.rb
 - lib/new_relic/agent/http_clients/http_rb_wrappers.rb
@@ -329,10 +333,12 @@ files:
 - lib/new_relic/agent/threading/backtrace_node.rb
 - lib/new_relic/agent/threading/backtrace_service.rb
 - lib/new_relic/agent/threading/thread_profile.rb
+- lib/new_relic/agent/throughput_monitor.rb
 - lib/new_relic/agent/transaction.rb
 - lib/new_relic/agent/transaction/abstract_segment.rb
 - lib/new_relic/agent/transaction/attributes.rb
 - lib/new_relic/agent/transaction/datastore_segment.rb
+- lib/new_relic/agent/transaction/distributed_tracing.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
@@ -340,6 +346,7 @@ files:
 - lib/new_relic/agent/transaction/slowest_sample_buffer.rb
 - lib/new_relic/agent/transaction/synthetics_sample_buffer.rb
 - lib/new_relic/agent/transaction/trace.rb
+- lib/new_relic/agent/transaction/trace_builder.rb
 - lib/new_relic/agent/transaction/trace_node.rb
 - lib/new_relic/agent/transaction/tracing.rb
 - lib/new_relic/agent/transaction/transaction_sample_buffer.rb
@@ -349,7 +356,6 @@ files:
 - lib/new_relic/agent/transaction_event_primitive.rb
 - lib/new_relic/agent/transaction_event_recorder.rb
 - lib/new_relic/agent/transaction_metrics.rb
-- lib/new_relic/agent/transaction_sample_builder.rb
 - lib/new_relic/agent/transaction_sampler.rb
 - lib/new_relic/agent/transaction_state.rb
 - lib/new_relic/agent/transaction_timings.rb

data/lib/new_relic/agent/transaction_sample_builder.rb

@@ -1,138 +0,0 @@
-# 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'
-require 'new_relic/agent/transaction/trace'
-
-module NewRelic
-  module Agent
-    # a builder is created with every sampled transaction, to dynamically
-    # generate the sampled data.  It is a thread-local object, and is not
-    # accessed by any other thread so no need for synchronization.
-    #
-    # @api private
-    class TransactionSampleBuilder
-
-      # Once we hit the TT node limit, we use this class to hold our place in
-      # the tree so that we can still get accurate names and times on the
-      # nodes we've already created. The placeholder node keeps a
-      # depth counter that's incremented on each node entry, and decremented
-      # on exit, until it reaches zero, when we throw the placeholder away.
-      # There should only ever be zero or one placeholder node at a time.
-      #
-      # @api private
-      class PlaceholderNode
-        attr_reader :parent_node
-        attr_accessor :depth
-
-        def initialize(parent_node)
-          @parent_node = parent_node
-          @depth = 1
-        end
-
-        # No-op - some clients expect to be able to use these to read/write
-        # params on TT nodes.
-        def [](key); end
-        def []=(key, value); end
-
-        # Stubbed out in case clients try to touch params directly.
-        def params; {}; end
-        def params=; end
-      end
-
-      attr_reader :current_node, :sample
-
-      def initialize(time=Time.now)
-        @sample = NewRelic::Agent::Transaction::Trace.new(time.to_f)
-        @sample_start = time.to_f
-        @current_node = @sample.root_node
-      end
-
-      def sample_id
-        @sample.sample_id
-      end
-
-      def ignored?
-        @ignore
-      end
-
-      def ignore_transaction
-        @ignore = true
-      end
-
-      def node_limit
-        Agent.config[:'transaction_tracer.limit_segments']
-      end
-
-      def trace_entry(time)
-        if @sample.count_nodes < node_limit
-          node = @sample.create_node(time.to_f - @sample_start)
-          @current_node.add_called_node(node)
-          @current_node = node
-          if @sample.count_nodes == node_limit()
-            ::NewRelic::Agent.logger.debug("Node limit of #{node_limit} reached, ceasing collection.")
-          end
-        else
-          if @current_node.is_a?(PlaceholderNode)
-            @current_node.depth += 1
-          else
-            @current_node = PlaceholderNode.new(@current_node)
-          end
-        end
-        @current_node
-      end
-
-      def trace_exit(metric_name, time)
-        if @current_node.is_a?(PlaceholderNode)
-          @current_node.depth -= 1
-          if @current_node.depth == 0
-            @current_node = @current_node.parent_node
-          end
-        else
-          @current_node.metric_name = metric_name
-          @current_node.end_trace(time.to_f - @sample_start)
-          @current_node = @current_node.parent_node
-        end
-      end
-
-      def finish_trace(time=Time.now.to_f)
-        # Should never get called twice, but in a rare case that we can't
-        # reproduce in house it does.  log forensics and return gracefully
-        if @sample.finished
-          ::NewRelic::Agent.logger.error "Unexpected double-finish_trace of Transaction Trace Object: \n#{@sample.to_s}"
-          return
-        end
-        @sample.root_node.end_trace(time.to_f - @sample_start)
-
-        @sample.threshold = transaction_trace_threshold
-        @sample.finished = true
-        @current_node = nil
-      end
-
-      TT_THRESHOLD_KEY = :'transaction_tracer.transaction_threshold'
-
-      def transaction_trace_threshold #THREAD_LOCAL_ACCESS
-        state = TransactionState.tl_get
-        source_class = Agent.config.source(TT_THRESHOLD_KEY).class
-        if source_class == Configuration::DefaultSource && state.current_transaction
-          state.current_transaction.apdex_t * 4
-        else
-          Agent.config[TT_THRESHOLD_KEY]
-        end
-      end
-
-      def scope_depth
-        depth = -1        # have to account for the root
-        current = @current_node
-
-        while(current)
-          depth += 1
-          current = current.parent_node
-        end
-
-        depth
-      end
-    end
-  end
-end