gitlab-experiment 0.4.10 → 0.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1cbae46377202f37922a880d0c1cde571de29e96dd14fbe879e05718ba6d8ea
-  data.tar.gz: 48258191a1de1e9ca5de40428d481466c3a68272422783610dbfbd112a834ea7
+  metadata.gz: 207b046a8c0b1c98ad958442716be6a8232c431bfcc702a42817d8eb1aa3f465
+  data.tar.gz: c654346312abfd1684af031fe1784cb1db61ac583c0c52c3ef50b08d0337182b
 SHA512:
-  metadata.gz: 8b7d5b2e1725e988bc55653baa1ece89c2d4b31f9cafc7e4d563bc6c093071abdf8fea89abf758658740f34168eb185a01beada94d331e85bf6c9b5cad78a345
-  data.tar.gz: cb295e0547616c5c7b47bcec319e27693e7017bbf14a0026b02afb6324715922a01620485db0878cf806f3ac89306f22e812cd44b812da871e3dc77157aa2386
+  metadata.gz: 3f3b9d02b8a268e99bb9cda60e7c1a76d55962f9d04754209558deebd58624c5407bf883a6405c3d248b13f3a246a96a9d4a370bfca052e512f125a57aa89e8f
+  data.tar.gz: b43611c028598b362972079b6b785dd62e7c4b35dffa2abc6bd9822a6a2b488385101a5aea975b0d6c429638a8e8661ff6e8aca9e0a0e184c9510a6e5c591d48

data/lib/gitlab/experiment.rb

@@ -79,11 +79,8 @@ module Gitlab
     end
 
     def variant(value = nil)
-      if value.blank? && @variant_name || @resolving_variant
-        return Variant.new(name: (@variant_name || :unresolved).to_s)
-      end
-
       @variant_name = value unless value.blank?
+      return Variant.new(name: (@variant_name || :unresolved).to_s) if @variant_name || @resolving_variant
 
       if enabled?
         @variant_name ||= :control if excluded?
@@ -94,18 +91,16 @@ module Gitlab
         end
       end
 
-      Variant.new(name: (@variant_name || :control).to_s)
+      run_callbacks(segmentation_callback_chain) do
+        @variant_name ||= :control
+        Variant.new(name: @variant_name.to_s)
+      end
     ensure
       @resolving_variant = false
     end
 
     def run(variant_name = nil)
-      @result ||= begin
-        variant_name = variant(variant_name).name
-        run_callbacks(run_with_segmenting? ? :segmented_run : :unsegmented_run) do
-          super(@variant_name ||= variant_name)
-        end
-      end
+      @result ||= super(variant(variant_name).name)
     end
 
     def publish(result)
@@ -158,7 +153,9 @@ module Gitlab
     end
 
     def excluded?
-      @excluded ||= !@context.trackable? || # adhere to DNT headers
+      return @excluded if defined?(@excluded)
+
+      @excluded = !@context.trackable? || # adhere to DNT headers
         !run_callbacks(:exclusion_check) { :not_excluded } # didn't pass exclusion check
     end
 
@@ -172,8 +169,10 @@ module Gitlab
 
     protected
 
-    def run_with_segmenting?
-      !variant_assigned? && enabled? && !excluded?
+    def segmentation_callback_chain
+      return :segmentation_check if !variant_assigned? && enabled? && !excluded?
+
+      :unsegmented
     end
 
     def variant_assigned?

data/lib/gitlab/experiment/callbacks.rb

@@ -7,8 +7,8 @@ module Gitlab
       include ActiveSupport::Callbacks
 
       included do
-        define_callbacks(:unsegmented_run)
-        define_callbacks(:segmented_run)
+        define_callbacks(:unsegmented)
+        define_callbacks(:segmentation_check)
         define_callbacks(:exclusion_check, skip_after_callbacks_if_terminated: true)
       end
 
@@ -34,7 +34,7 @@ module Gitlab
 
           raise ArgumentError, 'no filters provided' if filters.empty?
 
-          set_callback(:segmented_run, :before, *filters, options)
+          set_callback(:segmentation_check, :before, *filters, options)
         end
       end
     end

data/lib/gitlab/experiment/rspec.rb

@@ -86,7 +86,7 @@ module Gitlab
           experiment.context(context)
 
           experiment.instance_variable_set(ivar, nil)
-          experiment.run_callbacks(:segmented_run)
+          experiment.run_callbacks(:segmentation_check)
 
           @actual = experiment.instance_variable_get(ivar)
           @expected ? @actual.to_s == @expected.to_s : @actual.present?

data/lib/gitlab/experiment/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   class Experiment
-    VERSION = '0.4.10'
+    VERSION = '0.4.11'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-experiment
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.4.11
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-16 00:00:00.000000000 Z
+date: 2021-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport