newrelic_rpm 2.13.4.eum2 → 2.13.4.eum3

data/lib/new_relic/agent/browser_monitoring.rb

@@ -3,30 +3,33 @@ module NewRelic
     module BrowserMonitoring
       def browser_instrumentation_header(options={})
         
-        options = {:protocol => 'https'}.merge(options)
-        
-        license_key = NewRelic::Agent.instance.browser_monitoring_key
-        
-        return "" if license_key.nil?
-
-        application_id = NewRelic::Agent.instance.application_id
-        beacon = NewRelic::Agent.instance.beacon
-        episodes_file = NewRelic::Agent.instance.episodes_file
- 
-        transaction_name = Thread::current[:newrelic_scope_name] || "<unknown>"
+        return "" if NewRelic::Agent.instance.browser_monitoring_key.nil?
         
-        # Agents are hard-coded to a particular episodes JS file. This allows for radical future change
-        # to the contents of that file
-        file = "\"#{options[:protocol]}://#{episodes_file}\""
+        episodes_file = "//" + NewRelic::Agent.instance.episodes_file
         
 <<-eos
-<script src=#{file} type="text/javascript"></script><script type="text/javascript" charset="utf-8">NREUM.setContext("#{beacon}","#{license_key}","#{application_id}","#{transaction_name}")</script>
+<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
       end
       
       def browser_instrumentation_footer(options={})
         
-        return "" if NewRelic::Agent.instance.browser_monitoring_key.nil?
+        license_key = NewRelic::Agent.instance.browser_monitoring_key
+        
+        return "" if license_key.nil?
+
+        application_id = NewRelic::Agent.instance.application_id
+        beacon = NewRelic::Agent.instance.beacon
+        transaction_name = Thread::current[:newrelic_scope_name] || "<unknown>"
         
         frame = Thread.current[:newrelic_metric_frame]
         
@@ -36,7 +39,7 @@ eos
           app_time = ((Time.now - frame.start).to_f * 1000.0).round
  
 <<-eos
-<script type="text/javascript" charset="utf-8">NREUM.recordFooter(#{queue_time},#{app_time})</script>
+<script type="text/javascript" charset="utf-8">EPISODES.q.push(["nrfinish","#{beacon}","#{license_key}","#{application_id}","#{transaction_name}","#{queue_time}","#{app_time}"])</script>
 eos
         end
       end

data/lib/new_relic/version.rb

@@ -4,7 +4,7 @@ module NewRelic
     MAJOR = 2
     MINOR = 13
     TINY  = 4
-    BUILD = 'eum2' #'0' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
+    BUILD = 'eum3' #'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.eum2"
+  s.version = "2.13.4.eum3"
 
   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-14}
+  s.date = %q{2011-02-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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: newrelic_rpm
 version: !ruby/object:Gem::Version 
-  hash: -1847304031
+  hash: -1847304018
   prerelease: true
   segments: 
   - 2
   - 13
   - 4
-  - eum2
-  version: 2.13.4.eum2
+  - eum3
+  version: 2.13.4.eum3
 platform: ruby
 authors: 
 - Bill Kayser
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-14 00:00:00 -08:00
+date: 2011-02-16 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency