flagger 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0383baed2212fa14d29362b6aa702258c04127a5509b203da1f6048830a59a35
-  data.tar.gz: 18a20e60ce690b1cec114a679662189be1ed3df785f0941c9571bf0a31e65308
+  metadata.gz: 83ee349b75c8fe210460e4d38f08a1163c26934d9d3479ee6816339f7c717b18
+  data.tar.gz: 05aaec4dcc582463ae66d06ab01dc49f359b8177c655640550f4386ccfa92ced
 SHA512:
-  metadata.gz: 27d6f46021da920547581df3905d00d64cdcaf93ebe1bb3fa82cfe5e3de907d31686f26562886dc1945776a9c846f5dcbe2ff6167a2b64257f2b725af3e6a8ed
-  data.tar.gz: fde22430bfe8afc4c7a5204ce162c29ff3c7dae621f0b706263b78fdefcf1bf4f9fb0e0569a9125301c4614ff84abb6f50629c4f509d58e4285df923e2362e10
+  metadata.gz: 8a831fff34ffd437e578e7d201328fc2432364695eb09561e2e684b5f9c410dd5471e01d49f3f73a98fb4b587030d7dba8c5e62e35acf9ecce0bf496801392d9
+  data.tar.gz: b6b765ddf6dd34c7c8b3f450f3c549b0514157f29b8d6014929000fb36d58b36c93f231f232e3b1f5f271bd544a2c90b5da4496178ed222bad1ed4f6b73b60ee

data/lib/flagger/cloud.rb

@@ -25,17 +25,25 @@ module FlaggerEnvironments
     attr_accessor :request_timeout
 
     def initialize(env_key, request_timeout)
-      @entity_lru_hashes = LruRedux::Cache.new(500)
+      @env_key = env_key
+      @request_timeout = request_timeout
+
+      @ingestion_max_items = 500
+      @ingestion_interval = 30
+
       @entities = []
       @stats = []
       @exposures = []
       @flags = Set[]
       @ingested_flags = Set[]
-      @env_key = env_key
-      @request_timeout = request_timeout
 
-      @ingestion_max_items = 500
-      @ingestion_interval = 30
+      @entity_lru_hashes = LruRedux::Cache.new(500)
+      @first_ingestion = true
+
+      @should_ingest_entities = true
+      @should_ingest_stats = true
+      @should_ingest_exposures = true
+      @should_ingest_flags = true
 
       begin
         get_gating_info("#{GATING_INFO_ENDPOINT}/#{@env_key}", 'duration__gating_info')
@@ -112,9 +120,37 @@ module FlaggerEnvironments
       if gating_info&.sdk_info&.ingestion_interval then
         @ingestion_interval = gating_info.sdk_info.ingestion_interval
       end
+      if gating_info&.sdk_info&.should_ingest_entities then
+        @should_ingest_entities = gating_info.sdk_info.should_ingest_entities
+      end
+      if gating_info&.sdk_info&.should_ingest_stats then
+        @should_ingest_stats = gating_info&.sdk_info&.should_ingest_stats
+      end
+      if gating_info&.sdk_info&.should_ingest_exposures then
+        @should_ingest_exposures = gating_info&.sdk_info&.should_ingest_exposures
+      end
+      if gating_info&.sdk_info&.should_ingest_flags then
+        @should_ingest_flags = gating_info&.sdk_info&.should_ingest_flags
+      end
     end
 
     def maybe_ingest(should_ingest = false)
+      if !@should_ingest_entities then
+        @entities = []
+      end
+
+      if !@should_ingest_stats then
+        @stats = []
+      end
+
+      if !@should_ingest_exposures then
+        @exposures = []
+      end
+
+      if !@should_ingest_flags then
+        @flags = Set[]
+      end
+
       should_ingest |= (
         @entities.length > @ingestion_max_items ||
         @stats.length > @ingestion_max_items ||
@@ -122,6 +158,11 @@ module FlaggerEnvironments
         @flags.length > 0
       )
 
+      if @first_ingestion then
+        should_ingest |= @entities.length > 0
+        @first_ingestion = !should_ingest
+      end
+
       should_ingest &= (
         @entities.length > 0 ||
         @stats.length > 0 ||
@@ -246,41 +287,141 @@ module FlaggerEnvironments
       end
     end
 
-    {
-      'treatment' => 'duration__get_treatment',
-      'payload' => 'duration__get_payload',
-      'eligible?' => 'duration__is_eligible',
-      'enabled?' => 'duration__is_enabled',
-    }.each do |name, stat_name|
-      define_method(name.to_sym) do |flagger_flag, entity_json|
-        stat = FlaggerUtils::Stat.new(stat_name)
-        stat.start()
-
-        entity = identify_entity(entity_json)
-        flag = @gating_info&.flag(flagger_flag.flag_name)
-        if flag.nil? && !@ingested_flags.include?(flagger_flag.flag_name) then
-          save_flag(flagger_flag.flag_name)
-        end
-        return_value = flag&.public_send(name, entity)
-
-        if name == 'treatment' and !return_value.nil? then
-          exposure = {
-            type: entity.type,
-            id: entity.id,
-            treatment_id: return_value.treatment_id,
-            treatment: return_value.codename
-          }
+    def treatment(flagger_flag, entity_json)
+      stat = FlaggerUtils::Stat.new('duration__get_treatment')
+      stat.start()
 
-          return_value = return_value.codename
+      entity = identify_entity(entity_json)
+      flag = @gating_info&.flag(flagger_flag.flag_name)
+      if flag.nil? && !@ingested_flags.include?(flagger_flag.flag_name) then
+        save_flag(flagger_flag.flag_name)
+      end
+      return_value = flag&.treatment(entity)
 
-          save_exposure(exposure)
-        end
+      if !return_value then
+        return return_value
+      end
 
-        stat.stop()
-        save_stat(stat)
+      exposure = {
+        flag: flagger_flag.flag_name,
+        type: entity.type,
+        id: entity.id,
+        treatment: return_value[:treatment].codename,
+        method_called: 'get_treatment',
+        eligible: return_value[:eligible]
+      }
+
+      return_value = return_value[:treatment].codename
+
+      save_exposure(exposure)
 
-        return_value
+      stat.stop()
+      save_stat(stat)
+
+      return_value
+    end
+
+
+    def payload(flagger_flag, entity_json)
+      stat = FlaggerUtils::Stat.new('duration__get_payload')
+      stat.start()
+
+      entity = identify_entity(entity_json)
+      flag = @gating_info&.flag(flagger_flag.flag_name)
+      if flag.nil? && !@ingested_flags.include?(flagger_flag.flag_name) then
+        save_flag(flagger_flag.flag_name)
+      end
+      return_value = flag&.payload(entity)
+
+      if !return_value then
+        return return_value
+      end
+
+      exposure = {
+        flag: flagger_flag.flag_name,
+        type: entity.type,
+        id: entity.id,
+        treatment: return_value[:treatment].codename,
+        method_called: 'get_payload',
+        eligible: return_value[:eligible]
+      }
+
+      return_value = return_value[:treatment].payload
+
+      save_exposure(exposure)
+
+      stat.stop()
+      save_stat(stat)
+
+      return_value
+    end
+
+    def eligible?(flagger_flag, entity_json)
+      stat = FlaggerUtils::Stat.new('duration__is_eligible')
+      stat.start()
+
+      entity = identify_entity(entity_json)
+      flag = @gating_info&.flag(flagger_flag.flag_name)
+      if flag.nil? && !@ingested_flags.include?(flagger_flag.flag_name) then
+        save_flag(flagger_flag.flag_name)
+      end
+      return_value = flag&.eligible?(entity)
+
+      if !return_value then
+        return return_value
       end
+
+      exposure = {
+        flag: flagger_flag.flag_name,
+        type: entity.type,
+        id: entity.id,
+        treatment: return_value[:treatment].codename,
+        method_called: 'is_eligible',
+        eligible: return_value[:eligible]
+      }
+
+      return_value = return_value[:eligible]
+
+      save_exposure(exposure)
+
+      stat.stop()
+      save_stat(stat)
+
+      return_value
+    end
+
+    def enabled?(flagger_flag, entity_json)
+      stat = FlaggerUtils::Stat.new('duration__is_enabled')
+      stat.start()
+
+      entity = identify_entity(entity_json)
+      flag = @gating_info&.flag(flagger_flag.flag_name)
+      if flag.nil? && !@ingested_flags.include?(flagger_flag.flag_name) then
+        save_flag(flagger_flag.flag_name)
+      end
+      return_value = flag&.enabled?(entity)
+
+      if !return_value then
+        return return_value
+      end
+
+      exposure = {
+        flag: flagger_flag.flag_name,
+        type: entity.type,
+        id: entity.id,
+        treatment: return_value[:treatment].codename,
+        method_called: 'is_enabled',
+        eligible: return_value[:eligible]
+      }
+
+      return_value = !return_value[:treatment].is_off_treatment
+
+      save_exposure(exposure)
+
+      stat.stop()
+      save_stat(stat)
+
+      return_value
     end
 
     def publish(entities)

data/lib/flagger/models.rb

@@ -152,14 +152,26 @@ module FlaggerModels
     SCHEMA = Dry::Validation.Schema do
       optional(:@ingestion_interval) { int? }
       optional(:@ingestion_max_items) { int? }
+      optional(:@should_ingest_entities) { bool? }
+      optional(:@should_ingest_stats) { bool? }
+      optional(:@should_ingest_exposures) { bool? }
+      optional(:@should_ingest_flags) { bool? }
     end
 
     attr_reader :ingestion_interval
     attr_reader :ingestion_max_items
+    attr_reader :should_ingest_entities
+    attr_reader :should_ingest_stats
+    attr_reader :should_ingest_exposures
+    attr_reader :should_ingest_flags
 
     def initialize(json)
       @ingestion_interval = json['SDK_INGESTION_INTERVAL']
       @ingestion_max_items = json['SDK_INGESTION_MAX_ITEMS']
+      @should_ingest_entities = json['SDK_SHOULD_INGEST_OBJECTS']
+      @should_ingest_stats = json['SDK_SHOULD_INGEST_STATS']
+      @should_ingest_exposures = json['SDK_SHOULD_INGEST_EXPOSURES']
+      @should_ingest_flags = json['SDK_SHOULD_INGEST_FLAGS']
 
       validate
     end
@@ -232,7 +244,7 @@ module FlaggerModels
       if @flag_type == 'uncategorized' or !entity then
         nil
       else
-        resolved_allocation(@env_hash_key, entity)[:treatment]
+        resolved_allocation(@env_hash_key, entity)
       end
     end
 
@@ -240,7 +252,7 @@ module FlaggerModels
       if @flag_type == 'uncategorized' or !entity then
         nil
       else
-        resolved_allocation(@env_hash_key, entity)[:treatment].payload
+        resolved_allocation(@env_hash_key, entity)
       end
     end
 
@@ -248,7 +260,7 @@ module FlaggerModels
       if @flag_type == 'uncategorized' or !entity then
         false
       else
-        resolved_allocation(@env_hash_key, entity)[:eligible]
+        resolved_allocation(@env_hash_key, entity)
       end
     end
 
@@ -256,7 +268,7 @@ module FlaggerModels
       if @flag_type == 'uncategorized' or !entity then
         false
       else
-        not resolved_allocation(@env_hash_key, entity)[:treatment].is_off_treatment
+        resolved_allocation(@env_hash_key, entity)
       end
     end
 
@@ -621,7 +633,7 @@ module FlaggerModels
       required(:@is_control) { bool? }
       required(:@codename) { str? }
       required(:@is_off_treatment) { bool? }
-      optional(:@payload) { str? }
+      optional(:@payload) { str? | type?(Numeric) | bool? | array? | type?(Hash) }
     end
 
     attr_reader :treatment_id

data/lib/flagger/version.rb

@@ -1,4 +1,4 @@
 module FlaggerUtils
-  VERSION = '2.0.4'
+  VERSION = '2.0.5'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flagger
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Airship Dev Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-06 00:00:00.000000000 Z
+date: 2018-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday