newrelic_rpm 2.14.1 → 3.0.0.beta1

data/lib/new_relic/control.rb

@@ -41,8 +41,8 @@ module NewRelic
     # include Configuration
     # include ServerMethods
     # include Instrumentation
-    
-    
+
+
 
   end
 end

data/lib/new_relic/control/class_methods.rb

@@ -5,11 +5,6 @@ module NewRelic
       def instance
         @instance ||= new_instance
       end
-      
-      def mark_browser_request
-        Thread::current[:browser_request] = true
-      end
-      
 
       # Create the concrete class for environment specific behavior:
       def new_instance

data/lib/new_relic/control/configuration.rb

@@ -63,7 +63,7 @@ module NewRelic
         # Always initialized with a default
         fetch('apdex_t').to_f
       end
-      
+
       def license_key
         fetch('license_key')
       end
@@ -80,9 +80,10 @@ module NewRelic
         fetch('developer_mode', fetch('developer'))
       end
 
-      def episodes_enabled?
-        fetch('episodes_enabled', true)
+      def browser_monitoring_auto_instrument?
+        fetch('browser_monitoring', {}).fetch('auto_instrument', true)
       end
+
       # True if the app runs in multi-threaded mode
       def multi_threaded?
         fetch('multi_threaded')

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

@@ -25,19 +25,16 @@ module NewRelic
           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)
@@ -95,7 +92,7 @@ module NewRelic
             gem.name + (version ? "(#{version})" : "")
           end
         end
-        
+
         # Collect the Rails::Info into an associative array as well as the list of plugins
         def append_environment_info
           local_env.append_environment_value('Rails version'){ ::Rails::VERSION::STRING }
@@ -124,7 +121,7 @@ module NewRelic
             end
           end
         end
-        
+
         def install_shim
           super
           require 'new_relic/agent/instrumentation/controller_instrumentation'

data/lib/new_relic/control/instance_methods.rb

@@ -8,7 +8,7 @@ module NewRelic
 
       attr_reader :local_env
 
-      
+
       # Initialize the plugin/gem and start the agent.  This does the
       # necessary configuration based on the framework environment and
       # determines whether or not to start the agent.  If the agent is
@@ -116,7 +116,7 @@ module NewRelic
           []
         end
       end
-      
+
       def config_file
         File.expand_path(File.join(root,"config","newrelic.yml"))
       end

data/lib/new_relic/control/instrumentation.rb

@@ -32,7 +32,7 @@ module NewRelic
           @instrumentation_files << pattern
         end
       end
-      
+
       def install_instrumentation
         _install_instrumentation
       end

data/lib/new_relic/control/server_methods.rb

@@ -34,7 +34,7 @@ module NewRelic
         # if the host is not an IP address, turn it into one
         NewRelic::Control::Server.new host, (self['port'] || (use_ssl? ? 443 : 80)).to_i, convert_to_ip_address(host)
       end
-      
+
       # Check to see if we need to look up the IP address
       # If it's an IP address already, we pass it through.
       # If it's nil, or localhost, we don't bother.
@@ -48,7 +48,7 @@ module NewRelic
         log.info "Resolved #{host} to #{ip}"
         ip
       end
-      
+
       # Look up the ip address of the host using the pure ruby lookup
       # to prevent blocking.  If that fails, fall back to the regular
       # IPSocket library.  Return nil if we can't find the host ip

data/lib/new_relic/delayed_job_injection.rb

@@ -14,7 +14,7 @@ DependencyDetection.defer do
   depends_on do
     defined?(::Delayed) && defined?(::Delayed::Worker)
   end
-  
+
   executes do
     Delayed::Worker.class_eval do
       def initialize_with_new_relic(*args)

data/lib/new_relic/local_environment.rb

@@ -83,13 +83,13 @@ module NewRelic
         gather_jruby_info
       end
     end
-    
+
     def gather_jruby_info
       append_environment_value('JRuby version') { JRUBY_VERSION }
       append_environment_value('Java VM version') { ENV_JAVA['java.vm.version']}
     end
-    
-    # See what the number of cpus is, works only on linux.    
+
+    # See what the number of cpus is, works only on linux.
     def gather_cpu_info
       return unless File.readable? '/proc/cpuinfo'
       @processors = append_environment_value('Processors') do
@@ -109,7 +109,7 @@ module NewRelic
       append_environment_value('OS') { `uname -s` } ||
         append_environment_value('OS') { ENV['OS'] }
     end
-    
+
     def gather_system_info
       gather_architecture_info
       gather_cpu_info
@@ -126,7 +126,7 @@ module NewRelic
     end
 
     def gather_ar_adapter_info
-      # The name of the database adapter for the current environment.      
+      # The name of the database adapter for the current environment.
       append_environment_value 'Database adapter' do
         if defined?(ActiveRecord) && defined?(ActiveRecord::Base) &&
             ActiveRecord::Base.respond_to?(:configurations)
@@ -165,14 +165,14 @@ module NewRelic
       append_environment_value 'Dispatcher', @dispatcher.to_s if @dispatcher
       append_environment_value 'Dispatcher instance id', @dispatcher_instance_id if @dispatcher_instance_id
       append_environment_value('Environment') { NewRelic::Control.instance.env }
-      
+
       # miscellaneous other helpful debugging information
       gather_ruby_info
       gather_system_info
       gather_revision_info
       gather_db_info
     end
-    
+
     # Take a snapshot of the environment information for this application
     # Returns an associative array
     def snapshot

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/stats.rb

@@ -17,16 +17,16 @@ module NewRelic
         "%.0f ms" % value_ms
       end
     end
-    
+
     # makes sure we aren't dividing by zero
     def checked_calculation(numerator, denominator)
       if denominator.nil? || denominator == 0
         0.0
       else
-        numerator / denominator
+        numerator.to_f / denominator
       end
     end
-    
+
     def average_call_time
       checked_calculation(total_call_time, call_count)
     end
@@ -70,7 +70,7 @@ module NewRelic
     def update_totals(other)
       self.total_call_time      += other.total_call_time
       self.total_exclusive_time += other.total_exclusive_time
-      self.sum_of_squares       += other.sum_of_squares      
+      self.sum_of_squares       += other.sum_of_squares
     end
 
     def min_time_less?(other)
@@ -79,7 +79,7 @@ module NewRelic
 
     def expand_min_max_to(other)
         self.min_call_time = other.min_call_time if min_time_less?(other)
-        self.max_call_time = other.max_call_time if other.max_call_time > max_call_time      
+        self.max_call_time = other.max_call_time if other.max_call_time > max_call_time
     end
 
     def merge_attributes(other)
@@ -88,7 +88,7 @@ module NewRelic
       self.call_count += other.call_count
       update_boundaries(other)
     end
-    
+
     def merge!(other_stats)
       Array(other_stats).each do |other|
         merge_attributes(other)

data/lib/new_relic/version.rb

@@ -1,10 +1,10 @@
 #!/usr/bin/ruby
 module NewRelic
   module VERSION #:nodoc:
-    MAJOR = 2
-    MINOR = 14
-    TINY  = 1
-    BUILD = nil #'0' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
+    MAJOR = 3
+    MINOR = 0
+    TINY  = 0
+    BUILD = 'beta1' #'0' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end
 

data/newrelic.yml

@@ -59,6 +59,15 @@ common: &default_settings
   # log level here.
   log_level: info
 
+  # Optionally set the path to the log file This is expanded from the
+  # root directory (may be relative or absolute, e.g. 'log/' or
+  # '/var/log/') The agent will attempt to create this directory if it
+  # does not exist.
+  # log_file_path: 'log/'
+  
+  # Optionally set the name of the log file, defaults to 'newrelic_agent.log'
+  # log_file_name: 'newrelic_agent.log'
+
   # The newrelic agent communicates with the RPM service via http by
   # default.  If you want to communicate via https to increase
   # security, then turn on SSL by setting this value to true.  Note,
@@ -90,6 +99,16 @@ common: &default_settings
   # http://support.newrelic.com/faqs/general/apdex
 
   apdex_t: 0.5
+  
+  #============================== Browser Monitoring ===============================
+  # New Relic Real User Monitoring gives you insight into the performance real users are
+  # experiencing with your website. This is accomplished by measuring the time it takes for
+  # your users' browsers to download and render your web pages by injecting a small amount
+  # of JavaScript code into the header and footer of each page. 
+  browser_monitoring:
+      # By default the agent automatically injects the monitoring JavaScript 
+      # into web pages. Set this attribute to false to turn off this behavior.
+      auto_instrument: true
 
   # Proxy settings for connecting to the RPM server.
   #

data/newrelic_rpm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{newrelic_rpm}
-  s.version = "2.14.1"
+  s.version = "3.0.0.beta1"
 
   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-31}
+  s.date = %q{2011-04-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
@@ -40,6 +40,7 @@ http://github.com/newrelic/rpm/tree/master.
     "lib/conditional_vendored_metric_parser.rb",
     "lib/new_relic/agent.rb",
     "lib/new_relic/agent/agent.rb",
+    "lib/new_relic/agent/browser_monitoring.rb",
     "lib/new_relic/agent/busy_calculator.rb",
     "lib/new_relic/agent/chained_call.rb",
     "lib/new_relic/agent/error_collector.rb",
@@ -64,7 +65,6 @@ http://github.com/newrelic/rpm/tree/master.
     "lib/new_relic/agent/instrumentation/rails3/action_controller.rb",
     "lib/new_relic/agent/instrumentation/rails3/active_record_instrumentation.rb",
     "lib/new_relic/agent/instrumentation/rails3/errors.rb",
-    "lib/new_relic/agent/instrumentation/sequel.rb",
     "lib/new_relic/agent/instrumentation/sinatra.rb",
     "lib/new_relic/agent/instrumentation/sunspot.rb",
     "lib/new_relic/agent/instrumentation/unicorn_instrumentation.rb",
@@ -79,6 +79,7 @@ http://github.com/newrelic/rpm/tree/master.
     "lib/new_relic/agent/stats_engine/metric_stats.rb",
     "lib/new_relic/agent/stats_engine/samplers.rb",
     "lib/new_relic/agent/stats_engine/transactions.rb",
+    "lib/new_relic/agent/transaction_sample_builder.rb",
     "lib/new_relic/agent/transaction_sampler.rb",
     "lib/new_relic/agent/worker_loop.rb",
     "lib/new_relic/collection_helper.rb",
@@ -107,6 +108,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",
@@ -132,13 +134,16 @@ http://github.com/newrelic/rpm/tree/master.
     "test/new_relic/agent/agent/connect_test.rb",
     "test/new_relic/agent/agent/start_test.rb",
     "test/new_relic/agent/agent/start_worker_thread_test.rb",
+    "test/new_relic/agent/agent_test.rb",
     "test/new_relic/agent/agent_test_controller.rb",
     "test/new_relic/agent/agent_test_controller_test.rb",
     "test/new_relic/agent/apdex_from_server_test.rb",
+    "test/new_relic/agent/browser_monitoring_test.rb",
     "test/new_relic/agent/busy_calculator_test.rb",
     "test/new_relic/agent/error_collector/notice_error_test.rb",
     "test/new_relic/agent/error_collector_test.rb",
     "test/new_relic/agent/instrumentation/active_record_instrumentation_test.rb",
+    "test/new_relic/agent/instrumentation/controller_instrumentation_test.rb",
     "test/new_relic/agent/instrumentation/instrumentation_test.rb",
     "test/new_relic/agent/instrumentation/metric_frame_test.rb",
     "test/new_relic/agent/instrumentation/net_instrumentation_test.rb",
@@ -268,7 +273,7 @@ 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.14 of the Ruby Agent.
+in version 3.0 of the Ruby Agent.
 
 For details on this specific release, refer to the CHANGELOG file.
 

data/test/active_record_fixtures.rb

@@ -37,7 +37,7 @@ module ActiveRecordFixtures
       end
     end
   end
-  
+
   class Shipment < ActiveRecord::Base
     self.table_name = 'newrelic_test_shipment'
     has_and_belongs_to_many :orders, :class_name => 'ActiveRecordFixtures::Order'
@@ -46,14 +46,14 @@ module ActiveRecordFixtures
         # no other columns
       end
       connection.create_table 'orders_shipments', :force => true, :id => false do |t|
-        t.column :order_id, :integer 
-        t.column :shipment_id, :integer 
+        t.column :order_id, :integer
+        t.column :shipment_id, :integer
       end
     end
-    
+
     def self.teardown
       connection.drop_table 'orders_shipments'
       connection.drop_table self.table_name
     end
-  end    
+  end
 end