newrelic_rpm 3.3.4 → 3.3.4.1

data/CHANGELOG

@@ -1,3 +1,6 @@
+v3.3.4.1
+ * Bug fix when rendering empty collection in Rails 3.1+
+
 v3.3.4
   * Rails 3 view instrumentation
 

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

@@ -43,6 +43,8 @@ module NewRelic
             def template_metric(identifier, options = {})
               if options[:file]
                 "file"
+              elsif identifier.nil?
+                "(unknown)"
               elsif identifier.include? '/' # this is a filepath
                 identifier.split('/')[-2..-1].join('/')
               else
@@ -148,7 +150,8 @@ DependencyDetection.defer do
       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"
+        identifier = determine_template(options) ? determine_template(options).identifier : nil
+        str = "View/#{NewRelic::Agent::Instrumentation::Rails3::ActionView::NewRelic.template_metric(identifier, options)}/Rendering"
         trace_execution_scoped str do
           render_without_newrelic(context, options)
         end
@@ -163,7 +166,8 @@ DependencyDetection.defer do
 
       def render_with_newrelic(*args, &block)
         setup(*args, &block)
-        str = "View/#{NewRelic::Agent::Instrumentation::Rails3::ActionView::NewRelic.template_metric(find_partial.identifier)}/Partial"
+        identifier = find_partial ? find_partial.identifier : nil
+        str = "View/#{NewRelic::Agent::Instrumentation::Rails3::ActionView::NewRelic.template_metric(identifier)}/Partial"
         trace_execution_scoped str do
           render_without_newrelic(*args, &block)
         end

data/lib/new_relic/agent/transaction_sample_builder.rb

@@ -41,6 +41,7 @@ module NewRelic
           if @sample.count_segments == @segment_limit
             NewRelic::Control.instance.log.debug("Segment limit of #{@segment_limit} reached, ceasing collection.")
           end
+          @current_segment
         end
       end
 

data/lib/new_relic/version.rb

@@ -4,7 +4,7 @@ module NewRelic
     MAJOR = 3
     MINOR = 3
     TINY  = 4
-    BUILD = nil # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
+    BUILD = 1 # 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,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "newrelic_rpm"
-  s.version = "3.3.4"
+  s.version = "3.3.4.1"
 
   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-04-19"
+  s.date = "2012-04-24"
   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 = ["newrelic_cmd", "mongrel_rpm", "newrelic"]

data/test/new_relic/agent/transaction_sample_builder_test.rb

@@ -6,6 +6,14 @@ class NewRelic::Agent::TransationSampleBuilderTest < Test::Unit::TestCase
     @builder = NewRelic::Agent::TransactionSampleBuilder.new
   end
 
+  # if it doesn't the core app tests will break.  Not strictly necessary but
+  # we'll enforce it with this test for now.
+  def test_trace_entry_returns_segment
+    segment = @builder.trace_entry("/Foo/Bar", Time.now)
+    assert segment, "Segment should not be nil"
+    assert segment.is_a?(NewRelic::TransactionSample::Segment), "Segment should not be a #{segment.class.name}"
+  end
+
   def test_build_sample
     build_segment("a") do
       build_segment("aa") do

metadata

@@ -1,10 +1,16 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: newrelic_rpm
-version: !ruby/object:Gem::Version
-  version: 3.3.4
+version: !ruby/object:Gem::Version 
+  hash: 117
   prerelease: 
+  segments: 
+  - 3
+  - 3
+  - 4
+  - 1
+  version: 3.3.4.1
 platform: ruby
-authors:
+authors: 
 - Bill Kayser
 - Jon Guymon
 - Justin George
@@ -12,66 +18,72 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-19 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-04-24 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &2157272320 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2157272320
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: mocha
-  requirement: &2157270960 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2157270960
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: shoulda
-  requirement: &2157282800 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2157282800
-description: ! 'New Relic is a performance management system, developed by New Relic,
-
+  version_requirements: *id003
+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
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - CHANGELOG
 - LICENSE
 - README.rdoc
 - newrelic.yml
-files:
+files: 
 - CHANGELOG
 - LICENSE
 - README.rdoc
@@ -337,38 +349,60 @@ 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: ! "\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:
+
+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: 
 - --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
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: New Relic Ruby Agent
 test_files: []
+