Merge pull request #374 from Shopify/revert-367-cbruckmayer/reduce-key-size

Revert "Reduce Redis key size"

Author: ChrisBr

ruby/lib/ci/queue/redis.rb

@@ -11,7 +11,6 @@
 require 'ci/queue/redis/supervisor'
 require 'ci/queue/redis/grind_supervisor'
 require 'ci/queue/redis/test_time_record'
-require 'ci/queue/redis/key_shortener'
 
 module CI
   module Queue

ruby/lib/ci/queue/redis/base.rb

@@ -214,7 +214,7 @@ def measure
         end
 
         def key(*args)
-          KeyShortener.key(config.build_id, *args)
+          ['build', build_id, *args].join(':')
         end
 
         def build_id

ruby/lib/ci/queue/redis/build_record.rb

@@ -139,7 +139,7 @@ def record_stats(stats, pipeline: redis)
         end
 
         def key(*args)
-          KeyShortener.key(config.build_id, *args)
+          ['build', config.build_id, *args].join(':')
         end
       end
     end

ruby/lib/ci/queue/redis/grind_record.rb

@@ -52,7 +52,7 @@ def pop_warnings
         attr_reader :redis, :config
 
         def key(*args)
-          KeyShortener.key(config.build_id, *args)
+          ['build', config.build_id, *args].join(':')
         end
 
         def record_stats(stats, pipeline: redis)

ruby/lib/ci/queue/redis/key_shortener.rb

@@ -207,9 +207,9 @@ def test_acknowledge_returns_false_if_the_test_was_picked_up_by_another_worker
   end
 
   def test_workers_register
-    assert_equal 1, @redis.scard(CI::Queue::Redis::KeyShortener.key('42', 'workers'))
+    assert_equal 1, @redis.scard(('build:42:workers'))
     worker(2)
-    assert_equal 2, @redis.scard(CI::Queue::Redis::KeyShortener.key('42', 'workers'))
+    assert_equal 2, @redis.scard(('build:42:workers'))
   end
 
   def test_timeout_warning

ruby/test/ci/queue/redis_test.rb

@@ -139,7 +139,7 @@ def test_debug_log
           )
         end
 
-      assert_includes File.read(log_file.path), 'INFO -- : Finished \'["exists", "b:c4ca4238:w:1:q"]\': 0'
+      assert_includes File.read(log_file.path), 'INFO -- : Finished \'["exists", "build:1:worker:1:queue"]\': 0'
       assert_empty err
       result = normalize(out.lines.last.strip)
       assert_equal '--- Ran 11 tests, 8 assertions, 2 failures, 1 errors, 1 skips, 4 requeues in X.XXs', result
@@ -444,7 +444,7 @@ def test_retry_fails_when_test_run_is_expired
       assert_equal 'Ran 100 tests, 100 assertions, 0 failures, 0 errors, 0 skips, 0 requeues in X.XXs', output
 
       one_day = 60 * 60 * 24
-      key = CI::Queue::Redis::KeyShortener.key("1", "created-at")
+      key = ['build', "1", "created-at"].join(':')
       @redis.set(key, Time.now - one_day)
 
       out, err = capture_subprocess_io do