solid_apm 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6233330338e9044097e1315840f1bbc7f2cdeb1677df3dac3261c2a50666046
-  data.tar.gz: 37f306cf60295e74485092216c4bdbe2ba2c824ce08d279424e15c631543b33f
+  metadata.gz: f8623eafef426a98627eef8810538b4ad1100a125eadcdb99bf2db0df21cadc1
+  data.tar.gz: 386f31259d69c1ae17a182c1b6faf6368b8802c2bccf2985fa9e7853f9fc3ddb
 SHA512:
-  metadata.gz: 18d46f142b8bc401acc9dcd3417c9782d04a6e2beabda8d3c7dbafd62429f8bcf13e69ecf2e7fe51049f17da8b35411c3b1239c3f9476950590917990d0c7aba
-  data.tar.gz: a0140e3fdb51254f8c615ed7cd4002f851d0c1ef11b71d408c4966581b1638f475ada593977a53761631493201e53641df382b9c8d9c10598935fe7ae8b50da3
+  metadata.gz: 2cc471473ae3e41df512e12b6183c0410aaae6325f8a21db2f78e6f84caf22824b503e411eaa8f4508b40250511c9c4ea597f7de2929693ae30959977f6e4097
+  data.tar.gz: 03e17274e463f8e60fe50c9d22220a5f930570da6000802d227a9da2f28b4a51e84ba06af1009d6e32479f2a54a3ea95c21999ec2b06d0f18d00d94ecd17c5aa

data/README.md

@@ -3,8 +3,8 @@
 # SolidApm
 Rails engine to manage APM data without using a third party service.
 
-<img src="./docs/img.png" width="400px">
-<img src="./docs/img_1.png" width="400px">
+<img src="./docs/img.png" width="600px">
+<img src="./docs/img_1.png" width="600px">
 
 ## Installation
 
@@ -70,7 +70,7 @@ Contribution directions go here.
 
 ```shell
 gem bump -v minor
-bundle install && git add . && git commit --amend --no-edit
+bundle install && git add Gemfile.lock && git commit --amend --no-edit && git push
 gem tag -p
 ```
 

data/app/assets/javascripts/solid_apm/controllers/transaction-chart_controller.js

@@ -28,6 +28,9 @@ window.Stimulus.register('transaction-chart',
       xaxis: {
         type: 'datetime'
       },
+      dataLabels: {
+        enabled: false
+      },
       tooltip: {
         x: {
           formatter: function (value) {
@@ -37,9 +40,16 @@ window.Stimulus.register('transaction-chart',
       }
     }
 
-    let path = 'transactions/count_by_minutes'
+    let path = window.location.pathname.includes('transactions') ? 'count_by_minutes' : 'transactions/count_by_minutes';
+    path = path + "?";
     if (this.nameValue) {
-      path = path + "?name=" + encodeURIComponent(this.nameValue);
+      path = path + "name=" + encodeURIComponent(this.nameValue);
+    }
+
+    const fromValue = document.querySelector('input[name="from_value"]').value
+    const fromUnit = document.querySelector('select[name="from_unit"]').value;
+    if (fromValue && fromUnit) {
+      path = path + "&from_value=" + fromValue + "&from_unit=" + fromUnit;
     }
 
     fetch(path)

data/app/controllers/solid_apm/transactions_controller.rb

@@ -2,18 +2,20 @@
 
 module SolidApm
   class TransactionsController < ApplicationController
-    TransactionAggregation = Struct.new(:name, :tmp, :latency, :impact)
+    TransactionAggregation = Struct.new(:name, :tmp, :latency, :percentile_95, :impact)
 
     def index
-      @aggregated_transactions = Transaction.where(created_at: 1.hour.ago..).group_by(&:name)
+      @aggregated_transactions = Transaction.where(created_at: from_to_range).group_by(&:name)
       @aggregated_transactions.transform_values! do |transactions|
         latency = transactions.map(&:duration).sum / transactions.size
-        tmp = transactions.size.to_f / 60
+        tmp = transactions.size.to_f / ((from_to_range.end - from_to_range.begin) / 60).to_i
         impact = latency * tmp
+        percentile_95 = transactions[transactions.size * 0.95].duration
         TransactionAggregation.new(
           transactions.first.name,
           tmp,
           latency,
+          percentile_95,
           impact
         )
       end
@@ -24,7 +26,8 @@ module SolidApm
       # Normalize impact 0-100
       @aggregated_transactions.each do |_, aggregation|
         normalized_impact = ((aggregation.impact - min_impact) / (max_impact - min_impact)) * 100
-        aggregation.impact = normalized_impact.to_i
+        normalized_impact = 0 if normalized_impact.nan?
+        aggregation.impact = normalized_impact.to_i || 0
       end
       @aggregated_transactions = @aggregated_transactions.sort_by { |_, v| -v.impact }.to_h
     end
@@ -45,7 +48,7 @@ module SolidApm
 
     def count_by_minutes
       scope = Transaction.all.order(timestamp: :desc)
-                 .where(created_at: 1.hour.ago..)
+                 .where(created_at: from_to_range)
 
       if params[:name].present?
         scope = scope.where(name: params[:name])
@@ -54,5 +57,15 @@ module SolidApm
       render json: scope.group_by { |t| t.created_at.beginning_of_minute }
            .transform_values!(&:count)
     end
+
+    private
+
+    def from_to_range
+      params[:from_value] ||= 60
+      params[:from_unit] ||= 'minutes'
+      from = params[:from_value].to_i.public_send(params[:from_unit].to_sym).ago
+      to = Time.current
+      (from..to)
+    end
   end
 end

data/app/views/solid_apm/transactions/index.html.erb

@@ -1,6 +1,25 @@
 <h1 class="title">Transactions</h1>
 
-<h2 class="title is-4 has-text-grey">Last hour</h2>
+<%= form_with path: transactions_path, method: :get do |f| %>
+  <div class="is-flex is-flex-direction-row is-justify-content-center is-align-items-center" style="gap: 1em">
+    <%= f.label 'From' %>
+    <%= f.number_field :from_value, value: params[:from_value] || 60, min: 1, class: 'input', style: 'width: 6em' %>
+    <div class="select">
+      <%= f.select :from_unit, {
+        "minutes" => "minutes",
+        "hours" => "hours",
+        "days" => "days",
+        "weeks" => "weeks",
+        "months" => "months",
+        "years" => "years"
+      }, {selected: params[:from_unit] || 'minutes' } %>
+    </div>
+    <span class="has-text-white-ter">ago</span>
+    <b>→</b>
+    <span class="has-text-white-ter">now</span>
+    <%= f.submit 'Apply', class: 'button' %>
+  </div>
+<% end %>
 <div data-controller="transaction-chart"></div>
 
 <table class="table is-fullwidth">
@@ -9,6 +28,7 @@
       <th>Name</th>
       <th>Latency</th>
       <th>tmp</th>
+      <th>95p</th>
       <th>Impact</th>
     </tr>
   </thead>
@@ -18,6 +38,7 @@
       <td><%= link_to name, transaction_by_name_path(name) %></td>
       <td><%= aggregation.latency.round(2) %> ms</td>
       <td><%= aggregation.tmp.round(2) %></td>
+      <td><%= aggregation.percentile_95.round(2) %> ms</td>
       <td>
         <progress class="progress is-warning" value="<%= aggregation.impact %>" max="100"></progress>
       </td>

data/lib/solid_apm/version.rb

@@ -1,3 +1,3 @@
 module SolidApm
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solid_apm
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Jean-Francis Bastien
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-14 00:00:00.000000000 Z
+date: 2024-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack