newrelic_rpm 6.2.0.354 → 6.7.0.359

data/lib/new_relic/agent/tracer.rb

@@ -39,6 +39,38 @@ module NewRelic
           state.current_transaction
         end
 
+        # Returns the trace_id of the current_transaction, or +nil+ if
+        # none exists.
+        #
+        # @api public
+        def current_trace_id
+          if txn = current_transaction
+            txn.trace_id
+          end
+        end
+        alias_method :trace_id, :current_trace_id
+
+        # Returns the id of the current span, or +nil+ if none exists.
+        #
+        # @api public
+        def current_span_id
+          if span = current_segment
+            span.guid
+          end
+        end
+        alias_method :span_id, :current_span_id
+
+        # Returns a boolean indicating whether the current_transaction
+        # is sampled, or +nil+ if there is no current transaction.
+        #
+        # @api public
+        def transaction_sampled?
+          if txn = current_transaction
+            txn.sampled?
+          end
+        end
+        alias_method :sampled?, :transaction_sampled?
+
         # Runs the given block of code in a transaction.
         #
         # @param [String] name reserved for New Relic internal use

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_event_recorder.rb

@@ -14,9 +14,9 @@ module NewRelic
       attr_reader :transaction_event_aggregator
       attr_reader :synthetics_event_aggregator
 
-      def initialize
-        @transaction_event_aggregator = NewRelic::Agent::TransactionEventAggregator.new
-        @synthetics_event_aggregator = NewRelic::Agent::SyntheticsEventAggregator.new
+      def initialize events
+        @transaction_event_aggregator = NewRelic::Agent::TransactionEventAggregator.new events
+        @synthetics_event_aggregator = NewRelic::Agent::SyntheticsEventAggregator.new events
       end
 
       def record payload

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/cli/commands/deployments.rb

@@ -39,7 +39,7 @@ class NewRelic::Cli::Deployments < NewRelic::Cli::Command
     control.env = @environment if @environment
 
     load_yaml_from_env(control.env)
-    @appname ||= NewRelic::Agent.config.app_names[0] || control.env || 'development'
+    @appname ||= NewRelic::Agent.config[:app_name][0] || control.env || 'development'
     @license_key ||= NewRelic::Agent.config[:license_key]
 
     setup_logging(control.env)

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 = 2
+    MINOR = 7
     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

@@ -31,6 +31,13 @@ EOS
     "newrelic.yml"
   ]
 
+  s.metadata = {
+    'bug_tracker_uri' => 'https://support.newrelic.com/',
+    'changelog_uri' => 'https://github.com/newrelic/rpm/blob/master/CHANGELOG.md',
+    'documentation_uri' => 'https://docs.newrelic.com/docs/agents/ruby-agent',
+    'source_code_uri' => 'https://github.com/newrelic/rpm'
+  }
+
   file_list = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/(?!agent_helper.rb)}) }
   build_file_path = 'lib/new_relic/build.rb'
   file_list << build_file_path if File.exist?(build_file_path)

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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 6.2.0.354
+  version: 6.7.0.359
 platform: ruby
 authors:
 - Matthew Wear
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-12 00:00:00.000000000 Z
+date: 2019-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -178,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
@@ -191,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
@@ -240,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
@@ -254,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
@@ -271,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
@@ -278,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
@@ -299,6 +297,7 @@ files:
 - lib/new_relic/agent/internal_agent_error.rb
 - lib/new_relic/agent/javascript_instrumentor.rb
 - lib/new_relic/agent/log_once.rb
+- lib/new_relic/agent/logging.rb
 - lib/new_relic/agent/memory_logger.rb
 - lib/new_relic/agent/messaging.rb
 - lib/new_relic/agent/method_tracer.rb
@@ -360,7 +359,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
@@ -394,8 +392,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
@@ -445,7 +442,11 @@ files:
 homepage: https://github.com/newrelic/rpm
 licenses:
 - New Relic
-metadata: {}
+metadata:
+  bug_tracker_uri: https://support.newrelic.com/
+  changelog_uri: https://github.com/newrelic/rpm/blob/master/CHANGELOG.md
+  documentation_uri: https://docs.newrelic.com/docs/agents/ruby-agent
+  source_code_uri: https://github.com/newrelic/rpm
 post_install_message: 
 rdoc_options: []
 require_paths:

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