newrelic_rpm 3.3.1.beta2 → 3.3.1

data/CHANGELOG

@@ -3,6 +3,8 @@ v3.3.1
   * fix for issues with RAILS_ROOT deprecation warnings
   * fixed incorrect 1.9 GC time reporting
   * obfusction for Slow SQL queries respects transaction trace config
+  * fix for RUM instrumentation repoting bad timing info in some cases
+  * refactored ActiveRecord instrumentation, no longer requires Rails
 
 v3.3.0
   * fix for GC instrumentation when using Ruby 1.9

data/lib/new_relic/agent/agent.rb

@@ -1070,9 +1070,6 @@ module NewRelic
             now = Time.now
             log.debug "Sending (#{@traces.length}) transaction traces"
             
-            # REMOVE THIS BEFORE SHIPPING
-            log.info "Sending tts with GUIDS #{@traces.collect{|t| t.guid}.join(",")}"
-            
             begin
               options = { :keep_backtraces => true }
               options[:record_sql] = @record_sql unless @record_sql == :off
@@ -1284,6 +1281,13 @@ module NewRelic
             log.debug "Serializing agent data to disk"
             NewRelic::Agent.save_data
           end
+        rescue Exception => e
+          NewRelic::Control.instance.disable_serialization = true
+          NewRelic::Control.instance.log.warn("Disabling serialization: #{e.message}")
+          retry_count ||= 0
+          retry_count += 1
+          retry unless retry_count > 1
+          raise e
         end
 
         # This method contacts the server to send remaining data and

data/lib/new_relic/agent/beacon_configuration.rb

@@ -33,14 +33,7 @@ module NewRelic
       
       # RUM footer command used for 'finish' - based on whether JSONP is
       # being used. 'nrfj' for JSONP, otherwise 'nrf2'
-      def finish_command
-        if NewRelic::Control.instance.fetch('browser_monitoring', {}) \
-            .fetch('auto_instrument', true)
-          @finish_command
-        else
-          'nrf2'
-        end
-      end
+      attr_reader :finish_command
       
       # A static javascript header that is identical for every account
       # and application

data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb

@@ -231,8 +231,8 @@ module NewRelic
         # If a single argument is passed in, it is treated as a metric
         # path.  This form is deprecated.
         def perform_action_with_newrelic_trace(*args, &block)
-          NewRelic::Agent::TransactionInfo.reset unless NewRelic::Control.
-            instance.browser_monitoring_auto_instrument?
+          request = newrelic_request(args)
+          NewRelic::Agent::TransactionInfo.reset(request)
 
           # Skip instrumentation based on the value of 'do_not_trace' and if
           # we aren't calling directly with a block.
@@ -272,6 +272,22 @@ module NewRelic
         end
 
         protected
+
+        def newrelic_request(args)
+          opts = args.first
+          # passed as a parameter to add_transaction_tracer
+          if opts.respond_to?(:keys) && opts.respond_to?(:[]) && opts[:request]
+            opts[:request]
+          # in a Rack app
+          elsif opts.respond_to?(:keys) && opts.respond_to?(:[]) &&
+              opts['rack.version']
+            Rack::Request.new(args)
+          # in a Rails app
+          elsif self.respond_to?(:request)
+            self.request
+          end
+        end
+
         # Should be implemented in the dispatcher class
         def newrelic_response_code; end
 

data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb

@@ -28,8 +28,9 @@ DependencyDetection.defer do
   end
 
   executes do
-    # We're on an older version of passenger
-    NewRelic::Agent.logger.warn "An older version of Phusion Passenger has been detected.  We recommend using at least release 2.1.1."
+    ## We're on an older version of passenger
+    ## FIXME: This warning is printing on current version of passenger
+    # NewRelic::Agent.logger.warn "An older version of Phusion Passenger has been detected.  We recommend using at least release 2.1.1."
 
     NewRelic::Agent::Instrumentation::MetricFrame.check_server_connection = true
   end

data/lib/new_relic/agent/transaction_info.rb

@@ -45,11 +45,22 @@ module NewRelic
 
       # clears any existing transaction info object and initializes a new one.
       # This starts the timer for the transaction.
-      def self.reset
+      def self.reset(request=nil)
         clear
-        get
-      end
+        instance = get
 
+        if request
+          agent_flag = request.cookies['NRAGENT']
+          if agent_flag
+            s = agent_flag.split("=")
+            if s.length == 2
+              if s[0] == "tk" && s[1]
+                instance.token = s[1]
+              end
+            end
+          end
+        end
+      end
     end
   end
 end

data/lib/new_relic/data_serialization.rb

@@ -84,6 +84,8 @@ module NewRelic
       rescue Exception => e
         NewRelic::Control.instance.log.error("Error serializing data to disk: #{e.inspect}")
         NewRelic::Control.instance.log.debug(e.backtrace.split("\n"))
+        # re-raise so that serialization will be disabled higher up the stack
+        raise e
       end
 
       def get_data_from_file(f)

data/lib/new_relic/language_support.rb

@@ -27,13 +27,16 @@ module NewRelic::LanguageSupport
     def self.included(base)
       # need to use syck rather than psych when possible
       if defined?(::YAML::ENGINE)
-        base.class_eval do
-          def load_newrelic_yml(*args)
-            yamler = ::YAML::ENGINE.yamler
-            ::YAML::ENGINE.yamler = 'syck'
-            val = super
-            ::YAML::ENGINE.yamler = yamler
-            val
+        unless NewRelic::LanguageSupport.using_engine?('jruby') &&
+                NewRelic::LanguageSupport.using_version?('1.9')
+          base.class_eval do
+            def load_newrelic_yml(*args)
+              yamler = ::YAML::ENGINE.yamler
+              ::YAML::ENGINE.yamler = 'syck'
+              val = super
+              ::YAML::ENGINE.yamler = yamler
+              val
+            end
           end
         end
       end

data/lib/new_relic/rack/browser_monitoring.rb

@@ -9,33 +9,16 @@ module NewRelic::Rack
 
     # method required by Rack interface
     def call(env)
-      
-      req = Rack::Request.new(env)
-      
-      # clear any previous transaction info
-      NewRelic::Agent::TransactionInfo.reset
-      
-      agent_flag = req.cookies['NRAGENT']
-      
-      if agent_flag
-        s = agent_flag.split("=")
-        if s.length == 2
-          if s[0] == "tk" && s[1]
-            NewRelic::Agent::TransactionInfo.get.token = s[1]
-          end
-        end
-      end
-      
       # Two experimental options for allowing TT capture based on http params
       #
-      if req.params['nr_capture_deep_tt']
+      # if req.params['nr_capture_deep_tt']
         # NewRelic::Agent::TransactionInfo.get.force_persist = true
         # NewRelic::Agent::TransactionInfo.get.capture_deep_tt = true
-      end
+      # end
       
-      if req.params['nr_capture_tt']
+      # if req.params['nr_capture_tt']
         # NewRelic::Agent::TransactionInfo.get.force_persist = true
-      end
+      # end
       
       result = @app.call(env)   # [status, headers, response]
       
@@ -44,12 +27,6 @@ module NewRelic::Rack
 
         if response_string
           response = Rack::Response.new(response_string, result[0], result[1])
-
-          if NewRelic::Agent::TransactionInfo.get.token
-            # clear the cookie via expiration in the past
-            response.set_cookie("NRAGENT", {:value => "tk=", :path => "/", :expires => Time.now-(24* 60*60)})
-          end
-
           response.finish
         else
           result

data/lib/new_relic/version.rb

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

data/newrelic_rpm.gemspec

@@ -4,15 +4,21 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "newrelic_rpm"
-  s.version = "3.3.1.beta2"
+  s.name = %q{newrelic_rpm}
+  s.version = "3.3.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 = "2011-11-29"
-  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.date = %q{2011-12-15}
+  s.description = %q{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/
+}
+  s.email = %q{support@newrelic.com}
+  s.executables = ["newrelic_cmd", "newrelic", "mongrel_rpm"]
   s.extra_rdoc_files = [
     "CHANGELOG",
     "LICENSE",

data/test/new_relic/agent/browser_monitoring_test.rb

@@ -11,7 +11,7 @@ class NewRelic::Agent::BrowserMonitoringTest < Test::Unit::TestCase
     @browser_monitoring_key = "fred"
     @episodes_file = "this_is_my_file"
     NewRelic::Agent.instance.instance_eval do
-      @beacon_configuration = NewRelic::Agent::BeaconConfiguration.new({"rum.enabled" => true, "browser_key" => "browserKey", "application_id" => "apId", "beacon"=>"beacon", "episodes_url"=>"this_is_my_file"})
+      @beacon_configuration = NewRelic::Agent::BeaconConfiguration.new({"rum.enabled" => true, "browser_key" => "browserKey", "application_id" => "apId", "beacon"=>"beacon", "episodes_url"=>"this_is_my_file", 'rum.jsonp' => true})
     end
     Thread.current[:last_metric_frame] = nil
     NewRelic::Agent::TransactionInfo.clear
@@ -286,12 +286,6 @@ var e=document.createElement("script");'
     assert_equal("<script type=\"text/javascript\">if (!NREUMQ.f) { NREUMQ.f=function() {\nNREUMQ.push([\"load\",new Date().getTime()]);\nvar e=document.createElement(\"script\");\ne.type=\"text/javascript\";e.async=true;e.src=\"this_is_my_file\";\ndocument.body.appendChild(e);\nif(NREUMQ.a)NREUMQ.a();\n};\nNREUMQ.a=window.onload;window.onload=NREUMQ.f;\n};\nNREUMQ.push([\"nrfj\",\"\",\"\",1,\"most recent transaction\",0,0,new Date().getTime(),\"ABC\",\"0123456789ABCDEF\",\"user\",\"account\",\"product\"])</script>", value, "should return the javascript given some default values")
   end
 
-  def test_use_nrf2_footer_when_auto_rum_disabled
-    NewRelic::Control.instance['browser_monitoring'] = { 'auto_instrument' => false }
-    value = footer_js_string(NewRelic::Agent.instance.beacon_configuration, '', '', 1)
-    assert_match(/nrf2/, value, "footer should use nrf2 when auto-rum disabled")
-  end
-
   def test_html_safe_if_needed_unsafed
     string = mock('string')
     # here to handle 1.9 encoding - we stub this out because it should

data/test/new_relic/agent_test.rb

@@ -151,6 +151,18 @@ module NewRelic
       assert_equal(NewRelic::Agent.agent, NewRelic::Agent.instance, "should return the same agent for both identical methods")
     end
 
+    def test_load_data_should_disable_serialization_if_an_error_is_encountered
+      NewRelic::Control.instance['disable_serialization'] = false
+      NewRelic::DataSerialization.stubs(:should_send_data?).returns(false)
+      NewRelic::Agent.stubs(:save_data).raises(Errno::EACCES)
+      begin
+        NewRelic::Agent.instance.send(:save_or_transmit_data)
+      rescue Errno::EACCES; end
+      # should be true
+      assert(NewRelic::Control.instance['disable_serialization'])
+      NewRelic::Control.instance['disable_serialization'] = false
+    end
+
     def test_load_data_should_not_write_files_when_serialization_disabled
       NewRelic::Control.instance['disable_serialization'] = true
       NewRelic::DataSerialization.expects(:read_and_write_to_file).never

data/test/new_relic/rack/browser_monitoring_test.rb

@@ -17,8 +17,6 @@ class BrowserMonitoringTest < Test::Unit::TestCase
   include Rack::Test::Methods
   
   class TestApp
-    include NewRelic::Agent::Instrumentation::ControllerInstrumentation
-    
     def self.doc=(other)
       @@doc = other
     end
@@ -38,7 +36,7 @@ class BrowserMonitoringTest < Test::Unit::TestCase
 EOL
       [200, {'Content-Type' => 'text/html'}, Rack::Response.new(@@doc)]
     end
-    add_transaction_tracer :call, :category => :rack    
+    include NewRelic::Agent::Instrumentation::Rack
   end
   
   def app

metadata

@@ -1,10 +1,15 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: newrelic_rpm
-version: !ruby/object:Gem::Version
-  version: 3.3.1.beta2
-  prerelease: 6
+version: !ruby/object:Gem::Version 
+  hash: 9
+  prerelease: 
+  segments: 
+  - 3
+  - 3
+  - 1
+  version: 3.3.1
 platform: ruby
-authors:
+authors: 
 - Bill Kayser
 - Jon Guymon
 - Justin George
@@ -12,66 +17,73 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-29 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-12-15 00:00:00 -08:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &2153088200 !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: *2153088200
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: mocha
-  requirement: &2153087680 !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: *2153087680
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: shoulda
-  requirement: &2153087180 !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: *2153087180
-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:
-- mongrel_rpm
-- newrelic
+executables: 
 - newrelic_cmd
+- newrelic
+- mongrel_rpm
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - CHANGELOG
 - LICENSE
 - README.rdoc
 - newrelic.yml
-files:
+files: 
 - CHANGELOG
 - LICENSE
 - README.rdoc
@@ -330,40 +342,63 @@ files:
 - vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/web_frontend.rb
 - vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/web_service.rb
 - vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/web_transaction.rb
+has_rdoc: true
 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.10
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: New Relic Ruby Agent
 test_files: []
+