newrelic_rpm 6.3.0.355 → 6.4.0.356

data/lib/new_relic/agent/new_relic_service.rb

@@ -163,10 +163,6 @@ module NewRelic
         invoke_remote(:agent_command_results, [@agent_id, results])
       end
 
-      def get_xray_metadata(xray_ids)
-        invoke_remote(:get_xray_metadata, [@agent_id, *xray_ids])
-      end
-
       def analytic_event_data(data)
         _, items = data
         invoke_remote(:analytic_event_data, [@agent_id, *data],

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

@@ -36,8 +36,8 @@ module NewRelic
           @worker_loop = NewRelic::Agent::WorkerLoop.new
 
           # Memoize overhead % to avoid getting stale OR looked up every poll
-          @overhead_percent_threshold = NewRelic::Agent.config[:'xray_session.max_profile_overhead']
-          NewRelic::Agent.config.register_callback(:'xray_session.max_profile_overhead') do |new_value|
+          @overhead_percent_threshold = NewRelic::Agent.config[:'thread_profiler.max_profile_overhead']
+          NewRelic::Agent.config.register_callback(:'thread_profiler.max_profile_overhead') do |new_value|
             @overhead_percent_threshold = new_value
           end
 
@@ -213,7 +213,7 @@ module NewRelic
             if @buffer[thread].length < MAX_BUFFER_LENGTH
               @buffer[thread] << [timestamp, backtrace]
             else
-              NewRelic::Agent.increment_metric('Supportability/XraySessions/DroppedBacktraces')
+              NewRelic::Agent.increment_metric('Supportability/ThreadProfiler/DroppedBacktraces')
             end
           end
         end

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

@@ -16,7 +16,7 @@ module NewRelic
 
         attr_reader :profile_id, :traces, :sample_period,
           :duration, :poll_count, :backtrace_count, :failure_count,
-          :created_at, :xray_id, :command_arguments, :profile_agent_code
+          :created_at, :command_arguments, :profile_agent_code
         attr_accessor :finished_at
 
         def initialize(command_arguments={})
@@ -25,7 +25,6 @@ module NewRelic
           @duration           = command_arguments.fetch('duration', 120)
           @sample_period      = command_arguments.fetch('sample_period', 0.1)
           @profile_agent_code = command_arguments.fetch('profile_agent_code', false)
-          @xray_id            = command_arguments.fetch('x_ray_id', nil)
           @finished = false
 
           @traces = {
@@ -51,14 +50,6 @@ module NewRelic
           @poll_count += 1
         end
 
-        def sample_count
-          xray? ? @backtrace_count : @poll_count
-        end
-
-        def xray?
-          !!@xray_id
-        end
-
         def empty?
           @backtrace_count == 0
         end
@@ -121,26 +112,21 @@ module NewRelic
         def to_collector_array(encoder)
           encoded_trace_tree = encoder.encode(generate_traces, :skip_normalization => true)
           result = [
-            int(self.profile_id),
-            float(self.created_at),
-            float(self.finished_at),
-            int(self.sample_count),
+            int(profile_id),
+            float(created_at),
+            float(finished_at),
+            int(poll_count),
             encoded_trace_tree,
-            int(self.unique_thread_count),
+            int(unique_thread_count),
             0 # runnable thread count, which we don't track
           ]
-          result << int(@xray_id) if xray?
           result
         end
 
         def to_log_description
-          id = if xray?
-                 "@xray_id: #{xray_id}"
-               else
-                 "@profile_id: #{profile_id}"
-               end
-
-          "#<ThreadProfile:#{object_id} #{id} @command_arguments=#{@command_arguments.inspect}>"
+          "#<ThreadProfile:#{object_id} "\
+            "@profile_id: #{profile_id} "\
+            "@command_arguments=#{@command_arguments.inspect}>"
         end
 
       end

data/lib/new_relic/agent/transaction.rb

@@ -355,8 +355,6 @@ module NewRelic
 
       # For common interface with Trace
       alias_method :transaction_name, :best_name
-
-      attr_accessor :xray_session_id
       # End common interface
 
       def promoted_transaction_name(name)

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

@@ -11,7 +11,7 @@ module NewRelic
         class FinishedTraceError < StandardError; end
 
         attr_reader :start_time, :root_node
-        attr_accessor :transaction_name, :guid, :xray_session_id, :attributes,
+        attr_accessor :transaction_name, :guid, :attributes,
                       :node_count, :finished, :threshold, :profile
 
         ROOT = "ROOT".freeze
@@ -40,11 +40,6 @@ module NewRelic
           self.root_node.duration
         end
 
-        def forced?
-          return true if NewRelic::Coerce.int_or_nil(xray_session_id)
-          false
-        end
-
         def synthetics_resource_id
           intrinsic_attributes = attributes.intrinsic_attributes_for(NewRelic::Agent::AttributeFilter::DST_TRANSACTION_TRACER)
           intrinsic_attributes[:synthetics_resource_id]
@@ -148,8 +143,8 @@ module NewRelic
             encoder.encode(trace_tree(attributes_hash)),
             NewRelic::Coerce.string(self.guid),
             nil,
-            forced?,
-            NewRelic::Coerce.int_or_nil(xray_session_id),
+            false, # forced?,
+            nil, # NewRelic::Coerce.int_or_nil(xray_session_id),
             NewRelic::Coerce.string(self.synthetics_resource_id)
           ]
         end

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

@@ -48,7 +48,6 @@ module NewRelic
           trace.guid = transaction.guid
           trace.attributes = transaction.attributes
           trace.threshold = transaction.threshold
-          trace.xray_session_id = transaction.xray_session_id
           trace.finished = true
         end
       end

data/lib/new_relic/agent/transaction_sampler.rb

@@ -4,7 +4,6 @@
 
 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
@@ -19,13 +18,10 @@ module NewRelic
     #
     # @api public
     class TransactionSampler
-      attr_reader :last_sample, :xray_sample_buffer
+      attr_reader :last_sample
 
       def initialize
-        @xray_sample_buffer = NewRelic::Agent::Transaction::XraySampleBuffer.new
-
         @sample_buffers = []
-        @sample_buffers << @xray_sample_buffer
         @sample_buffers << NewRelic::Agent::Transaction::SlowestSampleBuffer.new
         @sample_buffers << NewRelic::Agent::Transaction::SyntheticsSampleBuffer.new
 

data/lib/new_relic/rack/browser_monitoring.rb

@@ -29,15 +29,16 @@ module NewRelic::Rack
     GT                  = ">".freeze
 
     def traced_call(env)
-      result = @app.call(env)   # [status, headers, response]
+      result = @app.call(env)
+      (status, headers, response) = result
 
       js_to_inject = NewRelic::Agent.browser_timing_header
-      if (js_to_inject != "") && should_instrument?(env, result[0], result[1])
-        response_string = autoinstrument_source(result[2], result[1], js_to_inject)
+      if (js_to_inject != "") && should_instrument?(env, status, headers)
+        response_string = autoinstrument_source(response, headers, js_to_inject)
 
         env[ALREADY_INSTRUMENTED_KEY] = true
         if response_string
-          response = Rack::Response.new(response_string, result[0], result[1])
+          response = Rack::Response.new(response_string, status, headers)
           response.finish
         else
           result
@@ -55,7 +56,7 @@ module NewRelic::Rack
         !env[ALREADY_INSTRUMENTED_KEY] &&
         is_html?(headers) &&
         !is_attachment?(headers) &&
-        !is_streaming?(env)
+        !is_streaming?(env, headers)
     end
 
     def is_html?(headers)
@@ -66,10 +67,11 @@ module NewRelic::Rack
       headers[CONTENT_DISPOSITION] && headers[CONTENT_DISPOSITION].include?(ATTACHMENT)
     end
 
-    def is_streaming?(env)
-      return false unless defined?(ActionController::Live)
+    def is_streaming?(env, headers)
+      return true if headers && headers['Transfer-Encoding'] == 'chunked'
 
-      env['action_controller.instance'].class.included_modules.include?(ActionController::Live)
+      defined?(ActionController::Live) &&
+        env['action_controller.instance'].class.included_modules.include?(ActionController::Live)
     end
 
     CHARSET_RE         = /<\s*meta[^>]+charset\s*=[^>]*>/im.freeze

data/lib/new_relic/version.rb

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

data/lib/tasks/config.rake

@@ -17,8 +17,7 @@ namespace :newrelic do
     }
 
     NAME_OVERRIDES = {
-      "slow_sql"     => "Slow SQL",
-      "xray_session" => "X-Ray Session"
+      "slow_sql"     => "Slow SQL"
     }
 
     def output(format)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 6.3.0.355
+  version: 6.4.0.356
 platform: ruby
 authors:
 - Matthew Wear
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-25 00:00:00.000000000 Z
+date: 2019-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -178,8 +178,6 @@ files:
 - lib/new_relic/agent/commands/agent_command.rb
 - lib/new_relic/agent/commands/agent_command_router.rb
 - lib/new_relic/agent/commands/thread_profiler_session.rb
-- lib/new_relic/agent/commands/xray_session.rb
-- lib/new_relic/agent/commands/xray_session_collection.rb
 - lib/new_relic/agent/configuration.rb
 - lib/new_relic/agent/configuration/default_source.rb
 - lib/new_relic/agent/configuration/dotted_hash.rb
@@ -256,7 +254,6 @@ files:
 - lib/new_relic/agent/instrumentation/curb.rb
 - lib/new_relic/agent/instrumentation/data_mapper.rb
 - lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb
-- lib/new_relic/agent/instrumentation/evented_subscriber.rb
 - lib/new_relic/agent/instrumentation/excon.rb
 - lib/new_relic/agent/instrumentation/excon/connection.rb
 - lib/new_relic/agent/instrumentation/excon/middleware.rb
@@ -273,6 +270,7 @@ files:
 - lib/new_relic/agent/instrumentation/mongo.rb
 - lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb
 - lib/new_relic/agent/instrumentation/net.rb
+- lib/new_relic/agent/instrumentation/notifications_subscriber.rb
 - lib/new_relic/agent/instrumentation/padrino.rb
 - lib/new_relic/agent/instrumentation/passenger_instrumentation.rb
 - lib/new_relic/agent/instrumentation/queue_time.rb
@@ -360,7 +358,6 @@ files:
 - lib/new_relic/agent/transaction/trace_node.rb
 - lib/new_relic/agent/transaction/tracing.rb
 - lib/new_relic/agent/transaction/transaction_sample_buffer.rb
-- lib/new_relic/agent/transaction/xray_sample_buffer.rb
 - lib/new_relic/agent/transaction_error_primitive.rb
 - lib/new_relic/agent/transaction_event_aggregator.rb
 - lib/new_relic/agent/transaction_event_primitive.rb

data/lib/new_relic/agent/commands/xray_session.rb

@@ -1,55 +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 'forwardable'
-
-module NewRelic
-  module Agent
-    module Commands
-      class XraySession
-        extend Forwardable
-
-        attr_reader :id, :command_arguments
-        attr_reader :xray_session_name, :key_transaction_name,
-                    :requested_trace_count, :duration, :sample_period
-
-        def initialize(command_arguments)
-          @command_arguments     = command_arguments
-          @id                    = command_arguments.fetch("x_ray_id", nil)
-          @xray_session_name     = command_arguments.fetch("xray_session_name", "")
-          @key_transaction_name  = command_arguments.fetch("key_transaction_name", "")
-          @requested_trace_count = command_arguments.fetch("requested_trace_count", 100)
-          @duration              = command_arguments.fetch("duration", 86400)
-          @sample_period         = command_arguments.fetch("sample_period", 0.1)
-          @run_profiler          = command_arguments.fetch("run_profiler", true)
-        end
-
-        def active?
-          @active
-        end
-
-        def run_profiler?
-          @run_profiler && NewRelic::Agent.config[:'xray_session.allow_profiles']
-        end
-
-        def activate
-          @active = true
-          @start_time = Time.now
-        end
-
-        def deactivate
-          @active = false
-        end
-
-        def requested_period
-          @sample_period
-        end
-
-        def finished?
-          @start_time + @duration < Time.now
-        end
-      end
-    end
-  end
-end

data/lib/new_relic/agent/commands/xray_session_collection.rb

@@ -1,161 +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 'forwardable'
-require 'thread'
-require 'new_relic/agent/commands/xray_session'
-
-module NewRelic
-  module Agent
-    module Commands
-      class XraySessionCollection
-        extend Forwardable
-
-        def initialize(backtrace_service, event_listener)
-          @backtrace_service = backtrace_service
-
-          # This lock protects access to the sessions hash, but it's expected
-          # that individual session objects within the hash will be manipulated
-          # outside the lock.  This is safe because manipulation of the session
-          # objects is expected from only a single thread (the harvest thread)
-          @sessions_lock = Mutex.new
-          @sessions = {}
-
-          if event_listener
-            event_listener.subscribe(:before_harvest, &method(:cleanup_finished_sessions))
-          end
-        end
-
-        def handle_active_xray_sessions(agent_command)
-          # If X-Rays are disabled, just be quiet about it and don't start the
-          # command. Other hosts might be running the X-Ray, so we don't need
-          # to bark on every get_agent_commands.
-          if !NewRelic::Agent.config[:'xray_session.enabled']
-            NewRelic::Agent.logger.debug("Not responding to X-Ray command because of config 'xray_session.enabled' = #{NewRelic::Agent.config[:'xray_session.enabled']}")
-            return
-          end
-
-          incoming_ids = agent_command.arguments["xray_ids"]
-          deactivate_for_incoming_sessions(incoming_ids)
-          activate_sessions(incoming_ids)
-        end
-
-        def session_id_for_transaction_name(name)
-          @sessions_lock.synchronize do
-            @sessions.each do |id, session|
-              return id if session.key_transaction_name == name
-            end
-          end
-          nil
-        end
-
-        NO_PROFILES = [].freeze
-
-        def harvest_thread_profiles
-          return NO_PROFILES unless NewRelic::Agent::Threading::BacktraceService.is_supported?
-
-          profiles = active_thread_profiling_sessions.map do |session|
-            NewRelic::Agent.logger.debug("Harvesting profile for X-Ray session #{session.inspect}")
-            @backtrace_service.harvest(session.key_transaction_name)
-          end
-          profiles.reject! {|p| p.empty?}
-          profiles.compact
-        end
-
-        def stop_all_sessions
-          deactivate_for_incoming_sessions([])
-        end
-
-        def cleanup_finished_sessions
-          finished_session_ids.each do |id|
-            NewRelic::Agent.logger.debug("Finished X-Ray session #{id} by duration. Removing it from active sessions.")
-            remove_session_by_id(id)
-          end
-        end
-
-
-        ### Internals
-
-        def new_relic_service
-          NewRelic::Agent.instance.service
-        end
-
-        # These are unsynchonized and should only be used for testing
-        def_delegators :@sessions, :[], :include?
-
-        def active_thread_profiling_sessions
-          @sessions_lock.synchronize do
-            @sessions.values.select { |s| s.active? && s.run_profiler? }
-          end
-        end
-
-        ### Session activation
-
-        def activate_sessions(incoming_ids)
-          lookup_metadata_for(ids_to_activate(incoming_ids)).each do |raw|
-            add_session(XraySession.new(raw))
-          end
-        end
-
-        def ids_to_activate(incoming_ids)
-          @sessions_lock.synchronize { incoming_ids - @sessions.keys }
-        end
-
-        # Please don't hold the @sessions_lock across me! Calling the service
-        # is time-consuming, and will block request threads. Which is rude.
-        def lookup_metadata_for(ids_to_activate)
-          return [] if ids_to_activate.empty?
-
-          NewRelic::Agent.logger.debug("Retrieving metadata for X-Ray sessions #{ids_to_activate.inspect}")
-          new_relic_service.get_xray_metadata(ids_to_activate)
-        end
-
-        def add_session(session)
-          NewRelic::Agent.logger.debug("Adding X-Ray session #{session.inspect}")
-          NewRelic::Agent.increment_metric("Supportability/XraySessions/Starts")
-
-          @sessions_lock.synchronize { @sessions[session.id] = session }
-
-          session.activate
-          if session.run_profiler?
-            @backtrace_service.subscribe(session.key_transaction_name, session.command_arguments)
-          end
-        end
-
-        ### Session deactivation
-
-        def deactivate_for_incoming_sessions(incoming_ids)
-          ids_to_remove(incoming_ids).each do |session_id|
-            remove_session_by_id(session_id)
-          end
-        end
-
-        def ids_to_remove(incoming_ids)
-          @sessions_lock.synchronize { @sessions.keys - incoming_ids }
-        end
-
-        def remove_session_by_id(id)
-          session = @sessions_lock.synchronize { @sessions.delete(id) }
-
-          if session
-            NewRelic::Agent.logger.debug("Removing X-Ray session #{session.inspect}")
-            NewRelic::Agent.increment_metric("Supportability/XraySessions/Stops")
-
-            if session.run_profiler?
-              @backtrace_service.unsubscribe(session.key_transaction_name)
-            end
-            session.deactivate
-          end
-        end
-
-        def finished_session_ids
-          @sessions_lock.synchronize do
-            @sessions.map{|k, s| k if s.finished?}.compact
-          end
-        end
-
-      end
-    end
-  end
-end