refactor: specify redis_rb when we are referring to gem

refactor: change name of slowlog method to be less confusing with
redis_rb version

Author: jim80net

inject_slow_query.rb

@@ -14,7 +14,7 @@
 
 REDIS = SlowlogCheck::Redis.new(
   host: ENV.fetch('REDIS_HOST')
-).redis
+).redis_rb
 
 if ARGV[0].nil?
   raise "Specify milliseconds to inject as the first positional argument to `#{__FILE__}`"

lib/slowlog_check.rb

@@ -152,7 +152,7 @@ def pad_results_with_zero(report)
 
   def slowlogs_by_flush_interval
     result = reporting_interval
-    @redis.slowlog.each do |slowlog|
+    @redis.slowlog_get.each do |slowlog|
       time = slowlog_time(slowlog)
       break if minute_precision(time) <= minute_precision(last_time_submitted)
 

lib/slowlog_check/redis.rb

@@ -27,8 +27,8 @@ def params
       end
     end
 
-    def redis
-      @redis ||= ::Redis.new(params)
+    def redis_rb
+      @redis_rb ||= ::Redis.new(params)
     end
 
     def replication_group
@@ -39,13 +39,13 @@ def replication_group
       end
     end
 
-    def slowlog(length = 128)
-      resp = redis.slowlog('get', length)
+    def slowlog_get(length = 128)
+      resp = redis_rb.slowlog('get', length)
 
       return resp if length > MAXLENGTH
       return resp if did_i_get_it_all?(resp)
 
-      slowlog(length * 2)
+      slowlog_get(length * 2)
     end
 
     private

spec/slowlog_check/redis_spec.rb

@@ -189,14 +189,14 @@
     end
   end
 
-  describe '#slowlog' do
+  describe '#slowlog_get' do
     include_context 'CME:TLS' # which context doesn't matter, so pick any one
 
     # mock the redis-rb gem
     let(:redis_rb) { double }
-    before(:example) { allow(redis).to receive(:redis).and_return(redis_rb) }
+    before(:example) { allow(redis).to receive(:redis_rb).and_return(redis_rb) }
 
-    describe '#slowlog.length' do
+    describe '#slowlog_get.length' do
       context 'redis has 4 entries' do
         before(:each) do
           # see spec_helper for redis_slowlog definition
@@ -210,7 +210,7 @@
           }
         end
 
-        subject { redis.slowlog.length }
+        subject { redis.slowlog_get.length }
         it { is_expected.to eq(4) }
       end
 
@@ -229,7 +229,7 @@
           }
         end
 
-        subject { redis.slowlog.length }
+        subject { redis.slowlog_get.length }
         it { is_expected.to eq(129) }
       end
 
@@ -245,7 +245,7 @@
           }
         end
 
-        subject { redis.slowlog.length }
+        subject { redis.slowlog_get.length }
         it { is_expected.to eq(1_048_576 * 2) } # with the last entry dropped
       end
 
@@ -261,7 +261,7 @@
           }
         end
 
-        subject { redis.slowlog.length }
+        subject { redis.slowlog_get.length }
         it { is_expected.to eq(567) }
       end
     end

spec/slowlog_check_spec.rb

@@ -27,7 +27,7 @@
     slowlog_check.instance_variable_set(:@redis, redis)
     allow(redis).to receive(:replication_group).and_call_original
 
-    allow(redis).to receive(:slowlog) {
+    allow(redis).to receive(:slowlog_get) {
       [
         redis_slowlog(3, Time.utc(2020, 4, 20, 4, 19, 45), 400_000),
         redis_slowlog(2, Time.utc(2020, 4, 20, 4, 19, 15), 100_000),
@@ -257,7 +257,7 @@ def example_bucket(index)
       end
 
       before(:example) do
-        allow(redis).to receive(:slowlog) {
+        allow(redis).to receive(:slowlog_get) {
           Array.new(5) do |x|
             redis_slowlog(x, Time.utc(2020, 0o4, 20, 0o4, 15, 10) + (x * 60), x + 1000, x.to_s)
           end.reverse