Merge pull request #432 from splitio/ci-job-31

sanzmauro · web-flow · commit 56d48ad99b67 · 2022-05-09T12:20:51.000-04:00
Working on add multiple ci jobs.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,16 +8,20 @@ jobs:
         image: redis
         ports:
           - 6379:6379
+    strategy:
+      matrix:
+        ruby: [ '2.5.0', '3.1.1' ]
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
-      - name: Set up Ruby
+      - name: Set up Ruby ${{ matrix.ruby }}
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.5
+          ruby-version: ${{ matrix.ruby }}
 
       - name: Install dependencies
         run: bundle install
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -27,20 +27,6 @@ Metrics/ParameterLists:
 
 Metrics/LineLength:
   Max: 135
-  Exclude:
-    - spec/sse/**/*
-    - spec/integrations/**/*
-    - spec/engine/sync_manager_spec.rb
-    - spec/engine/auth_api_client_spec.rb
-    - spec/telemetry/synchronizer_spec.rb
-    - spec/splitclient/split_config_spec.rb
-    - spec/engine/push_manager_spec.rb
-    - spec/cache/senders/impressions_sender_adapter_spec.rb
-
-Style/BracesAroundHashParameters:
-  Exclude:
-    - spec/integrations/push_client_spec.rb
-    - spec/engine/synchronizer_spec.rb
 
 Metrics/BlockLength:
   Exclude:
@@ -51,6 +37,22 @@ Naming/FileName:
   Exclude:
     - splitclient-rb.gemspec
 
+Style/OptionalBooleanParameter:
+  Exclude:
+    - lib/splitclient-rb/engine/matchers/between_matcher.rb
+    - lib/splitclient-rb/engine/matchers/combining_matcher.rb
+    - lib/splitclient-rb/engine/matchers/equal_to_matcher.rb
+    - lib/splitclient-rb/engine/matchers/less_than_or_equal_to_matcher.rb
+    - lib/splitclient-rb/engine/matchers/greater_than_or_equal_to_matcher.rb
+
+Style/HashTransformKeys:
+  Exclude:
+    - lib/splitclient-rb/engine/matchers/combining_matcher.rb
+
+Style/RedundantReturn:
+  Exclude:
+    - lib/splitclient-rb/engine/common/impressions_manager.rb
+
 AllCops:
   TargetRubyVersion: 2.5
   Exclude:
@@ -70,3 +72,5 @@ AllCops:
     - lib/splitclient-rb/engine/synchronizer.rb
     - tmp/**/*
     - lib/splitclient-rb/sse/event_source/client.rb
+    - spec/**/*
+    - .simplecov
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ This SDK is designed to work with Split, the platform for controlled rollouts, w
 [![Twitter Follow](https://img.shields.io/twitter/follow/splitsoftware.svg?style=social&label=Follow&maxAge=1529000)](https://twitter.com/intent/follow?screen_name=splitsoftware)
 
 ## Compatibility
-The Ruby SDK support Ruby version 2.3.0 or later and JRuby or 9.1.17 o later.
+The Ruby SDK support Ruby version 2.5.0 or later and JRuby or 9.1.17 o later.
 
 Also the Ruby SDK has been tested as a standalone app as well as using the following web servers:
  - Puma
diff --git a/lib/splitclient-rb/cache/fetchers/segment_fetcher.rb b/lib/splitclient-rb/cache/fetchers/segment_fetcher.rb
@@ -30,16 +30,16 @@ def fetch_segments_if_not_exists(names, cache_control_headers = false)
               fetch_segment(name, fetch_options) if change_number == -1
             end
           end
-        rescue StandardError => error
-          @config.log_found_exception(__method__.to_s, error)
+        rescue StandardError => e
+          @config.log_found_exception(__method__.to_s, e)
         end
 
         def fetch_segment(name, fetch_options = { cache_control_headers: false, till: nil })
           @semaphore.synchronize do
             segments_api.fetch_segments_by_names([name], fetch_options)
           end
-        rescue StandardError => error
-          @config.log_found_exception(__method__.to_s, error)
+        rescue StandardError => e
+          @config.log_found_exception(__method__.to_s, e)
         end
 
         def fetch_segments
@@ -48,8 +48,8 @@ def fetch_segments
 
             true
           end
-        rescue StandardError => error
-          @config.log_found_exception(__method__.to_s, error)
+        rescue StandardError => e
+          @config.log_found_exception(__method__.to_s, e)
           false
         end
 
diff --git a/lib/splitclient-rb/cache/fetchers/split_fetcher.rb b/lib/splitclient-rb/cache/fetchers/split_fetcher.rb
@@ -36,8 +36,8 @@ def fetch_splits(fetch_options = { cache_control_headers: false, till: nil })
 
             { segment_names: data[:segment_names], success: true }
           end
-        rescue StandardError => error
-          @config.log_found_exception(__method__.to_s, error)
+        rescue StandardError => e
+          @config.log_found_exception(__method__.to_s, e)
           { segment_names: [], success: false }
         end
 
diff --git a/lib/splitclient-rb/cache/repositories/events/memory_repository.rb b/lib/splitclient-rb/cache/repositories/events/memory_repository.rb
@@ -19,8 +19,8 @@ def add(key, traffic_type, event_type, time, value, properties, event_size)
             post_events if @size >= EVENTS_MAX_SIZE_BYTES || @adapter.length == @config.events_queue_size
 
             @telemetry_runtime_producer.record_events_stats(Telemetry::Domain::Constants::EVENTS_QUEUED, 1)
-          rescue StandardError => error
-            @config.log_found_exception(__method__.to_s, error)
+          rescue StandardError => e
+            @config.log_found_exception(__method__.to_s, e)
             @telemetry_runtime_producer.record_events_stats(Telemetry::Domain::Constants::EVENTS_DROPPED, 1)
           end
 
diff --git a/lib/splitclient-rb/cache/repositories/events_repository.rb b/lib/splitclient-rb/cache/repositories/events_repository.rb
@@ -21,8 +21,8 @@ def initialize(config, api_key, telemetry_runtime_producer)
 
         def post_events
           events_api.post(self.clear)
-        rescue StandardError => error
-          @config.log_found_exception(__method__.to_s, error)
+        rescue StandardError => e
+          @config.log_found_exception(__method__.to_s, e)
         end
 
         protected
diff --git a/lib/splitclient-rb/cache/repositories/segments_repository.rb b/lib/splitclient-rb/cache/repositories/segments_repository.rb
@@ -78,8 +78,8 @@ def segment_keys_count
           end
           
           keys
-        rescue StandardError => error
-          @config.log_found_exception(__method__.to_s, error)
+        rescue StandardError => e
+          @config.log_found_exception(__method__.to_s, e)
           0
         end
 
diff --git a/lib/splitclient-rb/cache/routers/impression_router.rb b/lib/splitclient-rb/cache/routers/impression_router.rb
@@ -41,17 +41,17 @@ def enqueue(impression)
         attributes: impression[:attributes]
       }
       @queue.push(imp) if @listener
-    rescue StandardError => error
-      @config.log_found_exception(__method__.to_s, error)
+    rescue StandardError => e
+      @config.log_found_exception(__method__.to_s, e)
     end
 
     def router_thread
       @config.threads[:impression_router] = Thread.new do
         loop do
           begin
             @listener.log(@queue.pop)
-          rescue StandardError => error
-            @config.log_found_exception(__method__.to_s, error)
+          rescue StandardError => e
+            @config.log_found_exception(__method__.to_s, e)
           end
         end
       end
diff --git a/lib/splitclient-rb/cache/senders/impressions_adapter/memory_sender.rb b/lib/splitclient-rb/cache/senders/impressions_adapter/memory_sender.rb
@@ -40,8 +40,8 @@ def uniques_formatter(uniques)
           end
 
           to_return
-        rescue StandardError => error
-          @config.log_found_exception(__method__.to_s, error)
+        rescue StandardError => e
+          @config.log_found_exception(__method__.to_s, e)
           nil
         end
 
@@ -61,8 +61,8 @@ def impressions_count_formatter(counts)
           end
 
           formated_counts
-        rescue StandardError => error
-          @config.log_found_exception(__method__.to_s, error)
+        rescue StandardError => e
+          @config.log_found_exception(__method__.to_s, e)
           nil
         end
       end
diff --git a/lib/splitclient-rb/cache/senders/impressions_adapter/redis_sender.rb b/lib/splitclient-rb/cache/senders/impressions_adapter/redis_sender.rb
@@ -65,8 +65,8 @@ def uniques_formatter(uniques)
           end
 
           to_return
-        rescue StandardError => error
-          @config.log_found_exception(__method__.to_s, error)
+        rescue StandardError => e
+          @config.log_found_exception(__method__.to_s, e)
           nil
         end
       end
diff --git a/lib/splitclient-rb/cache/senders/impressions_count_sender.rb b/lib/splitclient-rb/cache/senders/impressions_count_sender.rb
@@ -34,8 +34,8 @@ def impressions_count_thread
 
         def post_impressions_count
           @impressions_sender_adapter.record_impressions_count(@impression_counter.pop_all)
-        rescue StandardError => error
-          @config.log_found_exception(__method__.to_s, error)
+        rescue StandardError => e
+          @config.log_found_exception(__method__.to_s, e)
         end
       end
     end
diff --git a/lib/splitclient-rb/cache/senders/impressions_sender.rb b/lib/splitclient-rb/cache/senders/impressions_sender.rb
@@ -39,8 +39,8 @@ def post_impressions(fetch_all_impressions = true)
             .call(fetch_all_impressions)
 
           impressions_api.post(formatted_impressions)
-        rescue StandardError => error
-          @config.log_found_exception(__method__.to_s, error)
+        rescue StandardError => e
+          @config.log_found_exception(__method__.to_s, e)
         end
 
         def impressions_api
diff --git a/lib/splitclient-rb/cache/stores/localhost_split_store.rb b/lib/splitclient-rb/cache/stores/localhost_split_store.rb
@@ -46,10 +46,10 @@ def store_splits
           end
 
           @status_manager.ready! if @status_manager
-        rescue StandardError => error
+        rescue StandardError => e
           @config.logger.error('Error while parsing the split file. ' \
             'Check that the input file matches the expected format')
-          @config.log_found_exception(__method__.to_s, error)
+          @config.log_found_exception(__method__.to_s, e)
         end
 
         def store_split(split)
diff --git a/lib/splitclient-rb/clients/split_client.rb b/lib/splitclient-rb/clients/split_client.rb
@@ -110,8 +110,8 @@ def track(key, traffic_type_name, event_type, value = nil, properties = nil)
       @events_repository.add(key.to_s, traffic_type_name.downcase, event_type.to_s, (Time.now.to_f * 1000).to_i, value, properties, properties_size)
       record_latency(TRACK, start)
       true
-    rescue StandardError => error
-      @config.log_found_exception(__method__.to_s, error)
+    rescue StandardError => e
+      @config.log_found_exception(__method__.to_s, e)
       record_exception(TRACK)
 
       false
@@ -291,8 +291,8 @@ def treatment(
         
         impression = @impressions_manager.build_impression(matching_key, bucketing_key, split_name, treatment_data, { attributes: attributes, time: nil })
         impressions << impression unless impression.nil?
-      rescue StandardError => error
-        @config.log_found_exception(__method__.to_s, error)
+      rescue StandardError => e
+        @config.log_found_exception(__method__.to_s, e)
 
         record_exception(calling_method)
 
diff --git a/lib/splitclient-rb/engine/auth_api_client.rb b/lib/splitclient-rb/engine/auth_api_client.rb
@@ -85,8 +85,8 @@ def control_channels(channels_string)
         control_pri = SplitIoClient::Constants::CONTROL_PRI
         control_sec = SplitIoClient::Constants::CONTROL_SEC
         channels_string = channels_string.gsub(control_pri, "#{prefix}#{control_pri}")
-        channels_string = channels_string.gsub(control_sec, "#{prefix}#{control_sec}")
-        channels_string
+
+        channels_string.gsub(control_sec, "#{prefix}#{control_sec}")
       end
     end
   end
diff --git a/lib/splitclient-rb/engine/common/impressions_manager.rb b/lib/splitclient-rb/engine/common/impressions_manager.rb
@@ -64,8 +64,8 @@ def track(impressions)
 
         def impression_router
           @impression_router ||= SplitIoClient::ImpressionRouter.new(@config)
-        rescue StandardError => error
-          @config.log_found_exception(__method__.to_s, error)
+        rescue StandardError => e
+          @config.log_found_exception(__method__.to_s, e)
         end
 
         def record_stats(stats)
diff --git a/lib/splitclient-rb/engine/matchers/contains_all_matcher.rb b/lib/splitclient-rb/engine/matchers/contains_all_matcher.rb
@@ -6,10 +6,6 @@ class ContainsAllMatcher < SetMatcher
 
     attr_reader :attribute
 
-    def initialize(attribute, remote_array, logger)
-      super(attribute, remote_array, logger)
-    end
-
     def match?(args)
       if @remote_set.empty?
         @logger.log_if_debug('[ContainsAllMatcher] Remote Set Empty')
diff --git a/lib/splitclient-rb/engine/matchers/contains_any_matcher.rb b/lib/splitclient-rb/engine/matchers/contains_any_matcher.rb
@@ -6,10 +6,6 @@ class ContainsAnyMatcher < SetMatcher
 
     attr_reader :attribute
 
-    def initialize(attribute, remote_array, logger)
-      super(attribute, remote_array, logger)
-    end
-
     def match?(args)
       matches = local_set(args[:attributes], @attribute).intersect? @remote_set
       @logger.log_if_debug("[ContainsAnyMatcher] Remote Set #{@remote_set} contains any \
diff --git a/lib/splitclient-rb/engine/matchers/equal_to_set_matcher.rb b/lib/splitclient-rb/engine/matchers/equal_to_set_matcher.rb
@@ -6,10 +6,6 @@ class EqualToSetMatcher < SetMatcher
 
     attr_reader :attribute
 
-    def initialize(attribute, remote_array, logger)
-      super(attribute, remote_array, logger)
-    end
-
     def match?(args)
       set = local_set(args[:attributes], @attribute)
       matches = set == @remote_set
diff --git a/lib/splitclient-rb/engine/matchers/part_of_set_matcher.rb b/lib/splitclient-rb/engine/matchers/part_of_set_matcher.rb
@@ -6,10 +6,6 @@ class PartOfSetMatcher < SetMatcher
 
     attr_reader :attribute
 
-    def initialize(attribute, remote_array, logger)
-      super(attribute, remote_array, logger)
-    end
-
     def match?(args)
       @local_set = local_set(args[:attributes], @attribute)
 
diff --git a/lib/splitclient-rb/engine/synchronizer.rb b/lib/splitclient-rb/engine/synchronizer.rb
@@ -96,8 +96,8 @@ def fetch_splits(target_change_number)
         else
           @config.logger.debug("No changes fetched after #{attempts} attempts with CDN bypassed.") if @config.debug_enabled
         end
-      rescue StandardError => error
-        @config.log_found_exception(__method__.to_s, error)
+      rescue StandardError => e
+        @config.log_found_exception(__method__.to_s, e)
       end
 
       def fetch_segment(name, target_change_number)
@@ -132,8 +132,8 @@ def fetch_segment(name, target_change_number)
         else
           @config.logger.debug("No changes fetched for segment #{name} after #{attempts} attempts with CDN bypassed.") if @config.debug_enabled
         end
-      rescue StandardError => error
-        @config.log_found_exception(__method__.to_s, error)
+      rescue StandardError => e
+        @config.log_found_exception(__method__.to_s, e)
       end
 
       private
diff --git a/lib/splitclient-rb/sse/notification_manager_keeper.rb b/lib/splitclient-rb/sse/notification_manager_keeper.rb
@@ -61,10 +61,11 @@ def process_event_occupancy(channel, publishers)
       end
 
       def update_publishers(channel, publishers)
-        if channel == Constants::CONTROL_PRI
+        case channel
+        when Constants::CONTROL_PRI
           @telemetry_runtime_producer.record_streaming_event(Telemetry::Domain::Constants::OCCUPANCY_PRI, publishers)
           @publishers_pri.value = publishers
-        elsif channel == Constants::CONTROL_SEC
+        when Constants::CONTROL_SEC
           @telemetry_runtime_producer.record_streaming_event(Telemetry::Domain::Constants::OCCUPANCY_SEC, publishers)
           @publishers_sec.value = publishers
         end
diff --git a/lib/splitclient-rb/telemetry/memory/memory_evaluation_consumer.rb b/lib/splitclient-rb/telemetry/memory/memory_evaluation_consumer.rb
@@ -2,7 +2,7 @@
 
 module SplitIoClient
   module Telemetry
-    class MemoryEvaluationConsumer < EvaluationConsumer
+    class MemoryEvaluationConsumer
       def initialize(config)
         @config = config
         @adapter = config.telemetry_adapter
diff --git a/lib/splitclient-rb/telemetry/memory/memory_evaluation_producer.rb b/lib/splitclient-rb/telemetry/memory/memory_evaluation_producer.rb
diff --git a/lib/splitclient-rb/telemetry/memory/memory_init_consumer.rb b/lib/splitclient-rb/telemetry/memory/memory_init_consumer.rb
diff --git a/lib/splitclient-rb/telemetry/memory/memory_init_producer.rb b/lib/splitclient-rb/telemetry/memory/memory_init_producer.rb
diff --git a/lib/splitclient-rb/telemetry/memory/memory_runtime_consumer.rb b/lib/splitclient-rb/telemetry/memory/memory_runtime_consumer.rb
diff --git a/lib/splitclient-rb/telemetry/memory/memory_runtime_producer.rb b/lib/splitclient-rb/telemetry/memory/memory_runtime_producer.rb
diff --git a/lib/splitclient-rb/telemetry/memory/memory_synchronizer.rb b/lib/splitclient-rb/telemetry/memory/memory_synchronizer.rb
diff --git a/lib/splitclient-rb/telemetry/redis/redis_evaluation_producer.rb b/lib/splitclient-rb/telemetry/redis/redis_evaluation_producer.rb
diff --git a/lib/splitclient-rb/telemetry/redis/redis_init_producer.rb b/lib/splitclient-rb/telemetry/redis/redis_init_producer.rb
diff --git a/lib/splitclient-rb/telemetry/redis/redis_synchronizer.rb b/lib/splitclient-rb/telemetry/redis/redis_synchronizer.rb
diff --git a/splitclient-rb.gemspec b/splitclient-rb.gemspec

Original file line number	Diff line number	Diff line change
`@@ -78,8 +78,8 @@ def segment_keys_count`
`78`	`78`	`end`
`79`	`79`
`80`	`80`	`keys`
`81`		`- rescue StandardError => error`
`82`		`- @config.log_found_exception(__method__.to_s, error)`
	`81`	`+ rescue StandardError => e`
	`82`	`+ @config.log_found_exception(__method__.to_s, e)`
`83`	`83`	`0`
`84`	`84`	`end`
`85`	`85`