log_sense 2.5.0 → 2.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85b0ebee3c5879005dce7f3e32675a5f0319411eb74f138b2dfd7a4c21d26d43
-  data.tar.gz: 1aec3ca221196cfaf9061495e6767f5136a23a1f9d6f510fb43a28c056c1ca8c
+  metadata.gz: 89f75b81840da58b73455053de50295235e5afa62a817e2b681000a768c7d71c
+  data.tar.gz: 792bd5927bd31e6af055e6515fcea976511cb195b86b915d998acbb05dec9050
 SHA512:
-  metadata.gz: 27389b84f365fdaa02ece44dd70eabb130051ca81d26d17cd573325f8101d21c0dc83fd5c81915babfcd1e8d1f363ef777811f9676b2439e8f6b868013515700
-  data.tar.gz: e52b3e05fb838362c3938aaf20d1f6347a3a4c8025d40963c98eeae4fe4b6c01d9acf225353ce2c872c213b2f113af089de418bc0e424e4b151884f4fd37c03c
+  metadata.gz: be7bee52c0951609c0c2398e86ac7c93e4b670950e593d9962a57f7f2566fbfcf9baa438b03bc9bf06c89c84be5dd45e1e68b642ee7a453edb63bebad40131d8
+  data.tar.gz: 596d1a6daf73b5c1b80a404abcf4c7cefc6e6faf8432c2e24036f2a9e00e6861b21d66fd377d4627807a0a627f9add9aea0995c641478110bcadb34ff2c9d209

data/CHANGELOG.org

@@ -2,6 +2,15 @@
 #+AUTHOR: Adolfo Villafiorita
 #+STARTUP: showall
 
+* 2.5.2
+
+- Fixes a bug in the computation of total events in the Queries/Summary
+  report  
+
+* 2.5.1
+
+- Add number of events in SQL queries  
+
 * 2.5.0
 
 - Add query reports  

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    log_sense (2.3.1)
+    log_sense (2.5.1)
       browser (~> 6.0.0)
       csv
       ipaddr (~> 1.2.0)

data/lib/log_sense/formatting_util.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module LogSense
+  module FormattingUtil
+    ##
+    # Number with thousand separator
+    #
+    def self.with_thousands(number, separator: ",", comma: ".")
+      return unless number
+          
+      decimal, fraction = number.to_s.split(comma)
+      with_thousands = decimal.reverse.gsub(/(\d\d\d)/, "\\1#{separator}")
+
+      "#{with_thousands.reverse}#{comma if fraction}#{fraction}"
+    end
+  end
+end

data/lib/log_sense/rails_aggregator.rb

@@ -5,6 +5,9 @@ module LogSense
   class RailsAggregator < Aggregator
     WORDS_SEPARATOR = ' · '
 
+    # with thousands
+    include LogSense::FormattingUtil
+
     def initialize(db, options = { limit: 900 })
       @table = "Event"
       @date_field = "started_at"
@@ -81,18 +84,26 @@ module LogSense
         }
       end
 
-      @queries = @db.execute %Q(
-        SELECT SUM(queries), SUM(cached_queries),
-               ROUND(SUM(queries) / SUM(cached_queries), 2)
+      queries = @db.execute %Q(
+        SELECT COUNT(DISTINCT(id)), SUM(queries), SUM(cached_queries),
+               ROUND(1.0 * SUM(cached_queries) / SUM(queries), 2)
         FROM Event
       )
 
+      @queries = queries.map do |row|
+        row.map do |element|
+          FormattingUtil.with_thousands(element)
+        end
+      end
+
       @queries_by_controller = @db.execute %Q(
         SELECT controller,
-        MIN(queries), MAX(queries), ROUND(AVG(queries), 2),
+               COUNT(DISTINCT(id)),
+               MIN(queries), MAX(queries),
+               ROUND(AVG(queries), 2),
                SUM(queries), SUM(cached_queries),
-               ROUND(SUM(cached_queries) / SUM(queries), 2),
-               SUM(gc_duration)
+               ROUND(1.0 * SUM(cached_queries) / SUM(queries), 2),
+               ROUND(SUM(gc_duration), 2)
         FROM Event
         GROUP BY Event.controller
       )

data/lib/log_sense/report_shaper.rb

@@ -139,8 +139,8 @@ module LogSense
     def queries(data, colors: [], col: "small-12 cell")
       {
         title: "Number of queries",
-        header: %w[Queries Cached Perc_Cached],
-        column_alignment: %i[right right right],
+        header: %w[Events Queries Cached Perc_Cached],
+        column_alignment: %i[center center center center],
         rows: data[:queries],
         col: col,
       }      
@@ -150,6 +150,7 @@ module LogSense
       {
         title: "Queries by Controller",
         header: ["Controller",
+                 "Events",
                  "Min queries", "Max queries", "Avg Queries",
                  "Total queries", "Cached queries", "Perc",
                  "Total GC"],

data/lib/log_sense/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LogSense
-  VERSION = "2.5.0"
+  VERSION = "2.5.2"
 end

data/lib/log_sense.rb

@@ -6,6 +6,7 @@ require "log_sense/options/checker"
 require "log_sense/apache/log_parser"
 require "log_sense/rails/log_parser"
 
+require "log_sense/formatting_util"
 require "log_sense/aggregator"
 require "log_sense/apache_aggregator"
 require "log_sense/rails_aggregator"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: log_sense
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.2
 platform: ruby
 authors:
 - Adolfo Villafiorita
@@ -196,6 +196,7 @@ files:
 - lib/log_sense/apache_aggregator.rb
 - lib/log_sense/apache_report_shaper.rb
 - lib/log_sense/emitter.rb
+- lib/log_sense/formatting_util.rb
 - lib/log_sense/ip_locator.rb
 - lib/log_sense/options/checker.rb
 - lib/log_sense/options/parser.rb