pliny 0.20.1 → 0.20.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1424dc0c288ffda2c41014a5be8021194146f328
-  data.tar.gz: 238fb1ae442b1392ebd61ffeea5c966501613c13
+  metadata.gz: 11d6e6303689db3c75d06599309d8044f8e24058
+  data.tar.gz: ad4702309f3488e7bf99654a732c1e03f4685989
 SHA512:
-  metadata.gz: 66625177b344dbf1074856e7ef2a220df87ace5142608e83898641b6831ae8f6c57f0b9e456317483a2b971331ce349c20e092cec2cafd94170dbe0edf1a9b48
-  data.tar.gz: 56eb5cd7378f88adc4750dea565ccb373ea4f9594cd25eac2eb9a3035c4538efdb3b1974239c864ac17049c71bce468a82c1764a68c8b7689e34167d6805ab1a
+  metadata.gz: f5f26f1cdb8f55a373917e750fcae6866e4dbaf091fcd98f3876cfb6f7249359bde685aa523ca1df156ec0b57b78686d7ce6de053b8116e7209d889ddddf4cb6
+  data.tar.gz: d6e5c047b08ff89ed6c1f6e3fe1246877886ddd2ea491a3effc24e157ee23ca011d83f9eaea67d53e94711c8a7e21ab331bc182f032f1650ae5997e79dcd431d

data/lib/pliny.rb

@@ -16,6 +16,7 @@ require_relative "pliny/router"
 require_relative "pliny/utils"
 require_relative "pliny/middleware/cors"
 require_relative "pliny/middleware/instruments"
+require_relative "pliny/middleware/metrics"
 require_relative "pliny/middleware/request_id"
 require_relative "pliny/middleware/request_store/clear"
 require_relative "pliny/middleware/request_store/seed"

data/lib/pliny/middleware/metrics.rb

@@ -0,0 +1,28 @@
+module Pliny::Middleware
+  class Metrics
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      start = Time.now
+
+      Pliny::Metrics.count("requests")
+
+      begin
+        status, headers, body = @app.call(env)
+      rescue
+        status = 500
+        raise
+      ensure
+        elapsed = (Time.now - start).to_f
+        Pliny::Metrics.measure("requests.latency", value: elapsed)
+
+        status_level = "#{status/100}xx"
+        Pliny::Metrics.count("requests.status.#{status_level}")
+      end
+
+      [status, headers, body]
+    end
+  end
+end

data/lib/pliny/version.rb

@@ -1,3 +1,3 @@
 module Pliny
-  VERSION = "0.20.1"
+  VERSION = "0.20.2"
 end

data/lib/template/lib/routes.rb

@@ -3,6 +3,7 @@ Routes = Rack::Builder.new do
   use Pliny::Middleware::CORS
   use Pliny::Middleware::RequestID
   use Pliny::Middleware::RequestStore::Seed, store: Pliny::RequestStore
+  use Pliny::Middleware::Metrics
   use Pliny::Middleware::Instruments
   use Pliny::Middleware::RescueErrors, raise: Config.raise_errors?
   use Rack::Timeout,

data/spec/metrics_spec.rb

@@ -52,6 +52,10 @@ describe Pliny::Metrics do
       Pliny::Metrics.backends = [test_backend]
     end
 
+    after do
+      Timecop.return
+    end
+
     it "measures a block's execution time with a single key" do
       metrics.measure(:foo) { }
       expect(test_backend).to have_received(:report_measures).once.with(

data/spec/middleware/metrics_spec.rb

@@ -0,0 +1,65 @@
+require "spec_helper"
+
+describe Pliny::Middleware::Instruments do
+  def app
+    Rack::Builder.new do
+      run Sinatra.new {
+        use Pliny::Middleware::Metrics
+
+        get "/hello" do
+          Timecop.travel(5)
+          status 200
+          "hi"
+        end
+
+        get "/error" do
+          status 503
+          "boom"
+        end
+      }
+    end
+  end
+
+  before do
+    Timecop.freeze(Time.now)
+    allow(Pliny::Metrics).to receive(:count)
+    allow(Pliny::Metrics).to receive(:measure)
+  end
+
+  after do
+    Timecop.return
+  end
+
+  it "counts total requests" do
+    expect(Pliny::Metrics).to receive(:count).with("requests").once
+
+    get "/hello"
+  end
+
+  it "counts 2xx statuses" do
+    expect(Pliny::Metrics).to receive(:count).with("requests.status.2xx").once
+
+    get "/hello"
+  end
+
+  it "counts 4xx statuses" do
+    expect(Pliny::Metrics).to receive(:count).with("requests.status.4xx").once
+
+    get "/not-found"
+  end
+
+  it "counts 5xx statuses" do
+    expect(Pliny::Metrics).to receive(:count).with("requests.status.5xx").once
+
+    get "/error"
+  end
+
+  it "measures the request latency" do
+    expect(Pliny::Metrics).to receive(:measure) do |key, opts|
+      assert_equal(key, "requests.latency")
+      assert(4 < opts[:value] && opts[:value] < 6)
+    end
+
+    get "/hello"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pliny
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.20.2
 platform: ruby
 authors:
 - Brandur Leach
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-08 00:00:00.000000000 Z
+date: 2016-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -365,6 +365,7 @@ files:
 - lib/pliny/metrics/backends/logger.rb
 - lib/pliny/middleware/cors.rb
 - lib/pliny/middleware/instruments.rb
+- lib/pliny/middleware/metrics.rb
 - lib/pliny/middleware/request_id.rb
 - lib/pliny/middleware/request_store/clear.rb
 - lib/pliny/middleware/request_store/seed.rb
@@ -454,6 +455,7 @@ files:
 - spec/metrics_spec.rb
 - spec/middleware/cors_spec.rb
 - spec/middleware/instruments_spec.rb
+- spec/middleware/metrics_spec.rb
 - spec/middleware/request_id_spec.rb
 - spec/middleware/request_store/clear_spec.rb
 - spec/middleware/request_store/seed_spec.rb