rack-healthz 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f2db9eb6e4e77c61d09a7c24c09ed1054be13a9
-  data.tar.gz: 47d097eda0ea43b797347f8c5c72be986a9adde3
+  metadata.gz: a57636e6570937379f557ffe6ae23130896cd754
+  data.tar.gz: 4d7f5099aad1b246100297615f972a1c7aa2a223
 SHA512:
-  metadata.gz: 6f4c748f5b46b7128b12ad568c873d9dada21b438c885ff2738d591e7c949f48d79e236c8fc0e60635885a887e0b3381703eca359d7affda37158322baecba34
-  data.tar.gz: ebbd397052a57252725f2edd24f094532d0871de79a476bd1d43d50aabe4c38d03f4d5c28dc422ac77374ca3d7191fbe4d5f351c7691181c8de157d5133c412b
+  metadata.gz: 44d8de20b2f9b21afbe0985b87c76cdeabd7b125a9efda9f0b5a3870c55f5326897fbdc2e0117ef467dc5dea36a1a0577d7fbb6bfe7c2da3fee4cf67a71cfe0a
+  data.tar.gz: 24f300760fbe30759db3151f8be56604d1800288adc6ddccbe2279c97429e6a69fe14b2f35a181be70c07be0f650a010834abe308ebde6969559182b224be33d

data/Gemfile.lock

@@ -8,6 +8,11 @@ GEM
   remote: https://rubygems.org/
   specs:
     autoloaded (2.2.1)
+    coderay (1.1.2)
+    method_source (0.9.2)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
     rack (2.0.7)
     rake (10.5.0)
 
@@ -16,6 +21,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 2.0)
+  pry
   rack
   rack-healthz!
   rake (~> 10.0)

data/lib/rack/healthz.rb

@@ -1,86 +1,61 @@
-require "rack/healthz/version"
+require 'rack/healthz/version'
+
 require 'autoloaded'
 require 'json'
+require 'pry'
 
 module Rack
   class Healthz
     Autoloaded.module {}
-    class Error < StandardError;
-    end
 
-    def initialize(app, stats_path: "/healthz", max_time_between_requests: 3600)
-      @app = app
-      @count = 0
-      @my_stats = {}
-      @up_at = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-      @last_success_time = nil
-      @stats_path = stats_path
-      @max_time_between_requests = max_time_between_requests
-    end
+    DefaultPath = '/healthz'
 
-    def call(env)
-      if env.fetch("PATH_INFO") == @stats_path
-        now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-        [return_status(now), {'Content-Type' => 'application/json'}, [body_out(now)]]
-      else
-        @count += 1
-        start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-        result = @app.call env
-        end_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-        elapsed_time = end_time - start_time
-        response_code = result.first.to_i
-        request_category = response_code / 100
-        if !(@my_stats.key? request_category)
-          @my_stats[request_category] = RequestAccumulator.new
-        end
-        @my_stats[request_category] << elapsed_time
-        if response_code < 400
-          @last_success_time = end_time
-        end
-        result
-      end
-    end
+    DefaultTimeBetweenRequests = 3600
+
+    HealthyStatus = 200
+    UnhealthyStatus = 503
 
-    def return_status(now)
-      if healthy?(now)
-        200
-      else
-        503
+    ContentType = {'Content-Type' => 'application/json'}
+
+    class << self
+      def current_time
+        Process.clock_gettime(Process::CLOCK_MONOTONIC)
       end
-    end
 
-    def status(now)
-      if healthy?(now)
-        "healthy"
-      else
-        "unhealthy"
+      def measure(&block)
+        start_time = current_time
+
+        block.call
+
+        current_time - start_time
       end
     end
 
-    def healthy?(now)
-      !time_since_last_success(now).nil? and (time_since_last_success(now) < @max_time_between_requests)
+    class Error < StandardError;
     end
 
-    def time_since_last_success(now)
-      @last_success_time ? now - @last_success_time : nil
-    end
+    attr_reader :accumulator
 
-    def uptime(now)
-      now - @up_at
+    def initialize(app, **args)
+      @accumulator = Accumulator.new(app, **args)
     end
 
-    def body_out(now)
-      result = {
-          'count' => @count,
-          'uptime' => uptime(now),
-          'time_since_last_success' => time_since_last_success(now),
-          'status' => status(now), # TODO
-          'stats' => {},
-      }
-      @my_stats.each_pair do |status_category, reqest_accumulator|
-        result['stats'][status_category.to_s + 'xx'] = reqest_accumulator.to_h
+    def call(env)
+      with_now do
+        if accumulator.status_request?(env)
+          accumulator.response.to_a
+        else
+          accumulator.call(env).to_a
+        end
       end
-      result.to_json
+    end
+
+    def with_now
+      old_now = Thread.current[:now]
+      Thread.current[:now] = Healthz.current_time
+      result = yield
+      Thread.current[:now] = old_now
+      result
     end
   end
 end

data/lib/rack/healthz/accumulator.rb

@@ -0,0 +1,108 @@
+module Rack
+  class Healthz
+    class Accumulator
+      attr_reader :count, :path, :app, :stats, :max_time_between_requests, :up_at, :last_success_time
+
+      def initialize(app, max_time_between_requests: DefaultTimeBetweenRequests, path: DefaultPath)
+        @app = app
+        @count = 0
+        @stats = {}
+        @up_at = Healthz.current_time
+        @last_success_time = nil
+        @max_time_between_requests = max_time_between_requests
+        @path = path
+      end
+
+      def call(env)
+        count!
+
+        response = nil
+
+        elapsed_time = Healthz.measure do
+          response = app.call(env)
+        end
+
+        handle_response! elapsed_time, Rack::Response.new(response)
+
+        response
+      end
+
+      def status_request?(env)
+        env.fetch('PATH_INFO') == path
+      end
+
+      def healthy?
+        !time_since_last_success.nil? and (time_since_last_success < max_time_between_requests)
+      end
+
+      def response
+        Response.new self
+      end
+
+      def time_since_last_success
+        last_success_time ? current_time - last_success_time : nil
+      end
+
+      def uptime
+        current_time - up_at
+      end
+
+      def status
+        if healthy?
+          "healthy"
+        else
+          "unhealthy"
+        end
+      end
+
+      def to_h
+        {}.tap do |result|
+          result[:count] = count
+          result[:uptime] = uptime
+          result[:time_since_last_success] = time_since_last_success
+          result[:status] = status
+          result[:stats] = stats_hash
+        end
+      end
+
+      private
+
+      def stats_hash
+        {}.tap do |result|
+          stats.values.each do |stat|
+            result[stat.category] = stat.to_h
+          end
+        end
+      end
+
+      #
+      # Internal Commands
+      #
+      def handle_response!(elapsed_time, response)
+        response_category = response_category_of response
+
+        stats[response_category] ||= RequestAccumulator.new(response_category)
+        stats[response_category] << elapsed_time
+
+        successful! if response.successful?
+      end
+
+      def successful!
+        @last_success_time = current_time
+      end
+
+      def count!
+        @count += 1
+      end
+
+      #Internal Queries
+      def current_time
+        Thread.current[:now]
+      end
+
+      def response_category_of response
+        response.status / 100
+      end
+    end
+  end
+end

data/lib/rack/healthz/request_accumulator.rb

@@ -2,9 +2,10 @@ module Rack
   class Healthz
     class RequestAccumulator
 
-      attr_reader :min_time, :max_time, :count, :std, :mean
+      attr_reader :min_time, :max_time, :count, :std, :mean, :category
 
-      def initialize
+      def initialize(category)
+        @category = category
         @count = 0
         @sum_of_times = 0.0
         @sum_of_square_times = 0.0
@@ -19,6 +20,7 @@ module Rack
         @min_time = [@min_time, elapsed_time].min
         @max_time = [@max_time, elapsed_time].max
         @mean = @sum_of_times / @count
+
         @std = if @count > 1
                  Math.sqrt((@sum_of_square_times / @count) - (@sum_of_times / @count) ** 2)
                elsif @count == 1

data/lib/rack/healthz/response.rb

@@ -0,0 +1,39 @@
+module Rack
+  class Healthz
+    class Response
+      attr_reader :accumulator
+
+      def initialize(accumulator)
+        @accumulator = accumulator
+      end
+
+      def to_a
+        [return_status, content_type, [to_json]]
+      end
+
+      def to_json
+        to_h.to_json
+      end
+
+      def to_h
+        accumulator.to_h
+      end
+
+      def content_type
+        ContentType
+      end
+
+      def healthy?
+        accumulator.healthy?
+      end
+
+      def return_status
+        if healthy?
+          HealthyStatus
+        else
+          UnhealthyStatus
+        end
+      end
+    end
+  end
+end

data/lib/rack/healthz/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class Healthz
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/rack-healthz.gemspec

@@ -38,6 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rack"
+  spec.add_development_dependency "pry"
 
   spec.add_runtime_dependency "autoloaded"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-healthz
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrew Eberbach
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-12 00:00:00.000000000 Z
+date: 2019-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,6 +53,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: autoloaded
   requirement: !ruby/object:Gem::Requirement
@@ -84,7 +98,9 @@ files:
 - bin/setup
 - config.ru
 - lib/rack/healthz.rb
+- lib/rack/healthz/accumulator.rb
 - lib/rack/healthz/request_accumulator.rb
+- lib/rack/healthz/response.rb
 - lib/rack/healthz/version.rb
 - rack-healthz.gemspec
 homepage: