notable 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7ba556539ddc3c2c67a5fc37623c138c15432f32e962ff60118863ecd5ff3b7
-  data.tar.gz: a301a3c1a1f84c0bce4dd83e1a965210d6ccb08586c9b2bb6f51fb10676d3f8c
+  metadata.gz: 6901159f15d1920eaf07ff40c239d4b05d75bb469c55ddebc67874703e362efe
+  data.tar.gz: 5092cf2e632b615faaae6a1027104597ab4a434102374f9fc7a0eff7c5246b46
 SHA512:
-  metadata.gz: 9f7cb09c2f95526ebd6862199fcbe8889a50919c93e63293a5142efd5346998b7d9c803c358c0e283db43967e7f7303e22409b3afbc5206ea78939de7846ab84
-  data.tar.gz: c7612312bafaefbe1cee0f3b70f1bb0dff3bc0963e8116f1c110452d2b6634a8f3df1c7455dce10a058c934a2da71edb5569396d020292c15a075bdfa63e48f7
+  metadata.gz: fc4b419c11fc0dae0cac44c8ba581cff4df203cb4be3b462876e46b315139b3f2e71737ef69e2c28c07ed05ce3840aab6602ada5739bb51a0e5b2d5dc5abfbd4
+  data.tar.gz: c0ce85fa70b1930db449a3570f29c2e41adf13db86c5a2ade506978294de6daf82e4231ea7ce1fbe226b82cbcac63c87db4aaeb9748b114796b34610650913f5

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.5.0 (2023-07-02)
+
+- Dropped support for Ruby < 3 and Rails < 6.1
+
+## 0.4.1 (2022-09-26)
+
+- Switched to monotonic time
+
 ## 0.4.0 (2022-01-10)
 
 - Dropped support for Ruby < 2.6 and Rails < 5.2

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2022 Andrew Kane
+Copyright (c) 2014-2023 Andrew Kane
 
 MIT License
 

data/lib/notable/middleware.rb

@@ -5,9 +5,9 @@ module Notable
     end
 
     def call(env)
-      start_time = Time.now
+      start_time = Notable.monotonic_time
       status, headers, body = @app.call(env)
-      request_time = Time.now - start_time
+      request_time = Notable.monotonic_time - start_time
 
       Safely.safely do
         if env["action_dispatch.exception"]
@@ -22,11 +22,11 @@ module Notable
               "Error"
             end
           Notable.track message, "#{e.class.name}: #{e.message}"
-        elsif (!status or status.to_i >= 400) and !Notable.notes.any?
+        elsif (!status || status.to_i >= 400) && !Notable.notes.any?
           Notable.track Rack::Utils::HTTP_STATUS_CODES[status.to_i]
         end
 
-        if request_time > Notable.slow_request_threshold and status.to_i != 503
+        if request_time > Notable.slow_request_threshold && status.to_i != 503
           Notable.track "Slow Request"
         end
 

data/lib/notable/version.rb

@@ -1,3 +1,3 @@
 module Notable
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/lib/notable.rb

@@ -3,13 +3,13 @@ require "active_support"
 require "safely/core"
 
 # modules
-require "notable/debug_exceptions"
-require "notable/middleware"
-require "notable/throttle"
-require "notable/unpermitted_parameters"
-require "notable/version"
+require_relative "notable/debug_exceptions"
+require_relative "notable/middleware"
+require_relative "notable/throttle"
+require_relative "notable/unpermitted_parameters"
+require_relative "notable/version"
 
-require "notable/engine" if defined?(Rails)
+require_relative "notable/engine" if defined?(Rails)
 
 module Notable
   class << self
@@ -69,9 +69,8 @@ module Notable
     slow_job_threshold ||= Notable.slow_job_threshold
     exception = nil
     notes = nil
-    start_time = Time.now
-    created_at = Time.parse(created_at) if created_at.is_a?(String)
-    queued_time = created_at ? start_time - created_at : nil
+    started_at = Time.now # wall time
+    start_time = monotonic_time
     begin
       yield
     rescue Exception => e
@@ -81,11 +80,16 @@ module Notable
       notes = Notable.notes
       Notable.clear_notes
     end
-    runtime = Time.now - start_time
+    runtime = monotonic_time - start_time
 
     Safely.safely do
       notes << {note_type: "Slow Job"} if runtime > slow_job_threshold
 
+      if notes.any?
+        created_at = Time.parse(created_at) if created_at.is_a?(String)
+        queued_time = created_at ? [started_at - created_at, 0].max : nil
+      end
+
       notes.each do |note|
         data = {
           note_type: note[:note_type],
@@ -114,6 +118,10 @@ module Notable
       addr.mask(48).to_s
     end
   end
+
+  def self.monotonic_time
+    Process.clock_gettime(Process::CLOCK_MONOTONIC)
+  end
 end
 
 ActiveSupport.on_load(:action_controller) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: notable
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-11 00:00:00.000000000 Z
+date: 2023-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: safely_block
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '0.4'
 description:
 email: andrew@ankane.org
 executables: []
@@ -75,14 +75,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Track notable requests and background jobs