rails_event_viewer 0.3.0 → 0.4.0

data/app/views/rails_event_viewer/groups/index.html.erb

@@ -40,7 +40,7 @@
           <path fill-rule="evenodd" d="M8.257 3.099c.765-1.36 2.722-1.36 3.486 0l5.58 9.92c.75 1.334-.213 2.98-1.742 2.98H4.42c-1.53 0-2.493-1.646-1.743-2.98l5.58-9.92zM11 13a1 1 0 11-2 0 1 1 0 012 0zm-1-8a1 1 0 00-1 1v3a1 1 0 002 0V6a1 1 0 00-1-1z" clip-rule="evenodd" />
         </svg>
         <div class="ml-3">
-          <h3 class="text-sm font-medium text-yellow-800">No group keys configured</h3>
+          <h2 class="text-sm font-medium text-yellow-800">No group keys configured</h2>
           <p class="mt-1 text-sm text-yellow-700">
             Configure group keys in your initializer:
             <code class="bg-yellow-100 px-1 rounded">config.group_keys = [:request_id, :order_id]</code>
@@ -49,17 +49,17 @@
       </div>
     </div>
   <% elsif @groups.any? %>
-    <div class="bg-white shadow rounded-lg overflow-hidden">
+    <div class="bg-white shadow rounded-lg overflow-x-auto">
       <table class="min-w-full divide-y divide-gray-200">
         <thead class="bg-gray-50">
           <tr>
-            <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
+            <th scope="col" class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
               <%= @selected_key.to_s.titleize %>
             </th>
-            <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Events</th>
-            <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">First Event</th>
-            <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Last Event</th>
-            <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Duration</th>
+            <th scope="col" class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Events</th>
+            <th scope="col" class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">First Event</th>
+            <th scope="col" class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Last Event</th>
+            <th scope="col" class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Duration</th>
           </tr>
         </thead>
         <tbody class="bg-white divide-y divide-gray-200">
@@ -106,7 +106,7 @@
       <svg class="mx-auto h-12 w-12 text-gray-400" fill="none" viewBox="0 0 24 24" stroke="currentColor" aria-hidden="true">
         <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 11H5m14 0a2 2 0 012 2v6a2 2 0 01-2 2H5a2 2 0 01-2-2v-6a2 2 0 012-2m14 0V9a2 2 0 00-2-2M5 11V9a2 2 0 012-2m0 0V5a2 2 0 012-2h6a2 2 0 012 2v2M7 7h10" />
       </svg>
-      <h3 class="mt-2 text-sm font-medium text-gray-900">No groups found</h3>
+      <h2 class="mt-2 text-sm font-medium text-gray-900">No groups found</h2>
       <p class="mt-1 text-sm text-gray-500">
         No events with <code class="bg-gray-100 px-1 rounded"><%= @selected_key %></code> in their <%= @source %> data.
       </p>

data/app/views/rails_event_viewer/groups/show.html.erb

@@ -4,7 +4,7 @@
   <!-- Header -->
   <div class="flex items-center justify-between">
     <div class="flex items-center space-x-4">
-      <%= link_to rails_event_viewer.groups_path(key: @key, source: @source), class: "text-gray-400 hover:text-gray-600", aria: { label: "Back to groups" } do %>
+      <%= link_to rails_event_viewer.groups_path(key: @key, source: @source), class: "text-gray-500 hover:text-gray-700", aria: { label: "Back to groups" } do %>
         <svg class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor" aria-hidden="true">
           <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7" />
         </svg>
@@ -19,15 +19,11 @@
   </div>
 
   <!-- Stats -->
-  <div class="grid grid-cols-1 gap-5 sm:grid-cols-4">
+  <div class="grid grid-cols-1 gap-5 sm:grid-cols-3">
     <%= render "rails_event_viewer/shared/stat_card",
         title: "Total Events",
         value: number_with_delimiter(@total_count),
         icon: "database" %>
-    <%= render "rails_event_viewer/shared/stat_card",
-        title: "Event Types",
-        value: @event_names.size,
-        icon: "tag" %>
     <%= render "rails_event_viewer/shared/stat_card",
         title: "Duration",
         value: @duration ? format_duration(@duration) : "-",
@@ -41,7 +37,7 @@
   <!-- Timeline -->
   <div class="bg-white shadow rounded-lg overflow-hidden">
     <div class="px-6 py-4 border-b border-gray-200">
-      <h3 class="text-lg font-medium text-gray-900">Event Timeline</h3>
+      <h2 class="text-lg font-medium text-gray-900">Event Timeline</h2>
       <% if @first_event_at && @last_event_at %>
         <p class="text-sm text-gray-500">
           <%= @first_event_at.strftime("%Y-%m-%d %H:%M:%S") %> to <%= @last_event_at.strftime("%Y-%m-%d %H:%M:%S") %>
@@ -55,13 +51,13 @@
 
         <div class="divide-y divide-gray-100">
           <% @events.each_with_index do |event, index| %>
-            <a href="<%= rails_event_viewer.event_path(event_id(event)) %>" class="relative pl-16 pr-6 py-4 hover:bg-gray-50 block">
+            <a href="<%= rails_event_viewer.event_path(event[:id]) %>" class="relative pl-16 pr-6 py-4 hover:bg-gray-50 block">
               <div class="absolute left-10 top-6 w-4 h-4 rounded-full border-2 border-indigo-500 bg-white"></div>
 
-              <% if @first_event_at && event_occurred_at(event) %>
-                <% offset = event_occurred_at(event) - @first_event_at %>
+              <% if @first_event_at && event[:occurred_at] %>
+                <% offset = event[:occurred_at] - @first_event_at %>
                 <div class="absolute left-0 top-4 w-9 text-right">
-                  <span class="text-xs text-gray-400" title="<%= format_duration(offset) %> from start">
+                  <span class="text-xs text-gray-500" title="<%= format_duration(offset) %> from start">
                     <% if offset < 0.001 %>
                       0
                     <% elsif offset < 1 %>
@@ -79,7 +75,7 @@
                 <div class="flex-1 min-w-0">
                   <!-- Event name badge -->
                   <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-indigo-100 text-indigo-800">
-                    <%= event_name(event) %>
+                    <%= event[:name] %>
                   </span>
 
                   <!-- Payload preview -->
@@ -110,11 +106,11 @@
 
                 <div class="ml-4 flex-shrink-0 text-right">
                   <p class="text-sm text-gray-500">
-                    <%= time_ago_with_title(event_occurred_at(event)) %>
+                    <%= time_ago_with_title(event[:occurred_at]) %>
                   </p>
-                  <% if event_source_file(event).present? %>
-                    <p class="text-xs text-gray-400 mt-1">
-                      <%= event_short_filepath(event) %>:<%= event_source_line(event) %>
+                  <% if event[:source_file].present? %>
+                    <p class="text-xs text-gray-500 mt-1">
+                      <%= event_short_filepath(event) %>:<%= event[:source_line] %>
                     </p>
                   <% end %>
                 </div>

data/app/views/rails_event_viewer/shared/_navigation.html.erb

@@ -1,44 +1,40 @@
 <nav class="bg-indigo-600">
   <div class="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8">
-    <div class="flex h-16 items-center justify-between">
+    <div class="flex min-h-16 flex-wrap items-center justify-between gap-y-2 py-2">
       <div class="flex items-center">
         <div class="flex-shrink-0">
           <%= link_to rails_event_viewer.root_path, class: "text-white text-xl font-bold" do %>
             Event Viewer
           <% end %>
         </div>
-        <div class="ml-10 flex items-baseline space-x-4">
-          <%= link_to "Dashboard", rails_event_viewer.root_path,
-              class: nav_link_class("dashboard") %>
-          <%= link_to "Events", rails_event_viewer.events_path,
-              class: nav_link_class("events") %>
-          <%= link_to "Event Types", rails_event_viewer.event_types_path,
-              class: nav_link_class("event_types") %>
-          <%= link_to "Groups", rails_event_viewer.groups_path,
-              class: nav_link_class("groups") %>
-          <%= link_to "Analytics", rails_event_viewer.analytics_overview_path,
-              class: nav_link_class("analytics") %>
+        <div class="ml-10 flex flex-wrap items-baseline space-x-4">
+          <%= nav_link "Dashboard", rails_event_viewer.root_path, "dashboard" %>
+          <%= nav_link "Events", rails_event_viewer.events_path, "events" %>
+          <%= nav_link "Event Types", rails_event_viewer.event_types_path, "event_types" %>
+          <%= nav_link "Groups", rails_event_viewer.groups_path, "groups" %>
+          <% if analytics_supported? %>
+            <%= nav_link "Analytics", rails_event_viewer.analytics_overview_path, "analytics" %>
+          <% end %>
         </div>
       </div>
 
       <div class="flex items-center space-x-4">
-        <!-- Search -->
-        <%= form_with url: rails_event_viewer.search_events_path, method: :get, class: "relative", data: { turbo_frame: "_top" } do |f| %>
+        <%= form_with url: rails_event_viewer.events_path, method: :get, class: "relative" do |f| %>
           <div class="relative">
             <div class="pointer-events-none absolute inset-y-0 left-0 flex items-center pl-3">
-              <svg class="h-4 w-4 text-indigo-200" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+              <svg class="h-4 w-4 text-indigo-200" fill="none" viewBox="0 0 24 24" stroke="currentColor" aria-hidden="true">
                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z" />
               </svg>
             </div>
             <%= f.search_field :q,
                 value: params[:q],
                 placeholder: "Search events...",
+                aria: { label: "Search events" },
                 class: "w-64 rounded-md bg-indigo-500 py-2 pl-10 pr-3 text-sm text-white placeholder-indigo-200 focus:bg-white focus:text-gray-900 focus:placeholder-gray-400 focus:outline-none focus:ring-2 focus:ring-white" %>
           </div>
         <% end %>
 
-        <!-- Timezone indicator -->
-        <div class="text-indigo-200 text-sm" title="Current timezone">
+        <div class="text-indigo-200 text-sm" title="Times are shown in this time zone">
           <%= Time.zone.name %>
         </div>
       </div>

data/app/views/rails_event_viewer/shared/_pagination.html.erb

@@ -15,41 +15,41 @@
       <nav class="flex items-center space-x-1" aria-label="Pagination">
         <% if pagination.previous %>
           <%= link_to page_path(pagination.previous), class: "relative inline-flex items-center px-3 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-md hover:bg-gray-50" do %>
-            <svg class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+            <svg aria-hidden="true" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
               <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7" />
             </svg>
             <span class="ml-1">Prev</span>
           <% end %>
         <% else %>
           <span class="relative inline-flex items-center px-3 py-2 text-sm font-medium text-gray-300 bg-white border border-gray-200 rounded-md cursor-not-allowed">
-            <svg class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+            <svg aria-hidden="true" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
               <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7" />
             </svg>
             <span class="ml-1">Prev</span>
           </span>
         <% end %>
 
-        <% (1..pagination.pages).each do |page_num| %>
-          <% if page_num == pagination.page %>
-            <span class="relative inline-flex items-center px-3 py-2 text-sm font-medium text-white bg-indigo-600 border border-indigo-600 rounded-md"><%= page_num %></span>
-          <% elsif page_num == 1 || page_num == pagination.pages || (page_num >= pagination.page - 2 && page_num <= pagination.page + 2) %>
-            <%= link_to page_num, page_path(page_num), class: "relative inline-flex items-center px-3 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-md hover:bg-gray-50" %>
-          <% elsif page_num == pagination.page - 3 || page_num == pagination.page + 3 %>
+        <% pagination.window.each do |page_num| %>
+          <% if page_num == :gap %>
             <span class="relative inline-flex items-center px-2 py-2 text-sm font-medium text-gray-700">...</span>
+          <% elsif page_num == pagination.page %>
+            <span class="relative inline-flex items-center px-3 py-2 text-sm font-medium text-white bg-indigo-600 border border-indigo-600 rounded-md" aria-current="page"><%= page_num %></span>
+          <% else %>
+            <%= link_to page_num, page_path(page_num), class: "relative inline-flex items-center px-3 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-md hover:bg-gray-50" %>
           <% end %>
         <% end %>
 
         <% if pagination.next %>
           <%= link_to page_path(pagination.next), class: "relative inline-flex items-center px-3 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-md hover:bg-gray-50" do %>
             <span class="mr-1">Next</span>
-            <svg class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+            <svg aria-hidden="true" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
               <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7" />
             </svg>
           <% end %>
         <% else %>
           <span class="relative inline-flex items-center px-3 py-2 text-sm font-medium text-gray-300 bg-white border border-gray-200 rounded-md cursor-not-allowed">
             <span class="mr-1">Next</span>
-            <svg class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+            <svg aria-hidden="true" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
               <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7" />
             </svg>
           </span>

data/app/views/rails_event_viewer/shared/_stat_card.html.erb

@@ -4,23 +4,23 @@
       <div class="flex-shrink-0">
         <% case icon %>
         <% when "database" %>
-          <svg class="h-6 w-6 text-gray-400" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+          <svg aria-hidden="true" class="h-6 w-6 text-gray-400" fill="none" viewBox="0 0 24 24" stroke="currentColor">
             <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 7v10c0 2.21 3.582 4 8 4s8-1.79 8-4V7M4 7c0 2.21 3.582 4 8 4s8-1.79 8-4M4 7c0-2.21 3.582-4 8-4s8 1.79 8 4m0 5c0 2.21-3.582 4-8 4s-8-1.79-8-4" />
           </svg>
         <% when "calendar" %>
-          <svg class="h-6 w-6 text-gray-400" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+          <svg aria-hidden="true" class="h-6 w-6 text-gray-400" fill="none" viewBox="0 0 24 24" stroke="currentColor">
             <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 7V3m8 4V3m-9 8h10M5 21h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z" />
           </svg>
         <% when "tag" %>
-          <svg class="h-6 w-6 text-gray-400" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+          <svg aria-hidden="true" class="h-6 w-6 text-gray-400" fill="none" viewBox="0 0 24 24" stroke="currentColor">
             <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M7 7h.01M7 3h5c.512 0 1.024.195 1.414.586l7 7a2 2 0 010 2.828l-7 7a2 2 0 01-2.828 0l-7-7A1.994 1.994 0 013 12V7a4 4 0 014-4z" />
           </svg>
         <% when "clock" %>
-          <svg class="h-6 w-6 text-gray-400" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+          <svg aria-hidden="true" class="h-6 w-6 text-gray-400" fill="none" viewBox="0 0 24 24" stroke="currentColor">
             <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 8v4l3 3m6-3a9 9 0 11-18 0 9 9 0 0118 0z" />
           </svg>
         <% else %>
-          <svg class="h-6 w-6 text-gray-400" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+          <svg aria-hidden="true" class="h-6 w-6 text-gray-400" fill="none" viewBox="0 0 24 24" stroke="currentColor">
             <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 19v-6a2 2 0 00-2-2H5a2 2 0 00-2 2v6a2 2 0 002 2h2a2 2 0 002-2zm0 0V9a2 2 0 012-2h2a2 2 0 012 2v10m-6 0a2 2 0 002 2h2a2 2 0 002-2m0 0V5a2 2 0 012-2h2a2 2 0 012 2v14a2 2 0 01-2 2h-2a2 2 0 01-2-2z" />
           </svg>
         <% end %>

data/config/routes.rb

@@ -1,11 +1,7 @@
 RailsEventViewer::Engine.routes.draw do
   root to: "dashboard#index"
 
-  resources :events, only: [:index, :show] do
-    collection do
-      get :search
-    end
-  end
+  resources :events, only: [:index, :show]
 
   namespace :analytics do
     get :overview

data/db/migrate/20261002121337_create_rails_event_viewer_entries.rb

@@ -18,7 +18,6 @@ class CreateRailsEventViewerEntries < ActiveRecord::Migration[8.1]
       t.timestamps
     end
 
-    add_index :rails_event_viewer_entries, :name
     add_index :rails_event_viewer_entries, :occurred_at
     add_index :rails_event_viewer_entries, [:name, :occurred_at]
 

data/lib/generators/rails_event_viewer/install/templates/create_rails_event_viewer_entries.rb.erb

@@ -17,7 +17,6 @@ class CreateRailsEventViewerEntries < ActiveRecord::Migration<%= migration_versi
       t.timestamps
     end
 
-    add_index :rails_event_viewer_entries, :name
     add_index :rails_event_viewer_entries, :occurred_at
     add_index :rails_event_viewer_entries, [:name, :occurred_at]
 

data/lib/rails_event_viewer/adapter.rb

@@ -10,10 +10,6 @@ module RailsEventViewer
       true
     end
 
-    def supports_retention?
-      true
-    end
-
     def write_events(events)
       raise NotImplementedError, "#{self.class} must implement #write_events"
     end
@@ -59,10 +55,6 @@ module RailsEventViewer
       end.sort_by { |s| -s[:count] }
     end
 
-    def distinct_group_values(key, source: :context)
-      raise NotImplementedError, "#{self.class} must implement #distinct_group_values"
-    end
-
     def group_instances(key, source: :context, limit: 100)
       raise NotImplementedError, "#{self.class} must implement #group_instances"
     end

data/lib/rails_event_viewer/adapters/active_record.rb

@@ -3,10 +3,6 @@ module RailsEventViewer
     class ActiveRecord
       include Adapter
 
-      def initialize(**options)
-        @options = options
-      end
-
       def table_exists?
         Entry.table_exists?
       rescue ::ActiveRecord::NoDatabaseError
@@ -16,7 +12,6 @@ module RailsEventViewer
       def write_events(events)
         return if events.empty?
 
-        # Use insert_all for bulk inserts (more efficient)
         records = events.map do |event|
           {
             name: event[:name],
@@ -32,7 +27,7 @@ module RailsEventViewer
           }
         end
 
-        Entry.insert_all(records)
+        Entry.insert_all(records, returning: false)
       end
 
       def fetch_events(relation)
@@ -57,6 +52,10 @@ module RailsEventViewer
         Entry.where("occurred_at < ?", timestamp).in_batches.delete_all
       end
 
+      def clear!
+        Entry.in_batches.delete_all
+      end
+
       def events_over_time(range:, interval:)
         Entry.where(occurred_at: range).group_by_period(interval, :occurred_at).count
       end
@@ -84,16 +83,6 @@ module RailsEventViewer
           end
       end
 
-      def distinct_group_values(key, source: :context)
-        column = source == :tags ? :tags : :context
-        json_path = JsonQuery.extract_path(column, key)
-
-        Entry
-          .where(JsonQuery.extract_path_present(column, key))
-          .distinct
-          .pluck(Arel.sql(json_path))
-      end
-
       def group_instances(key, source: :context, limit: 100)
         column = source == :tags ? :tags : :context
         json_path = JsonQuery.extract_path(column, key)
@@ -144,39 +133,18 @@ module RailsEventViewer
       end
 
       def build_scope(relation)
-        scope = Entry.order(occurred_at: :desc)
-        scope = apply_name_filters(scope, relation)
-        scope = apply_tag_filters(scope, relation)
-        scope = apply_context_filters(scope, relation)
+        scope = Entry.order(occurred_at: :desc, id: :desc)
+        scope = scope.where(name: relation.names) if relation.names.present?
+        scope = apply_json_filters(scope, :tags, relation.tags)
+        scope = apply_json_filters(scope, :context, relation.contexts)
         scope = apply_time_filters(scope, relation)
         scope = apply_search(scope, relation)
         scope
       end
 
-      def apply_name_filters(scope, relation)
-        return scope if relation.names.blank?
-
-        if relation.names.size == 1
-          scope.where(name: relation.names.first)
-        else
-          scope.where(name: relation.names)
-        end
-      end
-
-      def apply_tag_filters(scope, relation)
-        return scope if relation.tags.blank?
-
-        relation.tags.each do |key, value|
-          scope = scope.where(*JsonQuery.contains(:tags, key, value))
-        end
-        scope
-      end
-
-      def apply_context_filters(scope, relation)
-        return scope if relation.contexts.blank?
-
-        relation.contexts.each do |key, value|
-          scope = scope.where(*JsonQuery.contains(:context, key, value))
+      def apply_json_filters(scope, column, filters)
+        filters.each do |key, value|
+          scope = scope.where(*JsonQuery.contains(column, key, value))
         end
         scope
       end

data/lib/rails_event_viewer/adapters/concerns/in_memory_filtering.rb

@@ -6,13 +6,6 @@ module RailsEventViewer
       module InMemoryFiltering
         extend ActiveSupport::Concern
 
-        def distinct_group_values(key, source: :context)
-          in_memory_events
-            .map { |e| group_value_for(e, key, source) }
-            .compact
-            .uniq
-        end
-
         def group_instances(key, source: :context, limit: 100)
           in_memory_events
             .group_by { |e| group_value_for(e, key, source).to_s }
@@ -41,6 +34,13 @@ module RailsEventViewer
           (limit ? counts.first(limit) : counts).to_h
         end
 
+        def event_type_statistics
+          statistics = in_memory_events.group_by { |e| e[:name] }.map do |name, events|
+            { name: name, count: events.size, last_event_at: events.filter_map { |e| e[:occurred_at] }.max }
+          end
+          statistics.sort_by { |statistic| -statistic[:count] }
+        end
+
         private
 
         def events_in(range)

data/lib/rails_event_viewer/adapters/memory.rb

@@ -24,10 +24,6 @@ module RailsEventViewer
         @max_events = max_events
       end
 
-      def supports_retention?
-        true
-      end
-
       def write_events(new_events)
         return if new_events.empty?
 

data/lib/rails_event_viewer/adapters/null.rb

@@ -11,10 +11,6 @@ module RailsEventViewer
         false
       end
 
-      def supports_retention?
-        false
-      end
-
       def write_events(events)
         nil
       end
@@ -51,10 +47,6 @@ module RailsEventViewer
         0
       end
 
-      def distinct_group_values(key, source: :context)
-        []
-      end
-
       def group_instances(key, source: :context, limit: 100)
         []
       end

data/lib/rails_event_viewer/adapters/redis.rb

@@ -26,10 +26,6 @@ module RailsEventViewer
         @max_events = max_events
       end
 
-      def supports_analytics?
-        true
-      end
-
       def write_events(events)
         return if events.empty?
 
@@ -57,7 +53,7 @@ module RailsEventViewer
 
       def fetch_events(relation)
         if relation.filtered?
-          return fetch_all_filtered(relation).drop(relation.offset_value).take(relation.limit_value)
+          return filter_events(in_memory_events, relation).drop(relation.offset_value).take(relation.limit_value)
         end
 
         start_idx = relation.offset_value
@@ -68,7 +64,7 @@ module RailsEventViewer
 
       def count_events(relation)
         if relation.filtered?
-          fetch_all_filtered(relation).size
+          filter_events(in_memory_events, relation).size
         else
           @redis.with { |conn| conn.zcard(events_key) }
         end
@@ -99,7 +95,7 @@ module RailsEventViewer
       def delete_before(timestamp)
         score = (timestamp.to_f * 1_000_000).to_i
         @redis.with do |conn|
-          deleted = conn.zremrangebyscore(events_key, "-inf", score)
+          deleted = conn.zremrangebyscore(events_key, "-inf", "(#{score}")
           prune_names(conn)
           deleted
         end
@@ -155,8 +151,8 @@ module RailsEventViewer
 
       def serialize_event(event, timestamp_usec = nil)
         timestamp_usec ||= (event[:occurred_at].to_f * 1_000_000).to_i
-        event_with_id = event.merge(id: "#{timestamp_usec}-#{SecureRandom.hex(8)}")
-        JSON.generate(event_with_id)
+        stored = event.merge(id: "#{timestamp_usec}-#{SecureRandom.hex(8)}", occurred_at: event[:occurred_at]&.iso8601(6))
+        JSON.generate(stored)
       end
 
       def deserialize_event(json)
@@ -171,18 +167,8 @@ module RailsEventViewer
         data
       end
 
-      def fetch_all_events
-        serialized_events = @redis.with { |conn| conn.zrevrange(events_key, 0, -1) }
-        serialized_events.map { |json| deserialize_event(json) }
-      end
-
-      def fetch_all_filtered(relation)
-        events = fetch_all_events
-        filter_events(events, relation)
-      end
-
       def in_memory_events
-        fetch_all_events
+        @redis.with { |conn| conn.zrevrange(events_key, 0, -1) }.map { |json| deserialize_event(json) }
       end
     end
   end

data/lib/rails_event_viewer/events_relation.rb

@@ -18,7 +18,7 @@ module RailsEventViewer
     end
 
     def with_name(*event_names)
-      event_names = event_names.flatten.compact
+      event_names = event_names.flatten.compact.map(&:to_s)
       return self if event_names.empty?
 
       clone_with { |rel| rel.names.concat(event_names) }

data/lib/rails_event_viewer/flusher.rb

@@ -56,7 +56,7 @@ module RailsEventViewer
       if @thread&.alive?
         @flush_requests << true
         @thread.join(shutdown_timeout)
-        effective_logger&.warn("[RailsEventViewer] Flusher thread still busy after #{shutdown_timeout}s writing #{@writing} events") if @thread.alive?
+        RailsEventViewer.effective_logger.warn("[RailsEventViewer] Flusher thread still busy after #{shutdown_timeout}s writing #{@writing} events") if @thread.alive?
       end
 
       @mutex.synchronize { @thread = nil }
@@ -72,7 +72,7 @@ module RailsEventViewer
 
       report_dropped_events
       leftover = @buffer.size
-      effective_logger&.warn("[RailsEventViewer] #{leftover} events still buffered at shutdown") if leftover.positive?
+      RailsEventViewer.effective_logger.warn("[RailsEventViewer] #{leftover} events still buffered at shutdown") if leftover.positive?
     end
 
     def running?
@@ -126,7 +126,7 @@ module RailsEventViewer
       end
       return if dropped.zero?
 
-      effective_logger&.warn("[RailsEventViewer] Dropped #{dropped} events because the buffer was full")
+      RailsEventViewer.effective_logger.warn("[RailsEventViewer] Dropped #{dropped} events because the buffer was full")
     end
 
     def request_flush
@@ -143,7 +143,7 @@ module RailsEventViewer
     end
 
     def run_loop
-      effective_logger&.debug("[RailsEventViewer] Flusher thread started (PID: #{Process.pid})")
+      RailsEventViewer.effective_logger.debug("[RailsEventViewer] Flusher thread started (PID: #{Process.pid})")
 
       until shutdown_requested?
         begin
@@ -157,7 +157,7 @@ module RailsEventViewer
         end
       end
 
-      effective_logger&.debug("[RailsEventViewer] Flusher thread stopped (PID: #{Process.pid})")
+      RailsEventViewer.effective_logger.debug("[RailsEventViewer] Flusher thread stopped (PID: #{Process.pid})")
     end
 
     def wait_for_flush

data/lib/rails_event_viewer/logging.rb

@@ -3,17 +3,7 @@ module RailsEventViewer
     private
 
     def log_error(message)
-      logger = effective_logger
-
-      if logger
-        logger.error(message)
-      else
-        warn message
-      end
-    end
-
-    def effective_logger
-      RailsEventViewer.logger || (defined?(Rails) && Rails.logger)
+      RailsEventViewer.effective_logger.error(message)
     end
   end
 end

data/lib/rails_event_viewer/version.rb

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