From debf45a7fdcc57cd4bafca47492549ce01a05a2f Mon Sep 17 00:00:00 2001 From: syasonik <syasonik@gitlab.com> Date: Tue, 23 Jul 2024 19:12:27 -0400 Subject: [PATCH] Remove unused prometheus metric service The Metrics Dashboard (used for monitoring apps deploying using gitlab) was deprecated in 14.7 and removed from the product in 16.0. This commit cleans up a portion of the dead code. https://gitlab.com/groups/gitlab-org/-/epics/10107 --- .rubocop_todo/rspec/named_subject.yml | 1 - .../prometheus/metrics/base_service.rb | 20 ------------------- .../prometheus/metrics/destroy_service.rb | 13 ------------ .../metrics/destroy_service_spec.rb | 15 -------------- spec/support/rspec_order_todo.yml | 1 - 5 files changed, 50 deletions(-) delete mode 100644 app/services/projects/prometheus/metrics/base_service.rb delete mode 100644 app/services/projects/prometheus/metrics/destroy_service.rb delete mode 100644 spec/services/projects/prometheus/metrics/destroy_service_spec.rb diff --git a/.rubocop_todo/rspec/named_subject.yml b/.rubocop_todo/rspec/named_subject.yml index 0a511b5b3dbfed..391747fbc4cc96 100644 --- a/.rubocop_todo/rspec/named_subject.yml +++ b/.rubocop_todo/rspec/named_subject.yml @@ -3291,7 +3291,6 @@ RSpec/NamedSubject: - 'spec/services/projects/operations/update_service_spec.rb' - 'spec/services/projects/overwrite_project_service_spec.rb' - 'spec/services/projects/prometheus/alerts/notify_service_spec.rb' - - 'spec/services/projects/prometheus/metrics/destroy_service_spec.rb' - 'spec/services/projects/readme_renderer_service_spec.rb' - 'spec/services/projects/transfer_service_spec.rb' - 'spec/services/projects/unlink_fork_service_spec.rb' diff --git a/app/services/projects/prometheus/metrics/base_service.rb b/app/services/projects/prometheus/metrics/base_service.rb deleted file mode 100644 index 15247d4577611d..00000000000000 --- a/app/services/projects/prometheus/metrics/base_service.rb +++ /dev/null @@ -1,20 +0,0 @@ -# frozen_string_literal: true - -module Projects - module Prometheus - module Metrics - class BaseService - include Gitlab::Utils::StrongMemoize - - def initialize(metric, params = {}) - @metric = metric - @params = params.dup - end - - protected - - attr_reader :metric, :params - end - end - end -end diff --git a/app/services/projects/prometheus/metrics/destroy_service.rb b/app/services/projects/prometheus/metrics/destroy_service.rb deleted file mode 100644 index d85499dc4ae20e..00000000000000 --- a/app/services/projects/prometheus/metrics/destroy_service.rb +++ /dev/null @@ -1,13 +0,0 @@ -# frozen_string_literal: true - -module Projects - module Prometheus - module Metrics - class DestroyService < Metrics::BaseService - def execute - metric.destroy - end - end - end - end -end diff --git a/spec/services/projects/prometheus/metrics/destroy_service_spec.rb b/spec/services/projects/prometheus/metrics/destroy_service_spec.rb deleted file mode 100644 index 4c2a959a149186..00000000000000 --- a/spec/services/projects/prometheus/metrics/destroy_service_spec.rb +++ /dev/null @@ -1,15 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' - -RSpec.describe Projects::Prometheus::Metrics::DestroyService, feature_category: :metrics do - let(:metric) { create(:prometheus_metric) } - - subject { described_class.new(metric) } - - it 'destroys metric' do - subject.execute - - expect(PrometheusMetric.find_by(id: metric.id)).to be_nil - end -end diff --git a/spec/support/rspec_order_todo.yml b/spec/support/rspec_order_todo.yml index 872b96c3fa3104..dabb56eeaec350 100644 --- a/spec/support/rspec_order_todo.yml +++ b/spec/support/rspec_order_todo.yml @@ -8183,7 +8183,6 @@ - './spec/services/projects/overwrite_project_service_spec.rb' - './spec/services/projects/participants_service_spec.rb' - './spec/services/projects/prometheus/alerts/notify_service_spec.rb' -- './spec/services/projects/prometheus/metrics/destroy_service_spec.rb' - './spec/services/projects/protect_default_branch_service_spec.rb' - './spec/services/projects/readme_renderer_service_spec.rb' - './spec/services/projects/record_target_platforms_service_spec.rb' -- GitLab