Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 0 deletions

diff --git a/lib/gitlab/redis/wrapper.rb b/lib/gitlab/redis/wrapper.rb
index db1e24a3201..7b804038146 100644
--- a/lib/gitlab/redis/wrapper.rb
+++ b/lib/gitlab/redis/wrapper.rb
@@ -96,6 +96,8 @@ module Gitlab
         end
 
         def instrumentation_class
+          return unless defined?(::Gitlab::Instrumentation::Redis)
+
           "::Gitlab::Instrumentation::Redis::#{store_name}".constantize
         end
       end
@@ -112,6 +114,10 @@ module Gitlab
         raw_config_hash[:url]
       end
 
+      def db
+        redis_store_options[:db]
+      end
+
       def sentinels
         raw_config_hash[:sentinels]
       end