inner_performance 0.1.4 → 0.3.0

data/app/jobs/inner_performance/save_event_job.rb

@@ -2,16 +2,26 @@
 
 module InnerPerformance
   class SaveEventJob < ApplicationJob
-    def perform(type:, created_at:, event:, name:, duration:, db_runtime:, properties: {})
-      InnerPerformance::Event.create(
+    def perform(type:, created_at:, event:, name:, duration:, db_runtime:, properties: {}, traces: [])
+      event = InnerPerformance::Event.create(
         type: type,
         created_at: created_at,
         event: event,
         name: name,
         duration: duration,
         db_runtime: db_runtime,
-        properties: properties
+        properties: properties,
       )
+
+      if InnerPerformance.configuration.traces_enabled && traces.any?
+        InnerPerformance::Trace.insert_all(
+          traces.map do |trace|
+            InnerPerformance::TraceForInsertInitializer.new(trace: trace, event: event)
+          end,
+        )
+      end
+
+      InnerPerformance::CleanupJob.perform_later if InnerPerformance.configuration.cleanup_immediately
     end
   end
 end

data/app/mailers/inner_performance/application_mailer.rb

@@ -2,7 +2,7 @@
 
 module InnerPerformance
   class ApplicationMailer < ActionMailer::Base
-    default from: 'from@example.com'
-    layout 'mailer'
+    default from: "from@example.com"
+    layout "mailer"
   end
 end

data/app/models/inner_performance/event.rb

@@ -2,10 +2,12 @@
 
 module InnerPerformance
   class Event < ApplicationRecord
+    has_many :traces, dependent: :destroy
+
     serialize :properties, coder: JSON
 
     def self.ransackable_attributes(_auth_object = nil)
-      %w[created_at db_runtime duration event format id name]
+      ["created_at", "db_runtime", "duration", "event", "format", "id", "name"]
     end
 
     def self.ransackable_associations(_auth_object = nil)

data/app/models/inner_performance/trace.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module InnerPerformance
+  class Trace < ApplicationRecord
+    belongs_to :event
+  end
+end

data/app/models/inner_performance/traces/db.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module InnerPerformance
+  module Traces
+    class Db < InnerPerformance::Trace
+      store :payload, accessors: [:sql, :name], coder: JSON, prefix: true
+
+      class << self
+        def initialize_for_insert(trace:, event:)
+          {
+            type: name,
+            name: trace[:name],
+            payload: trace[:payload].to_json,
+            duration: trace[:duration],
+            created_at: trace[:time],
+            event_id: event.id,
+          }
+        end
+      end
+    end
+  end
+end

data/app/models/inner_performance/traces/view.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module InnerPerformance
+  module Traces
+    class View < InnerPerformance::Trace
+      store :payload, accessors: [:identifier], coder: JSON, prefix: true
+
+      class << self
+        def initialize_for_insert(trace:, event:)
+          {
+            type: name,
+            name: trace[:name],
+            payload: trace[:payload].to_json,
+            duration: trace[:duration],
+            created_at: Time.at(trace[:time]),
+            event_id: event.id,
+          }
+        end
+      end
+    end
+  end
+end

data/app/services/inner_performance/trace_for_insert_initializer.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module InnerPerformance
+  class TraceForInsertInitializer
+    class << self
+      def new(trace:, event:)
+        class_from_group(trace).initialize_for_insert(trace: trace, event: event)
+      end
+
+      def class_from_group(trace)
+        case trace[:group]
+        when :db then InnerPerformance::Traces::Db
+        when :view then InnerPerformance::Traces::View
+        else raise ArgumentError, "Invalid trace group: #{trace[:group]}"
+        end
+      end
+    end
+  end
+end

data/app/views/inner_performance/events/_event.html.erb

@@ -1,5 +1,5 @@
 <tr>
-  <td><%= link_to event.name, events_path(q: { name_eq: event.name }) %></td>
+  <td><%= link_to event.name, event_path(event) %></td>
   <td class="<%= row_class_from_duration(event.duration) %>">
     <%= number_to_human(event.duration, units: { unit: 'ms' }) %>
   </td>

data/app/views/inner_performance/events/index.html.erb

@@ -1,10 +1,21 @@
 <%= search_form_for @q, class: 'mb-4' do |f| %>
   <div class="row align-items-end">
     <div class="col-10">
-      <%= f.label :name_eq, class: 'form-label' %>
-      <%= f.select :name_eq, options_for_select(InnerPerformance::Event.all.pluck(:name).uniq, f.object.name_eq),
-                             { include_blank: true },
-                             { class: 'form-select' } %>
+      <div class="d-flex gap-4">
+        <div>
+          <%= f.label :name_eq, class: 'form-label' %>
+          <%= f.select :name_eq, options_for_select(InnerPerformance::Event.all.pluck(:name).uniq, f.object.name_eq),
+                                { include_blank: true },
+                                { class: 'form-select' } %>
+        </div>
+
+        <div>
+          <%= f.label :event_eq, class: 'form-label' %>
+          <%= f.select :event_eq, options_for_select(InnerPerformance::Event.all.pluck(:event).uniq, f.object.event_eq),
+                                  { include_blank: true },
+                                  { class: 'form-select' } %>
+        </div>
+      </div>
     </div>
 
     <div class="col-2 text-end">
@@ -25,4 +36,12 @@
   </tbody>
 </table>
 
-<%== pagy_nav(@pagy) if @pagy.pages > 1 %>
+<div style="text-align: center;">
+  <% if @current_page > 1 %>
+    <%= link_to "Prev Page", params.to_unsafe_h(page: @current_page - 1), style: "margin-right: 20px;" %>
+  <% end %>
+
+  <% if @events.size == InnerPerformance::EventsController::RESULTS_PER_PAGE %>
+    <%= link_to "Next Page", params.to_unsafe_h(page: @current_page + 1) %>
+  <% end %>
+</div>

data/app/views/inner_performance/events/show.html.erb

@@ -0,0 +1,32 @@
+<div class="row mb-5">
+  <div class="col-lg-6 col-12 mb-4 mb-lg-0">
+    <h1 class="h3"><%= @event.name %></h1>
+    <div class="text-secondary">
+      <%= @event.created_at %> • <code><%= @event.event %></code>
+    </div>
+  </div>
+
+  <div class="col-lg-auto col-12 d-flex ms-auto gap-5">
+    <div>
+      <div class="text-uppercase small text-secondary">Duration</div>
+      <span><%= number_to_human(@event.duration, units: { unit: 'ms' }) %></span>
+    </div>
+
+    <div>
+      <div class="text-uppercase small text-secondary">Db Runtime</div>
+      <span><%= number_to_human(@event.db_runtime, units: { unit: 'ms' }) %></span>
+    </div>
+  </div>
+</div>
+
+<% if InnerPerformance.configuration.traces_enabled %>
+  <h4 class="mb-3"><%= pluralize(@traces.count, 'trace') %></h4>
+  <% @traces.each do |trace| %>
+    <%= render trace, trace: trace %>
+  <% end %>
+<% else %>
+  <h4 class="mb-3">Traces</h4>
+  <div class="card">
+    <div class="card-body bg-light text-center text-secondary">Traces tracking is currently disabled.</div>
+  </div>
+<% end %>

data/app/views/inner_performance/traces/dbs/_db.html.erb

@@ -0,0 +1,10 @@
+<div class="card mb-3">
+  <div class="card-header d-flex">
+    <code><%= trace.name %></code>
+    <div class="ms-auto font-monospace small text-muted"><%= trace.duration %> ms</div>
+  </div>
+  <div class="card-body">
+    <div class="fw-semibold mb-1"><%= trace.payload_name %></div>
+    <div class="text-muted font-monospace small"><%= trace.payload_sql %></div>
+  </div>
+</div>

data/app/views/inner_performance/traces/views/_view.html.erb

@@ -0,0 +1,9 @@
+<div class="card mb-3">
+  <div class="card-header d-flex">
+    <code><%= trace.name %></code>
+    <div class="ms-auto font-monospace small text-muted"><%= trace.duration %> ms</div>
+  </div>
+  <div class="card-body">
+    <div class="text-muted font-monospace small"><%= trace.payload_identifier %></div>
+  </div>
+</div>

data/app/views/layouts/inner_performance/application.html.erb

@@ -5,9 +5,7 @@
   <%= csrf_meta_tags %>
   <%= csp_meta_tag %>
 
-  <%= stylesheet_link_tag    "inner_performance/application", media: "all" %>
-
-  <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
+  <%= tag.link rel: "stylesheet", href: frontend_static_path(:bootstrap, format: :css), nonce: content_security_policy_nonce %>
 </head>
 <body>
 

data/config/routes.rb

@@ -1,7 +1,11 @@
 # frozen_string_literal: true
 
 InnerPerformance::Engine.routes.draw do
-  resources :events, only: [:index]
+  resources :events, only: [:index, :show]
 
-  root to: 'dashboard#index'
+  root to: "dashboard#index"
+
+  scope :frontend, controller: :frontends, defaults: { version: InnerPerformance::VERSION.tr(".", "-") } do
+    get "static/:version/:stem", action: :static, as: :frontend_static
+  end
 end

data/db/migrate/20241123121600_create_inner_performance_events.rb

@@ -2,14 +2,14 @@
 
 class CreateInnerPerformanceEvents < ActiveRecord::Migration[7.1]
   def change
-    create_table :inner_performance_events, force: :cascade do |t|
-      t.string 'event'
-      t.string 'name'
-      t.decimal 'duration'
-      t.decimal 'db_runtime'
-      t.datetime 'created_at', null: false
-      t.datetime 'updated_at', null: false
-      t.text 'properties', default: '{}'
+    create_table(:inner_performance_events, force: :cascade) do |t|
+      t.string("event")
+      t.string("name")
+      t.decimal("duration")
+      t.decimal("db_runtime")
+      t.datetime("created_at", null: false)
+      t.datetime("updated_at", null: false)
+      t.text("properties", default: "{}")
     end
   end
 end

data/db/migrate/20241124111458_add_type_to_inner_performance_events.rb

@@ -2,6 +2,6 @@
 
 class AddTypeToInnerPerformanceEvents < ActiveRecord::Migration[7.1]
   def change
-    add_column :inner_performance_events, :type, :string
+    add_column(:inner_performance_events, :type, :string)
   end
 end

data/db/migrate/20241218082041_remove_default_value_from_inner_performance_events_properties.rb

@@ -0,0 +1,5 @@
+class RemoveDefaultValueFromInnerPerformanceEventsProperties < ActiveRecord::Migration[7.1]
+  def change
+    change_column_default(:inner_performance_events, :properties, nil)
+  end
+end

data/db/migrate/20250214162622_create_inner_performance_traces.rb

@@ -0,0 +1,13 @@
+class CreateInnerPerformanceTraces < ActiveRecord::Migration[7.1]
+  def change
+    create_table(:inner_performance_traces) do |t|
+      t.references(:event, type: :bigint, null: false, foreign_key: { to_table: :inner_performance_events })
+      t.string(:name)
+      t.string(:type)
+      t.json(:payload)
+      t.decimal(:duration)
+
+      t.timestamps
+    end
+  end
+end

data/lib/inner_performance/configuration.rb

@@ -2,18 +2,32 @@
 
 module InnerPerformance
   class Configuration
-    attr_accessor :sample_rates, :events_retention, :medium_duration_range, :ignore_rules
+    attr_accessor :sample_rates,
+      :events_retention,
+      :medium_duration_range,
+      :ignore_rules,
+      :cleanup_immediately,
+      :traces_enabled,
+      :ignored_event_names
 
     def initialize
       @sample_rates = {
-        'process_action.action_controller' => 2,
-        'perform.active_job' => 100
+        "process_action.action_controller" => 2,
+        "perform.active_job" => 100,
       }
       @events_retention = 1.week
       @medium_duration_range = [200, 999]
       @ignore_rules = [
-        proc { |event| rand(100) > InnerPerformance.configuration.sample_rates[event.name.to_s] },
-        proc { |event| (event.payload[:job]&.class&.name || '').include?('InnerPerformance') }
+        proc { |event| rand(100_000.0) > (InnerPerformance.configuration.sample_rates[event.name.to_s] * 1000) },
+        proc { |event| (event.payload[:job]&.class&.name || "").include?("InnerPerformance") },
+      ]
+      @cleanup_immediately = false
+      @traces_enabled = false
+      @ignored_event_names = [
+        "SCHEMA",
+        "TRANSACTION",
+        "ActiveRecord::InternalMetadata Load",
+        "ActiveRecord::SchemaMigration Load",
       ]
     end
   end

data/lib/inner_performance/current_request.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+# Heavily based on RailsPerformance implementation:
+# https://github.com/igorkasyanchuk/rails_performance/blob/master/lib/rails_performance/thread/current_request.rb
+module InnerPerformance
+  class CurrentRequest
+    attr_reader :request_id, :traces, :ignore
+    attr_accessor :data
+    attr_accessor :record
+
+    class << self
+      def init
+        Thread.current[:ip_current_request] ||= CurrentRequest.new(SecureRandom.hex(16))
+      end
+
+      def current
+        CurrentRequest.init
+      end
+
+      def cleanup
+        Thread.current[:ip_current_request] = nil
+      end
+    end
+
+    def initialize(request_id)
+      @request_id = request_id
+      @traces = []
+      @ignore = Set.new
+      @data = nil
+      @record = nil
+    end
+
+    def trace(options = {})
+      @traces << options.merge(time: Time.current)
+    end
+  end
+end

data/lib/inner_performance/engine.rb

@@ -5,11 +5,16 @@ module InnerPerformance
     isolate_namespace InnerPerformance
 
     config.generators do |g|
-      g.test_framework :rspec
+      g.test_framework(:rspec)
     end
 
-    initializer 'inner_performance.install' do
+    initializer "inner_performance.install" do
       InnerPerformance.install!
     end
+
+    initializer "inner_performance.assets.precompile" do |app|
+      # this initializer is only called when sprockets is in use
+      app.config.assets.precompile << "inner_performance_manifest.js"
+    end
   end
 end

data/lib/inner_performance/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module InnerPerformance
-  VERSION = '0.1.4'
+  VERSION = "0.3.0"
 end

data/lib/inner_performance.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
-require 'inner_performance/version'
-require 'inner_performance/engine'
-require 'inner_performance/configuration'
+require "inner_performance/version"
+require "inner_performance/engine"
+require "inner_performance/configuration"
 
-require 'ransack'
-require 'pagy'
+require_relative "inner_performance/current_request"
+
+require "ransack"
 
 module InnerPerformance
   class << self
@@ -18,7 +19,36 @@ module InnerPerformance
     end
 
     def install!
-      ActiveSupport::Notifications.subscribe 'process_action.action_controller' do |event|
+      ActiveSupport::Notifications.subscribe("render_template.action_view") do |event|
+        CurrentRequest.current.trace({
+          group: :view,
+          name: event.name,
+          payload: { identifier: event.payload[:identifier] },
+          duration: event.duration.round(2),
+        }) if InnerPerformance.configuration.traces_enabled
+      end
+
+      ActiveSupport::Notifications.subscribe("render_partial.action_view") do |event|
+        CurrentRequest.current.trace({
+          group: :view,
+          name: event.name,
+          payload: { identifier: event.payload[:identifier] },
+          duration: event.duration.round(2),
+        }) if InnerPerformance.configuration.traces_enabled
+      end
+
+      ActiveSupport::Notifications.subscribe("sql.active_record") do |event|
+        unless event.payload[:name].in?(InnerPerformance.configuration.ignored_event_names)
+          CurrentRequest.current.trace({
+            group: :db,
+            name: event.name,
+            payload: { name: event.payload[:name], sql: event.payload[:sql] },
+            duration: event.duration.round(2),
+          }) if InnerPerformance.configuration.traces_enabled
+        end
+      end
+
+      ActiveSupport::Notifications.subscribe("process_action.action_controller") do |event|
         if save_event?(event)
           InnerPerformance::SaveEventJob.perform_later(
             type: InnerPerformance::Events::ProcessActionActionController.name,
@@ -28,13 +58,16 @@ module InnerPerformance
             duration: event.duration,
             db_runtime: event.payload[:db_runtime],
             properties: {
-              view_runtime: event.payload[:view_runtime]
-            }
+              view_runtime: event.payload[:view_runtime],
+            },
+            traces: CurrentRequest.current.traces,
           )
         end
+
+        CurrentRequest.cleanup
       end
 
-      ActiveSupport::Notifications.subscribe 'perform.active_job' do |event|
+      ActiveSupport::Notifications.subscribe("perform.active_job") do |event|
         if save_event?(event)
           InnerPerformance::SaveEventJob.perform_later(
             type: InnerPerformance::Events::PerformActiveJob.name,
@@ -42,9 +75,12 @@ module InnerPerformance
             event: event.name,
             name: event.payload[:job].class.name,
             duration: event.duration,
-            db_runtime: event.payload[:db_runtime]
+            db_runtime: event.payload[:db_runtime],
+            traces: CurrentRequest.current.traces,
           )
         end
+
+        CurrentRequest.cleanup
       end
     end
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: inner_performance
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.3.0
 platform: ruby
 authors:
 - mbajur
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-26 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -24,20 +23,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 7.1.5
-- !ruby/object:Gem::Dependency
-  name: pagy
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 9.3.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 9.3.1
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +79,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Database-backed modest performance monitoring tool for your Rails app.
+description: Simple database-backed performance monitoring for your Rails app.
 email:
 - mbajur@gmail.com
 executables: []
@@ -103,11 +88,11 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
-- app/assets/config/inner_performance_manifest.js
-- app/assets/stylesheets/inner_performance/application.css
 - app/controllers/inner_performance/application_controller.rb
 - app/controllers/inner_performance/dashboard_controller.rb
 - app/controllers/inner_performance/events_controller.rb
+- app/controllers/inner_performance/frontends_controller.rb
+- app/frontend/inner_performance/vendor/bootstrap.min.css
 - app/helpers/inner_performance/application_helper.rb
 - app/jobs/inner_performance/application_job.rb
 - app/jobs/inner_performance/cleanup_job.rb
@@ -117,15 +102,25 @@ files:
 - app/models/inner_performance/event.rb
 - app/models/inner_performance/events/perform_active_job.rb
 - app/models/inner_performance/events/process_action_action_controller.rb
+- app/models/inner_performance/trace.rb
+- app/models/inner_performance/traces/db.rb
+- app/models/inner_performance/traces/view.rb
+- app/services/inner_performance/trace_for_insert_initializer.rb
 - app/views/inner_performance/dashboard/index.html.erb
 - app/views/inner_performance/events/_event.html.erb
 - app/views/inner_performance/events/index.html.erb
+- app/views/inner_performance/events/show.html.erb
+- app/views/inner_performance/traces/dbs/_db.html.erb
+- app/views/inner_performance/traces/views/_view.html.erb
 - app/views/layouts/inner_performance/application.html.erb
 - config/routes.rb
 - db/migrate/20241123121600_create_inner_performance_events.rb
 - db/migrate/20241124111458_add_type_to_inner_performance_events.rb
+- db/migrate/20241218082041_remove_default_value_from_inner_performance_events_properties.rb
+- db/migrate/20250214162622_create_inner_performance_traces.rb
 - lib/inner_performance.rb
 - lib/inner_performance/configuration.rb
+- lib/inner_performance/current_request.rb
 - lib/inner_performance/engine.rb
 - lib/inner_performance/version.rb
 - lib/tasks/inner_performance_tasks.rake
@@ -135,7 +130,6 @@ metadata:
   homepage_uri: https://github.com/mbajur
   source_code_uri: https://github.com/mbajur/inner_performance
   changelog_uri: https://github.com/mbajur/inner_performance
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -150,8 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.23
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
-summary: Database-backed modest performance monitoring tool for your Rails app.
+summary: Simple database-backed performance monitoring for your Rails app.
 test_files: []

data/app/assets/config/inner_performance_manifest.js

@@ -1 +0,0 @@
-//= link_directory ../stylesheets/inner_performance .css

data/app/assets/stylesheets/inner_performance/application.css

@@ -1,15 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
- * files in this directory. Styles in this file should be added after the last require_* statement.
- * It is generally better to create a new file per style scope.
- *
- *= require_tree .
- *= require_self
- */