diff options
Diffstat (limited to 'lib/gitlab/usage/metrics/instrumentations')
9 files changed, 35 insertions, 42 deletions
diff --git a/lib/gitlab/usage/metrics/instrumentations/aggregated_metric.rb b/lib/gitlab/usage/metrics/instrumentations/aggregated_metric.rb index 66be7a7b64e..de8726f71b5 100644 --- a/lib/gitlab/usage/metrics/instrumentations/aggregated_metric.rb +++ b/lib/gitlab/usage/metrics/instrumentations/aggregated_metric.rb @@ -40,10 +40,6 @@ module Gitlab end end - def suggested_name - Gitlab::Usage::Metrics::NameSuggestion.for(:alt) - end - private attr_accessor :source, :aggregate diff --git a/lib/gitlab/usage/metrics/instrumentations/batched_background_migration_failed_jobs_metric.rb b/lib/gitlab/usage/metrics/instrumentations/batched_background_migration_failed_jobs_metric.rb new file mode 100644 index 00000000000..f5d963cf522 --- /dev/null +++ b/lib/gitlab/usage/metrics/instrumentations/batched_background_migration_failed_jobs_metric.rb @@ -0,0 +1,34 @@ +# frozen_string_literal: true + +module Gitlab + module Usage + module Metrics + module Instrumentations + class BatchedBackgroundMigrationFailedJobsMetric < DatabaseMetric + relation do + Gitlab::Database::BackgroundMigration::BatchedMigration + .joins(:batched_jobs) + .where(batched_jobs: { status: '2' }) + .group(%w[table_name job_class_name]) + .order(%w[table_name job_class_name]) + .select(['table_name', 'job_class_name', 'COUNT(batched_jobs) AS number_of_failed_jobs']) + end + + timestamp_column(:created_at) + + operation :count + + def value + relation.map do |batched_migration| + { + job_class_name: batched_migration.job_class_name, + table_name: batched_migration.table_name, + number_of_failed_jobs: batched_migration.number_of_failed_jobs + } + end + end + end + end + end + end +end diff --git a/lib/gitlab/usage/metrics/instrumentations/count_imported_projects_metric.rb b/lib/gitlab/usage/metrics/instrumentations/count_imported_projects_metric.rb index 05e29f2d885..f3e81766b4c 100644 --- a/lib/gitlab/usage/metrics/instrumentations/count_imported_projects_metric.rb +++ b/lib/gitlab/usage/metrics/instrumentations/count_imported_projects_metric.rb @@ -44,7 +44,7 @@ module Gitlab private def relation - super.imported_from(import_type) # rubocop: disable CodeReuse/ActiveRecord + super.imported_from(import_type) end def import_type diff --git a/lib/gitlab/usage/metrics/instrumentations/database_metric.rb b/lib/gitlab/usage/metrics/instrumentations/database_metric.rb index f731057309e..2af7c208fce 100644 --- a/lib/gitlab/usage/metrics/instrumentations/database_metric.rb +++ b/lib/gitlab/usage/metrics/instrumentations/database_metric.rb @@ -87,14 +87,6 @@ module Gitlab to_sql end - def suggested_name - Gitlab::Usage::Metrics::NameSuggestion.for( - self.class.metric_operation, - relation: relation, - column: self.class.column - ) - end - private def start diff --git a/lib/gitlab/usage/metrics/instrumentations/generic_metric.rb b/lib/gitlab/usage/metrics/instrumentations/generic_metric.rb index d57dd7eac20..774f65da3bf 100644 --- a/lib/gitlab/usage/metrics/instrumentations/generic_metric.rb +++ b/lib/gitlab/usage/metrics/instrumentations/generic_metric.rb @@ -37,10 +37,6 @@ module Gitlab self.class.metric_value.call(...) end end - - def suggested_name - Gitlab::Usage::Metrics::NameSuggestion.for(:alt) - end end end end diff --git a/lib/gitlab/usage/metrics/instrumentations/numbers_metric.rb b/lib/gitlab/usage/metrics/instrumentations/numbers_metric.rb index 3b20e6ad100..67fcd226a0a 100644 --- a/lib/gitlab/usage/metrics/instrumentations/numbers_metric.rb +++ b/lib/gitlab/usage/metrics/instrumentations/numbers_metric.rb @@ -44,10 +44,6 @@ module Gitlab method(self.class.metric_operation).call(*data) end - def suggested_name - Gitlab::Usage::Metrics::NameSuggestion.for(:alt) - end - private def data diff --git a/lib/gitlab/usage/metrics/instrumentations/redis_hll_metric.rb b/lib/gitlab/usage/metrics/instrumentations/redis_hll_metric.rb index 17009f7638e..d3bbb3ee02c 100644 --- a/lib/gitlab/usage/metrics/instrumentations/redis_hll_metric.rb +++ b/lib/gitlab/usage/metrics/instrumentations/redis_hll_metric.rb @@ -30,10 +30,6 @@ module Gitlab end end - def suggested_name - Gitlab::Usage::Metrics::NameSuggestion.for(:redis) - end - private def time_constraints diff --git a/lib/gitlab/usage/metrics/instrumentations/redis_metric.rb b/lib/gitlab/usage/metrics/instrumentations/redis_metric.rb index ae3326fa845..ca5e5b706c4 100644 --- a/lib/gitlab/usage/metrics/instrumentations/redis_metric.rb +++ b/lib/gitlab/usage/metrics/instrumentations/redis_metric.rb @@ -48,10 +48,6 @@ module Gitlab end end - def suggested_name - Gitlab::Usage::Metrics::NameSuggestion.for(:redis) - end - private def redis_key diff --git a/lib/gitlab/usage/metrics/instrumentations/work_items_activity_aggregated_metric.rb b/lib/gitlab/usage/metrics/instrumentations/work_items_activity_aggregated_metric.rb deleted file mode 100644 index d045265495a..00000000000 --- a/lib/gitlab/usage/metrics/instrumentations/work_items_activity_aggregated_metric.rb +++ /dev/null @@ -1,13 +0,0 @@ -# frozen_string_literal: true - -module Gitlab - module Usage - module Metrics - module Instrumentations - class WorkItemsActivityAggregatedMetric < AggregatedMetric - available? { Feature.enabled?(:track_work_items_activity) } - end - end - end - end -end |