diff --git a/app/lib/admin/metrics/dimension/base_dimension.rb b/app/lib/admin/metrics/dimension/base_dimension.rb
index 5872c22cbccb24eb63b9307b8bafbee268f10204..bd2e4ececbe71c25e67a48123005584dab0f48ad 100644
--- a/app/lib/admin/metrics/dimension/base_dimension.rb
+++ b/app/lib/admin/metrics/dimension/base_dimension.rb
@@ -1,23 +1,34 @@
# frozen_string_literal: true
class Admin::Metrics::Dimension::BaseDimension
+ CACHE_TTL = 5.minutes.freeze
+
def self.with_params?
false
end
+ attr_reader :loaded
+
+ alias loaded? loaded
+
def initialize(start_at, end_at, limit, params)
@start_at = start_at&.to_datetime
@end_at = end_at&.to_datetime
@limit = limit&.to_i
@params = params
+ @loaded = false
end
def key
raise NotImplementedError
end
+ def cache_key
+ ["metrics/dimension/#{key}", @start_at, @end_at, @limit, canonicalized_params].join(';')
+ end
+
def data
- raise NotImplementedError
+ load
end
def self.model_name
@@ -30,11 +41,28 @@ class Admin::Metrics::Dimension::BaseDimension
protected
+ def load
+ unless loaded?
+ @values = Rails.cache.fetch(cache_key, expires_in: CACHE_TTL) { perform_query }
+ @loaded = true
+ end
+
+ @values
+ end
+
+ def perform_query
+ raise NotImplementedError
+ end
+
def time_period
(@start_at..@end_at)
end
def params
- raise NotImplementedError
+ {}
+ end
+
+ def canonicalized_params
+ params.to_h.to_a.sort_by { |k, _v| k.to_s }.map { |k, v| "#{k}=#{v}" }.join(';')
end
end
diff --git a/app/lib/admin/metrics/dimension/languages_dimension.rb b/app/lib/admin/metrics/dimension/languages_dimension.rb
index 1cc5f41207d65b12b4fc290c3a5de9a2564a1574..f1cf82cf276d76754b823ef371008ca7cc8a7f93 100644
--- a/app/lib/admin/metrics/dimension/languages_dimension.rb
+++ b/app/lib/admin/metrics/dimension/languages_dimension.rb
@@ -7,7 +7,9 @@ class Admin::Metrics::Dimension::LanguagesDimension < Admin::Metrics::Dimension:
'languages'
end
- def data
+ protected
+
+ def perform_query
sql = <<-SQL.squish
SELECT locale, count(*) AS value
FROM users
diff --git a/app/lib/admin/metrics/dimension/servers_dimension.rb b/app/lib/admin/metrics/dimension/servers_dimension.rb
index 3e80b66250fb3c5fd4dcfe2a308a7655caff80c8..91bcce655102691d24336a02a67f6dddd38cf580 100644
--- a/app/lib/admin/metrics/dimension/servers_dimension.rb
+++ b/app/lib/admin/metrics/dimension/servers_dimension.rb
@@ -5,7 +5,9 @@ class Admin::Metrics::Dimension::ServersDimension < Admin::Metrics::Dimension::B
'servers'
end
- def data
+ protected
+
+ def perform_query
sql = <<-SQL.squish
SELECT accounts.domain, count(*) AS value
FROM statuses
diff --git a/app/lib/admin/metrics/dimension/software_versions_dimension.rb b/app/lib/admin/metrics/dimension/software_versions_dimension.rb
index 34917404d1407e27080e69a7916916c4dc1bce9f..816615f992ed8b2ef8f2982f4f66211d2dfadf91 100644
--- a/app/lib/admin/metrics/dimension/software_versions_dimension.rb
+++ b/app/lib/admin/metrics/dimension/software_versions_dimension.rb
@@ -7,12 +7,12 @@ class Admin::Metrics::Dimension::SoftwareVersionsDimension < Admin::Metrics::Dim
'software_versions'
end
- def data
+ protected
+
+ def perform_query
[mastodon_version, ruby_version, postgresql_version, redis_version]
end
- private
-
def mastodon_version
value = Mastodon::Version.to_s
diff --git a/app/lib/admin/metrics/dimension/sources_dimension.rb b/app/lib/admin/metrics/dimension/sources_dimension.rb
index a9f061809c8336080b14f80038ea833e9ab76e94..122807cdcdbc2ae8617ea2034cc336aa8d8bc23d 100644
--- a/app/lib/admin/metrics/dimension/sources_dimension.rb
+++ b/app/lib/admin/metrics/dimension/sources_dimension.rb
@@ -5,7 +5,9 @@ class Admin::Metrics::Dimension::SourcesDimension < Admin::Metrics::Dimension::B
'sources'
end
- def data
+ protected
+
+ def perform_query
sql = <<-SQL.squish
SELECT oauth_applications.name, count(*) AS value
FROM users
diff --git a/app/lib/admin/metrics/dimension/space_usage_dimension.rb b/app/lib/admin/metrics/dimension/space_usage_dimension.rb
index aa00a2e18b870898905b27f4bb96a3ed2eb8ca66..5867c5bab612f9728b13e885af7ff09ec43b1c8e 100644
--- a/app/lib/admin/metrics/dimension/space_usage_dimension.rb
+++ b/app/lib/admin/metrics/dimension/space_usage_dimension.rb
@@ -8,12 +8,12 @@ class Admin::Metrics::Dimension::SpaceUsageDimension < Admin::Metrics::Dimension
'space_usage'
end
- def data
+ protected
+
+ def perform_query
[postgresql_size, redis_size, media_size]
end
- private
-
def postgresql_size
value = ActiveRecord::Base.connection.execute('SELECT pg_database_size(current_database())').first['pg_database_size']
diff --git a/app/lib/admin/metrics/dimension/tag_languages_dimension.rb b/app/lib/admin/metrics/dimension/tag_languages_dimension.rb
index afbc8cde8ac1b099af2cfb236ead1d717d1ee9af..e1349c229434318af86875bf45e0a0e994ed30bf 100644
--- a/app/lib/admin/metrics/dimension/tag_languages_dimension.rb
+++ b/app/lib/admin/metrics/dimension/tag_languages_dimension.rb
@@ -11,7 +11,9 @@ class Admin::Metrics::Dimension::TagLanguagesDimension < Admin::Metrics::Dimensi
'tag_languages'
end
- def data
+ protected
+
+ def perform_query
sql = <<-SQL.squish
SELECT COALESCE(statuses.language, 'und') AS language, count(*) AS value
FROM statuses
@@ -28,8 +30,6 @@ class Admin::Metrics::Dimension::TagLanguagesDimension < Admin::Metrics::Dimensi
rows.map { |row| { key: row['language'], human_key: standard_locale_name(row['language']), value: row['value'].to_s } }
end
- private
-
def params
@params.permit(:id)
end
diff --git a/app/lib/admin/metrics/dimension/tag_servers_dimension.rb b/app/lib/admin/metrics/dimension/tag_servers_dimension.rb
index 12c5980d72898156f410b19064fa78a9c7061fce..7ddf3378cd45e803cc03157d0a396d6ad1fbcee4 100644
--- a/app/lib/admin/metrics/dimension/tag_servers_dimension.rb
+++ b/app/lib/admin/metrics/dimension/tag_servers_dimension.rb
@@ -9,7 +9,9 @@ class Admin::Metrics::Dimension::TagServersDimension < Admin::Metrics::Dimension
'tag_servers'
end
- def data
+ protected
+
+ def perform_query
sql = <<-SQL.squish
SELECT accounts.domain, count(*) AS value
FROM statuses
@@ -27,8 +29,6 @@ class Admin::Metrics::Dimension::TagServersDimension < Admin::Metrics::Dimension
rows.map { |row| { key: row['domain'] || Rails.configuration.x.local_domain, human_key: row['domain'] || Rails.configuration.x.local_domain, value: row['value'].to_s } }
end
- private
-
def params
@params.permit(:id)
end
diff --git a/app/lib/admin/metrics/measure/active_users_measure.rb b/app/lib/admin/metrics/measure/active_users_measure.rb
index 513189780693594f5e77d7c9a7c8fd93e3f7019b..e6f09d4bcf6293cd1ddabee1171acf7d8cbf4537 100644
--- a/app/lib/admin/metrics/measure/active_users_measure.rb
+++ b/app/lib/admin/metrics/measure/active_users_measure.rb
@@ -5,20 +5,20 @@ class Admin::Metrics::Measure::ActiveUsersMeasure < Admin::Metrics::Measure::Bas
'active_users'
end
- def total
+ protected
+
+ def perform_total_query
activity_tracker.sum(time_period.first, time_period.last)
end
- def previous_total
+ def perform_previous_total_query
activity_tracker.sum(previous_time_period.first, previous_time_period.last)
end
- def data
+ def perform_data_query
activity_tracker.get(time_period.first, time_period.last).map { |date, value| { date: date.to_time(:utc).iso8601, value: value.to_s } }
end
- protected
-
def activity_tracker
@activity_tracker ||= ActivityTracker.new('activity:logins', :unique)
end
diff --git a/app/lib/admin/metrics/measure/base_measure.rb b/app/lib/admin/metrics/measure/base_measure.rb
index 0107ffd9c1544eb947b867e403952c504e563240..ed1df9c7d9f74a404f5cf01be3b2c6edf6e92502 100644
--- a/app/lib/admin/metrics/measure/base_measure.rb
+++ b/app/lib/admin/metrics/measure/base_measure.rb
@@ -1,14 +1,25 @@
# frozen_string_literal: true
class Admin::Metrics::Measure::BaseMeasure
+ CACHE_TTL = 5.minutes.freeze
+
def self.with_params?
false
end
+ attr_reader :loaded
+
+ alias loaded? loaded
+
def initialize(start_at, end_at, params)
@start_at = start_at&.to_datetime
@end_at = end_at&.to_datetime
@params = params
+ @loaded = false
+ end
+
+ def cache_key
+ ["metrics/measure/#{key}", @start_at, @end_at, canonicalized_params].join(';')
end
def key
@@ -16,15 +27,15 @@ class Admin::Metrics::Measure::BaseMeasure
end
def total
- raise NotImplementedError
+ load[:total]
end
def previous_total
- raise NotImplementedError
+ load[:previous_total]
end
def data
- raise NotImplementedError
+ load[:data]
end
def self.model_name
@@ -37,6 +48,35 @@ class Admin::Metrics::Measure::BaseMeasure
protected
+ def load
+ unless loaded?
+ @values = Rails.cache.fetch(cache_key, expires_in: CACHE_TTL) { perform_queries }.with_indifferent_access
+ @loaded = true
+ end
+
+ @values
+ end
+
+ def perform_queries
+ {
+ total: perform_total_query,
+ previous_total: perform_previous_total_query,
+ data: perform_data_query,
+ }
+ end
+
+ def perform_total_query
+ raise NotImplementedError
+ end
+
+ def perform_previous_total_query
+ raise NotImplementedError
+ end
+
+ def perform_data_query
+ raise NotImplementedError
+ end
+
def time_period
(@start_at..@end_at)
end
@@ -50,6 +90,10 @@ class Admin::Metrics::Measure::BaseMeasure
end
def params
- raise NotImplementedError
+ {}
+ end
+
+ def canonicalized_params
+ params.to_h.to_a.sort_by { |k, _v| k.to_s }.map { |k, v| "#{k}=#{v}" }.join(';')
end
end
diff --git a/app/lib/admin/metrics/measure/interactions_measure.rb b/app/lib/admin/metrics/measure/interactions_measure.rb
index b928fdb8fbcd5b7cf1ae2dcf8819a2b29d0fc44c..7a2b7e0fac48fdaf01eadd3fedcadc8b8b56b49d 100644
--- a/app/lib/admin/metrics/measure/interactions_measure.rb
+++ b/app/lib/admin/metrics/measure/interactions_measure.rb
@@ -5,20 +5,20 @@ class Admin::Metrics::Measure::InteractionsMeasure < Admin::Metrics::Measure::Ba
'interactions'
end
- def total
+ protected
+
+ def perform_total_query
activity_tracker.sum(time_period.first, time_period.last)
end
- def previous_total
+ def perform_previous_total_query
activity_tracker.sum(previous_time_period.first, previous_time_period.last)
end
- def data
+ def perform_data_query
activity_tracker.get(time_period.first, time_period.last).map { |date, value| { date: date.to_time(:utc).iso8601, value: value.to_s } }
end
- protected
-
def activity_tracker
@activity_tracker ||= ActivityTracker.new('activity:interactions', :basic)
end
diff --git a/app/lib/admin/metrics/measure/new_users_measure.rb b/app/lib/admin/metrics/measure/new_users_measure.rb
index b31679ad3a5163aef3be535934d928b0567ee7d8..71191f1a2218a529a50927bfbcbe154484a0ac38 100644
--- a/app/lib/admin/metrics/measure/new_users_measure.rb
+++ b/app/lib/admin/metrics/measure/new_users_measure.rb
@@ -5,15 +5,17 @@ class Admin::Metrics::Measure::NewUsersMeasure < Admin::Metrics::Measure::BaseMe
'new_users'
end
- def total
+ protected
+
+ def perform_total_query
User.where(created_at: time_period).count
end
- def previous_total
+ def perform_previous_total_query
User.where(created_at: previous_time_period).count
end
- def data
+ def perform_data_query
sql = <<-SQL.squish
SELECT axis.*, (
WITH new_users AS (
diff --git a/app/lib/admin/metrics/measure/opened_reports_measure.rb b/app/lib/admin/metrics/measure/opened_reports_measure.rb
index 9acc2c33db9c7cd540688c18f595cae2bdaaeefd..4b80a0c8c3b7b02215a69ee2c7a486a22b4e2e63 100644
--- a/app/lib/admin/metrics/measure/opened_reports_measure.rb
+++ b/app/lib/admin/metrics/measure/opened_reports_measure.rb
@@ -5,15 +5,17 @@ class Admin::Metrics::Measure::OpenedReportsMeasure < Admin::Metrics::Measure::B
'opened_reports'
end
- def total
+ protected
+
+ def perform_total_query
Report.where(created_at: time_period).count
end
- def previous_total
+ def perform_previous_total_query
Report.where(created_at: previous_time_period).count
end
- def data
+ def perform_data_query
sql = <<-SQL.squish
SELECT axis.*, (
WITH new_reports AS (
diff --git a/app/lib/admin/metrics/measure/resolved_reports_measure.rb b/app/lib/admin/metrics/measure/resolved_reports_measure.rb
index 00cb24f7e1d805026b58ffeeb06ea85faa297b1b..4ab746c8fa537575a6092dd7366eba2f91d92654 100644
--- a/app/lib/admin/metrics/measure/resolved_reports_measure.rb
+++ b/app/lib/admin/metrics/measure/resolved_reports_measure.rb
@@ -5,15 +5,17 @@ class Admin::Metrics::Measure::ResolvedReportsMeasure < Admin::Metrics::Measure:
'resolved_reports'
end
- def total
+ protected
+
+ def perform_total_query
Report.resolved.where(action_taken_at: time_period).count
end
- def previous_total
+ def perform_previous_total_query
Report.resolved.where(action_taken_at: previous_time_period).count
end
- def data
+ def perform_data_query
sql = <<-SQL.squish
SELECT axis.*, (
WITH resolved_reports AS (
diff --git a/app/lib/admin/metrics/measure/tag_accounts_measure.rb b/app/lib/admin/metrics/measure/tag_accounts_measure.rb
index ef773081bed94f579a0b7280dc8552cc203e0b60..8f4512efe7cdd8c9da99a05fe21e053a3f6398e0 100644
--- a/app/lib/admin/metrics/measure/tag_accounts_measure.rb
+++ b/app/lib/admin/metrics/measure/tag_accounts_measure.rb
@@ -9,20 +9,20 @@ class Admin::Metrics::Measure::TagAccountsMeasure < Admin::Metrics::Measure::Bas
'tag_accounts'
end
- def total
+ protected
+
+ def perform_total_query
tag.history.aggregate(time_period).accounts
end
- def previous_total
+ def perform_previous_total_query
tag.history.aggregate(previous_time_period).accounts
end
- def data
+ def perform_data_query
time_period.map { |date| { date: date.to_time(:utc).iso8601, value: tag.history.get(date).accounts.to_s } }
end
- protected
-
def tag
@tag ||= Tag.find(params[:id])
end
diff --git a/app/lib/admin/metrics/measure/tag_servers_measure.rb b/app/lib/admin/metrics/measure/tag_servers_measure.rb
index cc064f63f64cd836f367b957b0a78a34d1c1e76b..11f229602eef0b4bd88d3d66eb1f64c913df09cd 100644
--- a/app/lib/admin/metrics/measure/tag_servers_measure.rb
+++ b/app/lib/admin/metrics/measure/tag_servers_measure.rb
@@ -9,15 +9,17 @@ class Admin::Metrics::Measure::TagServersMeasure < Admin::Metrics::Measure::Base
'tag_servers'
end
- def total
+ protected
+
+ def perform_total_query
tag.statuses.where('statuses.id BETWEEN ? AND ?', Mastodon::Snowflake.id_at(@start_at, with_random: false), Mastodon::Snowflake.id_at(@end_at, with_random: false)).joins(:account).count('distinct accounts.domain')
end
- def previous_total
+ def perform_previous_total_query
tag.statuses.where('statuses.id BETWEEN ? AND ?', Mastodon::Snowflake.id_at(@start_at - length_of_period, with_random: false), Mastodon::Snowflake.id_at(@end_at - length_of_period, with_random: false)).joins(:account).count('distinct accounts.domain')
end
- def data
+ def perform_data_query
sql = <<-SQL.squish
SELECT axis.*, (
SELECT count(distinct accounts.domain) AS value
@@ -38,8 +40,6 @@ class Admin::Metrics::Measure::TagServersMeasure < Admin::Metrics::Measure::Base
rows.map { |row| { date: row['day'], value: row['value'].to_s } }
end
- protected
-
def tag
@tag ||= Tag.find(params[:id])
end
diff --git a/app/lib/admin/metrics/measure/tag_uses_measure.rb b/app/lib/admin/metrics/measure/tag_uses_measure.rb
index b7667bc6cf9a0c99f907e4510168930f33205fbc..bce86b89f10887c6a1f007e27dff0d923211dbe2 100644
--- a/app/lib/admin/metrics/measure/tag_uses_measure.rb
+++ b/app/lib/admin/metrics/measure/tag_uses_measure.rb
@@ -9,20 +9,20 @@ class Admin::Metrics::Measure::TagUsesMeasure < Admin::Metrics::Measure::BaseMea
'tag_uses'
end
- def total
+ protected
+
+ def perform_total_query
tag.history.aggregate(time_period).uses
end
- def previous_total
+ def perform_previous_total_query
tag.history.aggregate(previous_time_period).uses
end
- def data
+ def perform_data_query
time_period.map { |date| { date: date.to_time(:utc).iso8601, value: tag.history.get(date).uses.to_s } }
end
- protected
-
def tag
@tag ||= Tag.find(params[:id])
end
diff --git a/app/lib/admin/metrics/retention.rb b/app/lib/admin/metrics/retention.rb
index 0179a6e282d22a1a48d47afccb68d96f5a40983e..f6135ac1efc0e97b0c39024c4e07c10a21cd8a33 100644
--- a/app/lib/admin/metrics/retention.rb
+++ b/app/lib/admin/metrics/retention.rb
@@ -1,6 +1,8 @@
# frozen_string_literal: true
class Admin::Metrics::Retention
+ CACHE_TTL = 5.minutes.freeze
+
class Cohort < ActiveModelSerializers::Model
attributes :period, :frequency, :data
end
@@ -9,13 +11,37 @@ class Admin::Metrics::Retention
attributes :date, :rate, :value
end
+ attr_reader :loaded
+
+ alias loaded? loaded
+
def initialize(start_at, end_at, frequency)
@start_at = start_at&.to_date
@end_at = end_at&.to_date
@frequency = %w(day month).include?(frequency) ? frequency : 'day'
+ @loaded = false
+ end
+
+ def cache_key
+ ['metrics/retention', @start_at, @end_at, @frequency].join(';')
end
def cohorts
+ load
+ end
+
+ protected
+
+ def load
+ unless loaded?
+ @values = Rails.cache.fetch(cache_key, expires_in: CACHE_TTL) { perform_query }
+ @loaded = true
+ end
+
+ @values
+ end
+
+ def perform_query
sql = <<-SQL.squish
SELECT axis.*, (
WITH new_users AS (