lograge-sql 1.3.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5983447366cf1c996e3f4a6571646b4d54298df7e8c54417c02537c23b5132f
-  data.tar.gz: 48b16b073f9681e809eb3d1bcf3bb0f661ca2ae80a2a2958ef1d9ce495a1147e
+  metadata.gz: '0794c5325c6cc647ab9e133b0ac1ebfee558311f12b26861c0776866a6cc27fb'
+  data.tar.gz: b2bae9007ad19926f3ba0fed85bb6a965b942e70a537ed50b4230f071834af8f
 SHA512:
-  metadata.gz: 1d53aade24130437f98e9bd7d06c448be1364cff17c6dc18c44da939723145a938246c15407fdb8644447d2be31824d34f52cafc0260dc3528b4674cf1a888b9
-  data.tar.gz: 9a8b3bbaa5abd569373b97ffbda2f1c8b2493be8c35695935587ae7726ac7af35adeb99caa01e2a03e753e26777d077c8f561fed1fa7d357568771094dcd4928
+  metadata.gz: 72222b28288cc38a14533c3a3babe408aa2d834dc19ba7f323ac9f7aeca167d55ad7ba2fc3af777e35fa643f7850901378282ee6865bbe4246edc410dff68ad2
+  data.tar.gz: f4a956079f4562b3f24737adc851fb78ca41d70b6e8555e3eda42c436b0c88af28a109d3db4e54c2b36c1d0d21ef67a8c344bcb5a5b22b7884d2b9268fbca0cd

data/README.md

@@ -1,7 +1,7 @@
 # Lograge::Sql
 
 [![Gem Version](https://badge.fury.io/rb/lograge-sql.svg)](https://badge.fury.io/rb/lograge-sql)
-[![Build Status](https://travis-ci.org/iMacTia/lograge-sql.svg)](https://travis-ci.org/iMacTia/lograge-sql)
+[![CI](https://github.com/iMacTia/lograge-sql/actions/workflows/ci.yml/badge.svg)](https://github.com/iMacTia/lograge-sql/actions/workflows/ci.yml)
 
 Lograge::Sql is an extension to the famous [Lograge](https://github.com/roidrage/lograge) gem, which adds SQL queries to the Lograge Event and disable default ActiveRecord logging.
 This is extremely useful if you're using Lograge together with the ELK stack.
@@ -66,6 +66,18 @@ Rails.application.configure do
 end
 ```
 
+`Lograge-sql` only stores any events by `min_duration_ms` condition.
+It very helpful if you want to detect `Slow SQL queries`
+
+```ruby
+# config/initializers/lograge.rb
+Rails.application.configure do
+  # Set limitted of SQL duration if you want to filter (unit: milliseconds)
+  # Defaults is zero
+  config.lograge_sql.min_duration_ms = 5000
+end
+```
+
 #### Thread-safety
 
 [Depending on the web server in your project](https://github.com/steveklabnik/request_store#the-problem) you might benefit from improved thread-safety by adding [`request_store`](https://github.com/steveklabnik/request_store) to your Gemfile. It will be automatically picked up by `lograge-sql`.
@@ -73,4 +85,3 @@ end
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/iMacTia/lograge-sql.
-

data/lib/lograge/active_record_log_subscriber.rb

@@ -6,11 +6,26 @@ module Lograge
     # Every time there's an SQL query, stores it into the Thread.
     # They'll later be access from the RequestLogSubscriber.
     def sql(event)
-      ActiveRecord::LogSubscriber.runtime += event.duration
+      increase_runtime_duration(event)
       return if event.payload[:name] == 'SCHEMA'
 
+      # Only store SQL events if `event.duration` is greater than the configured +min_duration+
+      # No need to check if +min_duration+ is present before as it defaults to 0
+      return if event.duration.to_f.round(2) < Lograge::Sql.min_duration_ms.to_f
+
       Lograge::Sql.store[:lograge_sql_queries] ||= []
       Lograge::Sql.store[:lograge_sql_queries] << Lograge::Sql.extract_event.call(event)
     end
+
+    private
+
+    # Add the event duration to the overall ActiveRecord::LogSubscriber.runtime;
+    # note we don't do this when `keep_default_active_record_log` is enabled,
+    # as ActiveRecord is already adding the duration.
+    def increase_runtime_duration(event)
+      return if Rails.application.config.lograge_sql.keep_default_active_record_log
+
+      ActiveRecord::LogSubscriber.runtime += event.duration
+    end
   end
 end

data/lib/lograge/sql/version.rb

@@ -3,6 +3,6 @@
 module Lograge
   module Sql
     # Gem version
-    VERSION = '1.3.1'
+    VERSION = '2.1.0'
   end
 end

data/lib/lograge/sql.rb

@@ -11,18 +11,17 @@ module Lograge
       attr_accessor :formatter
       # Extract information from SQL event
       attr_accessor :extract_event
+      # Filter SQL events by duration
+      attr_accessor :min_duration_ms
 
       # Initialise configuration with fallback to default values
       def setup(config)
-        Lograge::Sql.formatter     = config.formatter     || default_formatter
-        Lograge::Sql.extract_event = config.extract_event || default_extract_event
+        Lograge::Sql.formatter       = config.formatter       || default_formatter
+        Lograge::Sql.extract_event   = config.extract_event   || default_extract_event
+        Lograge::Sql.min_duration_ms = config.min_duration_ms || 0
 
         # Disable existing ActiveRecord logging
-        unless config.keep_default_active_record_log
-          ActiveSupport::LogSubscriber.log_subscribers.each do |subscriber|
-            Lograge.unsubscribe(:active_record, subscriber) if subscriber.is_a?(ActiveRecord::LogSubscriber)
-          end
-        end
+        unsubscribe_log_subscribers unless config.keep_default_active_record_log
 
         return unless defined?(Lograge::ActiveRecordLogSubscriber)
 
@@ -51,6 +50,12 @@ module Lograge
           "#{event.payload[:name]} (#{event.duration.to_f.round(2)}) #{event.payload[:sql]}"
         end
       end
+
+      def unsubscribe_log_subscribers
+        ActiveSupport::LogSubscriber.log_subscribers.each do |subscriber|
+          Lograge.unsubscribe(:active_record, subscriber) if subscriber.is_a?(ActiveRecord::LogSubscriber)
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lograge-sql
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Mattia Giuffrida
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-16 00:00:00.000000000 Z
+date: 2023-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,34 +16,34 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: lograge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -84,14 +84,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: An extension for Lograge to log SQL queries