Add latest changes from gitlab-org/gitlab@master

2 files changed, 14 insertions, 4 deletions

diff --git a/app/assets/javascripts/tracking/dispatch_snowplow_event.js b/app/assets/javascripts/tracking/dispatch_snowplow_event.js
index 7e596f5f36f..5daeaf1d85b 100644
--- a/app/assets/javascripts/tracking/dispatch_snowplow_event.js
+++ b/app/assets/javascripts/tracking/dispatch_snowplow_event.js
@@ -1,3 +1,4 @@
+import * as Sentry from '@sentry/browser';
 import getStandardContext from './get_standard_context';
 
 export function dispatchSnowplowEvent(
@@ -24,5 +25,11 @@ export function dispatchSnowplowEvent(
     value = Number(value);
   }
 
-  return window.snowplow('trackStructEvent', category, action, label, property, value, contexts);
+  try {
+    window.snowplow('trackStructEvent', category, action, label, property, value, contexts);
+    return true;
+  } catch (error) {
+    Sentry.captureException(error);
+    return false;
+  }
 }
diff --git a/app/assets/javascripts/tracking/tracking.js b/app/assets/javascripts/tracking/tracking.js
index f299c57b33f..cf7ec1e5465 100644
--- a/app/assets/javascripts/tracking/tracking.js
+++ b/app/assets/javascripts/tracking/tracking.js
@@ -49,8 +49,11 @@ export default class Tracking {
    * dispatched (data-attributes, load-events), they will be added
    * to a queue to be flushed afterwards.
    *
+   * If there is an error when using the library, it will return ´false´
+   * and ´true´ otherwise.
+   *
    * @param  {...any} eventData defined event taxonomy
-   * @returns {undefined|Boolean}
+   * @returns {Boolean}
    */
   static event(...eventData) {
     if (!this.enabled()) {
@@ -85,7 +88,7 @@ export default class Tracking {
    *
    * @param {String} basename
    * @param {Object} eventData
-   * @returns {undefined|Boolean}
+   * @returns {Boolean}
    */
   static definition(basename, eventData = {}) {
     if (!this.enabled()) {
@@ -105,7 +108,7 @@ export default class Tracking {
    *
    * @param {String} basename
    * @param {Object} eventData
-   * @returns {undefined|Boolean}
+   * @returns {Boolean}
    */
   static dispatchFromDefinition(basename, eventData) {
     if (!this.definitionsLoaded) {