dial 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42f0f94ef6fdc4992e56f9b1938f464916c2ac36ded2ae17a506fc3798cda278
-  data.tar.gz: 05e9b4db37fa643be44ca3b9800d44ecc79dbe1b69209d4978e13de1dbec82d6
+  metadata.gz: c57fbfd8d0f023bcfd0606a5d61cfe84dd7b93d618dd844d50332b576dcce3d5
+  data.tar.gz: 27db795cf357bd7c878ea939c9c66374cc50f54e304466f91b9add37e0535a95
 SHA512:
-  metadata.gz: 6f071e302b7b7f83395a3f4e796d9b8cb3b99138dcd9b67c7cabfd57dea537d197266e01f4789644c06c482b72badc6f6c858bb28913631959c9255ebf162536
-  data.tar.gz: f6782c98fde560a03f29aa95bdae546e1d1aae0388b6a2403617d229d15cebe3d4ab2d36d606a4ede4b5b4ff43c9f9690336716865b22eb526b9a706f98906a0
+  metadata.gz: ea4ba198fd052cdfed3a35d95a5424f6da32c94da85dec1cad9d78edd6b92e336d35afa76704349c5ef0475ac8a60f9ba90026b753109f4a0cea8caba994d3c4
+  data.tar.gz: 4d1578a97dd8439a4e6060698d24a0605f9747fd471d47844dd5f981f257790a00ecd4a5ed097377ef3af6d61062dd0b76d6023f5fd5dca0990a8f2642421c5a

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## [Unreleased]
 
+## [0.3.1] - 2025-05-03
+
+- Only show truncated summary + one full query in N+1 logs
+- Fix parsing of multiline N+1 query logs
+- Truncate summary N+1 queries to 100 chars
+
 ## [0.3.0] - 2025-05-02
 
 - Require rails 7.1.0 or later

data/lib/dial/constants.rb

@@ -11,6 +11,7 @@ module Dial
 
   HTTP_ACCEPT = "HTTP_ACCEPT"
   CONTENT_TYPE = ::Rack::CONTENT_TYPE
+  CONTENT_TYPE_HTML = "text/html"
   CONTENT_LENGTH = ::Rack::CONTENT_LENGTH
   NONCE = ::ActionDispatch::ContentSecurityPolicy::Request::NONCE
   REQUEST_TIMING = "dial_request_timing"

data/lib/dial/middleware/panel.rb

@@ -4,6 +4,8 @@ require "uri"
 
 module Dial
   class Panel
+    QUERY_CHARS_TRUNCATION_THRESHOLD = 100
+
     class << self
       def html env, headers, profile_out_filename, query_logs, ruby_vm_stat, gc_stat, gc_stat_heap, server_timing
         <<~HTML
@@ -223,7 +225,7 @@ module Dial
           query_logs.map do |(queries, stack_lines)|
             <<~HTML
               <details>
-                <summary>#{queries.shift}</summary>
+                <summary>#{truncated_query queries.first}</summary>
                 <div class="section query-logs">
                   #{queries.map { |query| "<span>#{query}</span>" }.join}
                   #{stack_lines.map { |stack_line| "<span>#{stack_line}</span>" }.join}
@@ -236,6 +238,12 @@ module Dial
         end
       end
 
+      def truncated_query query
+        return query if query.length <= QUERY_CHARS_TRUNCATION_THRESHOLD
+
+        query[0...QUERY_CHARS_TRUNCATION_THRESHOLD] + "..."
+      end
+
       def formatted_ruby_vm_stat ruby_vm_stat
         ruby_vm_stat.map { |key, value| "<span><b>#{key}:</b> #{value}</span>" }.join
       end

data/lib/dial/middleware.rb

@@ -12,14 +12,12 @@ module Dial
     include RubyStat
     include RailsStat
 
-    HTML_CONTENT_TYPE = "text/html"
-
     def initialize app
       @app = app
     end
 
     def call env
-      unless env[HTTP_ACCEPT]&.include? HTML_CONTENT_TYPE
+      unless env[HTTP_ACCEPT]&.include? CONTENT_TYPE_HTML
         return @app.call env
       end
 
@@ -40,7 +38,7 @@ module Dial
       end
       server_timing = server_timing headers
 
-      unless headers[CONTENT_TYPE]&.include? HTML_CONTENT_TYPE
+      unless headers[CONTENT_TYPE]&.include? CONTENT_TYPE_HTML
         return [status, headers, rack_body]
       end
 
@@ -106,13 +104,13 @@ module Dial
       when /N\+1 queries detected/
         [[[],[]], :queries, 0]
       when /Call stack/
-        entry.first << "+ #{count - 5} more queries" if count > 5
+        entry.first << "+ #{count - 1} more queries" if count > 1
         [entry, :call_stack, count]
       else
         case section
         when :queries
           count += 1
-          entry.first << line.strip if count <= 5
+          entry.first << line.strip if count == 1
           [entry, :queries, count]
         when :call_stack
           if line.strip.empty?

data/lib/dial/prosopite.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Dial
+  module Prosopite
+    def send_notifications
+      tc[:prosopite_notifications] = tc[:prosopite_notifications].to_h do |queries, kaller|
+        [queries.map { |query| query.squish }, kaller]
+      end
+
+      super
+    end
+  end
+end
+
+module ::Prosopite
+  class << self
+    prepend Dial::Prosopite
+  end
+end

data/lib/dial/railtie.rb

@@ -4,6 +4,7 @@ require "rails"
 require "active_record"
 require "prosopite"
 
+require_relative "prosopite"
 require_relative "middleware"
 require_relative "prosopite_logger"
 

data/lib/dial/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dial
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dial
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Joshua Young
@@ -113,6 +113,7 @@ files:
 - lib/dial/middleware/panel.rb
 - lib/dial/middleware/rails_stat.rb
 - lib/dial/middleware/ruby_stat.rb
+- lib/dial/prosopite.rb
 - lib/dial/prosopite_logger.rb
 - lib/dial/railtie.rb
 - lib/dial/util.rb