Add latest changes from gitlab-org/gitlab@master

2 files changed, 23 insertions, 12 deletions

diff --git a/app/assets/javascripts/tracking/dispatch_snowplow_event.js b/app/assets/javascripts/tracking/dispatch_snowplow_event.js
index 89d90cf89be..99e4a6aa3c7 100644
--- a/app/assets/javascripts/tracking/dispatch_snowplow_event.js
+++ b/app/assets/javascripts/tracking/dispatch_snowplow_event.js
@@ -15,10 +15,14 @@ export function dispatchSnowplowEvent(
   let { value } = data;
 
   const standardContext = getStandardContext({ extra });
-  const contexts = [standardContext];
+  let contexts = [standardContext];
 
   if (data.context) {
-    contexts.push(data.context);
+    if (Array.isArray(data.context)) {
+      contexts = [...contexts, ...data.context];
+    } else {
+      contexts.push(data.context);
+    }
   }
 
   if (value !== undefined) {
diff --git a/app/assets/javascripts/tracking/internal_events.js b/app/assets/javascripts/tracking/internal_events.js
index cc943163352..9bd0200cad1 100644
--- a/app/assets/javascripts/tracking/internal_events.js
+++ b/app/assets/javascripts/tracking/internal_events.js
@@ -15,17 +15,24 @@ const InternalEvents = {
   /**
    *
    * @param {string} event
+   * @param {object} data
    */
-  track_event(event) {
+  track_event(event, data = {}) {
+    const { context, ...rest } = data;
+
+    const defaultContext = {
+      schema: SERVICE_PING_SCHEMA,
+      data: {
+        event_name: event,
+        data_source: 'redis_hll',
+      },
+    };
+    const mergedContext = context ? [defaultContext, context] : defaultContext;
+
     API.trackInternalEvent(event);
     Tracking.event(GITLAB_INTERNAL_EVENT_CATEGORY, event, {
-      context: {
-        schema: SERVICE_PING_SCHEMA,
-        data: {
-          event_name: event,
-          data_source: 'redis_hll',
-        },
-      },
+      context: mergedContext,
+      ...rest,
     });
   },
   /**
@@ -35,8 +42,8 @@ const InternalEvents = {
   mixin() {
     return {
       methods: {
-        track_event(event) {
-          InternalEvents.track_event(event);
+        track_event(event, data = {}) {
+          InternalEvents.track_event(event, data);
         },
       },
     };