Add latest changes from gitlab-org/gitlab@master

2 files changed, 8 insertions, 11 deletions

diff --git a/lib/gitlab/usage_data_counters/ci_template_unique_counter.rb b/lib/gitlab/usage_data_counters/ci_template_unique_counter.rb
index eb040e9e819..04d1b1b4638 100644
--- a/lib/gitlab/usage_data_counters/ci_template_unique_counter.rb
+++ b/lib/gitlab/usage_data_counters/ci_template_unique_counter.rb
@@ -14,14 +14,11 @@ module Gitlab::UsageDataCounters
         Gitlab::UsageDataCounters::HLLRedisCounter.track_event(event_name, values: project.id)
 
         namespace = project.namespace
-        if Feature.enabled?(:route_hll_to_snowplow, namespace)
-          context = Gitlab::Tracking::ServicePingContext.new(data_source: :redis_hll,
-                                                             event: event_name).to_context
-          label = 'redis_hll_counters.ci_templates.ci_templates_total_unique_counts_monthly'
-          Gitlab::Tracking.event(name, 'ci_templates_unique', namespace: namespace,
-                                                              project: project, context: [context], user: user,
-                                                              label: label)
-        end
+        context = Gitlab::Tracking::ServicePingContext.new(data_source: :redis_hll,
+                                                           event: event_name).to_context
+        label = 'redis_hll_counters.ci_templates.ci_templates_total_unique_counts_monthly'
+        Gitlab::Tracking.event(name, 'ci_templates_unique', namespace: namespace,
+                               project: project, context: [context], user: user, label: label)
       end
 
       def ci_templates(relative_base = 'lib/gitlab/ci/templates')
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 10dae35d0bf..c8768164710 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
@@ -76,10 +76,10 @@ module Gitlab
             project: project,
             namespace: project.namespace,
             user: user,
-            property: MR_CREATE_ACTION,
-            label: 'redis_hll_counters.code_review.i_code_review_create_mr_monthly',
+            property: MR_USER_CREATE_ACTION,
+            label: 'redis_hll_counters.code_review.i_code_review_user_create_mr_monthly',
             context: [Gitlab::Tracking::ServicePingContext.new(data_source: :redis_hll,
-                                                               event: MR_CREATE_ACTION).to_context]
+                                                               event: MR_USER_CREATE_ACTION).to_context]
           )
         end