From ec9f8e2841db36261deeb838c411e1d7b03eb042 Mon Sep 17 00:00:00 2001
From: Andrew Kane <andrew@ankane.org>
Date: Wed, 14 Sep 2022 15:30:11 -0700
Subject: [PATCH] Fixed CI for redis > 5 gem

---
 test/support/redis.rb | 19 +++++++++++++++++++
 test/test_helper.rb   |  9 ++-------
 2 files changed, 21 insertions(+), 7 deletions(-)
 create mode 100644 test/support/redis.rb

diff --git a/test/support/redis.rb b/test/support/redis.rb
new file mode 100644
index 0000000..ac2c9e6
--- /dev/null
+++ b/test/support/redis.rb
@@ -0,0 +1,19 @@
+Searchkick.redis =
+  if defined?(ConnectionPool)
+    ConnectionPool.new { Redis.new }
+  else
+    Redis.new
+  end
+
+module RedisInstrumentation
+  def call(command, redis_config)
+    $logger.info "[redis] #{command.inspect}"
+    super
+  end
+
+  def call_pipelined(commands, redis_config)
+    $logger.info "[redis] #{commands.inspect}"
+    super
+  end
+end
+RedisClient.register(RedisInstrumentation)
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 55bcd8e..9755d06 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -26,13 +26,6 @@ Searchkick.index_suffix = ENV["TEST_ENV_NUMBER"] # for parallel tests
 
 puts "Running against #{Searchkick.opensearch? ? "OpenSearch" : "Elasticsearch"} #{Searchkick.server_version}"
 
-Searchkick.redis =
-  if defined?(ConnectionPool)
-    ConnectionPool.new { Redis.new(logger: $logger) }
-  else
-    Redis.new(logger: $logger)
-  end
-
 I18n.config.enforce_available_locales = true
 
 ActiveJob::Base.logger = $logger
@@ -46,6 +39,8 @@ else
   require_relative "support/activerecord"
 end
 
+require_relative "support/redis"
+
 # models
 Dir["#{__dir__}/models/*"].each do |file|
   require file
--
libgit2 0.21.0