1 files changed, 7 insertions, 15 deletions
diff --git a/lib/gitlab/sidekiq_status.rb b/lib/gitlab/sidekiq_status.rb
index 120d18f63f2..66417b3697e 100644
--- a/lib/gitlab/sidekiq_status.rb
+++ b/lib/gitlab/sidekiq_status.rb
@@ -29,16 +29,15 @@ module Gitlab
     # for most jobs.
     DEFAULT_EXPIRATION = 30.minutes.to_i
 
-    DEFAULT_VALUE = 1
-    DEFAULT_VALUE_MESSAGE = 'Keys using the default value for SidekiqStatus detected'
-
     # Starts tracking of the given job.
     #
     # jid - The Sidekiq job ID
     # expire - The expiration time of the Redis key.
-    def self.set(jid, expire = DEFAULT_EXPIRATION, value: DEFAULT_VALUE)
+    def self.set(jid, expire = DEFAULT_EXPIRATION)
+      return unless expire
+
       Sidekiq.redis do |redis|
-        redis.set(key_for(jid), value, ex: expire)
+        redis.set(key_for(jid), 1, ex: expire)
       end
     end
 
@@ -94,17 +93,10 @@ module Gitlab
       return [] if job_ids.empty?
 
       keys = job_ids.map { |jid| key_for(jid) }
-      results = Sidekiq.redis { |redis| redis.mget(*keys) }
-
-      if Feature.enabled?(:log_implicit_sidekiq_status_calls, default_enabled: :yaml)
-        to_log = keys.zip(results).select do |_key, result|
-          result == DEFAULT_VALUE.to_s
-        end.map(&:first)
-
-        Sidekiq.logger.info(message: DEFAULT_VALUE_MESSAGE, keys: to_log) if to_log.any?
-      end
 
-      results.map { |result| !result.nil? }
+      Sidekiq
+        .redis { |redis| redis.mget(*keys) }
+        .map { |result| !result.nil? }
     end
 
     # Returns the JIDs that are completed