Display historical count metrics in ui

bin/console

@@ -6,8 +6,8 @@ require 'outboxer'
 require 'sidekiq'
 
 environment = ENV['RAILS_ENV'] || 'development'
-config = Outboxer::Database.config(environment: environment)
-Outboxer::Database.connect(config: config.merge(pool: 1))
+config = Outboxer::Database.config(environment: environment, pool: 1)
+Outboxer::Database.connect(config: config)
 
 Sidekiq.configure_client do |config|
   redis_url = ENV['REDIS_URL'] || 'redis://localhost:6379/0'

bin/outboxer_published_messages_deleter

@@ -34,7 +34,7 @@ environment = ENV['RAILS_ENV'] || 'development'
 
 logger = Outboxer::Logger.new($stdout, level: log_level)
 
-db_config = Outboxer::Database.config(environment: environment)
+db_config = Outboxer::Database.config(environment: environment, pool: 1)
 Outboxer::Database.connect(config: db_config, logger: logger)
 
 $running = true

lib/outboxer/messages.rb

@@ -283,6 +283,9 @@ def metrics(current_utc_time: Time.now.utc)
         metrics[status][:throughput] = grouped_message.throughput
       end
 
+      metrics[:published][:count][:total] =
+        metrics[:published][:count][:historic] + metrics[:published][:count][:current]
+
       metrics
     end
   end

lib/outboxer/web/views/home.erb

@@ -9,9 +9,11 @@
                     <thead>
                         <tr>
                             <th scope="col">Status</th>
-                            <th scope="col">Count</th>
-                            <th scope="col">Throughput (per second)</th>
-                            <th scope="col">Latency (seconds)</th>
+                            <th scope="col">Current count</th>
+                            <th scope="col">Throughput</th>
+                            <th scope="col">Latency</th>
+                            <th scope="col">Historic count</th>
+                            <th scope="col">Total count</th>
                         </tr>
                     </thead>
                     <tbody>
@@ -25,6 +27,8 @@
                                 <td><%= messages_metrics[status.to_sym][:count][:current] %></td>
                                 <td><%= messages_metrics[status.to_sym][:throughput] %></td>
                                 <td><%= messages_metrics[status.to_sym][:latency] %></td>
+                                <td><%= messages_metrics[status.to_sym][:count][:historic] || '-' %></td>
+                                <td><%= messages_metrics[status.to_sym][:count][:total] || '-' %></td>
                             </tr>
                         <% end %>
                     </tbody>

spec/lib/outboxer/messages/metrics_spec.rb

@@ -72,7 +72,7 @@ module Outboxer
               throughput: 0,
             },
             published: {
-              count: { current: 2, historic: 500 },
+              count: { historic: 500, current: 2, total: 502 },
               latency: (current_utc_time - oldest_published_message.updated_at.utc).to_i,
               throughput: 0,
             },
@@ -93,7 +93,7 @@ module Outboxer
             queued: { count: { current: 0 }, latency: 0, throughput: 0 },
             dequeued: { count: { current: 0 }, latency: 0, throughput: 0 },
             publishing: { count: { current: 0 }, latency: 0, throughput: 0 },
-            published: { count: { current: 0, historic: 0 }, latency: 0, throughput: 0 },
+            published: { count: { historic: 0, current: 0, total: 0 }, latency: 0, throughput: 0 },
             failed: { count: { current: 0 }, latency: 0, throughput: 0 }
           )
         end
@@ -107,7 +107,7 @@ module Outboxer
             queued: { count: { current: 0 }, latency: 0, throughput: 0 },
             dequeued: { count: { current: 0 }, latency: 0, throughput: 0 },
             publishing: { count: { current: 0 }, latency: 0, throughput: 0 },
-            published: { count: { current: 0, historic: 0 }, latency: 0, throughput: 0 },
+            published: { count: { historic: 0, current: 0, total: 0 }, latency: 0, throughput: 0 },
             failed: { count: { current: 0 }, latency: 0, throughput: 0 }
           )
         end