diff --git a/app/services/packages/create_event_service.rb b/app/services/packages/create_event_service.rb
index 63248ef07c94798538756562d34e68ca5692756f..8fed6e2def8a342136e470ed012367653e373815 100644
--- a/app/services/packages/create_event_service.rb
+++ b/app/services/packages/create_event_service.rb
@@ -3,14 +3,12 @@
module Packages
class CreateEventService < BaseService
def execute
- if Feature.enabled?(:collect_package_events_redis, default_enabled: true)
- ::Packages::Event.unique_counters_for(event_scope, event_name, originator_type).each do |event_name|
- ::Gitlab::UsageDataCounters::HLLRedisCounter.track_event(event_name, values: current_user.id)
- end
-
- ::Packages::Event.counters_for(event_scope, event_name, originator_type).each do |event_name|
- ::Gitlab::UsageDataCounters::PackageEventCounter.count(event_name)
- end
+ ::Packages::Event.unique_counters_for(event_scope, event_name, originator_type).each do |event_name|
+ ::Gitlab::UsageDataCounters::HLLRedisCounter.track_event(event_name, values: current_user.id)
+ end
+
+ ::Packages::Event.counters_for(event_scope, event_name, originator_type).each do |event_name|
+ ::Gitlab::UsageDataCounters::PackageEventCounter.count(event_name)
end
if Feature.enabled?(:collect_package_events) && Gitlab::Database.read_write?
diff --git a/changelogs/unreleased/remove-pkg-event-redis-feature-flag.yml b/changelogs/unreleased/remove-pkg-event-redis-feature-flag.yml
new file mode 100644
index 0000000000000000000000000000000000000000..638a9c7bd7334d6c03188b87881dd3f37f4bdd44
--- /dev/null
+++ b/changelogs/unreleased/remove-pkg-event-redis-feature-flag.yml
@@ -0,0 +1,5 @@
+---
+title: Removes collect_package_events_redis feature flag
+merge_request: 49897
+author:
+type: other
diff --git a/config/feature_flags/development/collect_package_events_redis.yml b/config/feature_flags/development/collect_package_events_redis.yml
deleted file mode 100644
index 54dcf7c1bc61e1f22e940ad013c10bde8dd91950..0000000000000000000000000000000000000000
--- a/config/feature_flags/development/collect_package_events_redis.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-name: collect_package_events_redis
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46846
-rollout_issue_url:
-group: group::package
-type: development
-default_enabled: true
diff --git a/lib/gitlab/usage_data_counters/known_events/package_events.yml b/lib/gitlab/usage_data_counters/known_events/package_events.yml
index 6cf31ba4db7c49155ae9f2fc25fe943f4285fdb6..b7e583003c84466113bfeb9ce25057d17f05fac3 100644
--- a/lib/gitlab/usage_data_counters/known_events/package_events.yml
+++ b/lib/gitlab/usage_data_counters/known_events/package_events.yml
@@ -3,119 +3,95 @@
category: deploy_token_packages
aggregation: weekly
redis_slot: package
- feature_flag: collect_package_events_redis
- name: i_package_composer_user
category: user_packages
aggregation: weekly
redis_slot: package
- feature_flag: collect_package_events_redis
- name: i_package_conan_deploy_token
category: deploy_token_packages
aggregation: weekly
redis_slot: package
- feature_flag: collect_package_events_redis
- name: i_package_conan_user
category: user_packages
aggregation: weekly
redis_slot: package
- feature_flag: collect_package_events_redis
- name: i_package_container_deploy_token
category: deploy_token_packages
aggregation: weekly
redis_slot: package
- feature_flag: collect_package_events_redis
- name: i_package_container_user
category: user_packages
aggregation: weekly
redis_slot: package
- feature_flag: collect_package_events_redis
- name: i_package_debian_deploy_token
category: deploy_token_packages
aggregation: weekly
redis_slot: package
- feature_flag: collect_package_events_redis
- name: i_package_debian_user
category: user_packages
aggregation: weekly
redis_slot: package
- feature_flag: collect_package_events_redis
- name: i_package_generic_deploy_token
category: deploy_token_packages
aggregation: weekly
redis_slot: package
- feature_flag: collect_package_events_redis
- name: i_package_generic_user
category: user_packages
aggregation: weekly
redis_slot: package
- feature_flag: collect_package_events_redis
- name: i_package_golang_deploy_token
category: deploy_token_packages
aggregation: weekly
redis_slot: package
- feature_flag: collect_package_events_redis
- name: i_package_golang_user
category: user_packages
aggregation: weekly
redis_slot: package
- feature_flag: collect_package_events_redis
- name: i_package_maven_deploy_token
category: deploy_token_packages
aggregation: weekly
redis_slot: package
- feature_flag: collect_package_events_redis
- name: i_package_maven_user
category: user_packages
aggregation: weekly
redis_slot: package
- feature_flag: collect_package_events_redis
- name: i_package_npm_deploy_token
category: deploy_token_packages
aggregation: weekly
redis_slot: package
- feature_flag: collect_package_events_redis
- name: i_package_npm_user
category: user_packages
aggregation: weekly
redis_slot: package
- feature_flag: collect_package_events_redis
- name: i_package_nuget_deploy_token
category: deploy_token_packages
aggregation: weekly
redis_slot: package
- feature_flag: collect_package_events_redis
- name: i_package_nuget_user
category: user_packages
aggregation: weekly
redis_slot: package
- feature_flag: collect_package_events_redis
- name: i_package_pypi_deploy_token
category: deploy_token_packages
aggregation: weekly
redis_slot: package
- feature_flag: collect_package_events_redis
- name: i_package_pypi_user
category: user_packages
aggregation: weekly
redis_slot: package
- feature_flag: collect_package_events_redis
- name: i_package_rubygems_deploy_token
category: deploy_token_packages
aggregation: weekly
redis_slot: package
- feature_flag: collect_package_events_redis
- name: i_package_rubygems_user
category: user_packages
aggregation: weekly
redis_slot: package
- feature_flag: collect_package_events_redis
- name: i_package_tag_deploy_token
category: deploy_token_packages
aggregation: weekly
redis_slot: package
- feature_flag: collect_package_events_redis
- name: i_package_tag_user
category: user_packages
aggregation: weekly
redis_slot: package
- feature_flag: collect_package_events_redis
diff --git a/lib/tasks/gitlab/packages/events.rake b/lib/tasks/gitlab/packages/events.rake
index 4bf4ce430f146214b32ecaa0c29070cbd0a178c4..4a6a014acc5d6ea2850007dca6a5d3ec9bad8ec3 100644
--- a/lib/tasks/gitlab/packages/events.rake
+++ b/lib/tasks/gitlab/packages/events.rake
@@ -51,8 +51,7 @@ namespace :gitlab do
"name" => event_name,
"category" => "#{originator_type}_packages",
"aggregation" => "weekly",
- "redis_slot" => "package",
- "feature_flag" => "collect_package_events_redis"
+ "redis_slot" => "package"
}
end
diff --git a/spec/services/packages/create_event_service_spec.rb b/spec/services/packages/create_event_service_spec.rb
index f7bab0e5a9fdad10cd186cd9ac6447d02fcef067..122f1e88ad0c3b6096009d3f8b4e1b3b883352d3 100644
--- a/spec/services/packages/create_event_service_spec.rb
+++ b/spec/services/packages/create_event_service_spec.rb
@@ -57,18 +57,6 @@
end
shared_examples 'redis package unique event creation' do |originator_type, expected_scope|
- context 'with feature flag disable' do
- before do
- stub_feature_flags(collect_package_events_redis: false)
- end
-
- it 'does not track the event' do
- expect(::Gitlab::UsageDataCounters::HLLRedisCounter).not_to receive(:track_event)
-
- subject
- end
- end
-
it 'tracks the event' do
expect(::Gitlab::UsageDataCounters::HLLRedisCounter).to receive(:track_event).with(/package/, values: user.id)
@@ -77,18 +65,6 @@
end
shared_examples 'redis package count event creation' do |originator_type, expected_scope|
- context 'with feature flag disabled' do
- before do
- stub_feature_flags(collect_package_events_redis: false)
- end
-
- it 'does not track the event' do
- expect(::Gitlab::UsageDataCounters::PackageEventCounter).not_to receive(:count)
-
- subject
- end
- end
-
it 'tracks the event' do
expect(::Gitlab::UsageDataCounters::PackageEventCounter).to receive(:count).at_least(:once)