newrelic_rpm 3.5.4.29.beta → 3.5.4.31.beta

data/CHANGELOG

@@ -24,6 +24,17 @@
 
   * Report back build number and stage along with version info
 
+  * The host and the port that the agent reports to can now be set from environment vars
+
+    The host can be set with NEW_RELIC_HOST and the port with NEW_RELIC_PORT.  These setting
+    will overrride any other settings in your newrelic.yml.
+
+  * Fix RUM reporting to multiple applications
+
+    When the agent is configured to report to multiple "roll up" applications
+    RUM did not work correctly.
+
+>>>>>>> 3b105ce... RUBY-975 - Fix RUM reporting to multiple applications
 ## v3.5.3 ##
 
   * Update the collector protocol to use JSON and Ruby primitives

data/Rakefile

@@ -5,7 +5,7 @@ require "#{File.dirname(__FILE__)}/lib/tasks/all.rb"
 
 task :default => :test
 
-task :test => 'test:newrelic'
+task :test => [:gemspec, 'test:newrelic']
 
 namespace :test do
   desc "Run all tests"

data/lib/new_relic/agent/browser_monitoring.rb

@@ -174,7 +174,7 @@ module NewRelic
         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}\",\"#{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>")
+        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/tasks/tests.rake

@@ -4,8 +4,6 @@ rescue LoadError => e
 end
 
 if defined? Rake::TestTask
-  task :test => 'test:newrelic'
-  task :default => :test
   namespace :test do
     agent_home = File.expand_path(File.join(File.dirname(__FILE__),'..','..'))
 

data/newrelic_rpm.gemspec

@@ -1,12 +1,12 @@
 #-*- coding: utf-8 -*-
-# GITSHA: 69bcb7e301a855c25f8ca0f6c56c8f498ab67a94
+# GITSHA: d8d4ab9b32422a7a28c96b5fe9fc75634ec9a14f
 
 Gem::Specification.new do |s|
   s.name = "newrelic_rpm"
-  s.version = "3.5.4.29.beta"
+  s.version = "3.5.4.31.beta"
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = [ "Jason Clark", "Sam Goldstein", "Jon Guymon", "Ben Weintraub" ]
-  s.date = "2012-12-11"
+  s.date = "2012-12-13"
   s.description = <<-EOS
 New Relic is a performance management system, developed by New Relic,
 Inc (http://www.newrelic.com).  New Relic provides you with deep

data/test/multiverse/suites/rails_3_queue_time/queue_time_test.rb

@@ -69,7 +69,7 @@ class QueueTimeTest < ActionDispatch::IntegrationTest
   end
 
   def extract_queue_time_from_response
-    @response.body =~ /key\",,\".*\",(\d+.*),\d+,new Date/
+    @response.body =~ /key\","",\".*\",(\d+.*),\d+,new Date/
     $1.to_i
   end
 end

data/test/new_relic/agent/browser_monitoring_test.rb

@@ -14,7 +14,7 @@ class NewRelic::Agent::BrowserMonitoringTest < Test::Unit::TestCase
       :beacon                 => 'beacon',
       :disable_mobile_headers => false,
       :browser_key            => 'browserKey',
-      :application_id         => 5,
+      :application_id         => '5, 6', # collector can return app multiple ids
       :'rum.enabled'          => true,
       :episodes_file          => 'this_is_my_file',
       :'rum.jsonp'            => true
@@ -303,7 +303,7 @@ var e=document.createElement("script");'
     self.expects(:obfuscate).with(NewRelic::Agent.instance.beacon_configuration, 'product').returns('product')
 
     value = footer_js_string(NewRelic::Agent.instance.beacon_configuration)
-    assert_equal("<script type=\"text/javascript\">if (!NREUMQ.f) { NREUMQ.f=function() {\nNREUMQ.push([\"load\",new Date().getTime()]);\nvar e=document.createElement(\"script\");\ne.type=\"text/javascript\";\ne.src=((\"http:\"===document.location.protocol)?\"http:\":\"https:\") + \"//\" +\n  \"this_is_my_file\";\ndocument.body.appendChild(e);\nif(NREUMQ.a)NREUMQ.a();\n};\nNREUMQ.a=window.onload;window.onload=NREUMQ.f;\n};\nNREUMQ.push([\"nrfj\",\"beacon\",\"browserKey\",5,\"most recent transaction\",0,0,new Date().getTime(),\"ABC\",\"0123456789ABCDEF\",\"user\",\"account\",\"product\"]);</script>", value, "should return the javascript given some default values")
+    assert_equal(%'<script type="text/javascript">if (!NREUMQ.f) { NREUMQ.f=function() {\nNREUMQ.push(["load",new Date().getTime()]);\nvar e=document.createElement("script");\ne.type="text/javascript";\ne.src=(("http:"===document.location.protocol)?"http:":"https:") + "//" +\n  "this_is_my_file";\ndocument.body.appendChild(e);\nif(NREUMQ.a)NREUMQ.a();\n};\nNREUMQ.a=window.onload;window.onload=NREUMQ.f;\n};\nNREUMQ.push(["nrfj","beacon","browserKey","5, 6","most recent transaction",0,0,new Date().getTime(),"ABC","0123456789ABCDEF","user","account","product"]);</script>', value, "should return the javascript given some default values")
   end
 
   def test_html_safe_if_needed_unsafed
@@ -376,7 +376,7 @@ var e=document.createElement("script");'
     response = mobile_transaction
     txn_name = obfuscate(NewRelic::Agent.instance.beacon_configuration,
                          browser_monitoring_transaction_name)
-    expected_payload = %|["5","#{txn_name}",#{browser_monitoring_queue_time},#{browser_monitoring_app_time}]|
+    expected_payload = %|["5, 6","#{txn_name}",#{browser_monitoring_queue_time},#{browser_monitoring_app_time}]|
 
     assert_equal expected_payload, response['X-NewRelic-App-Server-Metrics'].strip
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.5.4.29.beta
+  version: 3.5.4.31.beta
   prerelease: 9
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-11 00:00:00.000000000 Z
+date: 2012-12-13 00:00:00.000000000 Z
 dependencies: []
 description: ! 'New Relic is a performance management system, developed by New Relic,