sidekiq_insight 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8c2db5cf7bb0e99fe1af7f752c3ad0999cc865c7e030d9b1c78b59c183e226c
-  data.tar.gz: 0c5594584fb8682227d72669cd1942ff0175051582efaddcc49af15511ff877e
+  metadata.gz: 930b6bcd68d1c5dc1fde7fcae30c3cb6a3cd2474a97452b5010938ff035a1bd4
+  data.tar.gz: e05a5f5fc51daab73546c665440ceee09b501365dabcdcac012a7484436269c7
 SHA512:
-  metadata.gz: 5c1be3e9a2f1101c4ecd2fe32080d4c7f42dc47f7652fd27735e93e63a181ce5b12f75bb720f9b6e061e97f148e90cf3a6dd817c7b099e42721edc6dc61fb087
-  data.tar.gz: ed781d6af149092780b7051ebf7d4456b8444d84424245846407294a622daa4bd57a30230633b072b47de7d2ffed9024e10b3bfd43693e8a3f283674548a2016
+  metadata.gz: f109133f4a1783e2540881b0f3645303a1dbea628a424a64e65484fa907710e1a5678c3ae336a08336754dcfa9f8e40a9d3614ec3af35b66a9289f29435a9d28
+  data.tar.gz: 53c8919b50ae46727fb6873a25c3277190e367c4527982cecb1080ba16706e09c03e6973c710ae82b8d9c163ed16993027d4024e0e1f67f66ede05796229118b

data/app/controllers/sidekiq_insight/graphs_controller.rb

@@ -26,13 +26,19 @@ module SidekiqInsight
     private
 
     def build_series(metric_sym)
-      data = {}
-      SidekiqInsight.storage.top_jobs(20).each do |job|
+      points = []
+
+      SidekiqInsight.storage.top_jobs(50).each do |job|
         samples = SidekiqInsight.storage.recent(job[:key], 200)
-        series = samples.reverse.map { |s| [s[:started_at], s[metric_sym].to_f] }
-        data[job[:key]] = series
+
+        samples.each do |s|
+          points << [s[:started_at], s[metric_sym].to_f]
+        end
       end
-      data
+
+      points.sort_by! { |t, _| t }
+
+      points
     end
   end
 end

data/app/views/layouts/sidekiq_insight/sidekiq_insight.html.erb

@@ -32,6 +32,8 @@
         <li class="nav-item"><a class="nav-link" href="<%= sidekiq_insight.cpu_path %>">CPU</a></li>
         <li class="nav-item"><a class="nav-link" href="<%= sidekiq_insight.rss_path %>">Memory</a></li>
         <li class="nav-item"><a class="nav-link" href="<%= sidekiq_insight.leaks_path %>">Leak Detector</a></li>
+        <li class="nav-item"><a class="nav-link" href="<%= sidekiq_insight.wall_path %>">Wall Time (ms)</a></li>
+
       </ul>
     </div>
   </div>

data/app/views/sidekiq_insight/dashboard/index.html.erb

@@ -6,43 +6,55 @@
     <div class="col-md-8">
       <div class="card shadow-sm h-100">
         <div class="card-header bg-primary text-white d-flex justify-content-between align-items-center">
-          <h4 class="mb-0">Top Jobs by Avg CPU</h4>
-          <span class="badge bg-light text-primary">
+          <h4 class="mb-0"><i class="bi bi-speedometer2"></i> Top Jobs by Avg CPU</h4>
+          <span class="badge bg-light text-primary fs-6">
             <%= @jobs.count %> jobs
           </span>
         </div>
 
         <div class="card-body p-0">
-          <table class="table table-hover table-striped mb-0">
+
+          <table class="table table-hover table-striped table-bordered mb-0 align-middle">
             <thead class="table-light">
               <tr>
-                <th>Job</th>
-                <th>Count</th>
-                <th>Avg CPU (ms)</th>
-                <th>Avg Mem (KB)</th>
-                <th></th>
+                <th style="width: 40%;">Job</th>
+                <th class="text-center" style="width: 10%">Runs</th>
+                <th class="text-center" style="width: 15%">Avg CPU</th>
+                <th class="text-center" style="width: 15%">Avg Mem</th>
+                <th class="text-center" style="width: 10%;">Action</th>
               </tr>
             </thead>
 
             <tbody>
               <% @jobs.each do |j| %>
                 <tr>
-                  <td class="fw-semibold"><%= j[:key] %></td>
-                  <td><%= j[:count] %></td>
-                  <td>
-                    <span class="badge bg-info text-dark">
-                      <%= number_with_precision(j[:avg_cpu_ms], precision: 2) %>
+                  <!-- JOB NAME -->
+                  <td class="fw-semibold text-break"><%= j[:key] %></td>
+
+                  <!-- RUNS -->
+                  <td class="text-center">
+                    <span class="badge bg-secondary"><%= j[:count] %></span>
+                  </td>
+
+                  <!-- AVG CPU -->
+                  <td class="text-center">
+                    <span class="badge bg-info text-dark px-3 py-2">
+                      <%= number_with_precision(j[:avg_cpu_ms], precision: 2) %> ms
                     </span>
                   </td>
-                  <td>
-                    <span class="badge bg-success">
-                      <%= number_with_precision(j[:avg_mem_kb], precision: 2) %>
+
+                  <!-- AVG MEMORY -->
+                  <td class="text-center">
+                    <span class="badge bg-success px-3 py-2">
+                      <%= number_with_precision(j[:avg_mem_kb], precision: 2) %> KB
                     </span>
                   </td>
-                  <td>
-                    <a class="btn btn-sm btn-outline-primary"
+
+                  <!-- SHOW BUTTON -->
+                  <td class="text-center">
+                    <a class="btn btn-sm btn-outline-primary px-3"
                        href="<%= sidekiq_insight.job_path(job: j[:key]) %>">
-                       View
+                      Show
                     </a>
                   </td>
                 </tr>
@@ -54,28 +66,32 @@
       </div>
     </div>
 
+
     <!-- ================= LEAK ALERTS ================= -->
     <div class="col-md-4">
       <div class="card shadow-sm h-100">
-        <div class="card-header bg-danger text-white">
-          <h4 class="mb-0">Leak Alerts</h4>
+        <div class="card-header bg-danger text-white d-flex justify-content-between align-items-center">
+          <h4 class="mb-0"><i class="bi bi-exclamation-triangle"></i> Leak Alerts</h4>
         </div>
 
         <div class="card-body">
+
           <% if @alerts.present? %>
-            <ul class="list-group">
+            <ul class="list-group shadow-sm">
               <% @alerts.each do |a| %>
                 <li class="list-group-item d-flex justify-content-between align-items-center">
                   <strong><%= a[:job] %></strong>
-                  <span class="badge bg-danger">Leak suspected</span>
+                  <span class="badge bg-danger px-3">⚠ Leak suspected</span>
                 </li>
               <% end %>
             </ul>
           <% else %>
-            <div class="text-center text-muted py-3">
-              No recent leak alerts 🔍
+            <div class="text-center text-muted py-4">
+              <i class="bi bi-check2-circle fs-1 text-success"></i>
+              <div class="mt-2">No recent leak alerts</div>
             </div>
           <% end %>
+
         </div>
       </div>
     </div>

data/app/views/sidekiq_insight/graphs/_chart.html.erb

@@ -4,37 +4,11 @@
   </div>
 
   <div class="card-body">
-    <canvas id="<%= dom_id %>" height="120"></canvas>
+    <%= line_chart data,
+          height: "260px",
+          points: true,
+          download: true,
+          legend: true,
+          curve: true %>
   </div>
 </div>
-
-<script>
-document.addEventListener("DOMContentLoaded", function () {
-  const ctx = document.getElementById("<%= dom_id %>").getContext("2d");
-
-  const datasets = [
-    <% data.each do |job_key, series| %>
-      {
-        label: "<%= job_key %>",
-        data: <%= series.map { |t, v| { x: t, y: v } }.to_json %>,
-        borderWidth: 2,
-        tension: 0.3,
-      },
-    <% end %>
-  ];
-
-  new Chart(ctx, {
-    type: 'line',
-    data: { datasets: datasets },
-    options: {
-      responsive: true,
-      parsing: false,
-      plugins: { legend: { position: "bottom" } },
-      scales: {
-        x: { type: 'time', time: { unit: 'minute' } },
-        y: { beginAtZero: true }
-      }
-    }
-  });
-});
-</script>

data/app/views/sidekiq_insight/graphs/cpu.html.erb

@@ -2,9 +2,7 @@
   <h2 class="mb-4 text-primary fw-bold">CPU Usage — Top Jobs</h2>
 
   <div class="card mb-4 shadow-sm">
-    <div class="card-header bg-dark text-white">
-      Job Statistics
-    </div>
+    <div class="card-header bg-dark text-white">Job Statistics</div>
 
     <div class="card-body p-0">
       <table class="table table-striped mb-0">
@@ -15,6 +13,7 @@
             <th>Runs</th>
           </tr>
         </thead>
+
         <tbody>
           <% @jobs.each do |job| %>
             <tr>
@@ -28,6 +27,9 @@
     </div>
   </div>
 
-  <%= render partial: "chart",
-             locals: { title: "CPU Time (ms)", dom_id: "cpu_chart", data: @cpu_chart } %>
+  <%= render "chart",
+             title: "CPU Time (ms)",
+             dom_id: "cpu_chart",
+             data: @cpu_chart %>
 </div>
+

data/app/views/sidekiq_insight/graphs/leaks.html.erb

@@ -7,9 +7,7 @@
     </div>
   <% else %>
     <div class="card shadow-sm">
-      <div class="card-header bg-danger text-white">
-        Leaking Jobs
-      </div>
+      <div class="card-header bg-danger text-white">Leaking Jobs</div>
 
       <div class="card-body p-0">
         <table class="table table-striped mb-0">
@@ -21,6 +19,7 @@
               <th>Runs</th>
             </tr>
           </thead>
+
           <tbody>
             <% @leak_jobs.each do |job| %>
               <tr class="table-danger">

data/app/views/sidekiq_insight/graphs/rss.html.erb

@@ -1,21 +1,16 @@
 <div class="container py-4">
+  <h2 class="mb-4 text-success fw-bold">RSS Memory Usage — Top Jobs</h2>
 
-  <h2 class="mb-4 text-success fw-bold">
-    RSS Memory Usage — Top Jobs
-  </h2>
-
-  <!-- Jobs Table -->
   <div class="card mb-4 shadow-sm">
-    <div class="card-header bg-success text-white">
-      Job Memory Summary
-    </div>
+    <div class="card-header bg-success text-white">Job Memory Summary</div>
 
     <div class="card-body p-0">
-      <table class="table table-hover table-striped mb-0">
+      <table class="table table-striped table-hover mb-0">
         <thead class="table-light">
           <tr>
             <th>Job</th>
-            <th>Average RSS (KB)</th>
+            <th>Avg RSS (ms)</th>
+            <th>Avg CPU (ms)</th>
             <th>Runs</th>
           </tr>
         </thead>
@@ -24,7 +19,8 @@
           <% @jobs.each do |job| %>
             <tr>
               <td><strong><%= job[:key] %></strong></td>
-              <td><%= job[:avg_mem_kb].round(2) %></td>
+              <td><%= job[:avg_mem_kb].round(2) %> KB</td>
+              <td><%= job[:avg_cpu_ms].round(2) %> ms</td>
               <td><%= job[:count] %></td>
             </tr>
           <% end %>
@@ -33,10 +29,8 @@
     </div>
   </div>
 
-  <!-- Chart -->
-  <%= render partial: "chart",
-             locals: { title: "RSS Memory (KB)",
-                       dom_id: "rss_chart",
-                       data: @rss_chart } %>
-
+  <%= render "chart",
+             title: "RSS Memory (KB)",
+             dom_id: "rss_chart",
+             data: @rss_chart %>
 </div>

data/app/views/sidekiq_insight/graphs/wall.html.erb

@@ -1,23 +1,28 @@
 <div class="container py-4">
-  <h2 class="mb-4 text-info fw-bold">Wall Time</h2>
+  <h2 class="mb-4 text-info fw-bold">Wall Time Analysis</h2>
 
-  <div class="card mb-3 shadow-sm">
+  <div class="card mb-4 shadow-sm">
     <div class="card-header bg-info text-white">
-      Job Wall Time Summary
+      Wall Time Summary (Last 200 Samples)
     </div>
 
     <div class="card-body p-0">
-      <table class="table table-bordered mb-0">
+      <table class="table table-striped table-hover mb-0">
         <thead class="table-light">
           <tr>
             <th>Job</th>
+            <th>Avg RSS (ms)</th>
+            <th>Avg CPU (ms)</th>
             <th>Runs</th>
           </tr>
         </thead>
+
         <tbody>
           <% @jobs.each do |job| %>
             <tr>
               <td><strong><%= job[:key] %></strong></td>
+              <td><%= job[:avg_mem_kb].round(2) %> KB</td>
+              <td><%= job[:avg_cpu_ms].round(2) %> ms</td>
               <td><%= job[:count] %></td>
             </tr>
           <% end %>
@@ -26,6 +31,8 @@
     </div>
   </div>
 
-  <%= render partial: "chart",
-             locals: { title: "Wall Time (ms)", dom_id: "wall_chart", data: @wall_chart } %>
+  <%= render "chart",
+             title: "Wall Time Trend (ms)",
+             dom_id: "wall_chart",
+             data: @wall_chart %>
 </div>

data/lib/sidekiq_insight/request_middleware.rb

@@ -7,19 +7,22 @@ module SidekiqInsight
     end
 
     def call(env)
-      pm_before = GetProcessMem.new
-      rss_before = pm_before.mb * 1024.0
-      cpu_before = Process.clock_gettime(Process::CLOCK_PROCESS_CPUTIME_ID)
-      t_before = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      # ---- BEFORE REQUEST ----
+      pm_before   = GetProcessMem.new
+      rss_before  = pm_before.mb * 1024.0
+      cpu_before  = Process.clock_gettime(Process::CLOCK_PROCESS_CPUTIME_ID)
+      t_before    = Process.clock_gettime(Process::CLOCK_MONOTONIC)
 
       status, headers, body = @app.call(env)
 
-      t_after = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      # ---- AFTER REQUEST ----
+      t_after   = Process.clock_gettime(Process::CLOCK_MONOTONIC)
       cpu_after = Process.clock_gettime(Process::CLOCK_PROCESS_CPUTIME_ID)
-      pm_after = GetProcessMem.new
+      pm_after  = GetProcessMem.new
       rss_after = pm_after.mb * 1024.0
 
       req = Rack::Request.new(env)
+
       sample = {
         path: req.path,
         method: req.request_method,
@@ -30,6 +33,7 @@ module SidekiqInsight
         rss_kb: (rss_after - rss_before)
       }
 
+      # 🚨 FIX — separate HTTP bucket
       SidekiqInsight.storage.push_sample("__http__#{req.path}", sample)
 
       [status, headers, body]

data/lib/sidekiq_insight/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SidekiqInsight
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_insight
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - mrmalvi