Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42

2 files changed, 10 insertions, 9 deletions

diff --git a/doc/development/snowplow/dictionary.md b/doc/development/snowplow/dictionary.md
index f20ec41d558..589d6f6fb9f 100644
--- a/doc/development/snowplow/dictionary.md
+++ b/doc/development/snowplow/dictionary.md
@@ -7,7 +7,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 <!---
   This documentation is auto generated by a script.
 
-  Please do not edit this file directly, check generate_metrics_dictionary task on lib/tasks/gitlab/usage_data.rake.
+  Please do not edit this file directly, check generate_event_dictionary task on lib/tasks/gitlab/snowplow.rake.
 --->
 
 <!-- vale gitlab.Spelling = NO -->
diff --git a/doc/development/snowplow/index.md b/doc/development/snowplow/index.md
index 552249344c7..527b4292b23 100644
--- a/doc/development/snowplow/index.md
+++ b/doc/development/snowplow/index.md
@@ -279,7 +279,8 @@ export default {
 ```
 
 The event data can be provided with a `tracking` object, declared in the `data` function,
-or as a `computed property`.
+or as a `computed property`. A `tracking` object is convenient when the default
+event properties are dynamic or provided at runtime.
 
 ```javascript
 export default {
@@ -292,6 +293,7 @@ export default {
         // category: '',
         // property: '',
         // value: '',
+        // experiment: '',
         // extra: {},
       },
     };
@@ -549,14 +551,14 @@ Snowplow Micro is a Docker-based solution for testing frontend and backend event
    update application_settings set snowplow_collector_hostname='localhost:9090', snowplow_enabled=true, snowplow_cookie_domain='.gitlab.com';
    ```
 
-1. Update `DEFAULT_SNOWPLOW_OPTIONS` in `app/assets/javascripts/tracking/index.js` to remove `forceSecureTracker: true`:
+1. Update `DEFAULT_SNOWPLOW_OPTIONS` in `app/assets/javascripts/tracking/constants.js` to remove `forceSecureTracker: true`:
 
    ```diff
-   diff --git a/app/assets/javascripts/tracking/index.js b/app/assets/javascripts/tracking/index.js
-   index 0a1211d0a76..3b98c8f28f2 100644
-   --- a/app/assets/javascripts/tracking/index.js
-   +++ b/app/assets/javascripts/tracking/index.js
-   @@ -7,7 +7,6 @@ const DEFAULT_SNOWPLOW_OPTIONS = {
+   diff --git a/app/assets/javascripts/tracking/constants.js b/app/assets/javascripts/tracking/constants.js
+   index 598111e4086..eff38074d4c 100644
+   --- a/app/assets/javascripts/tracking/constants.js
+   +++ b/app/assets/javascripts/tracking/constants.js
+   @@ -7,7 +7,6 @@ export const DEFAULT_SNOWPLOW_OPTIONS = {
       appId: '',
       userFingerprint: false,
       respectDoNotTrack: true,
@@ -564,7 +566,6 @@ Snowplow Micro is a Docker-based solution for testing frontend and backend event
       eventMethod: 'post',
       contexts: { webPage: true, performanceTiming: true },
       formTracking: false,
-
    ```
 
 1. Update `snowplow_options` in `lib/gitlab/tracking.rb` to add `protocol` and `port`: