Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42

2 files changed, 43 insertions, 2 deletions

diff --git a/lib/gitlab/tracking/destinations/product_analytics.rb b/lib/gitlab/tracking/destinations/product_analytics.rb
new file mode 100644
index 00000000000..cacedbc5b83
--- /dev/null
+++ b/lib/gitlab/tracking/destinations/product_analytics.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Tracking
+    module Destinations
+      class ProductAnalytics < Base
+        extend ::Gitlab::Utils::Override
+        include ::Gitlab::Utils::StrongMemoize
+
+        override :event
+        def event(category, action, label: nil, property: nil, value: nil, context: nil)
+          return unless event_allowed?(category, action)
+          return unless enabled?
+
+          tracker.track_struct_event(category, action, label, property, value, context, (Time.now.to_f * 1000).to_i)
+        end
+
+        private
+
+        def event_allowed?(category, action)
+          category == 'epics' && action == 'promote'
+        end
+
+        def enabled?
+          Feature.enabled?(:product_analytics_tracking, type: :ops) &&
+            Gitlab::CurrentSettings.usage_ping_enabled? &&
+            Gitlab::CurrentSettings.self_monitoring_project_id.present?
+        end
+
+        def tracker
+          @tracker ||= SnowplowTracker::Tracker.new(
+            SnowplowTracker::AsyncEmitter.new(::ProductAnalytics::Tracker::COLLECTOR_URL, protocol: Gitlab.config.gitlab.protocol),
+            SnowplowTracker::Subject.new,
+            Gitlab::Tracking::SNOWPLOW_NAMESPACE,
+            Gitlab::CurrentSettings.self_monitoring_project_id.to_s
+          )
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/tracking/destinations/snowplow.rb b/lib/gitlab/tracking/destinations/snowplow.rb
index 9cebcfe5ee1..4fa844de325 100644
--- a/lib/gitlab/tracking/destinations/snowplow.rb
+++ b/lib/gitlab/tracking/destinations/snowplow.rb
@@ -15,10 +15,10 @@ module Gitlab
           tracker.track_struct_event(category, action, label, property, value, context, (Time.now.to_f * 1000).to_i)
         end
 
-        def self_describing_event(schema_url, event_data_json, context: nil)
+        def self_describing_event(schema_url, data:, context: nil)
           return unless enabled?
 
-          event_json = SnowplowTracker::SelfDescribingJson.new(schema_url, event_data_json)
+          event_json = SnowplowTracker::SelfDescribingJson.new(schema_url, data)
           tracker.track_self_describing_event(event_json, context, (Time.now.to_f * 1000).to_i)
         end