ghazel-newrelic_rpm 3.4.0.2 → 3.5.4

data/lib/new_relic/agent/beacon_configuration.rb

@@ -12,81 +12,69 @@ 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
         if @license_bytes.nil?
           @license_bytes = []
-          NewRelic::Control.instance.license_key.each_byte {|byte| @license_bytes << byte}
+          Agent.config[:license_key].each_byte {|byte| @license_bytes << byte}
         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,10 +31,11 @@ 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
-        return "" if NewRelic::Agent.instance.beacon_configuration.nil?
-        return "" if !NewRelic::Agent.is_transaction_traced? || !NewRelic::Agent.is_execution_traced?
-
-        NewRelic::Agent.instance.beacon_configuration.browser_timing_header
+        if insert_js?
+          NewRelic::Agent.instance.beacon_configuration.browser_timing_header
+        else
+          ""
+        end
       end
 
       # This method returns a string suitable for inclusion in a page
@@ -49,73 +47,134 @@ module NewRelic
       # This is the footer string - it should be placed as low in the
       # page as is reasonably possible.
       def browser_timing_footer
-        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(config)
+        if insert_js?
+          generate_footer_js(NewRelic::Agent.instance.beacon_configuration)
+        else
+          ""
+        end
       end
 
-      private
+      module_function
 
-      def generate_footer_js(config)
-        if browser_monitoring_start_time
-          application_id = config.application_id
-          beacon = config.beacon
-          license_key = config.browser_monitoring_key
+      def obfuscate(config, text)
+        obfuscated = ""
+        key_bytes = config.license_bytes
+        index = 0
+        text.each_byte{|byte|
+          obfuscated.concat((byte ^ key_bytes[index % 13].to_i))
+          index+=1
+        }
 
-          footer_js_string(config, beacon, license_key, application_id)
-        else
-          ''
-        end
+        [obfuscated].pack("m0").gsub("\n", '')
       end
 
       def browser_monitoring_transaction_name
         NewRelic::Agent::TransactionInfo.get.transaction_name
       end
 
+      def browser_monitoring_queue_time
+        clamp_to_positive((current_metric_frame.queue_time.to_f * 1000.0).round)
+      end
+
+      def browser_monitoring_app_time
+        clamp_to_positive(((Time.now - browser_monitoring_start_time).to_f * 1000.0).round)
+      end
+
+      def current_metric_frame
+        Thread.current[:last_metric_frame] || @@dummy_metric_frame
+      end
+
+      def clamp_to_positive(value)
+        return 0.0 if value < 0
+        value
+      end
+
       def browser_monitoring_start_time
         NewRelic::Agent::TransactionInfo.get.start_time
       end
-            
+
+      def insert_mobile_response_header(request, response)
+        if mobile_header_found_in?(request) &&
+            NewRelic::Agent.instance.beacon_configuration
+
+          config = NewRelic::Agent.instance.beacon_configuration
+
+          response['X-NewRelic-Beacon-Url'] = beacon_url(request)
+
+          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
+
+      def mobile_header_found_in?(request)
+        headers = ['HTTP_X_NEWRELIC_MOBILE_TRACE', 'X_NEWRELIC_MOBILE_TRACE',
+                   'X-NewRelic-Mobile-Trace']
+        headers.inject(false){|i,m| i || (request.env[m] == 'true')}
+      end
+
+      def beacon_url(request)
+        "#{request.scheme || 'http'}://#{Agent.config[:beacon]}/mobile/1/#{Agent.config[:browser_key]}"
+      end
+
+      private
+
+      # Check whether RUM header and footer should be generated.  Log the
+      # reason if they shouldn't.
+      def insert_js?
+        if NewRelic::Agent.instance.beacon_configuration.nil?
+          NewRelic::Agent.logger.debug "Beacon configuration is nil. Skipping browser instrumentation."
+          false
+        elsif ! NewRelic::Agent.instance.beacon_configuration.enabled?
+          NewRelic::Agent.logger.debug "Beacon configuration is disabled. Skipping browser instrumentation."
+          NewRelic::Agent.logger.debug NewRelic::Agent.instance.beacon_configuration.inspect
+          false
+        elsif Agent.config[:browser_key].nil? || Agent.config[:browser_key].empty?
+          NewRelic::Agent.logger.debug "Browser key is not set. Skipping browser instrumentation."
+          false
+        elsif ! NewRelic::Agent.is_transaction_traced?
+          NewRelic::Agent.logger.debug "Transaction is not traced. Skipping browser instrumentation."
+          false
+        elsif ! NewRelic::Agent.is_execution_traced?
+          NewRelic::Agent.logger.debug "Execution is not traced. Skipping browser instrumentation."
+          false
+        elsif NewRelic::Agent::TransactionInfo.get.ignore_end_user?
+          NewRelic::Agent.logger.debug "Ignore end user for this transaction is set. Skipping browser instrumentation."
+          false
+        else
+          true
+        end
+      end
+
+      def generate_footer_js(config)
+        if browser_monitoring_start_time
+          footer_js_string(config)
+        else
+          ''
+        end
+      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
-      end
-
-      def browser_monitoring_app_time
-        clamp_to_positive(((Time.now - browser_monitoring_start_time).to_f * 1000.0).round)
-      end
-
-      def browser_monitoring_queue_time
-        clamp_to_positive((current_metric_frame.queue_time.to_f * 1000.0).round)
-      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)
@@ -125,18 +184,6 @@ module NewRelic
           string
         end
       end
-
-      def obfuscate(config, text)
-        obfuscated = ""
-        key_bytes = config.license_bytes
-        index = 0
-        text.each_byte{|byte|
-          obfuscated.concat((byte ^ key_bytes[index % 13].to_i))
-          index+=1
-        }
-
-        [obfuscated].pack("m0").gsub("\n", '')
-      end
     end
   end
 end

data/lib/new_relic/agent/busy_calculator.rb

@@ -30,7 +30,8 @@ module NewRelic
       # called when a transaction finishes, to add time to the
       # instance variable accumulator. this is harvested when we send
       # data to the server
-      def dispatcher_finish(end_time = Time.now)
+      def dispatcher_finish(end_time = nil)
+        end_time ||= time_now
         callers = Thread.current[:busy_entries] -= 1
         # Ignore nested calls
         return if callers > 0
@@ -56,15 +57,14 @@ module NewRelic
         Thread.current[:busy_entries] = 0
         @lock ||= Mutex.new
         @accumulator = 0
-        @harvest_start = Time.now
+        @harvest_start = time_now
       end
 
-      self.reset
 
       # Called before uploading to to the server to collect current busy stats.
       def harvest_busy
         busy = 0
-        t0 = Time.now
+        t0 = time_now
         @lock.synchronize do
           busy = accumulator
           @accumulator = 0
@@ -88,12 +88,20 @@ module NewRelic
         instance_busy_stats.record_data_point busy
         @harvest_start = t0
       end
+
       private
+
+      # so we can stub Time.now only for the BusyCalculator in tests
+      def time_now
+        Time.now
+      end
+
       def instance_busy_stats
         # Late binding on the Instance/busy stats
         NewRelic::Agent.agent.stats_engine.get_stats_no_scope 'Instance/Busy'
       end
 
+      self.reset
     end
   end
 end

data/lib/new_relic/agent/configuration.rb

@@ -0,0 +1,49 @@
+require 'new_relic/agent/configuration/manager'
+
+module NewRelic
+  module Agent
+    module Configuration
+      # This can be mixed in with minimal impact to provide easy
+      # access to the config manager
+      module Instance
+        def config
+          @@manager ||= Manager.new
+        end
+
+        # for testing
+        def reset_config
+          @@manager = Manager.new
+        end
+      end
+
+      class DottedHash < ::Hash
+        def initialize(hash)
+          self.merge!(dot_flattened(hash))
+          keys.each do |key|
+            self[(key.to_sym rescue key) || key] = delete(key)
+          end
+        end
+
+        def inspect
+          "#<#{self.class.name}:#{object_id} #{super}>"
+        end
+
+        protected
+        # turns {'a' => {'b' => 'c'}} into {'a.b' => 'c'}
+        def dot_flattened(nested_hash, names=[], result={})
+          nested_hash.each do |key, val|
+            next if val == nil
+            if val.respond_to?(:has_key?)
+              dot_flattened(val, names + [key], result)
+            else
+              result[(names + [key]).join('.')] = val
+            end
+          end
+          result
+        end
+      end
+
+      class ManualSource < DottedHash; end
+    end
+  end
+end