newrelic_rpm 3.6.8.168 → 3.6.9.171

data/lib/new_relic/agent/rules_engine.rb

@@ -12,6 +12,11 @@ module NewRelic
 
       attr_accessor :rules
 
+      def self.from_specs(specs)
+        rules = (specs || []).map { |spec| Rule.new(spec) }
+        self.new(rules)
+      end
+
       def initialize(rules=[])
         @rules = rules
       end

data/lib/new_relic/agent/samplers/object_sampler.rb

@@ -13,7 +13,7 @@ module NewRelic
         end
 
         def self.supported_on_this_platform?
-          NewRelic::LanguageSupport.object_space_enabled? && ObjectSpace.respond_to?(:live_objects)
+          NewRelic::LanguageSupport.object_space_usable? && ObjectSpace.respond_to?(:live_objects)
         end
 
         def poll

data/lib/new_relic/agent/sql_sampler.rb

@@ -111,7 +111,7 @@ module NewRelic
         end
       end
 
-      def merge(sql_traces)
+      def merge!(sql_traces)
         @samples_lock.synchronize do
 #FIXME we need to merge the sql_traces array back into the @sql_traces hash
 #          @sql_traces.merge! sql_traces
@@ -130,8 +130,10 @@ module NewRelic
         slowest
       end
 
-      # reset samples without rebooting the web server
       def reset!
+        @samples_lock.synchronize do
+          @sql_traces = {}
+        end
       end
     end
 

data/lib/new_relic/agent/stats_engine.rb

@@ -16,11 +16,14 @@ module NewRelic
       include Samplers
       include Transactions
 
+      attr_accessor :metric_rules
+
       def initialize
         # Makes the unit tests happy
         NewRelic::Agent::TransactionState.get.clear_stats_scope_stack
         @stats_lock = Mutex.new
         @stats_hash = StatsHash.new
+        @metric_rules = RulesEngine.new
       end
 
       # All access to the @stats_hash ivar should be funnelled through this

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

@@ -8,9 +8,9 @@ module NewRelic
     class StatsEngine
       module GCProfiler
         def self.init
-          @profiler = RailsBench.new if RailsBench.enabled?
-          @profiler = Ruby19.new if Ruby19.enabled?
-          @profiler = Rubinius.new if Rubinius.enabled?
+          @profiler = RailsBenchProfiler.new if RailsBenchProfiler.enabled?
+          @profiler = CoreGCProfiler.new if CoreGCProfiler.enabled?
+          @profiler = LegacyRubiniusProfiler.new if LegacyRubiniusProfiler.enabled?
           @profiler
         end
 
@@ -61,7 +61,7 @@ module NewRelic
           end
         end
 
-        class RailsBench < Profiler
+        class RailsBenchProfiler < Profiler
           def self.enabled?
             ::GC.respond_to?(:time) && ::GC.respond_to?(:collections)
           end
@@ -80,9 +80,10 @@ module NewRelic
           end
         end
 
-        class Ruby19 < Profiler
+        class CoreGCProfiler < Profiler
           def self.enabled?
-            defined?(::GC::Profiler) && ::GC::Profiler.enabled?
+            !NewRelic::LanguageSupport.using_engine?('jruby') &&
+              defined?(::GC::Profiler) && ::GC::Profiler.enabled?
           end
 
           # microseconds spent in GC
@@ -101,11 +102,20 @@ module NewRelic
           end
         end
 
-        class Rubinius < Profiler
+        # Only present for legacy support of Rubinius < 2.0.0
+        class LegacyRubiniusProfiler < Profiler
           def self.enabled?
+            self.has_rubinius_profiler? && !has_core_profiler?
+          end
+
+          def self.has_rubinius_profiler?
             defined?(::Rubinius) && defined?(::Rubinius::GC) && ::Rubinius::GC.respond_to?(:count)
           end
 
+          def self.has_core_profiler?
+            defined?(::GC::Profiler)
+          end
+
           def call_time
             ::Rubinius::GC.time * 1000
           end

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

@@ -131,14 +131,12 @@ module NewRelic
           end
         end
 
-        # Harvest the timeslice data.  First recombine current statss
-        # with any previously
-        # unsent metrics, clear out stats cache, and return the current
-        # stats.
-        def harvest_timeslice_data(old_stats_hash, rules_engine=RulesEngine.new)
+        def harvest
+          now = Time.now
           snapshot = reset_stats
-          snapshot = apply_rules_to_metric_data(rules_engine, snapshot)
-          snapshot.merge!(old_stats_hash)
+          snapshot = apply_rules_to_metric_data(@metric_rules, snapshot)
+          snapshot.harvested_at = now
+          snapshot
         end
 
         def apply_rules_to_metric_data(rules_engine, stats_hash)

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

@@ -18,6 +18,8 @@ require 'new_relic/agent/internal_agent_error'
 module NewRelic
   module Agent
     class StatsHash < ::Hash
+      attr_accessor :harvested_at
+
       def initialize
         super { |hash, key| hash[key] = NewRelic::Agent::Stats.new }
       end

data/lib/new_relic/agent/supported_versions.rb

@@ -0,0 +1,247 @@
+# 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.
+
+module NewRelic
+  module Agent
+    SUPPORTED_VERSIONS =
+    {
+      # Rubies
+      :mri =>
+      {
+        :type        => :ruby,
+        :name        => "MRI",
+        :supported   => ["1.8.7", "1.9.2", "1.9.3", "2.0.0"],
+        :deprecated  => ["1.8.6"],
+        :experimental=> [">= 2.1.0"],
+        :url         => "https://www.ruby-lang.org",
+        :feed        => "https://www.ruby-lang.org/en/feeds/news.rss",
+        :notes       => [
+          "1.8.7 includes support for Ruby Enterprise Edition (REE)",
+          "Last supported agent on 1.8.6 was 3.6.8.168"]
+      },
+      :jruby =>
+      {
+        :type        => :ruby,
+        :name        => "JRuby",
+        :supported   => ["~> 1.6.0", "~> 1.7.0"],
+        :url         => "http://jruby.org",
+        :feed        => "http://jruby.org/atom.xml"
+      },
+      :rbx =>
+      {
+        :type        => :ruby,
+        :name        => "Rubinius",
+        :experimental=> ["~> 2.1.1"],
+        :url         => "http://rubini.us",
+        :feed        => "http://rubini.us/feed/atom.xml",
+        :notes       => [
+          "Support for Rubinius 2.x is considered experimental.",
+          "Consider using the latest for best results, and watch http://docs.newrelic.com/docs/ruby/rubinius for updates."]
+      },
+
+      # App servers
+      :passenger =>
+      {
+        :type        => :app_server,
+        :supported   => ["~>2.2", "~>3.0", "~>4.0"],
+        :url         => "http://www.phusionpassenger.com/",
+        :feed        => "http://rubygems.org/gems/passenger/versions.atom"
+      },
+      :thin =>
+      {
+        :type        => :app_server,
+        :supported   => ["~>1.0"],
+        :url         => "http://code.macournoyer.com/thin/",
+        :feed        => "http://rubygems.org/gems/thin/versions.atom"
+      },
+      :unicorn =>
+      {
+        :type        => :app_server,
+        :supported   => ["~>4.0"],
+        :deprecated  => ["~>1.0", "~>2.0", "~>3.0"],
+        :url         => "http://unicorn.bogomips.org/",
+        :feed        => "http://rubygems.org/gems/unicorn/versions.atom"
+      },
+      :puma =>
+      {
+        :type        => :app_server,
+        :supported   => ["~>2.0"],
+        :deprecated  => ["~>1.0"],
+        :url         => "http://puma.io/",
+        :feed        => "http://rubygems.org/gems/puma/versions.atom"
+      },
+      :rainbows =>
+      {
+        :type        => :app_server,
+        :name        => "rainbows!",
+        :experimental=> ["4.5.0"],
+        :url         => "http://rainbows.rubyforge.org/",
+        :feed        => "http://rubygems.org/gems/rainbows/versions.atom"
+      },
+      :webrick =>
+      {
+        :type        => :app_server,
+        :notes       => [ "Supported for all agent-supported versions of Ruby" ]
+      },
+
+      # Web frameworks
+      :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"],
+        :deprecated  => ["~>2.0.0"],
+        :url         => "https://rubygems.org/gems/rails",
+        :feed        => "https://rubygems.org/gems/rails/versions.atom",
+        :notes       => ["Last supported agent for 2.0.x was 3.6.8.168"]
+      },
+      :sinatra =>
+      {
+        :type        => :web,
+        :supported   => ["~>1.2.0", "~>1.3.0", "~>1.4.0"],
+        :url         => "https://rubygems.org/gems/sinatra",
+        :feed        => "https://rubygems.org/gems/sinatra/versions.atom"
+      },
+      :padrino =>
+      {
+        :type        => :web,
+        :supported   => ["~>0.10"],
+        :url         => "https://rubygems.org/gems/padrino",
+        :feed        => "https://rubygems.org/gems/padrino/versions.atom"
+      },
+      :rack =>
+      {
+        :type        => :web,
+        :supported   => [">= 1.0.0"],
+        :url         => "https://rubygems.org/gems/rack",
+        :feed        => "https://rubygems.org/gems/rack/versions.atom"
+      },
+
+      # Database
+      :activerecord =>
+      {
+        :type        => :database,
+        :supported   => ["~>2.1.0", "~>2.2.0", "~>2.3.0", "~3.0.0", "~>3.1.0", "~>3.2.0", "~>4.0.0"],
+        :deprecated  => ["~>2.0.0"],
+        :url         => "https://rubygems.org/gems/activerecord",
+        :feed        => "https://rubygems.org/gems/activerecord/versions.atom",
+        :notes       => ["Last supported agent for 2.0.x was 3.6.8.168"]
+      },
+      :datamapper =>
+      {
+        :type        => :database,
+        :supported   => ["~>1.0"],
+        :url         => "https://rubygems.org/gems/datamapper",
+        :feed        => "https://rubygems.org/gems/datamapper/versions.atom"
+      },
+      :sequel =>
+      {
+        :type        => :database,
+        :supported   => ["~>3.37", "~>4.0"],
+        :url         => "https://rubygems.org/gems/sequel",
+        :feed        => "https://rubygems.org/gems/sequel/versions.atom"
+      },
+
+      # Background Jobs
+      :resque =>
+      {
+        :type        => :background,
+        :supported   => ["~>1.23.0"],
+        :deprecated  => ["~>1.22.0"],
+        :experimental=> [">= 2.0"],
+        :url         => "https://rubygems.org/gems/resque",
+        :feed        => "https://rubygems.org/gems/resque/versions.atom"
+      },
+      :sidekiq =>
+      {
+        :type        => :background,
+        :supported   => ["~>2.8"],
+        :url         => "https://rubygems.org/gems/sidekiq",
+        :feed        => "https://rubygems.org/gems/sidekiq/versions.atom"
+      },
+      :delayed_job =>
+      {
+        :type        => :background,
+        :supported   => ["~>2.0", "~>3.0", "~>4.0"],
+        :url         => "https://rubygems.org/gems/delayed_job",
+        :feed        => "https://rubygems.org/gems/delayed_job/versions.atom"
+      },
+
+      # HTTP Clients
+      :curb =>
+      {
+        :type        => :http,
+        :supported   => [ ">= 0.8.1" ],
+        :url         => "https://rubygems.org/gems/curb",
+        :feed        => "https://rubygems.org/gems/curb/versions.atom"
+      },
+      :excon =>
+      {
+        :type        => :http,
+        :supported   => [ ">= 0.10.1" ],
+        :url         => "https://rubygems.org/gems/excon",
+        :feed        => "https://rubygems.org/gems/excon/versions.atom"
+      },
+      :httpclient =>
+      {
+        :type        => :http,
+        :supported   => [ ">= 2.2.0"],
+        :url         => "https://rubygems.org/gems/httpclient",
+        :feed        => "https://rubygems.org/gems/httpclient/versions.atom"
+      },
+      :typhoeus =>
+      {
+        :type        => :http,
+        :supported   => [ ">= 0.5.3"],
+        :url         => "https://rubygems.org/gems/typhoeus",
+        :feed        => "https://rubygems.org/gems/typhoeus/versions.atom"
+      },
+      :net_http =>
+      {
+        :type        => :http,
+        :name        => "Net::HTTP",
+        :notes       => [
+          "Supported for all agent-supported versions of Ruby.",
+          "For more information on supported HTTP clients see http://docs.newrelic.com/docs/ruby/ruby-http-clients."]
+      },
+
+      # Other
+      :sunspot =>
+      {
+        :type        => :other,
+        :url         => "https://rubygems.org/gems/sunspot",
+        :feed        => "https://rubygems.org/gems/sunspot/versions.atom"
+      },
+      :acts_as_solr =>
+      {
+        :type        => :other,
+        :url         => "https://rubygems.org/gems/acts_as_solr",
+        :feed        => "https://rubygems.org/gems/acts_as_solr/versions.atom"
+      },
+      :dalli =>
+      {
+        :type        => :other,
+        :url         => "https://rubygems.org/gems/dalli",
+        :feed        => "https://rubygems.org/gems/dalli/versions.atom"
+      },
+      :'memcache-client' =>
+      {
+        :type        => :other,
+        :url         => "https://rubygems.org/gems/memcache-client",
+        :feed        => "https://rubygems.org/gems/memcache-client/versions.atom"
+      },
+      :authlogic =>
+      {
+        :type        => :other,
+        :url         => "https://rubygems.org/gems/authlogic",
+        :feed        => "https://rubygems.org/gems/authlogic/versions.atom"
+      },
+      :activemerchant =>
+      {
+        :type        => :other,
+        :url         => "https://rubygems.org/gems/activemerchant",
+        :feed        => "https://rubygems.org/gems/activemerchant/versions.atom"
+      },
+    }
+  end
+end

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

@@ -159,7 +159,7 @@ module NewRelic
             AgentThread.list.each do |thread|
               sample_thread(thread)
             end
-            @profiles.values.each { |c| c.increment_poll_count }
+            @profiles.each_value { |p| p.increment_poll_count }
             @buffer.delete_if { |thread, _| !thread.alive? }
           end
 

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

@@ -104,12 +104,13 @@ module NewRelic
         end
 
         def to_collector_array(encoder)
+          encoded_trace_tree = encoder.encode(generate_traces)
           result = [
             int(self.profile_id),
             float(self.created_at),
             float(self.finished_at),
             int(self.sample_count),
-            string(encoder.encode(generate_traces)),
+            encoded_trace_tree,
             int(self.unique_thread_count),
             0 # runnable thread count, which we don't track
           ]

data/lib/new_relic/agent/transaction.rb

@@ -5,14 +5,12 @@
 require 'new_relic/agent/transaction/pop'
 require 'new_relic/agent/transaction_timings'
 
-# A struct holding the information required to measure a controller
-# action.  This is put on the thread local.  Handles the issue of
-# re-entrancy, or nested action calls.
-#
-# This class is not part of the public API.  Avoid making calls on it directly.
-#
 module NewRelic
   module Agent
+    # This class represents a single transaction (usually mapping to one
+    # web request or background job invocation) instrumented by the Ruby agent.
+    #
+    # @api public
     class Transaction
       # helper module refactored out of the `pop` method
       include Pop
@@ -377,6 +375,9 @@ module NewRelic
 
       # Returns truthy if the current in-progress transaction is considered a
       # a web transaction (as opposed to, e.g., a background transaction).
+      #
+      # @api public
+      #
       def self.recording_web_transaction?
         self.current && self.current.recording_web_transaction?
       end

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

@@ -9,10 +9,16 @@ module NewRelic
     class Transaction
       class DeveloperModeSampleBuffer < TransactionSampleBuffer
 
-        MAX_SAMPLES = 100
+        CAPACITY = 100
 
-        def max_samples
-          MAX_SAMPLES
+        def capacity
+          max_capacity
+        end
+
+        # Dev mode is allowed more than the typical upper limit.
+        # Sidestep normal cap by overriding max_capacity.
+        def max_capacity
+          CAPACITY
         end
 
         def harvest_samples
@@ -23,9 +29,9 @@ module NewRelic
           Agent.config[:developer_mode]
         end
 
-        # Truncate to the last max_samples we've received
+        # Truncate to the last capacity samples we've received
         def truncate_samples
-          @samples = @samples.last(max_samples)
+          @samples = @samples.last(capacity)
         end
 
         # We don't hold onto previously trapped transactions on harvest