newrelic_rpm 3.4.2.1 → 3.5.0

data/lib/new_relic/agent/beacon_configuration.rb

@@ -12,52 +12,38 @@ module NewRelic
       # the static portion of the RUM footer - this part does not vary
       # by which request is in progress
       attr_reader :browser_timing_static_footer
-      
-      # the application id we include in the javascript -
-      # crossreferences with the application id on the collectors
-      attr_reader :application_id
 
-      # the key used for browser monitoring. This is different from
-      # the account key
-      attr_reader :browser_monitoring_key
-
-      # which beacon we should report to - set by startup of the agent
-      attr_reader :beacon
-
-      # whether RUM is enabled or not - determined based on server and
-      # 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>"
-      
+
       # Creates a new browser configuration data. Argument is a hash
       # of configuration values from the server
-      def initialize(connect_data)
-        @browser_monitoring_key = connect_data['browser_key']
-        @application_id = connect_data['application_id']
-        @beacon = connect_data['beacon']
-        @rum_enabled = connect_data['rum.enabled']
-        @rum_enabled = true if @rum_enabled.nil?
-        NewRelic::Control.instance.log.warn("Real User Monitoring is disabled for this agent. Edit your configuration to change this.") unless @rum_enabled
+      def initialize
         @browser_timing_header = build_browser_timing_header
         NewRelic::Control.instance.log.debug("Browser timing header: #{@browser_timing_header.inspect}")
-        @browser_timing_static_footer = build_load_file_js(connect_data)
+        @browser_timing_static_footer = build_load_file_js
         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'
+        if Agent.config[:'rum.jsonp']
+          NewRelic::Control.instance.log.debug("Real User Monitoring is using JSONP protocol")
+          @finish_command = 'nrfj'
+        else
+          @finish_command = 'nrf2'
+        end
+
+        if !Agent.config[:'rum.enabled']
+          NewRelic::Control.instance.log.warn("Real User Monitoring is disabled for this agent. Edit your configuration to change this.")
+        end
+      end
+
+      def enabled?
+        Agent.config[:'rum.enabled'] && !!Agent.config[:beacon]
       end
-      
+
       # returns a memoized version of the bytes in the license key for
       # obscuring transaction names in the javascript
       def license_bytes
@@ -67,26 +53,28 @@ module NewRelic
         end
         @license_bytes
       end
-      
+
       # returns a snippet of text that does not change
       # per-transaction. Is empty when rum is disabled, or we are not
       # including the episodes file dynamically (i.e. the user
       # includes it themselves)
-      def build_load_file_js(connect_data)
+      def build_load_file_js
         js = <<-EOS
 if (!NREUMQ.f) { NREUMQ.f=function() {
 NREUMQ.push(["load",new Date().getTime()]);
 EOS
-    
-        if connect_data.fetch('rum.load_episodes_file', true)
-          episodes_url = connect_data.fetch('episodes_url', '')          
+
+        if Agent.config[:'rum.load_episodes_file'] &&
+          Agent.config[:'rum.load_episodes_file'] != ''
           js << <<-EOS
-var e=document.createElement(\"script\");
-e.type=\"text/javascript\";e.async=true;e.src=\"#{episodes_url}\";
+var e=document.createElement("script");
+e.type="text/javascript";
+e.src=(("http:"===document.location.protocol)?"http:":"https:") + "//" +
+  "#{Agent.config[:episodes_file]}";
 document.body.appendChild(e);
 EOS
         end
-    
+
         js << <<-EOS
 if(NREUMQ.a)NREUMQ.a();
 };
@@ -101,12 +89,12 @@ EOS
       def javascript_header
         JS_HEADER.dup
       end
-      
+
       # Returns the header string, properly html-safed if needed
       def build_browser_timing_header
-        return "" if !@rum_enabled
-        return "" if @browser_monitoring_key.nil?
-        
+        return "" if !enabled?
+        return "" if Agent.config[:browser_key].nil?
+
         value = javascript_header
         if value.respond_to?(:html_safe)
           value.html_safe
@@ -117,5 +105,3 @@ EOS
     end
   end
 end
-
-

data/lib/new_relic/agent/browser_monitoring.rb

@@ -5,25 +5,22 @@ module NewRelic
     # This module contains support for Real User Monitoring - the
     # 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,8 +31,8 @@ module NewRelic
       # page as is reasonably possible - that is, before any style or
       # javascript inclusions, but after any header-related meta tags
       def browser_timing_header
-        if NewRelic::Agent.instance.beacon_configuration.nil? || 
-           !NewRelic::Agent.is_transaction_traced? || 
+        if NewRelic::Agent.instance.beacon_configuration.nil? ||
+           !NewRelic::Agent.is_transaction_traced? ||
            !NewRelic::Agent.is_execution_traced? ||
            NewRelic::Agent::TransactionInfo.get.ignore_end_user?
           return ""
@@ -54,16 +51,17 @@ module NewRelic
       # page as is reasonably possible.
       def browser_timing_footer
         config = NewRelic::Agent.instance.beacon_configuration
-        
-        if config.nil? || 
-           !config.rum_enabled || 
-           config.browser_monitoring_key.nil? ||
-           !NewRelic::Agent.is_transaction_traced? || 
-           !NewRelic::Agent.is_execution_traced? ||
-           NewRelic::Agent::TransactionInfo.get.ignore_end_user?
-           return ""
+
+        if config.nil? ||
+            !config.enabled? ||
+            Agent.config[:browser_key].nil? ||
+            Agent.config[:browser_key].empty? ||
+            !NewRelic::Agent.is_transaction_traced? ||
+            !NewRelic::Agent.is_execution_traced? ||
+            NewRelic::Agent::TransactionInfo.get.ignore_end_user?
+          return ""
          end
-        
+
         generate_footer_js(config)
       end
 
@@ -114,7 +112,7 @@ module NewRelic
 
           response['X-NewRelic-Beacon-Url'] = beacon_url(request)
 
-          payload = %[ ["#{config.application_id}","#{obfuscate(config, browser_monitoring_transaction_name)}",#{browser_monitoring_queue_time},#{browser_monitoring_app_time}] ]
+          payload = %[ ["#{Agent.config[:application_id]}","#{obfuscate(config, browser_monitoring_transaction_name)}",#{browser_monitoring_queue_time},#{browser_monitoring_app_time}] ]
           response['X-NewRelic-App-Server-Metrics'] = payload
         end
       end
@@ -126,24 +124,19 @@ module NewRelic
       end
 
       def beacon_url(request)
-        config = NewRelic::Agent.instance.beacon_configuration
-        "#{request.scheme || 'http'}://#{config.beacon}/mobile/1/#{config.browser_monitoring_key}"
+        "#{request.scheme || 'http'}://#{Agent.config[:beacon]}/mobile/1/#{Agent.config[:browser_key]}"
       end
 
       private
 
       def generate_footer_js(config)
         if browser_monitoring_start_time
-          application_id = config.application_id
-          beacon = config.beacon
-          license_key = config.browser_monitoring_key
-
-          footer_js_string(config, beacon, license_key, application_id)
+          footer_js_string(config)
         else
           ''
         end
       end
-            
+
       def metric_frame_attribute(key)
         current_metric_frame.user_attributes[key] || ""
       end
@@ -153,19 +146,19 @@ module NewRelic
         return txn.guid if txn.include_guid?
         ""
       end
-      
+
       def tt_token
         return NewRelic::Agent::TransactionInfo.get.token
       end
-      
-      def footer_js_string(config, beacon, license_key, application_id)
+
+      def footer_js_string(config)
         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>")
+
+        html_safe_if_needed("<script type=\"text/javascript\">#{config.browser_timing_static_footer}NREUMQ.push([\"#{config.finish_command}\",\"#{Agent.config[:beacon]}\",\"#{Agent.config[:browser_key]}\",#{Agent.config[: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)

data/lib/new_relic/agent/configuration/defaults.rb

@@ -21,18 +21,20 @@ module NewRelic
         :multi_homed     => false,
         :high_security   => false,
 
-        :host                  => 'collector.newrelic.com',
-        :api_host              => 'rpm.newrelic.com',
-        :port                  => Proc.new { self[:ssl] ? 443 : 80 },
-        :api_port              => Proc.new { self[:port] },
-        :ssl                   => false,
-        :verify_certificate    => false,
-        :sync_startup          => false,
-        :send_data_on_exit     => true,
-        :post_size_limit       => 2 * 1024 * 1024, # 2 megs
-        :timeout               => 2 * 60,          # 2 minutes
-        :force_send            => false,
-        :send_environment_info => true,
+        :host                   => 'collector.newrelic.com',
+        :api_host               => 'rpm.newrelic.com',
+        :port                   => Proc.new { self[:ssl] ? 443 : 80 },
+        :api_port               => Proc.new { self[:port] },
+        :ssl                    => false,
+        :verify_certificate     => false,
+        :sync_startup           => false,
+        :send_data_on_exit      => true,
+        :post_size_limit        => 2 * 1024 * 1024, # 2 megs
+        :timeout                => 2 * 60,          # 2 minutes
+        :force_send             => false,
+        :send_environment_info  => true,
+        :start_channel_listener => false,
+        :data_report_period     => 60,
 
         :log_file_name => 'newrelic_agent.log',
         :log_file_path => 'log/',
@@ -59,6 +61,7 @@ module NewRelic
         :'transaction_tracer.record_sql'            => 'obfuscated',
         :'transaction_tracer.limit_segments'        => 4000,
         :'transaction_tracer.random_sample'         => false,
+        :sample_rate                                => 10,
 
         :'slow_sql.enabled'               => Proc.new { self[:'transaction_tracer.enabled'] },
         :'slow_sql.stack_trace_threshold' => Proc.new { self[:'transaction_tracer.stack_trace_threshold'] },
@@ -68,7 +71,12 @@ module NewRelic
 
         :'error_collector.enabled'        => true,
         :'error_collector.capture_source' => true,
-        :'error_collector.ignore_errors'  => 'ActionController::RoutingError'
+        :'error_collector.ignore_errors'  => 'ActionController::RoutingError',
+
+        :'rum.enabled'            => true,
+        :'rum.jsonp'              => true,
+        :'rum.load_episodes_file' => true,
+        :'browser_monitoring.auto_instrument' => Proc.new { self[:'rum.enabled'] }
       }.freeze
     end
   end

data/lib/new_relic/agent/configuration/manager.rb

@@ -15,11 +15,13 @@ module NewRelic
         def initialize
           @config_stack = [ EnvironmentSource.new, DEFAULTS ]
           @cache = Hash.new {|hash,key| hash[key] = self.fetch(key) }
+          @callbacks = Hash.new {|hash,key| hash[key] = [] }
         end
 
         def apply_config(source, level=0)
+          invoke_callbacks(:add, source)
           @config_stack.insert(level, source.freeze)
-          expire_cache
+          reset_cache
         end
 
         def remove_config(source=nil)
@@ -28,7 +30,8 @@ module NewRelic
           else
             @config_stack.delete(source)
           end
-          expire_cache
+          reset_cache
+          invoke_callbacks(:remove, source)
         end
 
         def replace_or_add_config(source, level=0)
@@ -49,9 +52,7 @@ module NewRelic
           @config_stack.each do |config|
             next unless config
             accessor = key.to_sym
-            if config.respond_to?(accessor)
-              return config.send(accessor)
-            elsif config.has_key?(accessor)
+            if config.has_key?(accessor)
               if config[accessor].respond_to?(:call)
                 return instance_eval(&config[accessor])
               else
@@ -62,6 +63,26 @@ module NewRelic
           nil
         end
 
+        def register_callback(key, &proc)
+          @callbacks[key] << proc
+          proc.call(@cache[key])
+        end
+
+        def invoke_callbacks(direction, source)
+          return unless source
+          source.keys.each do |key|
+            if @cache[key] != source[key]
+              @callbacks[key].each do |proc|
+                if direction == :add
+                  proc.call(source[key])
+                else
+                  proc.call(@cache[key])
+                end
+              end
+            end
+          end
+        end
+
         def flattened_config
           @config_stack.reverse.inject({}) do |flat,layer|
             thawed_layer = layer.dup
@@ -69,7 +90,7 @@ module NewRelic
               begin
                 thawed_layer[k] = instance_eval(&v) if v.respond_to?(:call)
               rescue => e
-                NewRelic::Control.instance.log.debug("#{e.class.name} : #{e.message} - when calling Proc for config key #{k}")
+                NewRelic::Control.instance.log.debug("#{e.class.name} : #{e.message} - when accessing config key #{k}")
                 thawed_layer[k] = nil
               end
               thawed_layer.delete(:config)
@@ -78,13 +99,6 @@ module NewRelic
           end
         end
 
-        def exclude_rails_config(hash, key)
-          if defined?(::Rails::Configuration) &&
-              hash[key].kind_of?(::Rails::Configuration)
-            hash.delete(key)
-          end
-        end
-
         def app_names
           case self[:app_name]
           when Array then self[:app_name]
@@ -93,7 +107,7 @@ module NewRelic
           end
         end
 
-        def expire_cache
+        def reset_cache
           @cache = Hash.new {|hash,key| hash[key] = self.fetch(key) }
         end
       end

data/lib/new_relic/agent/configuration/server_source.rb

@@ -3,6 +3,14 @@ module NewRelic
     module Configuration
       class ServerSource < DottedHash
         def initialize(hash)
+          if hash['agent_config']
+            if hash['agent_config']['transaction_tracer.transaction_threshold'] =~ /apdex_f/i
+              # when value is "apdex_f" remove the config and defer to default
+              hash['agent_config'].delete('transaction_tracer.transaction_threshold')
+            end
+            super(hash.delete('agent_config'))
+          end
+
           string_map = [
              ['collect_traces', 'transaction_tracer.enabled'],
              ['collect_traces', 'slow_sql.enabled'],
@@ -11,11 +19,6 @@ module NewRelic
             hash[pair[1]] = hash[pair[0]] if hash[pair[0]] != nil
           end
 
-          if hash['transaction_tracer.transaction_threshold'] =~ /apdex_f/i
-            # when value is "apdex_f" remove the config and defer to default
-            hash.delete('transaction_tracer.transaction_threshold')
-          end
-
           super
         end
       end

data/lib/new_relic/agent/database.rb

@@ -14,27 +14,42 @@ module NewRelic
                            "Rows",
                            "Extra"
                           ].freeze
-  
+
   module Agent
     module Database
       extend self
-      
+
       def obfuscate_sql(sql)
         Obfuscator.instance.obfuscator.call(sql)
       end
-      
+
       def set_sql_obfuscator(type, &block)
         Obfuscator.instance.set_sql_obfuscator(type, &block)
       end
-      
+
+      def record_sql_method
+        case Agent.config[:'transaction_tracer.record_sql'].to_s
+        when 'off'
+          :off
+        when 'none'
+          :off
+        when 'false'
+          :off
+        when 'raw'
+          :raw
+        else
+          :obfuscated
+        end
+      end
+
       def get_connection(config)
         ConnectionManager.instance.get_connection(config)
       end
-      
+
       def close_connections
         ConnectionManager.instance.close_connections
       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
@@ -50,7 +65,7 @@ module NewRelic
         explain_sql = explain_statement(statement, connection_config)
         return explain_sql || []
       end
-      
+
       def explain_statement(statement, config)
         if is_select?(statement)
           handle_exception_in_explain do
@@ -63,12 +78,12 @@ module NewRelic
           end
         end
       end
-      
+
       def process_resultset(items)
         # The resultset type varies for different drivers.  Only thing you can count on is
         # that it implements each.  Also: can't use select_rows because the native postgres
         # driver doesn't know that method.
-        
+
         headers = []
         values = []
         if items.respond_to?(:each_hash)
@@ -88,7 +103,7 @@ module NewRelic
         else
           values = [items]
         end
-        
+
         headers = nil if headers.empty?
         [headers, values]
       end
@@ -104,14 +119,14 @@ module NewRelic
           # double exception. throw up your hands
         end
       end
-      
+
       def is_select?(statement)
         # split the string into at most two segments on the
         # system-defined field separator character
         first_word, rest_of_statement = statement.split($;, 2)
         (first_word.upcase == 'SELECT')
       end
-      
+
       class ConnectionManager
         include Singleton
 
@@ -121,11 +136,11 @@ module NewRelic
         # the sql
         def get_connection(config)
           @connections ||= {}
-          
+
           connection = @connections[config]
-          
+
           return connection if connection
-          
+
           begin
             connection = ActiveRecord::Base.send("#{config[:adapter]}_connection", config)
             @connections[config] = connection
@@ -135,7 +150,7 @@ module NewRelic
             nil
           end
         end
-        
+
         # Closes all the connections in the internal connection cache
         def close_connections
           @connections ||= {}
@@ -145,16 +160,16 @@ module NewRelic
             rescue
             end
           end
-          
+
           @connections = {}
         end
       end
 
       class Obfuscator
         include Singleton
-        
+
         attr_reader :obfuscator
-        
+
         def initialize
           reset
         end
@@ -162,7 +177,7 @@ module NewRelic
         def reset
           @obfuscator = method(:default_sql_obfuscator)
         end
-        
+
         # Sets the sql obfuscator used to clean up sql when sending it
         # to the server. Possible types are:
         #
@@ -185,7 +200,7 @@ module NewRelic
             fail "unknown sql_obfuscator type #{type}"
           end
         end
-        
+
         def default_sql_obfuscator(sql)
           stmt = sql.kind_of?(Statement) ? sql : Statement.new(sql)
           adapter = stmt.adapter
@@ -215,7 +230,7 @@ module NewRelic
         end
       end
 
-      class Statement < String        
+      class Statement < String
         attr_accessor :adapter
       end
     end