newrelic_rpm 6.1.0.352 → 6.6.0.358

data/lib/new_relic/agent/transaction_time_aggregator.rb

@@ -2,8 +2,6 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
-require 'objspace'
-
 # This module powers the Busy calculation for the Capacity report in
 # APM (https://rpm.newrelic.com/accounts/.../applications/.../optimize/capacity_analysis).
 #
@@ -102,12 +100,27 @@ module NewRelic
         end
 
         def thread_is_alive?(thread_id)
-          thread = ObjectSpace._id2ref(thread_id)
+          thread = thread_by_id thread_id
           thread && thread.alive?
         rescue StandardError
           false
         end
 
+        # ObjectSpace is faster on MRI, but disabled by default on JRuby for
+        # perfomance reasons. We have two implmentations of `thread_by_id`
+        # based on ruby implementation.
+        if RUBY_ENGINE == 'jruby'
+          def thread_by_id thread_id
+            Thread.list.detect { |t| t.object_id == thread_id }
+          end
+        else
+          require 'objspace'
+
+          def thread_by_id thread_id
+            ObjectSpace._id2ref(thread_id)
+          end
+        end
+
         def set_transaction_start_time(timestamp, thread_id = current_thread)
           @stats[thread_id].transaction_started_at = timestamp
         end
@@ -131,7 +144,9 @@ module NewRelic
         end
 
         def log_missing_elapsed_transaction_time
-          transaction_name = Tracer.current_transaction.best_name
+          transaction_name = Tracer.current_transaction &&
+            Tracer.current_transaction.best_name ||
+              "unknown"
           NewRelic::Agent.logger.warn("Unable to calculate elapsed transaction time for #{transaction_name}")
         end
       end

data/lib/new_relic/control/class_methods.rb

@@ -49,13 +49,19 @@ module NewRelic
           # maybe it is already loaded by some external system
           # i.e. rpm_contrib or user extensions?
         end
-        NewRelic::Control::Frameworks.const_get(framework.to_s.capitalize)
+        NewRelic::Control::Frameworks.const_get(camelize(framework.to_s))
       end
 
       # The root directory for the plugin or gem
       def newrelic_root
         File.expand_path(File.join("..", "..", "..", ".."), __FILE__)
       end
+
+      def camelize(snake_case_name)
+        snake_case_name.gsub(/(\_|^)[a-z]/) do |substring|
+          substring[-1].capitalize!
+        end
+      end
     end
     extend ClassMethods
   end

data/lib/new_relic/control/frameworks/{rails5.rb → rails_notifications.rb}

@@ -7,7 +7,7 @@ require 'new_relic/control/frameworks/rails4'
 module NewRelic
   class Control
     module Frameworks
-      class Rails5 < NewRelic::Control::Frameworks::Rails4
+      class RailsNotifications < NewRelic::Control::Frameworks::Rails4
       end
     end
   end

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 = 1
+    MINOR = 6
     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)

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", "Chris Pine", "Erin Dees", "Rachel Klein" ]
+  s.authors = [ "Matthew Wear", "Chris Pine", "Rachel Klein", "Justin Foote" ]
   s.date = Time.now.strftime('%Y-%m-%d')
   s.licenses    = ['New Relic']
   s.description = <<-EOS
@@ -45,15 +45,8 @@ EOS
   s.add_development_dependency 'minitest', '~> 4.7.5'
   s.add_development_dependency 'mocha', '~> 0.13.0'
   s.add_development_dependency 'yard'
-  s.add_development_dependency 'rails', '~> 3.2.13'
-  s.add_development_dependency 'json', '>= 2.0.2' if RUBY_VERSION >= '2.4.0' # possible bundler issue?
   s.add_development_dependency 'pry-nav', '~> 0.2.4'
   s.add_development_dependency 'pry-stack_explorer', '~> 0.4.9'
   s.add_development_dependency 'hometown', '~> 0.2.5'
-
-  if RUBY_PLATFORM == 'java'
-    s.add_development_dependency 'activerecord-jdbcsqlite3-adapter'
-  else
-    s.add_development_dependency 'sqlite3', '~> 1.3.13'
-  end
+  s.add_development_dependency 'bundler', '< 2.0'
 end

data/test/agent_helper.rb

@@ -452,6 +452,13 @@ def with_config(config_hash, at_start=true)
   end
 end
 
+def with_server_source config_hash, at_start=true
+  with_config config_hash, at_start do
+    NewRelic::Agent.config.notify_server_source_added
+    yield
+  end
+end
+
 def with_config_low_priority(config_hash)
   with_config(config_hash, false) do
     yield
@@ -521,7 +528,7 @@ def constant_path(name, opts={})
   path = [Object]
   parts = name.gsub(/^::/, '').split('::')
   parts.each do |part|
-    if !path.last.const_defined?(part)
+    if !path.last.constants.include?(part.to_sym)
       return allow_partial ? path : nil
     end
     path << path.last.const_get(part)
@@ -529,11 +536,17 @@ def constant_path(name, opts={})
   path
 end
 
+def get_parent(constant_name)
+  parent_name = constant_name.gsub(/::[^:]*$/, '')
+  const_path = constant_path(parent_name)
+  const_path ? const_path[-1] : nil
+end
+
 def undefine_constant(constant_symbol)
-  const_path = constant_path(constant_symbol.to_s)
-  return yield unless const_path
-  parent = const_path[-2]
-  const_name = constant_symbol.to_s.gsub(/.*::/, '')
+  const_str = constant_symbol.to_s
+  parent = get_parent(const_str)
+  const_name = const_str.gsub(/.*::/, '')
+  return yield unless parent && parent.constants.include?(const_name.to_sym)
   removed_constant = parent.send(:remove_const, const_name)
   yield
 ensure

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 6.1.0.352
+  version: 6.6.0.358
 platform: ruby
 authors:
 - Matthew Wear
 - Chris Pine
-- Erin Dees
 - Rachel Klein
+- Justin Foote
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-21 00:00:00.000000000 Z
+date: 2019-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -69,34 +69,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.2.13
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.2.13
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: pry-nav
   requirement: !ruby/object:Gem::Requirement
@@ -140,19 +112,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.5
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.3.13
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.3.13
+        version: '2.0'
 description: |
   New Relic is a performance management system, developed by New Relic,
   Inc (http://www.newrelic.com).  New Relic provides you with deep
@@ -206,12 +178,11 @@ 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
 - lib/new_relic/agent/configuration/environment_source.rb
+- lib/new_relic/agent/configuration/event_harvest_config.rb
 - lib/new_relic/agent/configuration/high_security_source.rb
 - lib/new_relic/agent/configuration/manager.rb
 - lib/new_relic/agent/configuration/manual_source.rb
@@ -219,6 +190,8 @@ files:
 - lib/new_relic/agent/configuration/security_policy_source.rb
 - lib/new_relic/agent/configuration/server_source.rb
 - lib/new_relic/agent/configuration/yaml_source.rb
+- lib/new_relic/agent/connect/request_builder.rb
+- lib/new_relic/agent/connect/response_handler.rb
 - lib/new_relic/agent/cross_app_monitor.rb
 - lib/new_relic/agent/cross_app_payload.rb
 - lib/new_relic/agent/cross_app_tracing.rb
@@ -268,9 +241,8 @@ files:
 - lib/new_relic/agent/instrumentation/active_job.rb
 - lib/new_relic/agent/instrumentation/active_merchant.rb
 - lib/new_relic/agent/instrumentation/active_record.rb
-- lib/new_relic/agent/instrumentation/active_record_4.rb
-- lib/new_relic/agent/instrumentation/active_record_5.rb
 - lib/new_relic/agent/instrumentation/active_record_helper.rb
+- lib/new_relic/agent/instrumentation/active_record_notifications.rb
 - lib/new_relic/agent/instrumentation/active_record_prepend.rb
 - lib/new_relic/agent/instrumentation/active_record_subscriber.rb
 - lib/new_relic/agent/instrumentation/active_storage.rb
@@ -282,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
@@ -299,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
@@ -306,12 +278,10 @@ files:
 - lib/new_relic/agent/instrumentation/rails/action_controller.rb
 - lib/new_relic/agent/instrumentation/rails/action_web_service.rb
 - lib/new_relic/agent/instrumentation/rails3/action_controller.rb
-- lib/new_relic/agent/instrumentation/rails4/action_controller.rb
-- lib/new_relic/agent/instrumentation/rails4/action_view.rb
-- lib/new_relic/agent/instrumentation/rails5/action_cable.rb
-- lib/new_relic/agent/instrumentation/rails5/action_controller.rb
-- lib/new_relic/agent/instrumentation/rails5/action_view.rb
 - lib/new_relic/agent/instrumentation/rails_middleware.rb
+- lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb
+- lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb
+- lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb
 - lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb
 - lib/new_relic/agent/instrumentation/rake.rb
 - lib/new_relic/agent/instrumentation/redis.rb
@@ -388,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
@@ -422,8 +391,7 @@ files:
 - lib/new_relic/control/frameworks/rails.rb
 - lib/new_relic/control/frameworks/rails3.rb
 - lib/new_relic/control/frameworks/rails4.rb
-- lib/new_relic/control/frameworks/rails5.rb
-- lib/new_relic/control/frameworks/rails6.rb
+- lib/new_relic/control/frameworks/rails_notifications.rb
 - lib/new_relic/control/frameworks/ruby.rb
 - lib/new_relic/control/frameworks/sinatra.rb
 - lib/new_relic/control/instance_methods.rb
@@ -489,8 +457,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: New Relic Ruby Agent

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