From 5a913585d6d4b84c23d97cc7d0d6b0f5af29ba67 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Sat, 9 Jan 2021 03:10:22 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- app/services/packages/create_event_service.rb | 2 +- .../205578-enable-collect_package_events_redis-feature.yml | 5 +++++ .../development/collect_package_events_redis.yml | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 changelogs/unreleased/205578-enable-collect_package_events_redis-feature.yml diff --git a/app/services/packages/create_event_service.rb b/app/services/packages/create_event_service.rb index fa0f0dbfab5..63248ef07c9 100644 --- a/app/services/packages/create_event_service.rb +++ b/app/services/packages/create_event_service.rb @@ -3,7 +3,7 @@ module Packages class CreateEventService < BaseService def execute - if Feature.enabled?(:collect_package_events_redis) + 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 diff --git a/changelogs/unreleased/205578-enable-collect_package_events_redis-feature.yml b/changelogs/unreleased/205578-enable-collect_package_events_redis-feature.yml new file mode 100644 index 00000000000..5d922b3d579 --- /dev/null +++ b/changelogs/unreleased/205578-enable-collect_package_events_redis-feature.yml @@ -0,0 +1,5 @@ +--- +title: Enable collect_package_events_redis by default +merge_request: 50092 +author: +type: changed diff --git a/config/feature_flags/development/collect_package_events_redis.yml b/config/feature_flags/development/collect_package_events_redis.yml index bc440a44f84..54dcf7c1bc6 100644 --- a/config/feature_flags/development/collect_package_events_redis.yml +++ b/config/feature_flags/development/collect_package_events_redis.yml @@ -4,4 +4,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46846 rollout_issue_url: group: group::package type: development -default_enabled: false +default_enabled: true