newrelic_rpm 3.3.3 → 3.3.4.beta1

data/CHANGELOG

@@ -1,3 +1,6 @@
+v3.3.4
+  * Rails 3 view instrumentation
+
 v3.3.3
   * Improved Sinatra instrumentation
   * Limit the number of nodes collected in long running transactions to prevent leaking memory

data/lib/new_relic/agent.rb

@@ -124,8 +124,7 @@ module NewRelic
 
     # The singleton Agent instance.  Used internally.
     def agent #:nodoc:
-      raise "Plugin not initialized!" if @agent.nil?
-      @agent
+      @agent || raise("Plugin not initialized!")
     end
 
     def agent=(new_instance)#:nodoc:

data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb

@@ -38,13 +38,25 @@ module NewRelic
         end
 
         module ActionView
-          def _render_template(template, layout = nil, options = {}) #:nodoc:
-            NewRelic::Agent.trace_execution_scoped "View/#{template.virtual_path}/Rendering" do
-              super
+          module NewRelic
+            extend self
+            def template_metric(identifier, options = {})
+              if options[:file]
+                "file"
+              elsif identifier.include? '/' # this is a filepath
+                identifier.split('/')[-2..-1].join('/')
+              else
+                identifier
+              end
+            end
+            def render_type(file_path)
+              file = File.basename(file_path)
+              if file.starts_with?('_')
+                return 'Partial'
+              else
+                return 'Rendering'
+              end
             end
-          end
-
-          module PartialRenderer
           end
         end
       end
@@ -54,7 +66,7 @@ end
 
 DependencyDetection.defer do
   @name = :rails3_controller
-  
+
   depends_on do
     defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i == 3
   end
@@ -65,8 +77,8 @@ DependencyDetection.defer do
 
   executes do
     NewRelic::Agent.logger.debug 'Installing Rails 3 Controller instrumentation'
-  end  
-  
+  end
+
   executes do
     class ActionController::Base
       include NewRelic::Agent::Instrumentation::ControllerInstrumentation
@@ -74,45 +86,91 @@ DependencyDetection.defer do
     end
   end
 end
-
 DependencyDetection.defer do
-  @name = :rails3_view
-  
+  @name = :rails30_view
+
   depends_on do
-    defined?(ActionView) && defined?(ActionView::Base) && defined?(ActionView::Partials)
+    defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i == 3 && ::Rails::VERSION::MINOR.to_i == 0
+  end
+
+  depends_on do
+    !NewRelic::Control.instance['disable_view_instrumentation']
+  end
+
+  executes do
+    NewRelic::Agent.logger.debug 'Installing Rails 3.0 view instrumentation'
+  end
+
+  executes do
+    ActionView::Template.class_eval do
+      include NewRelic::Agent::MethodTracer
+      def render_with_newrelic(*args, &block)
+        options = if @virtual_path && @virtual_path.starts_with?('/') # file render
+          {:file => true }
+        else
+          {}
+        end
+        str = "View/#{NewRelic::Agent::Instrumentation::Rails3::ActionView::NewRelic.template_metric(@identifier, options)}/#{NewRelic::Agent::Instrumentation::Rails3::ActionView::NewRelic.render_type(@identifier)}"
+        trace_execution_scoped str do
+          render_without_newrelic(*args, &block)
+        end
+      end
+
+      alias_method :render_without_newrelic, :render
+      alias_method :render, :render_with_newrelic
+
+    end
   end
+end
 
+DependencyDetection.defer do
+  @name = :rails31_view
+
+  # We can't be sure that this wil work with future versions of Rails 3.
+  # Currently enabled for Rails 3.1 and 3.2
   depends_on do
-    defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i == 3 && ::Rails::VERSION::MINOR.to_i >= 1
+    defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i == 3 && ([1,2].member?(::Rails::VERSION::MINOR.to_i))
   end
 
   depends_on do
     !NewRelic::Control.instance['disable_view_instrumentation']
   end
-  
+
   executes do
-    NewRelic::Agent.logger.debug 'Installing Rails 3 view instrumentation'
+    NewRelic::Agent.logger.debug 'Installing Rails 3.1/3.2 view instrumentation'
   end
-  
+
   executes do
-    class ActionView::Base
-      include NewRelic::Agent::Instrumentation::Rails3::ActionView
-    end
-    old_klass = ActionView::Partials::PartialRenderer
-    ActionView::Partials::PartialRenderer = Class.new(old_klass)
-    class ActionView::Partials::PartialRenderer
-      def render_partial(*args)
-        NewRelic::Agent.trace_execution_scoped "View/#{@template.virtual_path}/Partial" do
-          super
+    ActionView::TemplateRenderer.class_eval do
+      include NewRelic::Agent::MethodTracer
+      # namespaced helper methods
+
+      def render_with_newrelic(context, options)
+        # This is needed for rails 3.2 compatibility
+        @details = extract_details(options) if respond_to? :extract_details
+        str = "View/#{NewRelic::Agent::Instrumentation::Rails3::ActionView::NewRelic.template_metric(determine_template(options).identifier, options)}/Rendering"
+        trace_execution_scoped str do
+          render_without_newrelic(context, options)
         end
       end
 
-      def render_collection(*args)
-        name = @template ? @template.virtual_path : "Mixed"
-        NewRelic::Agent.trace_execution_scoped "View/#{name}/Collection" do
-          super
+      alias_method :render_without_newrelic, :render
+      alias_method :render, :render_with_newrelic
+    end
+
+    ActionView::PartialRenderer.class_eval do
+      include NewRelic::Agent::MethodTracer
+
+      def render_with_newrelic(*args, &block)
+        setup(*args, &block)
+        str = "View/#{NewRelic::Agent::Instrumentation::Rails3::ActionView::NewRelic.template_metric(find_partial.identifier)}/Partial"
+        trace_execution_scoped str do
+          render_without_newrelic(*args, &block)
         end
       end
+
+      alias_method :render_without_newrelic, :render
+      alias_method :render, :render_with_newrelic
     end
   end
 end

data/lib/new_relic/agent/transaction_sampler.rb

@@ -4,7 +4,7 @@ require 'new_relic/agent/transaction_sample_builder'
 
 module NewRelic
   module Agent
-    
+
     # This class contains the logic of sampling a transaction -
     # creation and modification of transaction samples
     class TransactionSampler
@@ -25,6 +25,7 @@ module NewRelic
       attr_reader :samples, :last_sample, :disabled
 
       def initialize
+
         # @samples is an array of recent samples up to @max_samples in
         # size - it's only used by developer mode
         @samples = []
@@ -49,14 +50,20 @@ module NewRelic
         # @segment_limit and @stack_trace_threshold come from the
         # configuration file, with built-in defaults that should
         # suffice for most customers
-        
+
         # enable if config.fetch('enabled', true)
-        
+
         @segment_limit = config.fetch('limit_segments', 4000)
         @stack_trace_threshold = config.fetch('stack_trace_threshold', 0.500).to_f
         @explain_threshold = config.fetch('explain_threshold', 0.5).to_f
         @explain_enabled = config.fetch('explain_enabled', true)
         @transaction_threshold = config.fetch('transation_threshold', 2.0)
+
+        # Configure the sample storage policy.  Create a list of methods to be called.
+        @store_sampler_methods = [ :store_random_sample, :store_slowest_sample ]
+        if NewRelic::Control.instance.developer_mode?
+          @store_sampler_methods << :store_sample_for_developer_mode
+        end
       end
 
       def config
@@ -180,13 +187,11 @@ module NewRelic
       # @samples array, and the @slowest_sample variable if it is
       # slower than the current occupant of that slot
       def store_sample(sample)
-        store_random_sample(sample)
-        store_sample_for_developer_mode(sample)
-        store_slowest_sample(sample)
-        
+        @store_sampler_methods.each{|sym| send sym, sample}
         if NewRelic::Agent::TransactionInfo.get.force_persist_sample?(sample)
           store_force_persist(sample)
         end
+
       end
 
       # Only active when random sampling is true - this is very rarely
@@ -197,7 +202,7 @@ module NewRelic
           @random_sample = sample
         end
       end
-      
+
       def store_force_persist(sample)
         @force_persist << sample
 
@@ -347,7 +352,7 @@ module NewRelic
         end
         nil # don't assume this method returns anything
       end
-      
+
       def add_force_persist_to(result)
         result.concat(@force_persist)
         @force_persist = []
@@ -358,14 +363,14 @@ module NewRelic
       # sample returned will be the slowest sample among those
       # available during this harvest
       def add_samples_to(result, slow_threshold)
-        
+
         # pull out force persist
         force_persist = result.select {|sample| sample.force_persist} || []
         result.reject! {|sample| sample.force_persist}
-        
+
         force_persist.each {|sample| store_force_persist(sample)}
-        
-        
+
+
         # Now get the slowest sample
         if @slowest_sample && @slowest_sample.duration >= slow_threshold
           result << @slowest_sample
@@ -374,10 +379,10 @@ module NewRelic
         result.compact!
         result = result.sort_by { |x| x.duration }
         result = result[-1..-1] || []               # take the slowest sample
-        
+
         add_random_sample_to(result)
         add_force_persist_to(result)
-        
+
         result.uniq
       end
 
@@ -388,26 +393,26 @@ module NewRelic
       def harvest(previous = [], slow_threshold = 2.0)
         return [] if disabled
         result = Array(previous)
-        
+
         @samples_lock.synchronize do
           result = add_samples_to(result, slow_threshold)
-                    
+
           # clear previous transaction samples
           @slowest_sample = nil
           @random_sample = nil
           @last_sample = nil
         end
-        
+
         # Clamp the number of TTs we'll keep in memory and send
         #
         result = clamp_number_tts(result, 20) if result.length > 20
-        
+
         # Truncate the samples at 2100 segments. The UI will clamp them at 2000 segments anyway.
         # This will save us memory and bandwidth.
         result.each { |sample| sample.truncate(@segment_limit) }
         result
       end
-      
+
       # JON - THIS CODE NEEDS A UNIT TEST
       def clamp_number_tts(tts, limit)
         tts.sort! do |a,b|
@@ -420,9 +425,9 @@ module NewRelic
           else
             b.duration <=> a.duration
           end
-        end        
-        
-        tts[0..(limit-1)]  
+        end
+
+        tts[0..(limit-1)]
       end
 
       # reset samples without rebooting the web server

data/lib/new_relic/collection_helper.rb

@@ -8,18 +8,20 @@ module NewRelic
   # strings
   def normalize_params(params)
     case params
-      when Symbol, FalseClass, TrueClass, nil
-        params
-      when Numeric
-        truncate(params.to_s)
-      when String
-        truncate(params)
       when Hash
+        # optimize for empty hash since that is often what this is called with.
+        return params if params.empty?
         new_params = {}
         params.each do | key, value |
           new_params[truncate(normalize_params(key),64)] = normalize_params(value)
         end
         new_params
+      when Symbol, FalseClass, TrueClass, nil
+        params
+      when Numeric
+        truncate(params.to_s)
+      when String
+        truncate(params)
       when Array
         params.first(DEFAULT_ARRAY_TRUNCATION_SIZE).map{|item| normalize_params(item)}
     else

data/lib/new_relic/control/configuration.rb

@@ -85,7 +85,7 @@ module NewRelic
 
       def apdex_t
         # Always initialized with a default
-        fetch('apdex_t').to_f
+        @apdex_t_float ||= fetch('apdex_t').to_f
       end
 
       def license_key

data/lib/new_relic/transaction_sample.rb

@@ -15,7 +15,7 @@ module NewRelic
     @@start_time = Time.now
 
     include TransactionAnalysis
-    
+
     def initialize(time = Time.now.to_f, sample_id = nil)
       @sample_id = sample_id || object_id
       @start_time = time
@@ -30,7 +30,7 @@ module NewRelic
     def count_segments
       @segment_count
     end
-        
+
     # Truncates the transaction sample to a maximum length determined
     # by the passed-in parameter. Operates recursively on the entire
     # tree of transaction segments in a depth-first manner
@@ -39,7 +39,13 @@ module NewRelic
       @root_segment.truncate(max + 1)
       @segment_count = max
     end
-    
+
+    # makes sure that the parameter cache for segment count is set to
+    # the correct value
+    def ensure_segment_count_set(count)
+      params[:segment_count] ||= count
+    end
+
     # offset from start of app
     def timestamp
       @start_time - @@start_time.to_f
@@ -74,7 +80,7 @@ module NewRelic
     def duration
       root_segment.duration
     end
-    
+
     # Iterates recursively over each segment in the entire transaction
     # sample tree
     def each_segment(&block)
@@ -90,7 +96,7 @@ module NewRelic
     def to_s_compact
       @root_segment.to_s_compact
     end
-    
+
     # Searches the tree recursively for the segment with the given
     # id. note that this is an internal id, not an ActiveRecord id
     def find_segment(id)
@@ -168,11 +174,19 @@ module NewRelic
     end
 
   private
-    
+
+
+
+    HEX_DIGITS = (0..15).map{|i| i.to_s(16)}
+    # generate a random 64 bit uuid
     def generate_guid
-      (0..15).to_a.map{|a| rand(16).to_s(16)}.join  # a 64 bit random GUID
+      guid = ''
+      HEX_DIGITS.each do |a|
+        guid << HEX_DIGITS[rand(16)]
+      end
+      guid
     end
-    
+
     # This is badly in need of refactoring
     def build_segment_with_omissions(new_sample, time_delta, source_segment, target_segment, regex)
       source_segment.called_segments.each do |source_called_segment|
@@ -225,7 +239,7 @@ module NewRelic
                 source_called_segment.duration > options[:explain_sql].to_f
               target_called_segment[:explain_plan] = source_called_segment.explain_sql
             end
-            
+
             target_called_segment[:sql] = case options[:record_sql]
               when :raw then v
               when :obfuscated then NewRelic::Agent::Database.obfuscate_sql(v)

data/lib/new_relic/version.rb

@@ -3,8 +3,8 @@ module NewRelic
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 3
-    TINY  = 3
-    BUILD = nil # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
+    TINY  = 4
+    BUILD = 'beta1' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end
 

data/newrelic_rpm.gemspec

@@ -5,14 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = "newrelic_rpm"
-  s.version = "3.3.3"
+  s.version = "3.3.4.beta1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bill Kayser", "Jon Guymon", "Justin George", "Darin Swanson"]
-  s.date = "2012-03-28"
+  s.date = "2012-04-02"
   s.description = "New Relic is a performance management system, developed by New Relic,\nInc (http://www.newrelic.com).  New Relic provides you with deep\ninformation about the performance of your web application as it runs\nin production. The New Relic Ruby Agent is dual-purposed as a either a\nGem or plugin, hosted on\nhttp://github.com/newrelic/rpm/\n"
   s.email = "support@newrelic.com"
-  s.executables = ["mongrel_rpm", "newrelic", "newrelic_cmd"]
+  s.executables = ["newrelic_cmd", "mongrel_rpm", "newrelic"]
   s.extra_rdoc_files = [
     "CHANGELOG",
     "LICENSE",

data/test/new_relic/agent/transaction_sampler_test.rb

@@ -247,7 +247,8 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
   end
 
   def test_store_sample_for_developer_mode_no_dev
-    NewRelic::Control.instance.expects(:developer_mode?).returns(false)
+    NewRelic::Control.instance.stubs(:developer_mode?).returns(false)
+    @sampler.configure!
     sample = mock('sample')
     @sampler.store_sample_for_developer_mode(sample)
     assert_equal([], @sampler.instance_variable_get('@samples'))

data/vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/metric_parser.rb

@@ -8,17 +8,21 @@ module NewRelic
       # Load in the parsers classes in the plugin:
       Dir[File.join(File.dirname(__FILE__), "metric_parser", "*.rb")].each { | file | require file }
 
+      def self.category_is_constant(category)
+        @string_constants ||= (
+          NewRelic::MetricParser.constants.inject({}){|memo, const| memo[const.to_s] = true; memo}
+        )
+        @string_constants[category]
+      end
       # return a string that is parsable via the Metric parser APIs
       def self.for_metric_named(s)
         category = (s =~ /^([^\/]*)/) && $1
         parser_class = self
-        if category
-          if NewRelic::MetricParser.constants.map(&:to_s).include?(category)
-            begin
-              parser_class = NewRelic::MetricParser.const_get(category)
-            rescue
-              nil
-            end
+        if category_is_constant(category)
+          begin
+            parser_class = NewRelic::MetricParser.const_get(category)
+          rescue
+            nil
           end
         end
         parser_class.new s
@@ -77,9 +81,12 @@ module NewRelic
         segments[0]
       end
 
+
+      EMPTY_SEGMENTS_HASH = [].freeze
+      SEGMENTS_CACHE = {}
       def segments
-        return [] if !name
-        @segments ||= name.split(SEPARATOR).freeze
+        name || (return EMPTY_SEGMENTS_HASH)
+        SEGMENTS_CACHE[name] ||= name.split(SEPARATOR).freeze
       end
 
       # --

metadata

@@ -1,15 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: newrelic_rpm
-version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: 
-  segments: 
-  - 3
-  - 3
-  - 3
-  version: 3.3.3
+version: !ruby/object:Gem::Version
+  version: 3.3.4.beta1
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - Bill Kayser
 - Jon Guymon
 - Justin George
@@ -17,72 +12,66 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-28 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-02 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: jeweler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70304829042800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70304829042800
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &70304829042320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70304829042320
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: &70304829041840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-description: |
-  New Relic is a performance management system, developed by New Relic,
+  prerelease: false
+  version_requirements: *70304829041840
+description: ! 'New Relic is a performance management system, developed by New Relic,
+
   Inc (http://www.newrelic.com).  New Relic provides you with deep
+
   information about the performance of your web application as it runs
+
   in production. The New Relic Ruby Agent is dual-purposed as a either a
+
   Gem or plugin, hosted on
+
   http://github.com/newrelic/rpm/
 
+'
 email: support@newrelic.com
-executables: 
+executables:
+- newrelic_cmd
 - mongrel_rpm
 - newrelic
-- newrelic_cmd
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - CHANGELOG
 - LICENSE
 - README.rdoc
 - newrelic.yml
-files: 
+files:
 - CHANGELOG
 - LICENSE
 - README.rdoc
@@ -348,60 +337,38 @@ files:
 - vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/web_transaction.rb
 homepage: http://www.github.com/newrelic/rpm
 licenses: []
-
-post_install_message: |
-  
-  PLEASE NOTE:
-  
-  Developer Mode is now a Rack middleware.
-  
-  Developer Mode is no longer available in Rails 2.1 and earlier.
-  However, starting in version 2.12 you can use Developer Mode in any
-  Rack based framework, in addition to Rails.  To install developer mode
-  in a non-Rails application, just add NewRelic::Rack::DeveloperMode to
-  your middleware stack.
-  
-  If you are using JRuby, we recommend using at least version 1.4 or 
-  later because of issues with the implementation of the timeout library.
-  
-  Refer to the README.md file for more information.
-  
-  Please see http://github.com/newrelic/rpm/blob/master/CHANGELOG
-  for a complete description of the features and enhancements available
-  in version 3.3 of the Ruby Agent.
-    
-
-rdoc_options: 
+post_install_message: ! "\nPLEASE NOTE:\n\nDeveloper Mode is now a Rack middleware.\n\nDeveloper
+  Mode is no longer available in Rails 2.1 and earlier.\nHowever, starting in version
+  2.12 you can use Developer Mode in any\nRack based framework, in addition to Rails.
+  \ To install developer mode\nin a non-Rails application, just add NewRelic::Rack::DeveloperMode
+  to\nyour middleware stack.\n\nIf you are using JRuby, we recommend using at least
+  version 1.4 or \nlater because of issues with the implementation of the timeout
+  library.\n\nRefer to the README.md file for more information.\n\nPlease see http://github.com/newrelic/rpm/blob/master/CHANGELOG\nfor
+  a complete description of the features and enhancements available\nin version 3.3
+  of the Ruby Agent.\n  \n"
+rdoc_options:
 - --line-numbers
 - --inline-source
 - --title
 - New Relic Ruby Agent
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: New Relic Ruby Agent
 test_files: []
-