newrelic_rpm 2.13.5.beta1 → 2.13.5.beta2

data/CHANGELOG

@@ -6,6 +6,7 @@ v2.13.5
   * Sequel instrumentation from Aman Gupta
   * patches to 1.9 compatibility from dkastner on github
   * Support for 1.9.2's garbage collection instrumentation from Justin Weiss
+  * On Heroku, existing queue time headers will be detected
 
 v2.13.4
   * Update DNS lookup code to remove hardcoded IP addresses

data/lib/new_relic/agent/instrumentation/queue_time.rb

@@ -7,6 +7,7 @@ module NewRelic
           MIDDLEWARE_HEADER = 'HTTP_X_MIDDLEWARE_START'
           QUEUE_HEADER = 'HTTP_X_QUEUE_START'
           ALT_QUEUE_HEADER = 'HTTP_X_QUEUE_TIME'
+          HEROKU_QUEUE_HEADER = 'HTTP_X_HEROKU_QUEUE_WAIT_TIME'
           APP_HEADER = 'HTTP_X_APPLICATION_START'
           
           HEADER_REGEX = /([^\s\/,(t=)]+)? ?t=([0-9]+)/
@@ -77,11 +78,19 @@ module NewRelic
         end
 
         def check_for_alternate_queue_length(env)
+          heroku_length = check_for_heroku_queue_length(env)
+          return heroku_length if heroku_length
           header = env[ALT_QUEUE_HEADER]
           return nil unless header
           (header.gsub('t=', '').to_i / 1_000_000.0)
         end
 
+        def check_for_heroku_queue_length(env)
+          header = env[HEROKU_QUEUE_HEADER]
+          return nil unless header
+          (header.gsub(/[^0-9]/, '').to_i / 1_000.0)
+        end
+
         def get_matches_from_header(header, env)
           return [] if env.nil?
           get_matches(env[header]).map do |name, time|

data/lib/new_relic/version.rb

@@ -4,7 +4,7 @@ module NewRelic
     MAJOR = 2
     MINOR = 13
     TINY  = 5
-    BUILD = 'beta1' #'0' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
+    BUILD = 'beta2' #'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,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{newrelic_rpm}
-  s.version = "2.13.5.beta1"
+  s.version = "2.13.5.beta2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bill Kayser", "Justin George"]

data/test/new_relic/agent/queue_time_test.rb

@@ -164,6 +164,43 @@ class NewRelic::Agent::Instrumentation::QueueTimeTest < Test::Unit::TestCase
     check_metric_time('WebFrontend/QueueTime', 1.0, 0.001)
   end
 
+  def test_check_for_alternate_queue_length_override
+    env = {}
+    create_test_start_time(env)
+    env['HTTP_X_QUEUE_START'] = 't=1' # obviously incorrect
+    env['HTTP_X_QUEUE_TIME'] = '1000000'
+    assert_calls_metrics('WebFrontend/QueueTime') do
+      parse_queue_time_from(env)
+    end
+
+    # alternate queue should override normal header
+    check_metric_time('WebFrontend/QueueTime', 1.0, 0.001)
+  end
+
+  def test_check_for_heroku_queue_length
+    env = {}
+    create_test_start_time(env)
+    env['HTTP_X_HEROKU_QUEUE_WAIT_TIME'] = '1000'
+    assert_calls_metrics('WebFrontend/QueueTime') do
+      parse_queue_time_from(env)
+    end
+
+    check_metric_time('WebFrontend/QueueTime', 1.0, 0.001)    
+  end
+
+  def test_check_for_heroku_queue_length_override
+    env = {}
+    create_test_start_time(env)
+    env['HTTP_X_QUEUE_TIME'] = '10000000' # ten MEEELION useconds
+    env['HTTP_X_HEROKU_QUEUE_WAIT_TIME'] = '1000'
+    assert_calls_metrics('WebFrontend/QueueTime') do
+      parse_queue_time_from(env)
+    end
+
+    # heroku queue should override alternate queue
+    check_metric_time('WebFrontend/QueueTime', 1.0, 0.001)
+  end
+
   # each server should be one second, and the total would be 2 seconds
   def test_record_individual_server_stats
     matches = [['foo', Time.at(1000)], ['bar', Time.at(1001)]]

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: newrelic_rpm
 version: !ruby/object:Gem::Version 
-  hash: 62196249
+  hash: 62196255
   prerelease: 7
   segments: 
   - 2
   - 13
   - 5
   - beta
-  - 1
-  version: 2.13.5.beta1
+  - 2
+  version: 2.13.5.beta2
 platform: ruby
 authors: 
 - Bill Kayser