Add latest changes from gitlab-org/gitlab@master

3 files changed, 10 insertions, 17 deletions

diff --git a/lib/gitlab/usage_data_counters/editor_unique_counter.rb b/lib/gitlab/usage_data_counters/editor_unique_counter.rb
index 2aebc1b8813..4e4a01ed301 100644
--- a/lib/gitlab/usage_data_counters/editor_unique_counter.rb
+++ b/lib/gitlab/usage_data_counters/editor_unique_counter.rb
@@ -38,18 +38,16 @@ module Gitlab
         def track_unique_action(event_name, author, time, project = nil)
           return unless author
 
-          if Feature.enabled?(:route_hll_to_snowplow_phase2)
-            Gitlab::Tracking.event(
-              name,
-              'ide_edit',
-              property: event_name.to_s,
-              project: project,
-              namespace: project&.namespace,
-              user: author,
-              label: 'usage_activity_by_stage_monthly.create.action_monthly_active_users_ide_edit',
-              context: [Gitlab::Tracking::ServicePingContext.new(data_source: :redis_hll, event: event_name).to_context]
-            )
-          end
+          Gitlab::Tracking.event(
+            name,
+            'ide_edit',
+            property: event_name.to_s,
+            project: project,
+            namespace: project&.namespace,
+            user: author,
+            label: 'usage_activity_by_stage_monthly.create.action_monthly_active_users_ide_edit',
+            context: [Gitlab::Tracking::ServicePingContext.new(data_source: :redis_hll, event: event_name).to_context]
+          )
 
           Gitlab::UsageDataCounters::HLLRedisCounter.track_event(event_name, values: author.id, time: time)
         end
diff --git a/lib/gitlab/usage_data_counters/issue_activity_unique_counter.rb b/lib/gitlab/usage_data_counters/issue_activity_unique_counter.rb
index a59ea36961d..c0d1af8a43a 100644
--- a/lib/gitlab/usage_data_counters/issue_activity_unique_counter.rb
+++ b/lib/gitlab/usage_data_counters/issue_activity_unique_counter.rb
@@ -180,7 +180,6 @@ module Gitlab
         private
 
         def track_snowplow_action(event_name, author, project)
-          return unless Feature.enabled?(:route_hll_to_snowplow_phase2, project.namespace)
           return unless author
 
           Gitlab::Tracking.event(
diff --git a/lib/gitlab/usage_data_counters/merge_request_activity_unique_counter.rb b/lib/gitlab/usage_data_counters/merge_request_activity_unique_counter.rb
index c8768164710..fceeacb60ca 100644
--- a/lib/gitlab/usage_data_counters/merge_request_activity_unique_counter.rb
+++ b/lib/gitlab/usage_data_counters/merge_request_activity_unique_counter.rb
@@ -68,8 +68,6 @@ module Gitlab
           track_unique_action_by_merge_request(MR_CREATE_ACTION, merge_request)
 
           project = merge_request.target_project
-          return unless Feature.enabled?(:route_hll_to_snowplow_phase2, project.namespace)
-
           Gitlab::Tracking.event(
             name,
             :create,
@@ -99,8 +97,6 @@ module Gitlab
           track_unique_action_by_user(MR_APPROVE_ACTION, user)
 
           project = merge_request.target_project
-          return unless Feature.enabled?(:route_hll_to_snowplow_phase2, project.namespace)
-
           Gitlab::Tracking.event(
             name,
             :approve,