solid_apm 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97cdcafb0a31dea64161262374dcfd274cf450836668be0df7f4f5b5d7e70f58
-  data.tar.gz: bd0af22ac948642e3ecb63c9b4528011ddc7df7f9ea997caee806687eba7f25b
+  metadata.gz: 8c079a73239f6410c8fba60e90a060136ea999c6887ff594104efd27ff90cb6e
+  data.tar.gz: c7125efd2a3ba768d5b0b2187d193195b5f8b33ae60aca5b2d84c25299cb68a5
 SHA512:
-  metadata.gz: 9c65419c5facee2826defd7428aff0c175e9a982879b4572867370e8b0e0acd265d33f3471c111dbcf64ec192ee9fbc34290f481ad2e79be7e10f2dfb71b9408
-  data.tar.gz: 000e091daa7ef33222824974c216d9cc4544d6be37ba6640c3eee87d18c16ced922c7b946d6368a95976f010f0cf6871892afaa229b6153ad6ba32be59f7b84c
+  metadata.gz: 82077863bb4ca5ed2b8d1fa9be8bb211b9849dba0fde4dbee648415d136aba80aa86c8873cb7128accbf0fa86c8f54fd60137aea993ff15f08ecb6fed35faeb8
+  data.tar.gz: 4e912fa0297c355534a4ab4904c863f25612191ed8d3f18d8ba64b9f2f25413ea33d146942ffab0c949ec7bee6fe2d05f83686e1a5b9b397c2f41b831cef3fcc

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

@@ -16,7 +16,6 @@ window.Stimulus.register('transaction-chart',
     static values = { name: String }
 
     connect() {
-    console.log('Connected')
     var options = {
       chart: {
         type: 'bar',
@@ -40,8 +39,7 @@ window.Stimulus.register('transaction-chart',
       }
     }
 
-    let path = window.location.pathname.includes('transactions') ? 'count_by_minutes' : 'transactions/count_by_minutes';
-    path = path + "?";
+    let path = "count_time_aggregations?";
     if (this.nameValue) {
       path = path + "name=" + encodeURIComponent(this.nameValue);
     }
@@ -52,6 +50,9 @@ window.Stimulus.register('transaction-chart',
       path = path + "&from_value=" + fromValue.value + "&from_unit=" + fromUnit.value;
     }
 
+    const base = window.location.pathname.split('/transactions')[0];
+    path = base + "/transactions/" + path;
+    path = path.replace("//", "/");
     fetch(path)
       .then(response => response.json())
       .then(data => {

data/app/controllers/solid_apm/transactions_controller.rb

@@ -46,16 +46,16 @@ module SolidApm
       render json: @spans
     end
 
-    def count_by_minutes
+    def count_time_aggregations
       scope = Transaction.all.order(timestamp: :desc)
                  .where(created_at: from_to_range)
 
+
       if params[:name].present?
         scope = scope.where(name: params[:name])
       end
 
-      render json: scope.group_by { |t| t.created_at.beginning_of_minute }
-           .transform_values!(&:count)
+      render json: aggregate(scope.select(:id, :created_at).find_each, from_to_range, intervals_count: 20).transform_values!(&:count)
     end
 
     private
@@ -67,5 +67,14 @@ module SolidApm
       to = Time.current
       (from..to)
     end
+
+    def aggregate(items, range, intervals_count: 20)
+      start_time = range.begin
+      end_time = range.end
+      time_range_in_seconds = (end_time - start_time).to_i
+      time_interval_duration_in_seconds = (time_range_in_seconds / intervals_count.to_f).round
+
+      items.chunk { |item| Time.zone.at((item.created_at.to_i) / time_interval_duration_in_seconds * time_interval_duration_in_seconds, 0) }.to_h
+    end
   end
 end

data/config/routes.rb

@@ -2,9 +2,7 @@ SolidApm::Engine.routes.draw do
   root 'transactions#index'
 
   get 'transactions', to: 'transactions#index'
-  get 'transactions/count_by_minutes',
-      to: 'transactions#count_by_minutes',
-      as: 'transactions_count_by_minutes',
+  get 'transactions/count_time_aggregations',
       default: { format: 'json' }
 
   get 'transactions/:id', to: 'transactions#show', as: 'transaction', constraints: { id: /\d+/ }

data/lib/solid_apm/version.rb

@@ -1,3 +1,3 @@
 module SolidApm
-  VERSION = "0.4.4"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solid_apm
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Jean-Francis Bastien
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-15 00:00:00.000000000 Z
+date: 2024-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.16
 signing_key: 
 specification_version: 4
 summary: SolidApm is a DB base engine for Application Performance Monitoring.