From a81701115ef1f8e9f3371b3f197ceb1ae3e59047 Mon Sep 17 00:00:00 2001
From: Christian Bruckmayer <christian.bruckmayer@shopify.com>
Date: Wed, 21 May 2025 11:01:04 +0100
Subject: [PATCH] Remove binary conversion

---
 ruby/lib/ci/queue/redis.rb                  | 1 +
 ruby/lib/ci/queue/redis/build_record.rb     | 8 ++++----
 ruby/lib/ci/queue/redis/grind_record.rb     | 2 +-
 ruby/lib/ci/queue/redis/test_time_record.rb | 8 ++++----
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/ruby/lib/ci/queue/redis.rb b/ruby/lib/ci/queue/redis.rb
index 3b00308c..3fbb2672 100644
--- a/ruby/lib/ci/queue/redis.rb
+++ b/ruby/lib/ci/queue/redis.rb
@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+gem "redis", "~> 5.0"
 require 'redis'
 require 'ci/queue/redis/build_record'
 require 'ci/queue/redis/base'
diff --git a/ruby/lib/ci/queue/redis/build_record.rb b/ruby/lib/ci/queue/redis/build_record.rb
index 4f484523..032e11cd 100644
--- a/ruby/lib/ci/queue/redis/build_record.rb
+++ b/ruby/lib/ci/queue/redis/build_record.rb
@@ -66,8 +66,8 @@ def record_error(id, payload, stats: nil)
             redis.pipelined do |pipeline|
               pipeline.hset(
                 key('error-reports'),
-                id.dup.force_encoding(Encoding::BINARY),
-                payload.dup.force_encoding(Encoding::BINARY),
+                id,
+                payload,
               )
               pipeline.expire(key('error-reports'), config.redis_ttl)
               record_stats(stats, pipeline: pipeline)
@@ -80,8 +80,8 @@ def record_error(id, payload, stats: nil)
         def record_success(id, stats: nil, skip_flaky_record: false, acknowledge: true)
           @queue.acknowledge(Test.new(id)) if acknowledge
           error_reports_deleted_count, requeued_count, _ = redis.pipelined do |pipeline|
-            pipeline.hdel(key('error-reports'), id.dup.force_encoding(Encoding::BINARY))
-            pipeline.hget(key('requeues-count'), id.b)
+            pipeline.hdel(key('error-reports'), id)
+            pipeline.hget(key('requeues-count'), id)
             record_stats(stats, pipeline: pipeline)
           end
           record_flaky(id) if !skip_flaky_record && (error_reports_deleted_count.to_i > 0 || requeued_count.to_i > 0)
diff --git a/ruby/lib/ci/queue/redis/grind_record.rb b/ruby/lib/ci/queue/redis/grind_record.rb
index f87caacf..6f114bc3 100644
--- a/ruby/lib/ci/queue/redis/grind_record.rb
+++ b/ruby/lib/ci/queue/redis/grind_record.rb
@@ -14,7 +14,7 @@ def record_error(payload, stats: nil)
           redis.pipelined do |pipeline|
             pipeline.lpush(
               key('error-reports'),
-              payload.force_encoding(Encoding::BINARY),
+              payload,
             )
             pipeline.expire(key('error-reports'), config.redis_ttl)
             record_stats(stats, pipeline: pipeline)
diff --git a/ruby/lib/ci/queue/redis/test_time_record.rb b/ruby/lib/ci/queue/redis/test_time_record.rb
index 439b1b3f..1a7d1eec 100644
--- a/ruby/lib/ci/queue/redis/test_time_record.rb
+++ b/ruby/lib/ci/queue/redis/test_time_record.rb
@@ -22,7 +22,7 @@ def record_test_time(test_name, duration)
           redis.pipelined do |pipeline|
             pipeline.lpush(
               test_time_key(test_name),
-              duration.to_s.force_encoding(Encoding::BINARY),
+              duration.to_s,
             )
             pipeline.expire(test_time_key(test_name), config.redis_ttl)
           end
@@ -33,7 +33,7 @@ def record_test_name(test_name)
           redis.pipelined do |pipeline|
             pipeline.lpush(
               all_test_names_key,
-              test_name.dup.force_encoding(Encoding::BINARY),
+              test_name,
             )
             pipeline.expire(all_test_names_key, config.redis_ttl)
           end
@@ -53,11 +53,11 @@ def fetch_test_time(test_name)
         end
 
         def all_test_names_key
-          "build:#{config.build_id}:list_of_test_names".dup.force_encoding(Encoding::BINARY)
+          "build:#{config.build_id}:list_of_test_names"
         end
 
         def test_time_key(test_name)
-          "build:#{config.build_id}:#{test_name}".dup.force_encoding(Encoding::BINARY)
+          "build:#{config.build_id}:#{test_name}"
         end
       end
     end