newrelic_rpm 2.13.4.eum3 → 2.13.4.rum4

data/lib/new_relic/agent.rb

@@ -382,17 +382,38 @@ module NewRelic
     # PRE-RELEASE
     # Returns a Javascript string which should be injected into the very top of the response body
     # == options
-    # * <tt>:protocol => 'http' or 'https'
+    # * <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_instrumentation_header(options={})
-      agent.browser_instrumentation_header(options)
+    def browser_timing_header(protocol=nil)
+      agent.browser_timing_header(protocol)
+    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
     #
+    def browser_timing_footer
+      agent.browser_timing_footer
+    end
+    
+    # FOR BACKWARD COMPATIBILITY (REMOVE BEFORE GA)
+    def browser_instrumentation_header(options={})
+      agent.browser_timing_header
+    end
+
+    # FOR BACKWARD COMPATIBILITY (REMOVE BEFORE GA)
     def browser_instrumentation_footer(options={})
-      agent.browser_instrumentation_footer(options={})
+      agent.browser_timing_footer
     end
+    
   end
 end

data/lib/new_relic/agent/browser_monitoring.rb

@@ -1,27 +1,32 @@
+require 'base64'
+
 module NewRelic
   module Agent
     module BrowserMonitoring
-      def browser_instrumentation_header(options={})
+      
+      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?
         
         episodes_file = "//" + NewRelic::Agent.instance.episodes_file
         
-<<-eos
-<script>
-var EPISODES=EPISODES||{};
-EPISODES.q=[];
-EPISODES.q.push(["mark","firstbyte",new Date().getTime()]);
-(function() {
- var e=document.createElement("script");e.type="text/javascript";e.async=true;
- e.src=document.location.protocol+"#{episodes_file}";
- var s=document.getElementsByTagName("script")[0];s.parentNode.insertBefore(e,s);
-})();
-</script>
-eos
+        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);})()"
+        "<script>var NREUMQ=[];NREUMQ.push([\"mark\",\"firstbyte\",new Date().getTime()]);#{load_js}</script>"
       end
       
-      def browser_instrumentation_footer(options={})
+      def browser_timing_footer
         
         license_key = NewRelic::Agent.instance.browser_monitoring_key
         
@@ -30,6 +35,7 @@ eos
         application_id = NewRelic::Agent.instance.application_id
         beacon = NewRelic::Agent.instance.beacon
         transaction_name = Thread::current[:newrelic_scope_name] || "<unknown>"
+        obf = obfuscate(transaction_name)
         
         frame = Thread.current[:newrelic_metric_frame]
         
@@ -39,10 +45,24 @@ eos
           app_time = ((Time.now - frame.start).to_f * 1000.0).round
  
 <<-eos
-<script type="text/javascript" charset="utf-8">EPISODES.q.push(["nrfinish","#{beacon}","#{license_key}","#{application_id}","#{transaction_name}","#{queue_time}","#{app_time}"])</script>
+<script type="text/javascript" charset="utf-8">NREUMQ.push(["nrf2","#{beacon}","#{license_key}",#{application_id},"#{obf}",#{queue_time},#{app_time}])</script>
 eos
         end
       end
+      
+      private
+
+      def obfuscate(text)
+        obfuscated = ""
+        
+        key = NewRelic::Control.instance.license_key
+        
+        text.bytes.each_with_index do |byte, i|
+          obfuscated.concat((byte ^ key[i % 13]))
+        end
+        
+        [obfuscated].pack("m0").chomp
+      end
     end
   end
 end

data/lib/new_relic/agent/shim_agent.rb

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

data/lib/new_relic/version.rb

@@ -4,7 +4,7 @@ module NewRelic
     MAJOR = 2
     MINOR = 13
     TINY  = 4
-    BUILD = 'eum3' #'0' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
+    BUILD = 'rum4' #'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.eum3"
+  s.version = "2.13.4.rum4"
 
   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-02-16}
+  s.date = %q{2011-03-16}
   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
@@ -260,7 +260,7 @@ for instructions for previous versions
 }
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "New Relic Ruby Performance Monitoring Agent"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.2}
   s.summary = %q{New Relic Ruby Performance Monitoring Agent}
 
   if s.respond_to? :specification_version then

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: newrelic_rpm
 version: !ruby/object:Gem::Version 
-  hash: -1847304018
-  prerelease: true
+  hash: 1958316443
+  prerelease: 7
   segments: 
   - 2
   - 13
   - 4
-  - eum3
-  version: 2.13.4.eum3
+  - rum
+  - 4
+  version: 2.13.4.rum4
 platform: ruby
 authors: 
 - Bill Kayser
@@ -17,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-16 00:00:00 -08:00
+date: 2011-03-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -345,7 +346,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: New Relic Ruby Performance Monitoring Agent