log_sanity 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2aad47580de71bc5f808b70557881ed7134404f150e8b8c7893f33c3ef660327
-  data.tar.gz: 3cba5122b91fa6163d3d9e5e8b6cb537a577136e670ace442c30297a8ddd8a50
+  metadata.gz: 334adfd10ad13c52b7a3e24973adb808447737f1f7099576aac44b21c871df46
+  data.tar.gz: dcfab6f923a4d6ccce9d57f57c10c8b883ff4729a2e36fa977be03c58f631487
 SHA512:
-  metadata.gz: 1112c2fdc532170c33d4288806f369f077ccc1f627345bbdb5d593a051480cd5417d875c475c545096261ec095e3d1c89ab9fe25174c1ae02c9f94e1f0f96d27
-  data.tar.gz: f653ecf13c53ed5b8a5a3a44af7353461488a6bc6c5cac9060fcc692d5c0ceb9528b1547054dfa8285e91f369bce1281e081cc6a0961cc45a36fa33773d9cec2
+  metadata.gz: 0776a645c92e2fcc3bb17c1df01b364c5ad070690c388628060461a8a1c1880cee6bfa5605eb53d24443bbdec853407bb3f9ebafbc76a7b799cd3278bf3c2eb9
+  data.tar.gz: a964344a187aaccc49c3eda2dddd8f17077541b9b836eb836507cda7980c608818510e3e6330df1d51602d27fe7e7c1b46b50d456e92b4296033173a77167dde

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+#### 2.2.0
+
+- Add DB query counts for ActiveRecord 7.2
+  Only real queries are reported; cached queries are excluded
+
+#### 2.1.2
+
+- In ActiveJob logs, output gid:// when available instead of using .to_json
+
 #### 2.1.1
 
 - Report correct request method when Rails handles an exception

data/Gemfile.lock

@@ -1,104 +1,100 @@
 PATH
   remote: .
   specs:
-    log_sanity (2.1.1)
-      rails (>= 7.1.2, < 7.2)
+    log_sanity (2.2.0)
+      rails (>= 7.1.2, < 7.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.1.2)
-      actionpack (= 7.1.2)
-      activesupport (= 7.1.2)
+    actioncable (7.2.1)
+      actionpack (= 7.2.1)
+      activesupport (= 7.2.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.1.2)
-      actionpack (= 7.1.2)
-      activejob (= 7.1.2)
-      activerecord (= 7.1.2)
-      activestorage (= 7.1.2)
-      activesupport (= 7.1.2)
-      mail (>= 2.7.1)
-      net-imap
-      net-pop
-      net-smtp
-    actionmailer (7.1.2)
-      actionpack (= 7.1.2)
-      actionview (= 7.1.2)
-      activejob (= 7.1.2)
-      activesupport (= 7.1.2)
-      mail (~> 2.5, >= 2.5.4)
-      net-imap
-      net-pop
-      net-smtp
+    actionmailbox (7.2.1)
+      actionpack (= 7.2.1)
+      activejob (= 7.2.1)
+      activerecord (= 7.2.1)
+      activestorage (= 7.2.1)
+      activesupport (= 7.2.1)
+      mail (>= 2.8.0)
+    actionmailer (7.2.1)
+      actionpack (= 7.2.1)
+      actionview (= 7.2.1)
+      activejob (= 7.2.1)
+      activesupport (= 7.2.1)
+      mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.2)
-      actionview (= 7.1.2)
-      activesupport (= 7.1.2)
+    actionpack (7.2.1)
+      actionview (= 7.2.1)
+      activesupport (= 7.2.1)
       nokogiri (>= 1.8.5)
       racc
-      rack (>= 2.2.4)
+      rack (>= 2.2.4, < 3.2)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.2)
-      actionpack (= 7.1.2)
-      activerecord (= 7.1.2)
-      activestorage (= 7.1.2)
-      activesupport (= 7.1.2)
+      useragent (~> 0.16)
+    actiontext (7.2.1)
+      actionpack (= 7.2.1)
+      activerecord (= 7.2.1)
+      activestorage (= 7.2.1)
+      activesupport (= 7.2.1)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.2)
-      activesupport (= 7.1.2)
+    actionview (7.2.1)
+      activesupport (= 7.2.1)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (7.1.2)
-      activesupport (= 7.1.2)
+    activejob (7.2.1)
+      activesupport (= 7.2.1)
       globalid (>= 0.3.6)
-    activemodel (7.1.2)
-      activesupport (= 7.1.2)
-    activerecord (7.1.2)
-      activemodel (= 7.1.2)
-      activesupport (= 7.1.2)
+    activemodel (7.2.1)
+      activesupport (= 7.2.1)
+    activerecord (7.2.1)
+      activemodel (= 7.2.1)
+      activesupport (= 7.2.1)
       timeout (>= 0.4.0)
-    activestorage (7.1.2)
-      actionpack (= 7.1.2)
-      activejob (= 7.1.2)
-      activerecord (= 7.1.2)
-      activesupport (= 7.1.2)
+    activestorage (7.2.1)
+      actionpack (= 7.2.1)
+      activejob (= 7.2.1)
+      activerecord (= 7.2.1)
+      activesupport (= 7.2.1)
       marcel (~> 1.0)
-    activesupport (7.1.2)
+    activesupport (7.2.1)
       base64
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
     base64 (0.2.0)
-    bigdecimal (3.1.4)
-    builder (3.2.4)
-    concurrent-ruby (1.2.2)
+    bigdecimal (3.1.8)
+    builder (3.3.0)
+    concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
     crass (1.0.6)
     date (3.3.4)
-    drb (2.2.0)
-      ruby2_keywords
-    erubi (1.12.0)
+    drb (2.2.1)
+    erubi (1.13.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    i18n (1.14.1)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
-    io-console (0.6.0)
-    irb (1.9.1)
-      rdoc
-      reline (>= 0.3.8)
+    io-console (0.7.2)
+    irb (1.14.0)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    logger (1.6.1)
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -107,30 +103,28 @@ GEM
       net-imap
       net-pop
       net-smtp
-    marcel (1.0.2)
+    marcel (1.0.4)
     mini_mime (1.1.5)
-    minitest (5.20.0)
-    mutex_m (0.2.0)
-    net-imap (0.4.6)
+    minitest (5.25.1)
+    net-imap (0.4.16)
       date
       net-protocol
     net-pop (0.1.2)
-      net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.4.0)
+    net-smtp (0.5.0)
       net-protocol
-    nio4r (2.6.1)
-    nokogiri (1.15.5-arm64-darwin)
+    nio4r (2.7.3)
+    nokogiri (1.16.7-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.15.5-x86_64-darwin)
+    nokogiri (1.16.7-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.15.5-x86_64-linux)
+    nokogiri (1.16.7-x86_64-linux)
       racc (~> 1.4)
-    psych (5.1.1.1)
+    psych (5.1.2)
       stringio
-    racc (1.7.3)
-    rack (3.0.8)
+    racc (1.8.1)
+    rack (3.1.7)
     rack-session (2.0.0)
       rack (>= 3.0.0)
     rack-test (2.1.0)
@@ -138,20 +132,20 @@ GEM
     rackup (2.1.0)
       rack (>= 3)
       webrick (~> 1.8)
-    rails (7.1.2)
-      actioncable (= 7.1.2)
-      actionmailbox (= 7.1.2)
-      actionmailer (= 7.1.2)
-      actionpack (= 7.1.2)
-      actiontext (= 7.1.2)
-      actionview (= 7.1.2)
-      activejob (= 7.1.2)
-      activemodel (= 7.1.2)
-      activerecord (= 7.1.2)
-      activestorage (= 7.1.2)
-      activesupport (= 7.1.2)
+    rails (7.2.1)
+      actioncable (= 7.2.1)
+      actionmailbox (= 7.2.1)
+      actionmailer (= 7.2.1)
+      actionpack (= 7.2.1)
+      actiontext (= 7.2.1)
+      actionview (= 7.2.1)
+      activejob (= 7.2.1)
+      activemodel (= 7.2.1)
+      activerecord (= 7.2.1)
+      activestorage (= 7.2.1)
+      activesupport (= 7.2.1)
       bundler (>= 1.15.0)
-      railties (= 7.1.2)
+      railties (= 7.2.1)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
@@ -159,30 +153,31 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (7.1.2)
-      actionpack (= 7.1.2)
-      activesupport (= 7.1.2)
-      irb
+    railties (7.2.1)
+      actionpack (= 7.2.1)
+      activesupport (= 7.2.1)
+      irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
-    rake (13.1.0)
-    rdoc (6.6.0)
+    rake (13.2.1)
+    rdoc (6.7.0)
       psych (>= 4.0.0)
-    reline (0.4.0)
+    reline (0.5.10)
       io-console (~> 0.5)
-    ruby2_keywords (0.0.5)
-    stringio (3.0.9)
-    thor (1.3.0)
+    securerandom (0.3.1)
+    stringio (3.1.1)
+    thor (1.3.2)
     timeout (0.4.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
+    useragent (0.16.10)
     webrick (1.8.1)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.6.12)
+    zeitwerk (2.6.18)
 
 PLATFORMS
   arm64-darwin
@@ -193,4 +188,4 @@ DEPENDENCIES
   log_sanity!
 
 BUNDLED WITH
-   2.4.10
+   2.5.11

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2017-2023 thomas morgan
+Copyright 2017-2024 thomas morgan
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/log_sanity/log_subscribers/action_controller.rb

@@ -23,14 +23,24 @@ module LogSanity
         end
 
         durations = {'total' => event.duration.round}
+        queries   = {}
         additions = ::ActionController::Base.log_process_action(payload)
         additions.each do |add|
           if add =~ /^([^:]+):?\s*([0-9.]+)(ms)?/
             ms = $2.to_f.round
-            durations[$1.downcase] = ms if ms > 0
+            name = $1.downcase
+            durations[name] = ms if ms > 0
+          end
+          if name and add =~ /[^0-9]([0-9]+) quer/
+            q_real = $1.to_i
+            if q_real > 0 and add =~ /[^0-9]([0-9]+) cached/
+              q_real -= $1.to_i # exclude cached queries
+            end
+            queries[name] = q_real if q_real > 0
           end
         end
 
+        log 'queries', queries if queries.any?
         log 'duration', durations
         log 'status', status
       end

data/lib/log_sanity/log_subscribers/active_job.rb

@@ -12,7 +12,7 @@ module LogSanity
             'id' => job.job_id,
             'queue' => job.queue_name
           }
-          e['params'] = job.arguments if job.arguments.any?
+          e['params'] = format_args(job.arguments) if job.arguments.any?
           if error = event.payload[:exception_object] || job.enqueue_error
             e['error'] = error
           elsif event.payload[:aborted]
@@ -33,7 +33,7 @@ module LogSanity
             'queue' => job.queue_name,
             'start_at' => job.scheduled_at
           }
-          e['params'] = job.arguments if job.arguments.any?
+          e['params'] = format_args(job.arguments) if job.arguments.any?
           if error = event.payload[:exception_object] || job.enqueue_error
             e['error'] = error
           elsif event.payload[:aborted]
@@ -65,7 +65,7 @@ module LogSanity
       #       'id' => job.job_id,
       #       'queue' => job.queue_name,
       #     }
-      #     e['params'] = job.arguments if job.arguments.any?
+      #     e['params'] = format_args(job.arguments) if job.arguments.any?
       #     e
       #   end
       # end
@@ -81,7 +81,7 @@ module LogSanity
             'queue' => job.queue_name,
             'duration' => {'total' => event.duration.round}
           }
-          e['params'] = job.arguments if job.arguments.any?
+          e['params'] = format_args(job.arguments) if job.arguments.any?
           if error = event.payload[:exception_object]
             e['error'] = error
           elsif event.payload[:aborted]
@@ -91,6 +91,22 @@ module LogSanity
         end
       end
 
+
+      private
+
+      def format_args(arg)
+        case arg
+        when Hash
+          arg.transform_values{|val| format_args val }
+        when Array
+          arg.map{|val| format_args val }
+        when GlobalID::Identification
+          arg.to_global_id rescue "#{arg.class}(#{arg.try(:id)})"
+        else
+          arg
+        end
+      end
+
     end
   end
 end

data/lib/log_sanity/version.rb

@@ -1,3 +1,3 @@
 module LogSanity
-  VERSION = '2.1.1'
+  VERSION = '2.2.0'
 end

data/log_sanity.gemspec

@@ -17,5 +17,5 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]
 
-  s.add_dependency 'rails', '>= 7.1.2', '< 7.2'
+  s.add_dependency 'rails', '>= 7.1.2', '< 7.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: log_sanity
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - thomas morgan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-27 00:00:00.000000000 Z
+date: 2024-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,7 +19,7 @@ dependencies:
         version: 7.1.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '7.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 7.1.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '7.3'
 description: LogSanity - Bring sanity to Rails logs by reducing verbosity, using json
   output, and more.
 email:
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: LogSanity - Bring sanity to Rails logs