newrelic_rpm 3.7.3.204 → 3.8.0.218

data/lib/new_relic/agent/stats_engine/stats_hash.rb

@@ -21,7 +21,7 @@ module NewRelic
       attr_accessor :started_at, :harvested_at
 
       def initialize(started_at=Time.now)
-        @started_at = started_at
+        @started_at = started_at.to_f
         super() { |hash, key| hash[key] = NewRelic::Agent::Stats.new }
       end
 

data/lib/new_relic/agent/supported_versions.rb

@@ -11,7 +11,7 @@ module NewRelic
       {
         :type        => :ruby,
         :name        => "MRI",
-        :supported   => ["1.8.7", "1.9.2", "1.9.3", "2.0.0", "2.1.0"],
+        :supported   => ["1.8.7", "1.9.2", "1.9.3", "2.0.0", "~> 2.1.0"],
         :deprecated  => ["1.8.6"],
         :url         => "https://www.ruby-lang.org",
         :feed        => "https://www.ruby-lang.org/en/feeds/news.rss",
@@ -85,7 +85,7 @@ module NewRelic
       :rails =>
       {
         :type        => :web,
-        :supported   => ["~>2.1.0", "~>2.2.0", "~>2.3.0", "~3.0.0", "~>3.1.0", "~>3.2.0", "~>4.0.0"],
+        :supported   => ["~>2.1.0", "~>2.2.0", "~>2.3.0", "~3.0.0", "~>3.1.0", "~>3.2.0", "~>4.0.0", "~>4.1.0"],
         :deprecated  => ["~>2.0.0"],
         :url         => "https://rubygems.org/gems/rails",
         :feed        => "https://rubygems.org/gems/rails/versions.atom",

data/lib/new_relic/agent/transaction.rb

@@ -25,6 +25,7 @@ module NewRelic
       attr_reader :name
       attr_reader :guid
       attr_reader :stats_hash
+      attr_reader :gc_start_snapshot
 
       # Populated with the trace sample once this transaction is completed.
       attr_reader :transaction_trace
@@ -102,6 +103,7 @@ module NewRelic
         @apdex_start = @start_time
         @jruby_cpu_start = jruby_cpu_time
         @process_cpu_start = process_cpu
+        @gc_start_snapshot = NewRelic::Agent::StatsEngine::GCProfiler.take_snapshot
         @filtered_params = options[:filtered_params] || {}
         @force_flag = options[:force]
         @request = options[:request]
@@ -157,7 +159,6 @@ module NewRelic
         transaction_sampler.notice_first_scope_push(start_time)
         sql_sampler.notice_first_scope_push(start_time)
 
-        NewRelic::Agent::StatsEngine::GCProfiler.init
         agent.stats_engine.start_transaction
         transaction_sampler.notice_transaction(uri, filtered_params)
         sql_sampler.notice_transaction(uri, filtered_params)
@@ -198,9 +199,11 @@ module NewRelic
           # before the transaction sampler is finished
           if traced?
             record_transaction_cpu
-            gc_time = NewRelic::Agent::StatsEngine::GCProfiler.capture
+            gc_stop_snapshot = NewRelic::Agent::StatsEngine::GCProfiler.take_snapshot
+            gc_delta = NewRelic::Agent::StatsEngine::GCProfiler.record_delta(
+                gc_start_snapshot, gc_stop_snapshot)
           end
-          @transaction_trace = transaction_sampler.notice_scope_empty(self, Time.now, gc_time)
+          @transaction_trace = transaction_sampler.notice_scope_empty(self, Time.now, gc_delta)
           sql_sampler.notice_scope_empty(@name)
         end
 

data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb

@@ -9,12 +9,14 @@
 # This class comes to the rescue. It relies on being the only party to reset
 # the underlying GC::Profiler, but otherwise gives us a steadily increasing
 # total time.
+
 module NewRelic
   module Agent
     module VM
       class MonotonicGCProfiler
         def initialize
-          @total_time = 0
+          @total_time_s = 0
+          @lock         = Mutex.new
         end
 
         class ProfilerNotEnabledError < StandardError
@@ -23,12 +25,22 @@ module NewRelic
           end
         end
 
-        def total_time
+        def total_time_s
           raise ProfilerNotEnabledError.new unless NewRelic::LanguageSupport.gc_profiler_enabled?
 
-          @total_time += ::GC::Profiler.total_time
-          ::GC::Profiler.clear
-          @total_time
+          # There's a race here if the next two lines don't execute as an atomic
+          # unit - we may end up double-counting some GC time in that scenario.
+          # Locking around them guarantees atomicity of the read/increment/reset
+          # sequence.
+          @lock.synchronize do
+            # The Ruby 1.9.x docs claim that GC::Profiler.total_time returns
+            # a value in milliseconds. They are incorrect - both 1.9.x and 2.x
+            # return values in seconds.
+            @total_time_s += ::GC::Profiler.total_time
+            ::GC::Profiler.clear
+          end
+
+          @total_time_s
         end
       end
     end

data/lib/new_relic/agent/vm/mri_vm.rb

@@ -19,6 +19,7 @@ module NewRelic
           gather_gc_stats(snap)
           gather_ruby_vm_stats(snap)
           gather_thread_stats(snap)
+          gather_gc_time(snap)
         end
 
         def gather_gc_stats(snap)
@@ -38,7 +39,7 @@ module NewRelic
 
         def gather_gc_time(snap)
           if supports?(:gc_total_time)
-            snap.gc_total_time = NewRelic::Agent.instance.monotonic_gc_profiler.total_time
+            snap.gc_total_time = NewRelic::Agent.instance.monotonic_gc_profiler.total_time_s
           end
         end
 

data/lib/new_relic/agent/vm/snapshot.rb

@@ -9,7 +9,11 @@ module NewRelic
         attr_accessor :gc_total_time, :gc_runs, :major_gc_count, :minor_gc_count,
                       :total_allocated_object, :heap_live, :heap_free,
                       :method_cache_invalidations, :constant_cache_invalidations,
-                      :thread_count
+                      :thread_count, :taken_at
+
+        def initialize
+          @taken_at = Time.now.to_f
+        end
       end
     end
   end

data/lib/new_relic/control/instance_methods.rb

@@ -52,10 +52,7 @@ module NewRelic
         Agent.logger.info("Starting the New Relic agent in #{env.inspect} environment.")
         Agent.logger.info("To prevent agent startup add a NEWRELIC_ENABLE=false environment variable or modify the #{env.inspect} section of your newrelic.yml.")
 
-        yaml = Agent::Configuration::YamlSource.new(@config_file_path, env)
-        Agent.config.replace_or_add_config(yaml, 1)
-
-        Agent.config.replace_or_add_config(Agent::Configuration::ManualSource.new(options), 1)
+        configure_agent(env, options)
 
         # Be sure to only create once! RUBY-1020
         if ::NewRelic::Agent.logger.is_startup_logger?
@@ -76,12 +73,18 @@ module NewRelic
         if Agent.config[:agent_enabled] && !NewRelic::Agent.instance.started?
           start_agent
           install_instrumentation
-          load_samplers unless Agent.config[:disable_samplers]
         elsif !Agent.config[:agent_enabled]
           install_shim
         end
       end
 
+      def configure_agent(env, options)
+        yaml = Agent::Configuration::YamlSource.new(@config_file_path, env)
+        Agent.config.replace_or_add_config(yaml, 1)
+
+        Agent.config.replace_or_add_config(Agent::Configuration::ManualSource.new(options), 1)
+      end
+
       # Install the real agent into the Agent module, and issue the start command.
       def start_agent
         NewRelic::Agent.agent.start

data/lib/new_relic/control/instrumentation.rb

@@ -52,15 +52,6 @@ module NewRelic
         _install_instrumentation
       end
 
-      # adds samplers to the stats engine so that they run every
-      # minute. This is dynamically recognized by any class that
-      # subclasses NewRelic::Agent::Sampler
-      def load_samplers
-        NewRelic::Agent::Sampler.sampler_classes.each do | subclass |
-          NewRelic::Agent.instance.add_harvest_sampler(subclass)
-        end
-      end
-
       private
 
       def _install_instrumentation

data/lib/new_relic/environment_report.rb

@@ -80,7 +80,7 @@ module NewRelic
     end
     report_on 'Rails Env' do
       if defined? ::Rails and ::Rails.respond_to?(:env)
-        ::Rails.env
+        ::Rails.env.to_s
       else
         ENV['RAILS_ENV']
       end

data/lib/new_relic/language_support.rb

@@ -98,6 +98,10 @@ module NewRelic::LanguageSupport
     defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
   end
 
+  def ree?
+    defined?(RUBY_DESCRIPTION) && RUBY_DESCRIPTION =~ /Ruby Enterprise Edition/
+  end
+
   def using_version?(version)
     numbers = version.split('.')
     numbers == ::RUBY_VERSION.split('.')[0, numbers.size]

data/lib/new_relic/local_environment.rb

@@ -6,11 +6,23 @@ require 'set'
 require 'new_relic/version'
 
 module NewRelic
-  # An instance of LocalEnvironment is responsible for determining the 'dispatcher'
-  # in use by the current process.
+  # This class is responsible for determining the 'dispatcher' in use by the
+  # current process. The dispatcher might be a recognized web server such as
+  # unicorn or passenger, a background job processor such as resque or sidekiq,
+  # or nil for unknown.
   #
-  # A dispatcher might be a recognized web server such as unicorn or passenger,
-  # a background job processor such as resque or sidekiq, or nil for unknown.
+  # Dispatcher detection is best-effort, and serves two purposes:
+  #
+  # 1. For some dispatchers, we need to apply specific workarounds in order for
+  #    the agent to work correctly.
+  # 2. When reading logs, since multiple processes on a given host might write
+  #    into the same log, it's useful to be able to identify what kind of
+  #    process a given PID mapped to.
+  #
+  # Overriding the dispatcher is possible via the NEW_RELIC_DISPATCHER
+  # environment variable, but this should not generally be necessary unless
+  # you're on a dispatcher that falls into category 1 above, and our detection
+  # logic isn't working correctly.
   #
   # If the environment can't be determined, it will be set to nil.
   #
@@ -61,10 +73,24 @@ module NewRelic
 
     private
 
-    # Although you can override the dispatcher with NEWRELIC_DISPATCHER this
-    # is not advisable since it implies certain api's being available.
     def discover_dispatcher
-      dispatchers = %w[passenger torquebox trinidad glassfish resque sidekiq delayed_job thin mongrel litespeed webrick fastcgi rainbows unicorn]
+      dispatchers = %w[
+        passenger
+        torquebox
+        trinidad
+        glassfish
+        resque
+        sidekiq
+        delayed_job
+        puma
+        thin
+        mongrel
+        litespeed
+        webrick
+        fastcgi
+        rainbows
+        unicorn
+      ]
       while dispatchers.any? && @discovered_dispatcher.nil?
         send 'check_for_'+(dispatchers.shift)
       end
@@ -107,13 +133,6 @@ module NewRelic
     def check_for_mongrel
       return unless defined?(::Mongrel) && defined?(::Mongrel::HttpServer)
       @discovered_dispatcher = :mongrel
-
-      # Get the port from the server if it's started
-      if mongrel && mongrel.respond_to?(:port)
-      end
-
-      # Might not have server yet, so allow one more check later on first request
-      @looked_for_mongrel = false
     end
 
     def check_for_unicorn
@@ -130,6 +149,12 @@ module NewRelic
       end
     end
 
+    def check_for_puma
+      if defined?(::Puma) && File.basename($0) == 'puma'
+        @discovered_dispatcher = :puma
+      end
+    end
+
     def check_for_delayed_job
       if $0 =~ /delayed_job$/ || (File.basename($0) == 'rake' && ARGV.include?('jobs:work'))
         @discovered_dispatcher = :delayed_job

data/lib/new_relic/noticed_error.rb

@@ -21,12 +21,15 @@ class NewRelic::NoticedError
     @exception_class_name = exception.is_a?(Exception) ? exception.class.name : 'Error'
     @exception_class_constant = exception.class
 
-    if exception.respond_to?('original_exception')
-      @message = exception.original_exception.message.to_s
-    else
-      @message = (exception || '<no message>').to_s
+    if exception.nil?
+      @message = '<no message>'
+    elsif exception.respond_to?('original_exception')
+      @message = (exception.original_exception || exception).to_s
+    else # exception is not nil, but does not respond to original_exception
+      @message = exception.to_s
     end
 
+
     unless @message.is_a?(String)
       # In pre-1.9.3, Exception.new({}).to_s.class != String
       # That is, Exception#to_s may not return a String instance if one wasn't

data/lib/new_relic/rack/browser_monitoring.rb

@@ -50,6 +50,7 @@ module NewRelic::Rack
         !headers['Content-Disposition'].to_s.include?('attachment')
     end
 
+    CHARSET_RE         = /<\s*meta[^>]+charset\s*=[^>]*>/im.freeze
     X_UA_COMPATIBLE_RE = /<\s*meta[^>]+http-equiv\s*=\s*['"]x-ua-compatible['"][^>]*>/im.freeze
 
     def autoinstrument_source(response, headers)
@@ -61,9 +62,16 @@ module NewRelic::Rack
       beginning_of_source = source[0..50_000]
 
       if body_start = find_body_start(beginning_of_source)
-        insertion_index = find_x_ua_compatible_position(beginning_of_source) ||
-                          find_end_of_head_open(beginning_of_source) ||
-                          body_start
+        meta_tag_positions = [
+          find_x_ua_compatible_position(beginning_of_source),
+          find_charset_position(beginning_of_source)
+        ].compact
+
+        if !meta_tag_positions.empty?
+          insertion_index = meta_tag_positions.max
+        else
+          insertion_index = find_end_of_head_open(beginning_of_source) || body_start
+        end
 
         if insertion_index
           source = source[0...insertion_index] <<
@@ -106,6 +114,11 @@ module NewRelic::Rack
       match.end(0) if match
     end
 
+    def find_charset_position(beginning_of_source)
+      match = CHARSET_RE.match(beginning_of_source)
+      match.end(0) if match
+    end
+
     def find_end_of_head_open(beginning_of_source)
       head_open = beginning_of_source.index("<head")
       beginning_of_source.index(">", head_open) + 1 if head_open

data/lib/new_relic/version.rb

@@ -11,8 +11,8 @@ module NewRelic
     end
 
     MAJOR = 3
-    MINOR = 7
-    TINY  = 3
+    MINOR = 8
+    TINY  = 0
 
     begin
       require File.join(File.dirname(__FILE__), 'build')

data/newrelic_rpm.gemspec

@@ -49,7 +49,7 @@ EOS
   s.add_development_dependency 'sdoc-helpers'
   s.add_development_dependency 'rdoc', '>= 2.4.2'
   s.add_development_dependency 'rails', '~> 3.2.13'
-  s.add_development_dependency 'sqlite3' unless RUBY_PLATFORM == 'java'
+  s.add_development_dependency 'sqlite3', '1.3.8' unless RUBY_PLATFORM == 'java'
   s.add_development_dependency 'activerecord-jdbcsqlite3-adapter' if RUBY_PLATFORM == 'java'
   s.add_development_dependency 'jruby-openssl' if RUBY_PLATFORM == 'java'
   s.add_development_dependency 'sequel', '~> 3.46.0'

data/test/agent_helper.rb

@@ -59,7 +59,7 @@ def assert_equal_unordered(left, right)
 end
 
 def compare_metrics(expected, actual)
-  actual.delete_if {|a| a.include?('GC/cumulative') } # in case we are in REE
+  actual.delete_if {|a| a.include?('GC/Transaction/') }
   assert_equal(expected.to_a.sort, actual.to_a.sort, "extra: #{(actual - expected).to_a.inspect}; missing: #{(expected - actual).to_a.inspect}")
 end
 
@@ -78,6 +78,8 @@ def _normalize_metric_expectations(expectations)
     # Just assert that the metric is present, nothing about the attributes
     expectations.each { |k| hash[k] = { } }
     hash
+  when String
+    { expectations => {} }
   else
     expectations
   end
@@ -122,7 +124,7 @@ def assert_metrics_recorded_exclusive(expected, options={})
     recorded_metrics = recorded_metrics.select { |m| m.match(options[:filter]) }
   end
   expected_metrics = expected.keys.map { |s| metric_spec_from_specish(s).to_s }
-  unexpected_metrics = recorded_metrics.select{|m| m !~ /GC\/cumulative/}
+  unexpected_metrics = recorded_metrics.select { |m| m !~ /GC\/Transaction/ }
   unexpected_metrics -= expected_metrics
   assert_equal(0, unexpected_metrics.size, "Found unexpected metrics: [#{unexpected_metrics.join(', ')}]")
 end
@@ -187,7 +189,7 @@ def in_transaction(*args)
   NewRelic::Agent.instance.stats_engine.transaction_sampler = \
     NewRelic::Agent.instance.transaction_sampler
   NewRelic::Agent::Transaction.start(transaction_type, opts || {})
-  val = yield
+  val = yield NewRelic::Agent::Transaction.current
   NewRelic::Agent::Transaction.stop(name)
   val
 end

data/test/environments/lib/environments/runner.rb

@@ -11,12 +11,12 @@ module Environments
     include Multiverse::Color
 
     BLACKLIST = {
+      "1.9"         => ["rails21", "rails22"],
+      "2"           => ["rails21", "rails22", "rails23"],
+
       "1.8.7"       => ["rails40", "rails41"],
+      "1.9.2"       => ["rails40", "rails41"],
       "ree"         => ["rails40", "rails41"],
-      "1.9.2"       => ["rails21", "rails22", "rails40"],
-      "1.9.3"       => ["rails21", "rails22"],
-      "2.0.0"       => ["rails21", "rails22", "rails23"],
-      "2.1.0"       => ["rails21", "rails22", "rails23"],
       "jruby-1.6"   => ["rails40", "rails41"],
       "jruby-1.7"   => ["rails21", "rails22", "rails23"],
       "rbx-2.0"     => ["rails21", "rails22", "rails23", "rails30", "rails31", "rails32"],
@@ -71,9 +71,10 @@ module Environments
       version = "jruby-#{JRUBY_VERSION[0..2]}" if defined?(JRUBY_VERSION)
       version = "rbx-2.0" if defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx"
 
-      blacklist = BLACKLIST[version] || []
-      blacklist.each do |blacklisted|
-        dirs.delete_if {|d| File.basename(d) == blacklisted }
+      BLACKLIST.each do |check_version, blacklisted|
+        if version.start_with?(check_version)
+          dirs.reject! {|d| blacklisted.include?(File.basename(d)) }
+        end
       end
 
       dirs

data/test/environments/norails/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rake'
+gem 'rake', '~>10.1.1'
 
 gem 'minitest', '~>4.7.5'
 gem 'mocha', :require => false