newrelic_rpm 3.2.0.1 → 3.3.0.beta1

data/CHANGELOG

@@ -1,6 +1,10 @@
-v3.2.0.1
-  * Updated LICENSE
-  * Updated links to support docs
+v3.3.0
+  * fix for GC instrumentation when using Ruby 1.9
+  * new feature to correlate browser and server transaction traces
+  * new feature to trace slow sql statements
+  * fix to help cope with malformed rack responses
+  * do not try to instrument versions of ActiveMerchant that are too old
+
 v3.2.0
   * Fix over-detection of mongrel and unicorn and only start the agent when
     actual server is running

data/LICENSE

@@ -1,31 +1,4 @@
-This product includes jquery written by John Resig
-and distributed under an MIT license.
-See https://github.com/jquery/jquery/blob/master/MIT-LICENSE.txt
-
-    Copyright (c) 2011 John Resig, http://jquery.com/
-
-    Permission is hereby granted, free of charge, to any person obtaining
-    a copy of this software and associated documentation files (the
-    "Software"), to deal in the Software without restriction, including
-    without limitation the rights to use, copy, modify, merge, publish,
-    distribute, sublicense, and/or sell copies of the Software, and to
-    permit persons to whom the Software is furnished to do so, subject to
-    the following conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-All other components of this product are
-Copyright (c) 2008-2011 New Relic, Inc.  All rights reserved.
+Copyright (c) 2008-2010 New Relic, Inc.  All rights reserved.
 
 Certain inventions disclosed in this file may be claimed within
 patents owned or patent applications filed by New Relic, Inc. or third
@@ -61,4 +34,4 @@ FITNESS FOR A PARTICULAR PURPOSE, TITLE, or NON-INFRINGEMENT.  As a
 condition to your use of these files, you are solely responsible for
 such use. New Relic will have no liability to you for direct,
 indirect, consequential, incidental, special, or punitive damages or
-for lost profits or data.
+for lost profits or data.

data/README.rdoc

@@ -163,7 +163,7 @@ online.  Refer to instructions in *Getting Started*, below.
 = Support
 
 Reach out to us--and to fellow users--at
-support.newrelic.com[http://support.newrelic.com/].
+support.newrelic.com[http://support.newrelic.com/discussions/support].
 There you'll find documentation, FAQs, and forums where you can submit
 suggestions and discuss New Relic with staff and other users.
 
@@ -171,7 +171,7 @@ Also available is community support on IRC: we generally use #newrelic
 on irc.freenode.net
 
 Find a bug?  E-mail support@newrelic.com, or post it to
-support.newrelic.com[http://support.newrelic.com/].
+support.newrelic.com[http://support.newrelic.com/discussions/support].
 
 Thank you, and may your application scale to infinity plus one.  
 

data/lib/new_relic/agent.rb

@@ -86,6 +86,7 @@ module NewRelic
     require 'new_relic/agent/busy_calculator'
     require 'new_relic/agent/sampler'
     require 'new_relic/agent/database'
+    require 'new_relic/agent/transaction_info'
 
     require 'new_relic/agent/instrumentation/controller_instrumentation'
 
@@ -387,6 +388,19 @@ module NewRelic
     def add_custom_parameters(params)
       NewRelic::Agent::Instrumentation::MetricFrame.add_custom_parameters(params)
     end
+    
+    # Set attributes about the user making this request. These attributes will be automatically
+    # appended to any Transaction Trace or Error that is collected. These attributes
+    # will also be collected for RUM requests.
+    #
+    # Attributes (hash)
+    # * <tt>:user</tt> => user name or ID
+    # * <tt>:account</tt> => account name or ID
+    # * <tt>:product</tt> => product name or level
+    #
+    def set_user_attributes(attributes)
+      NewRelic::Agent::Instrumentation::MetricFrame.set_user_attributes(attributes)
+    end
 
     # The #add_request_parameters method is aliased to #add_custom_parameters
     # and is now deprecated.

data/lib/new_relic/agent/agent.rb

@@ -37,7 +37,6 @@ module NewRelic
         @transaction_sampler = NewRelic::Agent::TransactionSampler.new
         @sql_sampler = NewRelic::Agent::SqlSampler.new
         @stats_engine.transaction_sampler = @transaction_sampler
-        @stats_engine.sql_sampler = @sql_sampler
         @error_collector = NewRelic::Agent::ErrorCollector.new
         @connect_attempts = 0
 
@@ -775,13 +774,15 @@ module NewRelic
             # Ask the server for permission to send transaction samples.
             # determined by subscription license.
             @transaction_sampler.config['enabled'] = server_enabled
-            @sql_sampler.disable unless @transaction_sampler.config['enabled']
-            
+            @sql_sampler.configure!
             @should_send_samples = @config_should_send_samples && server_enabled
-
+            
             if @should_send_samples
               # I don't think this is ever true, but...
               enable_random_samples!(sample_rate) if @should_send_random_samples
+              
+              @transaction_sampler.slow_capture_threshold = @slowest_transaction_threshold
+              
               log.debug "Transaction tracing threshold is #{@slowest_transaction_threshold} seconds."
             else
               log.debug "Transaction traces will not be sent to the New Relic service."
@@ -862,6 +863,11 @@ module NewRelic
             @beacon_configuration = BeaconConfiguration.new(config_data)
             @server_side_config_enabled = config_data['listen_to_server_config']
 
+            if @server_side_config_enabled
+              log.info "Using config from server"
+              log.debug "Server provided config: #{config_data.inspect}"
+            end
+
             control.merge_server_side_config(config_data) if @server_side_config_enabled
             config_transaction_tracer
             log_connection!(config_data)
@@ -1063,6 +1069,10 @@ module NewRelic
           unless @traces.empty?
             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
@@ -1134,16 +1144,16 @@ module NewRelic
         def compress_data(object)
           dump = Marshal.dump(object)
 
-          # this checks to make sure mongrel won't choke on big uploads
-          check_post_size(dump)
-
           dump_size = dump.size
 
           return [dump, 'identity'] if dump_size < (64*1024)
 
-          compression = dump_size < 2000000 ? Zlib::BEST_SPEED : Zlib::BEST_COMPRESSION
+          compressed_dump = Zlib::Deflate.deflate(dump, Zlib::DEFAULT_COMPRESSION)
+
+          # this checks to make sure mongrel won't choke on big uploads
+          check_post_size(compressed_dump)
 
-          [Zlib::Deflate.deflate(dump, compression), 'deflate']
+          [compressed_dump, 'deflate']
         end
 
         # Raises a PostTooBigException if the post_string is longer

data/lib/new_relic/agent/beacon_configuration.rb

@@ -28,6 +28,13 @@ module NewRelic
       # local config
       attr_reader :rum_enabled
       
+      # whether JSONP is used to communicate with the Beacon or not
+      attr_reader :rum_jsonp
+      
+      # RUM footer command used for 'finish' - based on whether JSONP is
+      # being used. 'nrfj' for JSONP, otherwise 'nrf2'
+      attr_reader :finish_command
+      
       # A static javascript header that is identical for every account
       # and application
       JS_HEADER = "<script type=\"text/javascript\">var NREUMQ=NREUMQ||[];NREUMQ.push([\"mark\",\"firstbyte\",new Date().getTime()]);</script>"
@@ -45,6 +52,10 @@ module NewRelic
         NewRelic::Control.instance.log.debug("Browser timing header: #{@browser_timing_header.inspect}")
         @browser_timing_static_footer = build_load_file_js(connect_data)
         NewRelic::Control.instance.log.debug("Browser timing static footer: #{@browser_timing_static_footer.inspect}")
+        @rum_jsonp = connect_data['rum.jsonp']
+        @rum_jsonp = true if @rum_jsonp.nil?
+        NewRelic::Control.instance.log.debug("Real User Monitoring is using JSONP protocol") if @rum_jsonp
+        @finish_command = @rum_jsonp ?  'nrfj' : 'nrf2'
       end
       
       # returns a memoized version of the bytes in the license key for

data/lib/new_relic/agent/browser_monitoring.rb

@@ -6,6 +6,24 @@ module NewRelic
     # javascript generation and configuration
     module BrowserMonitoring
       
+     
+      class DummyMetricFrame
+        def initialize
+          @attributes = {}
+        end
+        
+        def user_attributes
+          @attributes
+        end
+        
+        def queue_time
+          0.0
+        end
+      end
+            
+      @@dummy_metric_frame = DummyMetricFrame.new
+      
+      
       # This method returns a string suitable for inclusion in a page
       # - known as 'manual instrumentation' for Real User
       # Monitoring. Can return either a script tag with associated
@@ -34,32 +52,49 @@ module NewRelic
         config = NewRelic::Agent.instance.beacon_configuration
         return "" if config.nil? || !config.rum_enabled || config.browser_monitoring_key.nil?
         return "" if !NewRelic::Agent.is_transaction_traced? || !NewRelic::Agent.is_execution_traced?
-        generate_footer_js
+        generate_footer_js(config)
       end
 
       private
 
-      def generate_footer_js
+      def generate_footer_js(config)
         if browser_monitoring_start_time
-          config = NewRelic::Agent.instance.beacon_configuration
           application_id = config.application_id
           beacon = config.beacon
           license_key = config.browser_monitoring_key
 
-          footer_js_string(beacon, license_key, application_id)
+          footer_js_string(config, beacon, license_key, application_id)
         else
           ''
         end
       end
 
       def browser_monitoring_transaction_name
-        Thread.current[:newrelic_most_recent_transaction] || "<unknown>"
+        NewRelic::Agent::TransactionInfo.get.transaction_name
       end
 
       def browser_monitoring_start_time
-        Thread.current[:newrelic_start_time]
+        NewRelic::Agent::TransactionInfo.get.start_time
       end
-
+            
+      def metric_frame_attribute(key)
+        current_metric_frame.user_attributes[key] || ""
+      end
+      
+      def current_metric_frame
+        Thread.current[:last_metric_frame] || @@dummy_metric_frame      
+      end
+      
+      def tt_guid
+        txn = NewRelic::Agent::TransactionInfo.get
+        return txn.guid if txn.include_guid?
+        ""
+      end
+      
+      def tt_token
+        return NewRelic::Agent::TransactionInfo.get.token
+      end
+      
       def clamp_to_positive(value)
         return 0.0 if value < 0
         value
@@ -70,12 +105,17 @@ module NewRelic
       end
 
       def browser_monitoring_queue_time
-        clamp_to_positive((Thread.current[:newrelic_queue_time].to_f * 1000.0).round)
+        clamp_to_positive((current_metric_frame.queue_time.to_f * 1000.0).round)
       end
 
-      def footer_js_string(beacon, license_key, application_id)
-        obfuscated_transaction_name = obfuscate(browser_monitoring_transaction_name)
-        html_safe_if_needed("<script type=\"text/javascript\">#{NewRelic::Agent.instance.beacon_configuration.browser_timing_static_footer}NREUMQ.push([\"nrf2\",\"#{beacon}\",\"#{license_key}\",#{application_id},\"#{obfuscated_transaction_name}\",#{browser_monitoring_queue_time},#{browser_monitoring_app_time},new Date().getTime()])</script>")
+      def footer_js_string(config, beacon, license_key, application_id)
+        obfuscated_transaction_name = obfuscate(config, browser_monitoring_transaction_name)
+        
+        user = obfuscate(config, metric_frame_attribute(:user))
+        account = obfuscate(config, metric_frame_attribute(:account))
+        product = obfuscate(config, metric_frame_attribute(:product))
+        
+        html_safe_if_needed("<script type=\"text/javascript\">#{config.browser_timing_static_footer}NREUMQ.push([\"#{config.finish_command}\",\"#{beacon}\",\"#{license_key}\",#{application_id},\"#{obfuscated_transaction_name}\",#{browser_monitoring_queue_time},#{browser_monitoring_app_time},new Date().getTime(),\"#{tt_guid}\",\"#{tt_token}\",\"#{user}\",\"#{account}\",\"#{product}\"])</script>")
       end
 
       def html_safe_if_needed(string)
@@ -86,9 +126,9 @@ module NewRelic
         end
       end
 
-      def obfuscate(text)
+      def obfuscate(config, text)
         obfuscated = ""
-        key_bytes = NewRelic::Agent.instance.beacon_configuration.license_bytes
+        key_bytes = config.license_bytes
         index = 0
         text.each_byte{|byte|
           obfuscated.concat((byte ^ key_bytes[index % 13].to_i))

data/lib/new_relic/agent/database.rb

@@ -30,11 +30,19 @@ module NewRelic
       def get_connection(config)
         ConnectionManager.instance.get_connection(config)
       end
-
+      
       def close_connections
         ConnectionManager.instance.close_connections
       end
       
+      def config
+        ConnectionManager.instance.config
+      end
+      
+      def config=(other)
+        ConnectionManager.instance.config = other
+      end
+
       # Perform this in the runtime environment of a managed
       # application, to explain the sql statement executed within a
       # segment of a transaction sample. Returns an array of
@@ -114,6 +122,8 @@ module NewRelic
 
       class ConnectionManager
         include Singleton
+
+        attr_accessor :config
         
         # Returns a cached connection for a given ActiveRecord
         # configuration - these are stored or reopened as needed, and if

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

@@ -2,7 +2,9 @@ DependencyDetection.defer do
   @name = :active_merchant
   
   depends_on do
-    defined?(ActiveMerchant) && defined?(ActiveMerchant::Billing)
+    defined?(ActiveMerchant) && defined?(ActiveMerchant::Billing) &&
+      defined?(ActiveMerchant::Billing::Gateway) &&
+      ActiveMerchant::Billing::Gateway.respond_to?(:implementations)
   end
   
   executes do

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

@@ -340,7 +340,9 @@ module NewRelic
             available_params = self.respond_to?(:params) ? self.params : {}
           end
           frame_data.request ||= self.request if self.respond_to? :request
-          frame_data.push(category + '/'+ path)
+          transaction_name = category + '/' + path
+          frame_data.push(transaction_name)
+          NewRelic::Agent::TransactionInfo.get.transaction_name = transaction_name
           frame_data.filtered_params = (respond_to? :filter_parameters) ? filter_parameters(available_params) : available_params
           frame_data
         end
@@ -403,7 +405,6 @@ module NewRelic
           queue_start = nil
           if newrelic_request_headers
             queue_start = parse_frontend_headers(newrelic_request_headers)
-            Thread.current[:newrelic_queue_time] = (now.to_f - queue_start.to_f) if queue_start
           end
           queue_start || now
         rescue Exception => e

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

@@ -74,10 +74,11 @@ module NewRelic
         attr_reader :depth
 
         def initialize
-          Thread.current[:newrelic_start_time] = @start = Time.now
+          @start = Time.now
           @path_stack = [] # stack of [controller, path] elements
           @jruby_cpu_start = jruby_cpu_time
           @process_cpu_start = process_cpu
+          Thread.current[:last_metric_frame] = self
         end
 
         def agent
@@ -199,11 +200,19 @@ module NewRelic
         def self.add_custom_parameters(p)
           current.add_custom_parameters(p) if current
         end
-
+        
         def self.custom_parameters
           (current && current.custom_parameters) ? current.custom_parameters : {}
         end
 
+        def self.set_user_attributes(attributes)
+          current.set_user_attributes(attributes) if current 
+        end
+
+        def self.user_attributes
+          (current) ? current.user_attributes : {}
+        end
+          
         def record_apdex()
           return unless recording_web_transaction? && NewRelic::Agent.is_execution_traced?
           t = Time.now
@@ -248,10 +257,22 @@ module NewRelic
         def custom_parameters
           @custom_parameters ||= {}
         end
+        
+        def user_attributes
+          @user_atrributes ||= {}
+        end
+        
+        def queue_time
+          apdex_start - start
+        end
 
         def add_custom_parameters(p)
           custom_parameters.merge!(p)
         end
+        
+        def set_user_attributes(attributes)
+          user_attributes.merge!(attributes)
+        end
 
         def self.recording_web_transaction?
           c = Thread.current[:newrelic_metric_frame]

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

@@ -8,19 +8,12 @@ module NewRelic
             alias_method :log_without_newrelic_instrumentation, :log
             alias_method :log, :log_with_newrelic_instrumentation
             protected :log
-          end
+          end          
         end
-
+        
         def log_with_newrelic_instrumentation(sql, name, &block)
-
           return log_without_newrelic_instrumentation(sql, name, &block) unless NewRelic::Agent.is_execution_traced?
-
-          # Capture db config if we are going to try to get the explain plans
-          if (defined?(ActiveRecord::ConnectionAdapters::MysqlAdapter) && self.is_a?(ActiveRecord::ConnectionAdapters::MysqlAdapter)) ||
-              (defined?(ActiveRecord::ConnectionAdapters::Mysql2Adapter) && self.is_a?(ActiveRecord::ConnectionAdapters::Mysql2Adapter)) ||
-              (defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter) && self.is_a?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter))
-            supported_config = @config
-          end
+          
           if name && (parts = name.split " ") && parts.size == 2
             model = parts.first
             operation = parts.last.downcase
@@ -56,13 +49,22 @@ module NewRelic
           else
             metrics = [metric, "ActiveRecord/all"]
             metrics << "ActiveRecord/#{metric_name}" if metric_name
+            if NewRelic::Agent::Database.config && NewRelic::Agent::Database.config[:adapter]
+              type = NewRelic::Agent::Database.config[:adapter].sub(/\d*/, '')
+              host = NewRelic::Agent::Database.config[:host] || 'localhost'
+              metrics << "RemoteService/sql/#{type}/#{host}"
+            end
+            
             self.class.trace_execution_scoped(metrics) do
               t0 = Time.now
               begin
                 log_without_newrelic_instrumentation(sql, name, &block)
               ensure
-                NewRelic::Agent.instance.transaction_sampler.notice_sql(sql, supported_config, (Time.now - t0).to_f)
-                NewRelic::Agent.instance.sql_sampler.notice_sql(sql, metric, supported_config, (Time.now - t0).to_f)
+                elapsed_time = (Time.now - t0).to_f
+                NewRelic::Agent.instance.transaction_sampler.notice_sql(sql, NewRelic::Agent::Database.config,
+                                                                        elapsed_time)
+                NewRelic::Agent.instance.sql_sampler.notice_sql(sql, metric, NewRelic::Agent::Database.config,
+                                                                elapsed_time)
               end
             end
           end
@@ -104,6 +106,7 @@ DependencyDetection.defer do
 
   executes do
     ActiveRecord::Base.class_eval do
+      NewRelic::Agent::Database::ConnectionManager.instance.config = connection.instance_eval{ @config }
       class << self
         add_method_tracer :find_by_sql, 'ActiveRecord/#{self.name}/find_by_sql', :metric => false
         add_method_tracer :transaction, 'ActiveRecord/#{self.name}/transaction', :metric => false