rack-instruments 0.3.0 → 0.3.1

data/lib/rack/instruments.rb

@@ -4,13 +4,14 @@ require "slides"
 module Rack
   class Instruments
     UUID_PATTERN =
-      /\A[a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89ab][a-f0-9]{3}-[a-f0-9]{12}\Z/
+      /\A([a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89ab][a-f0-9]{3}-[a-f0-9]{12}|[a-f0-9]{32})\Z/
 
     def initialize(app, options={})
       @app = app
 
       @context              = options[:context]
       @header_request_ids   = options.fetch(:header_request_ids, true)
+      @heroku_request_id    = options.fetch(:heroku_request_id, true)
       @ignore_extensions    = options.fetch(:ignore_extensions,
         %w{css gif ico jpg js jpeg pdf png})
       @request_id_generator = options.fetch(:request_id_generator,
@@ -24,7 +25,7 @@ module Rack
           env["REQUEST_PATH"] =~ /\.#{ext}$/
         }
 
-      request_ids = [@request_id_generator.call]
+      request_ids = [current_request_id(env)]
       status, headers, response = nil, nil, nil
 
       # make ID of the request accessible to consumers down the stack
@@ -64,5 +65,15 @@ module Rack
       end
       request_ids
     end
+
+    # uses Heroku-Request-Id or falls back to a generator
+    def current_request_id(env)
+      if @heroku_request_id && env["HTTP_HEROKU_REQUEST_ID"] &&
+        env["HTTP_HEROKU_REQUEST_ID"] =~ @request_id_pattern
+        env["HTTP_HEROKU_REQUEST_ID"]
+      else
+        @request_id_generator.call
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-instruments
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-10 00:00:00.000000000 Z
+date: 2013-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slides