diff --git a/db/post_migrate/20220310141349_remove_dependency_list_usage_data_from_redis.rb b/db/post_migrate/20220310141349_remove_dependency_list_usage_data_from_redis.rb new file mode 100644 index 0000000000000000000000000000000000000000..3c1e671452917379593b7fd67694f4b7b587e85a --- /dev/null +++ b/db/post_migrate/20220310141349_remove_dependency_list_usage_data_from_redis.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +class RemoveDependencyListUsageDataFromRedis < Gitlab::Database::Migration[1.0] + disable_ddl_transaction! + + def up + Gitlab::Redis::SharedState.with { |r| r.del("DEPENDENCY_LIST_USAGE_COUNTER") } + end + + def down + # no-op + end +end diff --git a/db/schema_migrations/20220310141349 b/db/schema_migrations/20220310141349 new file mode 100644 index 0000000000000000000000000000000000000000..d52b2d997a4df34d57b99eac3d7e267d3525ea1d --- /dev/null +++ b/db/schema_migrations/20220310141349 @@ -0,0 +1 @@ +39785d4140c7345ddbe62417576381654ce22d505ee5c92a84425f0a3f8e4935 \ No newline at end of file diff --git a/ee/app/controllers/projects/dependencies_controller.rb b/ee/app/controllers/projects/dependencies_controller.rb index 9d4294524323ecdf4f9ae67bb0a0df1818b0916c..d634e6ed1adb49ef6688ac80ecb516a00ba32f40 100644 --- a/ee/app/controllers/projects/dependencies_controller.rb +++ b/ee/app/controllers/projects/dependencies_controller.rb @@ -18,8 +18,6 @@ def index render status: :ok end format.json do - ::Gitlab::UsageCounters::DependencyList.increment(project.id) - render json: serializer.represent(dependencies, build: report_service.build) end end diff --git a/ee/config/metrics/counts_all/20210216175211_dependency_list_usages_total.yml b/ee/config/metrics/counts_all/20210216175211_dependency_list_usages_total.yml index a4e877dd099b03eab0bd6b619902248566e353c6..042defc4ac0f1474a55f3995e4917361770b2873 100644 --- a/ee/config/metrics/counts_all/20210216175211_dependency_list_usages_total.yml +++ b/ee/config/metrics/counts_all/20210216175211_dependency_list_usages_total.yml @@ -7,7 +7,8 @@ product_stage: secure product_group: group::composition analysis product_category: dependency_scanning value_type: number -status: active +status: removed +milestone_removed: "14.9" time_frame: all data_source: redis distribution: diff --git a/ee/lib/ee/gitlab/usage_data.rb b/ee/lib/ee/gitlab/usage_data.rb index c68fece8a88ada75d207e73a4ff45b5793c6e1e7..2d793cff2e38883c7959eba75a0b30872fb52732 100644 --- a/ee/lib/ee/gitlab/usage_data.rb +++ b/ee/lib/ee/gitlab/usage_data.rb @@ -201,7 +201,6 @@ def system_usage_data usage_data[:counts].merge!( { confidential_epics: count(::Epic.confidential), - dependency_list_usages_total: redis_usage_data { ::Gitlab::UsageCounters::DependencyList.usage_totals[:total] }, epics: count(::Epic), epic_issues: count(::EpicIssue), geo_nodes: count(::GeoNode), diff --git a/ee/lib/gitlab/usage_counters/dependency_list.rb b/ee/lib/gitlab/usage_counters/dependency_list.rb deleted file mode 100644 index da897639618d4026cfaa2614420422755b77aa89..0000000000000000000000000000000000000000 --- a/ee/lib/gitlab/usage_counters/dependency_list.rb +++ /dev/null @@ -1,11 +0,0 @@ -# frozen_string_literal: true - -module Gitlab - module UsageCounters - class DependencyList < Common - def self.base_key - 'DEPENDENCY_LIST_USAGE_COUNTER' - end - end - end -end diff --git a/ee/spec/controllers/projects/dependencies_controller_spec.rb b/ee/spec/controllers/projects/dependencies_controller_spec.rb index b2083605ee05d1e22c27c347b91e6c23a8590a49..9337d1f1fd28c647738eff80bc843392f554a178 100644 --- a/ee/spec/controllers/projects/dependencies_controller_spec.rb +++ b/ee/spec/controllers/projects/dependencies_controller_spec.rb @@ -43,16 +43,6 @@ end end - context 'when usage ping is collected' do - let(:user) { developer } - - it 'counts usage of the feature' do - expect(::Gitlab::UsageCounters::DependencyList).to receive(:increment).with(project.id) - - get :index, params: params, format: :json - end - end - context 'with existing report' do let_it_be(:pipeline) { create(:ee_ci_pipeline, :with_dependency_list_report, project: project) } diff --git a/ee/spec/lib/ee/gitlab/usage_data_spec.rb b/ee/spec/lib/ee/gitlab/usage_data_spec.rb index 418556fd03a462b03a73ecc1946c52e40ce17561..70aece52b280db2102107cdfd90f10c151f798df 100644 --- a/ee/spec/lib/ee/gitlab/usage_data_spec.rb +++ b/ee/spec/lib/ee/gitlab/usage_data_spec.rb @@ -93,7 +93,6 @@ container_scanning_jobs coverage_fuzzing_jobs dast_jobs - dependency_list_usages_total dependency_scanning_jobs epics epics_deepest_relationship_level diff --git a/ee/spec/lib/gitlab/usage_counters/dependency_list_spec.rb b/ee/spec/lib/gitlab/usage_counters/dependency_list_spec.rb deleted file mode 100644 index 66c6fc3531fe9913a659c9bf351dff4ec12ddbe4..0000000000000000000000000000000000000000 --- a/ee/spec/lib/gitlab/usage_counters/dependency_list_spec.rb +++ /dev/null @@ -1,7 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' - -RSpec.describe Gitlab::UsageCounters::DependencyList, :clean_gitlab_redis_shared_state do - it_behaves_like 'a usage counter' -end diff --git a/ee/spec/lib/gitlab/usage_counters/pod_logs_spec.rb b/spec/lib/gitlab/usage_counters/pod_logs_spec.rb similarity index 100% rename from ee/spec/lib/gitlab/usage_counters/pod_logs_spec.rb rename to spec/lib/gitlab/usage_counters/pod_logs_spec.rb diff --git a/spec/migrations/20220310141349_remove_dependency_list_usage_data_from_redis_spec.rb b/spec/migrations/20220310141349_remove_dependency_list_usage_data_from_redis_spec.rb new file mode 100644 index 0000000000000000000000000000000000000000..c00685c139777642bcc28ba5a59113543788e80f --- /dev/null +++ b/spec/migrations/20220310141349_remove_dependency_list_usage_data_from_redis_spec.rb @@ -0,0 +1,23 @@ +# frozen_string_literal: true + +require 'spec_helper' +require_migration! + +RSpec.describe RemoveDependencyListUsageDataFromRedis, :migration, :clean_gitlab_redis_shared_state do + let(:key) { "DEPENDENCY_LIST_USAGE_COUNTER" } + + describe "#up" do + it 'removes the hash from redis' do + with_redis do |redis| + redis.hincrby(key, 1, 1) + redis.hincrby(key, 2, 1) + end + + expect { migrate! }.to change { with_redis { |r| r.hgetall(key) } }.from({ '1' => '1', '2' => '1' }).to({}) + end + end + + def with_redis(&block) + Gitlab::Redis::SharedState.with(&block) + end +end diff --git a/ee/spec/support/shared_examples/lib/gitlab/usage_counters/usage_counter_shared_examples.rb b/spec/support/shared_examples/lib/gitlab/usage_data_counters/usage_counter_shared_examples.rb similarity index 100% rename from ee/spec/support/shared_examples/lib/gitlab/usage_counters/usage_counter_shared_examples.rb rename to spec/support/shared_examples/lib/gitlab/usage_data_counters/usage_counter_shared_examples.rb