newrelic_rpm 2.13.4.rum5 → 2.13.4.rum6

data/lib/new_relic/agent.rb

@@ -381,23 +381,11 @@ module NewRelic
     
     # PRE-RELEASE
     # Returns a Javascript string which should be injected into the very top of the response body
-    # == options
-    # * <tt>:protocol => if nil then autodetect the protocol for loading the javascript file from newrelic. If set, use specified protocol.
-    #                    Legal values "http" and "https" 
     #
-    def browser_timing_header(protocol=nil)
-      agent.browser_timing_header(protocol)
+    def browser_timing_header
+      agent.browser_timing_header
     end
         
-    
-    # PRE-RELEASE
-    # Returns a Javascript string which should be injected into the very top of the response body. Use this
-    # if you bundle our eum.js file manually
-    #
-    def browser_timing_short_header
-      agent.browser_timing_short_header
-    end
-    
     # PRE-RELEASE
     # Returns a Javascript string which should be injected into the very bottom of the response body
     #

data/lib/new_relic/agent/agent.rb

@@ -61,10 +61,7 @@ module NewRelic
         attr_reader :histogram
         attr_reader :metric_ids
         attr_reader :url_rules
-        attr_reader :browser_monitoring_key
-        attr_reader :application_id
-        attr_reader :beacon
-        attr_reader :episodes_file
+        attr_reader :beacon_configuration
 
         def record_transaction(duration_seconds, options={})
           is_error = options['is_error'] || options['error_message'] || options['exception']
@@ -437,10 +434,7 @@ module NewRelic
             @agent_id = connect_data['agent_run_id']
             @report_period = connect_data['data_report_period']
             @url_rules = connect_data['url_rules']
-            @browser_monitoring_key = connect_data['browser_key']
-            @application_id = connect_data['application_id']
-            @beacon = connect_data['beacon']
-            @episodes_file = connect_data['episodes_file']
+            @beacon_configuration = BeaconConfiguration.new(connect_data)
 
             control.log! "Connected to NewRelic Service at #{@collector}"
             log.debug "Agent Run       = #{@agent_id}."

data/lib/new_relic/agent/browser_monitoring.rb

@@ -2,44 +2,56 @@ require 'base64'
 
 module NewRelic
   module Agent
-    module BrowserMonitoring
+    class BeaconConfiguration    
+      attr_reader :browser_timing_header
+      attr_reader :application_id
+      attr_reader :browser_monitoring_key
+      attr_reader :beacon
       
-      def browser_timing_short_header
-        return "" if NewRelic::Agent.instance.browser_monitoring_key.nil?
-
-        "<script>var NREUMQ=[];NREUMQ.push([\"mark\",\"firstbyte\",new Date().getTime()])</script>"
-      end
-      
-      def browser_timing_header(protocol=nil)
-        
-        return "" if NewRelic::Agent.instance.browser_monitoring_key.nil?
+      def initialize(connect_data)
+        @browser_monitoring_key = connect_data['browser_key']
+        @application_id = connect_data['application_id']
+        @beacon = connect_data['beacon']
         
-        episodes_file = "//" + NewRelic::Agent.instance.episodes_file
+        @browser_timing_header = build_browser_timing_header(connect_data)
+      end
+    
+      def build_browser_timing_header(connect_data)
+        return "" if @browser_monitoring_key.nil?
         
-        if protocol
-          protocol = "\"#{protocol}:"
-        else
-          protocol = "((\"http:\"===d.location.protocol)?\"http:\":\"https:\")+\""
-        end
-      
-        load_js = "(function(){var d=document;var e=d.createElement(\"script\");e.type=\"text/javascript\";e.async=true;e.src=#{protocol}#{episodes_file}\";var s=d.getElementsByTagName(\"script\")[0];s.parentNode.insertBefore(e,s);})()"
+        episodes_url = connect_data['episodes_url']
+        load_episodes_file = connect_data['rum.load_episodes_file']
+        load_episodes_file = true if load_episodes_file.nil?
+    
+        load_js = load_episodes_file ? "(function(){var d=document;var e=d.createElement(\"script\");e.type=\"text/javascript\";e.async=true;e.src=\"#{episodes_url}\";var s=d.getElementsByTagName(\"script\")[0];s.parentNode.insertBefore(e,s);})()" : ""
+            
         "<script>var NREUMQ=[];NREUMQ.push([\"mark\",\"firstbyte\",new Date().getTime()]);#{load_js}</script>"
       end
+    end
+
+    module BrowserMonitoring
+            
+      def browser_timing_header        
+        return "" if NewRelic::Agent.instance.beacon_configuration.nil?
+        NewRelic::Agent.instance.beacon_configuration.browser_timing_header
+      end
       
       def browser_timing_footer
-        
-        license_key = NewRelic::Agent.instance.browser_monitoring_key
+        config = NewRelic::Agent.instance.beacon_configuration
+        return "" if config.nil?
+        license_key = config.browser_monitoring_key
         
         return "" if license_key.nil?
 
-        application_id = NewRelic::Agent.instance.application_id
-        beacon = NewRelic::Agent.instance.beacon
-        transaction_name = Thread::current[:newrelic_scope_name] || "<unknown>"
-        obf = obfuscate(transaction_name)
+        application_id = config.application_id
+        beacon = config.beacon
         
+        transaction_name = Thread::current[:newrelic_scope_name] || "<unknown>"
         frame = Thread.current[:newrelic_metric_frame]
         
         if frame && frame.start
+          obf = obfuscate(transaction_name)
+          
           # HACK ALERT - there's probably a better way for us to get the queue-time
           queue_time = ((Thread.current[:queue_time] || 0).to_f * 1000.0).round
           app_time = ((Time.now - frame.start).to_f * 1000.0).round
@@ -47,6 +59,8 @@ module NewRelic
 <<-eos
 <script type="text/javascript" charset="utf-8">NREUMQ.push(["nrf2","#{beacon}","#{license_key}",#{application_id},"#{obf}",#{queue_time},#{app_time}])</script>
 eos
+        else
+          ""
         end
       end
       
@@ -54,11 +68,10 @@ eos
 
       def obfuscate(text)
         obfuscated = ""
-        
-        key = NewRelic::Control.instance.license_key
+        @@license_bytes ||= NewRelic::Control.instance.license_key.bytes.to_a
         
         text.bytes.each_with_index do |byte, i|
-          obfuscated.concat((byte ^ key[i % 13]))
+          obfuscated.concat((byte ^ @@license_bytes[i % 13]))
         end
         
         [obfuscated].pack("m0").chomp

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

@@ -138,7 +138,7 @@ module NewRelic
               NewRelic::Agent.instance.transaction_sampler.notice_scope_empty
             end
             NewRelic::Agent.instance.stats_engine.end_transaction
-            Thread.current[:newrelic_metric_frame] = nil
+#            Thread.current[:newrelic_metric_frame] = nil
           else # path stack not empty
             # change the transaction name back to whatever was on the stack.
             NewRelic::Agent.instance.stats_engine.scope_name = metric_name

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

@@ -16,6 +16,13 @@ if defined? ActionController
     ActionView::Template.class_eval do
       add_method_tracer :render, 'View/#{(path_without_extension || @view.controller.newrelic_metric_path)[%r{^(/.*/)?(.*)$},2]}.#{@view.template_format}.#{extension}/Rendering'
     end
+#    ActionView::Template.class_eval do
+#      alias_method :source_without_newrelic, :source
+#      
+#      def source
+#        "text/html" == mime_type ? NewRelic::Agent.autoinstrument_source(source_without_newrelic) : source_without_newrelic
+#      end
+#    end if NewRelic::Control.instance['auto_enable_real_user_monitoring']
 
     when /^2\./   # Rails 2.2-2.*
     ActionView::RenderablePartial.module_eval do
@@ -24,6 +31,14 @@ if defined? ActionController
     ActionView::Template.class_eval do
       add_method_tracer :render, 'View/#{path[%r{^(/.*/)?(.*)$},2]}/Rendering'
     end
+#    ActionView::Template.class_eval do
+#      alias_method :source_without_newrelic, :source
+#      
+#      def source
+#        "text/html" == mime_type ? NewRelic::Agent.autoinstrument_source(source_without_newrelic) : source_without_newrelic
+#      end
+#    end if NewRelic::Control.instance['auto_enable_real_user_monitoring']
+    
   end unless NewRelic::Control.instance['disable_view_instrumentation']
 
   ActionController::Base.class_eval do

data/lib/new_relic/agent/shim_agent.rb

@@ -20,9 +20,8 @@ module NewRelic
       def shutdown; end
       def push_trace_execution_flag(*args); end
       def pop_trace_execution_flag(*args); end
-      def browser_timing_header(protocol=nil); end
-      def browser_timing_short_header; end
-      def browser_timing_footer; end
+      def browser_timing_header; "" end
+      def browser_timing_footer; "" end
     end
   end
 end

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

@@ -105,7 +105,6 @@ module Agent
 
         if stack && stack.empty?
           Thread::current[:newrelic_scope_stack] = nil
-          Thread::current[:newrelic_scope_name] = nil
         end
       end
 

data/lib/new_relic/control/configuration.rb

@@ -79,9 +79,16 @@ module NewRelic
         fetch('developer_mode', fetch('developer'))
       end
 
-      def episodes_enabled?
-        fetch('episodes_enabled', true)
+      def browser_monitoring_auto_instrument?
+        bm = fetch('browser_monitoring')
+        
+        if bm.nil?
+          false
+        else
+          bm.fetch('auto_instrument', false)
+        end
       end
+      
       # True if the app runs in multi-threaded mode
       def multi_threaded?
         fetch('multi_threaded')

data/lib/new_relic/control/frameworks/rails.rb

@@ -21,19 +21,16 @@ class NewRelic::Control::Frameworks::Rails < NewRelic::Control
     else
       log! "Starting the New Relic Agent."
       install_developer_mode rails_config if developer_mode?
-      install_episodes rails_config
+      install_browser_monitoring rails_config
     end
   end
 
-  def install_episodes(config)
-    return if config.nil? || !config.respond_to?(:middleware) || !episodes_enabled?
-    config.after_initialize do
-      if defined?(NewRelic::Rack::Episodes)
-        config.middleware.use NewRelic::Rack::Episodes
-        log! "Installed episodes middleware"
-        ::RAILS_DEFAULT_LOGGER.info "Installed episodes middleware"
-      end
-    end
+  def install_browser_monitoring(config)
+    return if config.nil? || !config.respond_to?(:middleware) || !browser_monitoring_auto_instrument?
+    
+    require 'new_relic/rack/browser_monitoring'
+    config.middleware.use NewRelic::Rack::BrowserMonitoring
+    ::RAILS_DEFAULT_LOGGER.info "Installed browser monitoring middleware"
   end
 
   def install_developer_mode(rails_config)

data/lib/new_relic/rack/browser_monitoring.rb

@@ -0,0 +1,61 @@
+require 'rack'
+
+module NewRelic::Rack
+  class BrowserMonitoring
+    
+    def initialize(app, options = {})
+      @app = app
+    end
+
+    # method required by Rack interface
+    def call(env)
+      result = @app.call(env)   # [status, headers, response]
+      
+      if (NewRelic::Agent.browser_timing_header != "") && should_instrument?(result[0], result[1])
+        response_string = autoinstrument_source(result[2], result[1])
+        
+        if (response_string)
+          Rack::Response.new(response_string, result[0], result[1]).finish
+        else
+          result
+        end
+      else
+        result
+      end
+    end
+    
+    def should_instrument?(status, headers)
+      status == 200 && headers["Content-Type"] && headers["Content-Type"].include?("text/html")
+    end
+
+    def autoinstrument_source(response, headers)      
+      source = nil
+      response.each {|fragment| (source) ? (source << f) : (source = fragment)}
+
+      body_start = source.index("<body")
+      body_close = source.rindex("</body>")
+      
+      if body_start && body_close
+        footer = NewRelic::Agent.browser_timing_footer
+        header = NewRelic::Agent.browser_timing_header
+
+        head_open = source.index("<head")
+
+        if head_open
+          head_close = source.index(">", head_open)
+          
+          head_pos = head_close + 1
+        else
+          # put the header right above body start
+          head_pos = body_start
+        end
+        
+        source = source[0..(head_pos-1)] + header + source[head_pos..(body_close-1)] + footer + source[body_close..-1]
+        
+        headers['Content-Length'] = source.length.to_s if headers['Content-Length'] 
+      end
+
+      source
+    end
+  end
+end

data/lib/new_relic/version.rb

@@ -4,7 +4,7 @@ module NewRelic
     MAJOR = 2
     MINOR = 13
     TINY  = 4
-    BUILD = 'rum5' #'0' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
+    BUILD = 'rum6' #'0' # 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 = %q{newrelic_rpm}
-  s.version = "2.13.4.rum5"
+  s.version = "2.13.4.rum6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bill Kayser", "Justin George"]
-  s.date = %q{2011-03-23}
+  s.date = %q{2011-03-29}
   s.description = %q{New Relic RPM is a Ruby performance management system, developed by
 New Relic, Inc (http://www.newrelic.com).  RPM provides you with deep
 information about the performance of your Ruby on Rails or Merb
@@ -100,6 +100,7 @@ http://github.com/newrelic/rpm/tree/master.
     "lib/new_relic/metric_spec.rb",
     "lib/new_relic/metrics.rb",
     "lib/new_relic/noticed_error.rb",
+    "lib/new_relic/rack/browser_monitoring.rb",
     "lib/new_relic/rack/developer_mode.rb",
     "lib/new_relic/rack/metric_app.rb",
     "lib/new_relic/rack/mongrel_rpm.ru",

metadata

@@ -1,14 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: newrelic_rpm
 version: !ruby/object:Gem::Version 
-  hash: -240926931
-  prerelease: true
-  segments: 
-  - 2
-  - 13
-  - 4
-  - rum5
-  version: 2.13.4.rum5
+  prerelease: 7
+  version: 2.13.4.rum6
 platform: ruby
 authors: 
 - Bill Kayser
@@ -17,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-23 00:00:00 -07:00
+date: 2011-03-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,9 +22,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id001
@@ -42,9 +33,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id002
@@ -56,9 +44,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id003
@@ -157,6 +142,7 @@ files:
 - lib/new_relic/metric_spec.rb
 - lib/new_relic/metrics.rb
 - lib/new_relic/noticed_error.rb
+- lib/new_relic/rack/browser_monitoring.rb
 - lib/new_relic/rack/developer_mode.rb
 - lib/new_relic/rack/metric_app.rb
 - lib/new_relic/rack/mongrel_rpm.ru
@@ -291,32 +277,23 @@ has_rdoc: true
 homepage: http://www.github.com/newrelic/rpm
 licenses: []
 
-post_install_message: |+
-  
-  PLEASE NOTE:
-  
-  Developer Mode is now a Rack middleware.
-  
-  RPM 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://support.newrelic.com/faqs/docs/ruby-agent-release-notes
-  for a complete description of the features and enhancements available
-  in version 2.13 of the Ruby Agent.
-  
-  For details on this specific release, refer to the CHANGELOG file.
-  
-  Notice: Developer Mode now supports only Rails 2.3+ - refer to README
-  for instructions for previous versions
-  
+post_install_message: "\n\
+  PLEASE NOTE:\n\n\
+  Developer Mode is now a Rack middleware.\n\n\
+  RPM Developer Mode is no longer available in Rails 2.1 and earlier.\n\
+  However, starting in version 2.12 you can use Developer Mode in any\n\
+  Rack based framework, in addition to Rails.  To install developer mode\n\
+  in a non-Rails application, just add NewRelic::Rack::DeveloperMode to\n\
+  your middleware stack.\n\n\
+  If you are using JRuby, we recommend using at least version 1.4 or \n\
+  later because of issues with the implementation of the timeout library.\n\n\
+  Refer to the README.md file for more information.\n\n\
+  Please see http://support.newrelic.com/faqs/docs/ruby-agent-release-notes\n\
+  for a complete description of the features and enhancements available\n\
+  in version 2.13 of the Ruby Agent.\n\n\
+  For details on this specific release, refer to the CHANGELOG file.\n\n\
+  Notice: Developer Mode now supports only Rails 2.3+ - refer to README\n\
+  for instructions for previous versions\n\n"
 rdoc_options: 
 - --line-numbers
 - --inline-source
@@ -329,23 +306,17 @@ required_ruby_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 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: New Relic Ruby Performance Monitoring Agent