Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42

1 files changed, 46 insertions, 16 deletions

diff --git a/lib/gitlab/experimentation.rb b/lib/gitlab/experimentation.rb
index 196203211ed..423f238a0a2 100644
--- a/lib/gitlab/experimentation.rb
+++ b/lib/gitlab/experimentation.rb
@@ -6,6 +6,7 @@
 # Experiment options:
 # - tracking_category (optional, used to set the category when tracking an experiment event)
 # - use_backwards_compatible_subject_index (optional, set this to true if you need backwards compatibility -- you likely do not need this, see note in the next paragraph.)
+# - rollout_strategy: default is `:cookie` based rollout. We may also set it to `:user` based rollout
 #
 # Using the backwards-compatible subject index (use_backwards_compatible_subject_index option):
 # This option was added when [the calculation of experimentation_subject_index was changed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45733/diffs#41af4a6fa5a10c7068559ce21c5188483751d934_157_173). It is not intended to be used by new experiments, it exists merely for the segmentation integrity of in-flight experiments at the time the change was deployed. That is, we want users who were assigned to the "experimental" group or the "control" group before the change to still be in those same groups after the change. See [the original issue](https://gitlab.com/gitlab-org/gitlab/-/issues/270858) and [this related comment](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48110#note_458223745) for more information.
@@ -33,10 +34,6 @@
 module Gitlab
   module Experimentation
     EXPERIMENTS = {
-      onboarding_issues: {
-        tracking_category: 'Growth::Conversion::Experiment::OnboardingIssues',
-        use_backwards_compatible_subject_index: true
-      },
       ci_notification_dot: {
         tracking_category: 'Growth::Expansion::Experiment::CiNotificationDot',
         use_backwards_compatible_subject_index: true
@@ -69,13 +66,6 @@ module Gitlab
         tracking_category: 'Growth::Conversion::Experiment::GroupOnlyTrials',
         use_backwards_compatible_subject_index: true
       },
-      default_to_issues_board: {
-        tracking_category: 'Growth::Conversion::Experiment::DefaultToIssuesBoard',
-        use_backwards_compatible_subject_index: true
-      },
-      jobs_empty_state: {
-        tracking_category: 'Growth::Activation::Experiment::JobsEmptyState'
-      },
       remove_known_trial_form_fields: {
         tracking_category: 'Growth::Conversion::Experiment::RemoveKnownTrialFormFields'
       },
@@ -92,19 +82,27 @@ module Gitlab
         tracking_category: 'Growth::Conversion::Experiment::TrialDuringSignup'
       },
       ci_syntax_templates: {
-        tracking_category: 'Growth::Activation::Experiment::CiSyntaxTemplates'
-      },
-      pipelines_empty_state: {
-        tracking_category: 'Growth::Activation::Experiment::PipelinesEmptyState'
+        tracking_category: 'Growth::Activation::Experiment::CiSyntaxTemplates',
+        rollout_strategy: :user
       },
       invite_members_new_dropdown: {
         tracking_category: 'Growth::Expansion::Experiment::InviteMembersNewDropdown'
       },
       show_trial_status_in_sidebar: {
-        tracking_category: 'Growth::Conversion::Experiment::ShowTrialStatusInSidebar'
+        tracking_category: 'Growth::Conversion::Experiment::ShowTrialStatusInSidebar',
+        rollout_strategy: :group
       },
       trial_onboarding_issues: {
         tracking_category: 'Growth::Conversion::Experiment::TrialOnboardingIssues'
+      },
+      learn_gitlab_a: {
+        tracking_category: 'Growth::Conversion::Experiment::LearnGitLabA'
+      },
+      learn_gitlab_b: {
+        tracking_category: 'Growth::Activation::Experiment::LearnGitLabB'
+      },
+      in_product_marketing_emails: {
+        tracking_category: 'Growth::Activation::Experiment::InProductMarketingEmails'
       }
     }.freeze
 
@@ -126,12 +124,44 @@ module Gitlab
         return false if subject.blank?
         return false unless active?(experiment_key)
 
+        log_invalid_rollout(experiment_key, subject)
+
         experiment = get_experiment(experiment_key)
         return false unless experiment
 
         experiment.enabled_for_index?(index_for_subject(experiment, subject))
       end
 
+      def rollout_strategy(experiment_key)
+        experiment = get_experiment(experiment_key)
+        return unless experiment
+
+        experiment.rollout_strategy
+      end
+
+      def log_invalid_rollout(experiment_key, subject)
+        return if valid_subject_for_rollout_strategy?(experiment_key, subject)
+
+        logger = Gitlab::ExperimentationLogger.build
+        logger.warn message: 'Subject must conform to the rollout strategy',
+                     experiment_key: experiment_key,
+                     subject: subject.class.to_s,
+                     rollout_strategy: rollout_strategy(experiment_key)
+      end
+
+      def valid_subject_for_rollout_strategy?(experiment_key, subject)
+        case rollout_strategy(experiment_key)
+        when :user
+          subject.is_a?(User)
+        when :group
+          subject.is_a?(Group)
+        when :cookie
+          subject.nil? || subject.is_a?(String)
+        else
+          false
+        end
+      end
+
       private
 
       def index_for_subject(experiment, subject)