newrelic_rpm 6.3.0.355 → 6.8.0.360

data/lib/new_relic/control/instance_methods.rb

@@ -101,7 +101,13 @@ module NewRelic
         Agent.config.replace_or_add_config(manual)
 
         config_file_path = @config_file_override || Agent.config[:config_path]
-        Agent.config.replace_or_add_config(Agent::Configuration::YamlSource.new(config_file_path, env))
+        yaml_source = Agent::Configuration::YamlSource.new(config_file_path, env)
+        if yaml_source.failed?
+          yaml_source.failures.each do |msg|
+            stdout.puts Agent::AgentLogger.format_fatal_error(msg)
+          end
+        end
+        Agent.config.replace_or_add_config(yaml_source)
 
         if security_settings_valid? && Agent.config[:high_security]
           Agent.logger.info("Installing high security configuration based on local configuration")
@@ -172,6 +178,9 @@ module NewRelic
         '.'
       end
 
+      def stdout
+        STDOUT
+      end
     end
     include InstanceMethods
   end

data/lib/new_relic/dependency_detection.rb

@@ -93,8 +93,8 @@ module DependencyDetection
       end
     end
 
-    def depends_on
-      @dependencies << Proc.new
+    def depends_on &block
+      @dependencies << block if block_given?
     end
 
     def allowed_by_config?
@@ -114,8 +114,8 @@ module DependencyDetection
       self.name = new_name
     end
 
-    def executes
-      @executes << Proc.new
+    def executes &block
+      @executes << block if block_given?
     end
   end
 end

data/lib/new_relic/noticed_error.rb

@@ -39,7 +39,7 @@ class NewRelic::NoticedError
 
     # replace error message if enabled
     if NewRelic::Agent.config[:'strip_exception_messages.enabled'] &&
-       !self.class.passes_message_whitelist(exception.class)
+       !self.class.passes_message_allowlist(exception.class)
       @message = STRIPPED_EXCEPTION_REPLACEMENT_MESSAGE
     end
 
@@ -57,8 +57,12 @@ class NewRelic::NoticedError
     end
   end
 
-  def self.passes_message_whitelist(exception_class)
-    NewRelic::Agent.config[:'strip_exception_messages.whitelist'].any? do |klass|
+  def self.passes_message_allowlist(exception_class)
+    # For backwards compatibility until we remove :'strip_exception_messages.whitelist' config option
+
+    allowed = NewRelic::Agent.config[:'strip_exception_messages.allowed_classes'].concat(NewRelic::Agent.config[:'strip_exception_messages.whitelist'])
+
+    allowed.any? do |klass|
       exception_class <= klass
     end
   end
@@ -87,7 +91,7 @@ class NewRelic::NoticedError
   def processed_attributes
     @processed_attributes ||= begin
       attributes = base_parameters
-      merged_attributes = NewRelic::Agent::Transaction::Attributes.new(NewRelic::Agent.instance.attribute_filter)
+      merged_attributes = NewRelic::Agent::Attributes.new(NewRelic::Agent.instance.attribute_filter)
       append_attributes(attributes, USER_ATTRIBUTES, merged_custom_attributes(merged_attributes))
       append_attributes(attributes, AGENT_ATTRIBUTES, build_agent_attributes(merged_attributes))
       append_attributes(attributes, INTRINSIC_ATTRIBUTES, build_intrinsic_attributes)

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 = 8
     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", "Rachel Klein", "Justin Foote" ]
+  s.authors = [ "Chris Pine", "Rachel Klein", "Justin Foote", "Michael Lang" ]
   s.date = Time.now.strftime('%Y-%m-%d')
   s.licenses    = ['New Relic']
   s.description = <<-EOS
@@ -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)
@@ -41,12 +48,14 @@ EOS
   s.rubygems_version = Gem::VERSION
   s.summary = "New Relic Ruby Agent"
 
-  s.add_development_dependency 'rake', '10.1.0'
+  s.add_development_dependency 'rake', '12.3.3'
   s.add_development_dependency 'minitest', '~> 4.7.5'
-  s.add_development_dependency 'mocha', '~> 0.13.0'
+  s.add_development_dependency 'mocha', '~> 1.9.0'
   s.add_development_dependency 'yard'
   s.add_development_dependency 'pry-nav', '~> 0.2.4'
   s.add_development_dependency 'pry-stack_explorer', '~> 0.4.9'
+  s.add_development_dependency 'guard', '~> 2.16.0'
+  s.add_development_dependency 'guard-minitest', '~> 2.4.0'
   s.add_development_dependency 'hometown', '~> 0.2.5'
-  s.add_development_dependency 'bundler', '< 2.0'
+  s.add_development_dependency 'bundler'
 end

data/test/agent_helper.rb

@@ -212,7 +212,7 @@ end
 #
 # If you want to *allow* unexpected metrics matching certain patterns, use
 # the :ignore_filter option. This will allow you to specify a Regex that
-# whitelists broad swathes of metric territory (e.g. 'Supportability/').
+# allowlists broad swathes of metric territory (e.g. 'Supportability/').
 #
 def assert_metrics_recorded_exclusive(expected, options={})
   expected = _normalize_metric_expectations(expected)
@@ -345,6 +345,15 @@ def in_transaction(*args, &blk)
   txn
 end
 
+# Convenience wrapper to stand up a transaction and provide a segment within
+# that transaction to work with.  The same arguements as provided to in_transaction
+# may be supplied.
+def with_segment *args, &blk
+  in_transaction *args do |txn|
+    yield txn.current_segment, txn
+  end
+end
+
 def stub_transaction_guid(guid)
   NewRelic::Agent::Transaction.tl_current.instance_variable_set(:@guid, guid)
 end
@@ -452,6 +461,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
@@ -605,17 +621,87 @@ ensure
   NewRelic::Agent.logger = orig_logger
 end
 
-def with_environment(env)
-  old_env = {}
-  env.each do |key, val|
-    old_env[key] = ENV[key]
-    ENV[key]     = val.to_s
+# The EnvUpdater was introduced due to random fails in JRuby environment
+# whereby attempting to set ENV[key] = some_value randomly failed.
+# It is conjectured that this is thread related, but may also be
+# a core bug in the JVM implementation of Ruby.  Root cause was not
+# discovered, but it was found that a combination of retrying and using
+# mutex lock around the update operation was the only consistently working
+# solution as the error continued to surface without the mutex and 
+# retry alone wasn't enough, either.
+#
+# JRUBY: oraclejdk8 + jruby-9.2.6.0
+#
+# NOTE: Singleton pattern to ensure one mutex lock for all threads
+class EnvUpdater
+  MAX_RETRIES = 5
+
+  def initialize
+    @mutex = Mutex.new
   end
-  begin
+
+  # Will attempt the given block up to MAX_RETRIES before 
+  # surfacing the exception down the chain.
+  def with_retry retry_limit=MAX_RETRIES
+    retries ||= 0
+    sleep(retries)
     yield
-  ensure
-    old_env.each { |key, old_val| ENV[key] = old_val }
+  rescue
+    (retries += 1) < retry_limit ? retry : raise
+  end
+
+  # Locks and updates the ENV
+  def safe_update env
+    with_retry do
+      @mutex.synchronize do
+        env.each{ |key, val| ENV[key] = val.to_s }
+      end
+    end
+  end
+
+  # Locks and restores the ENV
+  def safe_restore old_env
+    with_retry do
+      @mutex.synchronize do
+        old_env.each{ |key, val| val ? ENV[key] = val : ENV.delete(key) }
+      end
+    end
+  end
+
+  # Singleton pattern implemented via @@instance
+  def self.instance
+    @@instance ||= EnvUpdater.new
+  end
+
+  def self.safe_update env
+    instance.safe_update env
+  end
+
+  def self.safe_restore old_env
+    instance.safe_restore old_env
   end
+
+  # Effectively saves current ENV settings for given env's key/values,
+  # runs given block, then restores ENV to original state before returning.
+  def self.inject env, &block
+    old_env = {}
+    env.each{ |key, val| old_env[key] = ENV[key] }
+    begin
+      safe_update(env)
+      yield
+    ensure
+      safe_restore(old_env)
+    end
+  end    
+
+  # must call instance here to ensure only one @mutex for all threads.
+  instance
+end
+
+# Changes ENV settings to given and runs given block and restores ENV 
+# to original values before returning.
+def with_environment(env, &block)
+  EnvUpdater.inject(env) { yield }
 end
 
 def with_argv(argv)

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 6.3.0.355
+  version: 6.8.0.360
 platform: ruby
 authors:
-- Matthew Wear
 - Chris Pine
 - Rachel Klein
 - Justin Foote
+- Michael Lang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-25 00:00:00.000000000 Z
+date: 2019-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.1.0
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.1.0
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -47,14 +47,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 1.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -97,6 +97,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.9
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.16.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.16.0
+- !ruby/object:Gem::Dependency
+  name: guard-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: hometown
   requirement: !ruby/object:Gem::Requirement
@@ -115,16 +143,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 description: |
   New Relic is a performance management system, developed by New Relic,
   Inc (http://www.newrelic.com).  New Relic provides you with deep
@@ -172,19 +200,18 @@ files:
 - lib/new_relic/agent/agent_logger.rb
 - lib/new_relic/agent/attribute_filter.rb
 - lib/new_relic/agent/attribute_processing.rb
+- lib/new_relic/agent/attributes.rb
 - lib/new_relic/agent/audit_logger.rb
 - lib/new_relic/agent/autostart.rb
 - lib/new_relic/agent/chained_call.rb
 - 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_data.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
@@ -212,8 +239,11 @@ 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_intrinsics.rb
+- lib/new_relic/agent/distributed_trace_metrics.rb
 - lib/new_relic/agent/distributed_trace_monitor.rb
 - lib/new_relic/agent/distributed_trace_payload.rb
+- lib/new_relic/agent/distributed_trace_transport_type.rb
 - lib/new_relic/agent/distributed_tracing.rb
 - lib/new_relic/agent/encoding_normalizer.rb
 - lib/new_relic/agent/error_collector.rb
@@ -224,6 +254,7 @@ files:
 - lib/new_relic/agent/event_listener.rb
 - lib/new_relic/agent/event_loop.rb
 - lib/new_relic/agent/external.rb
+- lib/new_relic/agent/guid_generator.rb
 - lib/new_relic/agent/harvester.rb
 - lib/new_relic/agent/heap.rb
 - lib/new_relic/agent/hostname.rb
@@ -256,7 +287,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 +303,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
@@ -299,6 +330,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
@@ -343,10 +375,12 @@ files:
 - lib/new_relic/agent/threading/backtrace_service.rb
 - lib/new_relic/agent/threading/thread_profile.rb
 - lib/new_relic/agent/timestamp_sampled_buffer.rb
+- lib/new_relic/agent/trace_context.rb
+- lib/new_relic/agent/trace_context_payload.rb
+- lib/new_relic/agent/trace_context_request_monitor.rb
 - lib/new_relic/agent/tracer.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
@@ -357,10 +391,10 @@ files:
 - 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_context.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
-- 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
@@ -432,19 +466,19 @@ files:
 - lib/tasks/multiverse.rb
 - lib/tasks/newrelic.rb
 - lib/tasks/tests.rake
-- lib/tasks/versions.html.erb
-- lib/tasks/versions.postface.html
-- lib/tasks/versions.preface.html
-- lib/tasks/versions.rake
-- lib/tasks/versions.txt.erb
 - newrelic.yml
 - newrelic_rpm.gemspec
 - recipes/newrelic.rb
 - test/agent_helper.rb
+- 'true'
 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:
@@ -460,7 +494,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: New Relic Ruby Agent