diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-20 16:37:47 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-20 16:37:47 +0300 |
commit | aee0a117a889461ce8ced6fcf73207fe017f1d99 (patch) | |
tree | 891d9ef189227a8445d83f35c1b0fc99573f4380 /app/experiments/application_experiment.rb | |
parent | 8d46af3258650d305f53b819eabf7ab18d22f59e (diff) |
Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42
Diffstat (limited to 'app/experiments/application_experiment.rb')
-rw-r--r-- | app/experiments/application_experiment.rb | 32 |
1 files changed, 25 insertions, 7 deletions
diff --git a/app/experiments/application_experiment.rb b/app/experiments/application_experiment.rb index 37d87baf30b..859716b4739 100644 --- a/app/experiments/application_experiment.rb +++ b/app/experiments/application_experiment.rb @@ -13,7 +13,6 @@ class ApplicationExperiment < Gitlab::Experiment # rubocop:disable Gitlab/Namesp super publish_to_client - publish_to_database if @record end def publish_to_client @@ -25,6 +24,8 @@ class ApplicationExperiment < Gitlab::Experiment # rubocop:disable Gitlab/Namesp end def publish_to_database + ActiveSupport::Deprecation.warn('publish_to_database is deprecated and should not be used for reporting anymore') + return unless should_track? # if the context contains a namespace, group, project, user, or actor @@ -32,18 +33,18 @@ class ApplicationExperiment < Gitlab::Experiment # rubocop:disable Gitlab/Namesp subject = value[:namespace] || value[:group] || value[:project] || value[:user] || value[:actor] return unless ExperimentSubject.valid_subject?(subject) - variant = :experimental if @variant_name != :control - Experiment.add_subject(name, variant: variant || :control, subject: subject) - end - - def record! - @record = true + variant_name = :experimental if variant&.name != 'control' + Experiment.add_subject(name, variant: variant_name || :control, subject: subject) end def control_behavior # define a default nil control behavior so we can omit it when not needed end + def track(action, **event_args) + super(action, **tracking_context.merge(event_args)) + end + # TODO: remove # This is deprecated logic as of v0.6.0 and should eventually be removed, but # needs to stay intact for actively running experiments. The new strategy @@ -57,8 +58,25 @@ class ApplicationExperiment < Gitlab::Experiment # rubocop:disable Gitlab/Namesp Digest::MD5.hexdigest(ingredients.join('|')) end + def nest_experiment(other) + instance_exec(:nested, { label: other.name }, &Configuration.tracking_behavior) + end + private + def tracking_context + { + namespace: context.try(:namespace) || context.try(:group), + project: context.try(:project), + user: user_or_actor + }.compact || {} + end + + def user_or_actor + actor = context.try(:actor) + actor.respond_to?(:id) ? actor : context.try(:user) + end + def feature_flag_name name.tr('/', '_') end |