rails_riemann_middleware 0.5.0 → 0.5.1

data/lib/rails_riemann_middleware/duration.rb

@@ -1,4 +1,4 @@
-require 'riemann/client'
+require "rails_riemann_middleware/headers"
 
 module RailsRiemannMiddleware
 
@@ -21,9 +21,9 @@ module RailsRiemannMiddleware
         :service     => "#{event.app_prefix} request duration".strip,
         :state       => 'info',
         :metric      => duration,
-        :tags        => ["duration"]
+        :tags        => ["duration"],
+        :description => Headers.new(env).to_s
       }
-      # ap msg
       msg
     end
 

data/lib/rails_riemann_middleware/exception_notification.rb

@@ -1,8 +1,10 @@
+require "rails_riemann_middleware/headers"
+
 module RailsRiemannMiddleware
-  
+
   class ExceptionNotification
     attr_reader :event, :env, :exception
-    
+
     def initialize(event, env, exception)
       @event, @env, @exception = event, env, exception
     end
@@ -10,7 +12,7 @@ module RailsRiemannMiddleware
     def send
       event << message
     end
-    
+
     def message
       msg = {
         :host        => env['HTTP_HOST'],
@@ -26,11 +28,14 @@ module RailsRiemannMiddleware
     private
 
     def backtrace
-      e = "#{exception.to_s}\n"
-      e << exception.backtrace.join("\n")
-      e[0..8000]
+      e = ["#{exception.to_s}"]
+      e << "----------------------------------------"
+      e += Headers.new(env).to_a
+      e << "----------------------------------------\n"
+      e += exception.backtrace
+      e.join("\n")[0..8000]
     end
-    
+
   end
-  
+
 end

data/lib/rails_riemann_middleware/headers.rb

@@ -0,0 +1,25 @@
+module RailsRiemannMiddleware
+
+  class Headers
+
+    attr_reader :env
+    
+    def initialize(env)
+      @env = env
+    end
+
+    def keys
+      %w{REQUEST_METHOD REQUEST_URI PATH_INFO HTTP_X_REAL_IP HTTP_USER_AGENT HTTP_REFERER}
+    end
+    
+    def to_a
+      keys.map { |h| " #{h.downcase}: #{env.fetch(h, "N/A")}" }
+    end
+
+    def to_s
+      to_a.join("\n")
+    end
+    
+  end
+
+end

data/lib/rails_riemann_middleware/version.rb

@@ -1,3 +1,3 @@
 module RailsRiemannMiddleware
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/lib/rails_riemann_middleware.rb

@@ -7,7 +7,7 @@ module RailsRiemannMiddleware
 
   class Notifier
     attr_reader :event, :send_durations, :send_exceptions
-    
+
     def initialize(app, options = {})
       @app, @options = app, options
       @send_durations  = options.fetch(:send_durations, true)

data/specs/duraction_spec.rb

@@ -41,4 +41,16 @@ describe RailsRiemannMiddleware::Duration do
     d.message[:state].must_equal "info"
   end
 
+  it "should have the REQUEST_METHOD in the description" do
+    @env["REQUEST_METHOD"] = "POST"
+    d = RailsRiemannMiddleware::Duration.new(@event, @env, @start_time)
+    d.message[:description].must_match /request_method: POST/
+  end
+
+  it "should have the REQUEST_URI in the description" do
+    @env["REQUEST_URI"] = "/this/is/uri"
+    d = RailsRiemannMiddleware::Duration.new(@event, @env, @start_time)
+    d.message[:description].must_match /request_uri: \/this\/is\/uri/
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_riemann_middleware
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-06 00:00:00.000000000 Z
+date: 2013-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riemann-client
-  requirement: &70318980766960 !ruby/object:Gem::Requirement
+  requirement: &70188642881040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70318980766960
+  version_requirements: *70188642881040
 description: Rack middleware for sending data to riemann
 email:
 - outtenr@gmail.com
@@ -38,6 +38,7 @@ files:
 - lib/rails_riemann_middleware/duration.rb
 - lib/rails_riemann_middleware/event.rb
 - lib/rails_riemann_middleware/exception_notification.rb
+- lib/rails_riemann_middleware/headers.rb
 - lib/rails_riemann_middleware/version.rb
 - rails_riemann_middleware.gemspec
 - specs/duraction_spec.rb