solid_apm 0.4.4 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97cdcafb0a31dea64161262374dcfd274cf450836668be0df7f4f5b5d7e70f58
-  data.tar.gz: bd0af22ac948642e3ecb63c9b4528011ddc7df7f9ea997caee806687eba7f25b
+  metadata.gz: d90f515a42a990a08a88c44bb8146dfe87176c81ad8584bcf7e4a29083316c2e
+  data.tar.gz: a92fd226a1a96882700cea025afa4ba1d8d2356cce2dd621701149e612e9fe2c
 SHA512:
-  metadata.gz: 9c65419c5facee2826defd7428aff0c175e9a982879b4572867370e8b0e0acd265d33f3471c111dbcf64ec192ee9fbc34290f481ad2e79be7e10f2dfb71b9408
-  data.tar.gz: 000e091daa7ef33222824974c216d9cc4544d6be37ba6640c3eee87d18c16ced922c7b946d6368a95976f010f0cf6871892afaa229b6153ad6ba32be59f7b84c
+  metadata.gz: 3d0af12fc21edcb8117da1f466b440c0241ccb6995f174abf50e09e77e7fa8a32a36b1c0aa2559d55af6238dce318101bd42e38f06536f28d75499c8bdbc0a11
+  data.tar.gz: 5b0829667356213cda1c572c8386f902b2054143bf66b2252f2e047d9590345acaea13c4902b7dee3c04b42e6dbe73f2449d7a30197afdf5a3989628d3d1ef8b

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.6.0"
 end

metadata

@@ -1,69 +1,68 @@
 --- !ruby/object:Gem::Specification
 name: solid_apm
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.6.0
 platform: ruby
 authors:
 - Jean-Francis Bastien
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-15 00:00:00.000000000 Z
+date: 2025-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '7.1'
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '7.1'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '7.1'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '7.1'
 description: SolidApm allow you to monitor your application without any external service.
@@ -114,7 +113,6 @@ metadata:
   homepage_uri: https://github.com/Bhacaz/solid_apm
   source_code_uri: https://github.com/Bhacaz/solid_apm
   changelog_uri: https://github.com/Bhacaz/solid_apm/releases
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -129,8 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: SolidApm is a DB base engine for Application Performance Monitoring.
 test_files: []