diff --git a/Gemfile b/Gemfile
index cc56608b026..e3e4574be36 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,6 @@ source 'https://rubygems.org'
 gemspec
 
 # Development dependencies
-gem 'addressable', '~> 2.4.0' # locking transitive dependency of webmock
 if RUBY_VERSION < '2.3'
   gem 'appraisal', '~> 2.2.0'
 else
diff --git a/gemfiles/jruby_9.2.21.0_aws.gemfile b/gemfiles/jruby_9.2.21.0_aws.gemfile
index 3e52b2f2037..1857a895f75 100644
--- a/gemfiles/jruby_9.2.21.0_aws.gemfile
+++ b/gemfiles/jruby_9.2.21.0_aws.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.2.21.0_aws.gemfile.lock b/gemfiles/jruby_9.2.21.0_aws.gemfile.lock
index 8cead6ed1c9..322b0288a26 100644
--- a/gemfiles/jruby_9.2.21.0_aws.gemfile.lock
+++ b/gemfiles/jruby_9.2.21.0_aws.gemfile.lock
@@ -1534,7 +1534,6 @@ PLATFORMS
   universal-java-1.8
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   aws-sdk
   benchmark-ips (~> 2.8)
diff --git a/gemfiles/jruby_9.2.21.0_contrib.gemfile b/gemfiles/jruby_9.2.21.0_contrib.gemfile
index 7e8ff06252b..6cc81078566 100644
--- a/gemfiles/jruby_9.2.21.0_contrib.gemfile
+++ b/gemfiles/jruby_9.2.21.0_contrib.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.2.21.0_contrib.gemfile.lock b/gemfiles/jruby_9.2.21.0_contrib.gemfile.lock
index ab01e3f81f4..50030f1fb3b 100644
--- a/gemfiles/jruby_9.2.21.0_contrib.gemfile.lock
+++ b/gemfiles/jruby_9.2.21.0_contrib.gemfile.lock
@@ -273,7 +273,6 @@ DEPENDENCIES
   actionpack
   actionview
   active_model_serializers (>= 0.10.0)
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.2.21.0_contrib_old.gemfile b/gemfiles/jruby_9.2.21.0_contrib_old.gemfile
index c9e060c285a..51535e4d567 100644
--- a/gemfiles/jruby_9.2.21.0_contrib_old.gemfile
+++ b/gemfiles/jruby_9.2.21.0_contrib_old.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.2.21.0_contrib_old.gemfile.lock b/gemfiles/jruby_9.2.21.0_contrib_old.gemfile.lock
index fa6fcd0676a..39ca73f05cd 100644
--- a/gemfiles/jruby_9.2.21.0_contrib_old.gemfile.lock
+++ b/gemfiles/jruby_9.2.21.0_contrib_old.gemfile.lock
@@ -133,7 +133,6 @@ PLATFORMS
   universal-java-1.8
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.2.21.0_core_old.gemfile b/gemfiles/jruby_9.2.21.0_core_old.gemfile
index f75153aafae..c31e7a2c488 100644
--- a/gemfiles/jruby_9.2.21.0_core_old.gemfile
+++ b/gemfiles/jruby_9.2.21.0_core_old.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.2.21.0_core_old.gemfile.lock b/gemfiles/jruby_9.2.21.0_core_old.gemfile.lock
index ca77acf7fa2..02180c97169 100644
--- a/gemfiles/jruby_9.2.21.0_core_old.gemfile.lock
+++ b/gemfiles/jruby_9.2.21.0_core_old.gemfile.lock
@@ -110,7 +110,6 @@ PLATFORMS
   universal-java-1.8
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.2.21.0_hanami_1.gemfile b/gemfiles/jruby_9.2.21.0_hanami_1.gemfile
index 2e2de75b9c4..c52f07b5264 100644
--- a/gemfiles/jruby_9.2.21.0_hanami_1.gemfile
+++ b/gemfiles/jruby_9.2.21.0_hanami_1.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.2.21.0_hanami_1.gemfile.lock b/gemfiles/jruby_9.2.21.0_hanami_1.gemfile.lock
index fa81ce8a6c3..818f9b16529 100644
--- a/gemfiles/jruby_9.2.21.0_hanami_1.gemfile.lock
+++ b/gemfiles/jruby_9.2.21.0_hanami_1.gemfile.lock
@@ -214,7 +214,6 @@ PLATFORMS
   universal-java-1.8
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.2.21.0_http.gemfile b/gemfiles/jruby_9.2.21.0_http.gemfile
index 9ce32a1c60a..cf95dfd45dc 100644
--- a/gemfiles/jruby_9.2.21.0_http.gemfile
+++ b/gemfiles/jruby_9.2.21.0_http.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.2.21.0_http.gemfile.lock b/gemfiles/jruby_9.2.21.0_http.gemfile.lock
index 9b4e0296ea4..97e3feeb9ff 100644
--- a/gemfiles/jruby_9.2.21.0_http.gemfile.lock
+++ b/gemfiles/jruby_9.2.21.0_http.gemfile.lock
@@ -183,7 +183,6 @@ PLATFORMS
   universal-java-1.8
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.2.21.0_rails5_mysql2.gemfile b/gemfiles/jruby_9.2.21.0_rails5_mysql2.gemfile
index 24fc2ff1abc..e515e90f3c9 100644
--- a/gemfiles/jruby_9.2.21.0_rails5_mysql2.gemfile
+++ b/gemfiles/jruby_9.2.21.0_rails5_mysql2.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.2.21.0_rails5_mysql2.gemfile.lock b/gemfiles/jruby_9.2.21.0_rails5_mysql2.gemfile.lock
index a2c09e35dd5..1e0ea891baa 100644
--- a/gemfiles/jruby_9.2.21.0_rails5_mysql2.gemfile.lock
+++ b/gemfiles/jruby_9.2.21.0_rails5_mysql2.gemfile.lock
@@ -224,7 +224,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-jdbcmysql-adapter
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.2.21.0_rails5_postgres.gemfile b/gemfiles/jruby_9.2.21.0_rails5_postgres.gemfile
index 922a6d248de..f2e88203c55 100644
--- a/gemfiles/jruby_9.2.21.0_rails5_postgres.gemfile
+++ b/gemfiles/jruby_9.2.21.0_rails5_postgres.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.2.21.0_rails5_postgres.gemfile.lock b/gemfiles/jruby_9.2.21.0_rails5_postgres.gemfile.lock
index 660f8a7bba1..27eca1c4d70 100644
--- a/gemfiles/jruby_9.2.21.0_rails5_postgres.gemfile.lock
+++ b/gemfiles/jruby_9.2.21.0_rails5_postgres.gemfile.lock
@@ -244,7 +244,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-jdbcpostgresql-adapter
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.2.21.0_rails5_postgres_redis.gemfile b/gemfiles/jruby_9.2.21.0_rails5_postgres_redis.gemfile
index da64436bb0f..45669fc0834 100644
--- a/gemfiles/jruby_9.2.21.0_rails5_postgres_redis.gemfile
+++ b/gemfiles/jruby_9.2.21.0_rails5_postgres_redis.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.2.21.0_rails5_postgres_redis.gemfile.lock b/gemfiles/jruby_9.2.21.0_rails5_postgres_redis.gemfile.lock
index 56d3d13b480..9aa4f8cedd2 100644
--- a/gemfiles/jruby_9.2.21.0_rails5_postgres_redis.gemfile.lock
+++ b/gemfiles/jruby_9.2.21.0_rails5_postgres_redis.gemfile.lock
@@ -249,7 +249,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-jdbcpostgresql-adapter
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.2.21.0_rails5_postgres_redis_activesupport.gemfile b/gemfiles/jruby_9.2.21.0_rails5_postgres_redis_activesupport.gemfile
index f63ef178361..c6d0dd5a7bd 100644
--- a/gemfiles/jruby_9.2.21.0_rails5_postgres_redis_activesupport.gemfile
+++ b/gemfiles/jruby_9.2.21.0_rails5_postgres_redis_activesupport.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.2.21.0_rails5_postgres_redis_activesupport.gemfile.lock b/gemfiles/jruby_9.2.21.0_rails5_postgres_redis_activesupport.gemfile.lock
index c2ca5122d2a..ff98066d381 100644
--- a/gemfiles/jruby_9.2.21.0_rails5_postgres_redis_activesupport.gemfile.lock
+++ b/gemfiles/jruby_9.2.21.0_rails5_postgres_redis_activesupport.gemfile.lock
@@ -261,7 +261,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-jdbcpostgresql-adapter
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.2.21.0_rails5_postgres_sidekiq.gemfile b/gemfiles/jruby_9.2.21.0_rails5_postgres_sidekiq.gemfile
index 0dae7626c6a..9eddbe0360e 100644
--- a/gemfiles/jruby_9.2.21.0_rails5_postgres_sidekiq.gemfile
+++ b/gemfiles/jruby_9.2.21.0_rails5_postgres_sidekiq.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.2.21.0_rails5_postgres_sidekiq.gemfile.lock b/gemfiles/jruby_9.2.21.0_rails5_postgres_sidekiq.gemfile.lock
index c4cfc5b291b..25eeba9dbdf 100644
--- a/gemfiles/jruby_9.2.21.0_rails5_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/jruby_9.2.21.0_rails5_postgres_sidekiq.gemfile.lock
@@ -251,7 +251,6 @@ PLATFORMS
 DEPENDENCIES
   activejob
   activerecord-jdbcpostgresql-adapter
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.2.21.0_rails5_semantic_logger.gemfile b/gemfiles/jruby_9.2.21.0_rails5_semantic_logger.gemfile
index 47d0eb799b3..457d55db62e 100644
--- a/gemfiles/jruby_9.2.21.0_rails5_semantic_logger.gemfile
+++ b/gemfiles/jruby_9.2.21.0_rails5_semantic_logger.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.2.21.0_rails5_semantic_logger.gemfile.lock b/gemfiles/jruby_9.2.21.0_rails5_semantic_logger.gemfile.lock
index dd63f00c45a..1a5ac297db1 100644
--- a/gemfiles/jruby_9.2.21.0_rails5_semantic_logger.gemfile.lock
+++ b/gemfiles/jruby_9.2.21.0_rails5_semantic_logger.gemfile.lock
@@ -243,7 +243,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-jdbcpostgresql-adapter
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.2.21.0_rails61_mysql2.gemfile b/gemfiles/jruby_9.2.21.0_rails61_mysql2.gemfile
index e32f347a4c4..3b73e1115f5 100644
--- a/gemfiles/jruby_9.2.21.0_rails61_mysql2.gemfile
+++ b/gemfiles/jruby_9.2.21.0_rails61_mysql2.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.2.21.0_rails61_mysql2.gemfile.lock b/gemfiles/jruby_9.2.21.0_rails61_mysql2.gemfile.lock
index 19d0633e45f..1aa23af8431 100644
--- a/gemfiles/jruby_9.2.21.0_rails61_mysql2.gemfile.lock
+++ b/gemfiles/jruby_9.2.21.0_rails61_mysql2.gemfile.lock
@@ -243,7 +243,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-jdbcmysql-adapter (>= 61)
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.2.21.0_rails61_postgres.gemfile b/gemfiles/jruby_9.2.21.0_rails61_postgres.gemfile
index e1d569c01a7..0e9d3b2c3a4 100644
--- a/gemfiles/jruby_9.2.21.0_rails61_postgres.gemfile
+++ b/gemfiles/jruby_9.2.21.0_rails61_postgres.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.2.21.0_rails61_postgres.gemfile.lock b/gemfiles/jruby_9.2.21.0_rails61_postgres.gemfile.lock
index 3541d69c954..8c59354d9a9 100644
--- a/gemfiles/jruby_9.2.21.0_rails61_postgres.gemfile.lock
+++ b/gemfiles/jruby_9.2.21.0_rails61_postgres.gemfile.lock
@@ -263,7 +263,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-jdbcpostgresql-adapter (>= 61)
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.2.21.0_rails61_postgres_redis.gemfile b/gemfiles/jruby_9.2.21.0_rails61_postgres_redis.gemfile
index 7efa735b790..5668d68c509 100644
--- a/gemfiles/jruby_9.2.21.0_rails61_postgres_redis.gemfile
+++ b/gemfiles/jruby_9.2.21.0_rails61_postgres_redis.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.2.21.0_rails61_postgres_redis.gemfile.lock b/gemfiles/jruby_9.2.21.0_rails61_postgres_redis.gemfile.lock
index cc9bc16196e..1c663430274 100644
--- a/gemfiles/jruby_9.2.21.0_rails61_postgres_redis.gemfile.lock
+++ b/gemfiles/jruby_9.2.21.0_rails61_postgres_redis.gemfile.lock
@@ -268,7 +268,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-jdbcpostgresql-adapter (>= 61)
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.2.21.0_rails61_postgres_sidekiq.gemfile b/gemfiles/jruby_9.2.21.0_rails61_postgres_sidekiq.gemfile
index 458371f3cf9..39348ef2492 100644
--- a/gemfiles/jruby_9.2.21.0_rails61_postgres_sidekiq.gemfile
+++ b/gemfiles/jruby_9.2.21.0_rails61_postgres_sidekiq.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.2.21.0_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/jruby_9.2.21.0_rails61_postgres_sidekiq.gemfile.lock
index 71b41b74ce5..a2b1f834fa9 100644
--- a/gemfiles/jruby_9.2.21.0_rails61_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/jruby_9.2.21.0_rails61_postgres_sidekiq.gemfile.lock
@@ -269,7 +269,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-jdbcpostgresql-adapter (>= 61)
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.2.21.0_rails61_semantic_logger.gemfile b/gemfiles/jruby_9.2.21.0_rails61_semantic_logger.gemfile
index 6f744463098..0677d615c49 100644
--- a/gemfiles/jruby_9.2.21.0_rails61_semantic_logger.gemfile
+++ b/gemfiles/jruby_9.2.21.0_rails61_semantic_logger.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.2.21.0_rails61_semantic_logger.gemfile.lock b/gemfiles/jruby_9.2.21.0_rails61_semantic_logger.gemfile.lock
index abcb90cdb39..34bf30c27af 100644
--- a/gemfiles/jruby_9.2.21.0_rails61_semantic_logger.gemfile.lock
+++ b/gemfiles/jruby_9.2.21.0_rails61_semantic_logger.gemfile.lock
@@ -262,7 +262,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-jdbcpostgresql-adapter (>= 61)
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.2.21.0_rails6_mysql2.gemfile b/gemfiles/jruby_9.2.21.0_rails6_mysql2.gemfile
index 16a04ecf6fa..c8fbd2d2361 100644
--- a/gemfiles/jruby_9.2.21.0_rails6_mysql2.gemfile
+++ b/gemfiles/jruby_9.2.21.0_rails6_mysql2.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.2.21.0_rails6_mysql2.gemfile.lock b/gemfiles/jruby_9.2.21.0_rails6_mysql2.gemfile.lock
index c041dee7681..18517fca587 100644
--- a/gemfiles/jruby_9.2.21.0_rails6_mysql2.gemfile.lock
+++ b/gemfiles/jruby_9.2.21.0_rails6_mysql2.gemfile.lock
@@ -240,7 +240,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-jdbcmysql-adapter (>= 60)
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.2.21.0_rails6_postgres.gemfile b/gemfiles/jruby_9.2.21.0_rails6_postgres.gemfile
index bf726ed0911..82397f8fbd2 100644
--- a/gemfiles/jruby_9.2.21.0_rails6_postgres.gemfile
+++ b/gemfiles/jruby_9.2.21.0_rails6_postgres.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.2.21.0_rails6_postgres.gemfile.lock b/gemfiles/jruby_9.2.21.0_rails6_postgres.gemfile.lock
index bf8449ccc0e..16aacd7b89f 100644
--- a/gemfiles/jruby_9.2.21.0_rails6_postgres.gemfile.lock
+++ b/gemfiles/jruby_9.2.21.0_rails6_postgres.gemfile.lock
@@ -260,7 +260,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-jdbcpostgresql-adapter (>= 60)
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.2.21.0_rails6_postgres_redis.gemfile b/gemfiles/jruby_9.2.21.0_rails6_postgres_redis.gemfile
index 1cc2709ea25..f2bf2ba827e 100644
--- a/gemfiles/jruby_9.2.21.0_rails6_postgres_redis.gemfile
+++ b/gemfiles/jruby_9.2.21.0_rails6_postgres_redis.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.2.21.0_rails6_postgres_redis.gemfile.lock b/gemfiles/jruby_9.2.21.0_rails6_postgres_redis.gemfile.lock
index ebe7f2917cf..6ea4c1c60ec 100644
--- a/gemfiles/jruby_9.2.21.0_rails6_postgres_redis.gemfile.lock
+++ b/gemfiles/jruby_9.2.21.0_rails6_postgres_redis.gemfile.lock
@@ -265,7 +265,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-jdbcpostgresql-adapter (>= 60)
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.2.21.0_rails6_postgres_redis_activesupport.gemfile b/gemfiles/jruby_9.2.21.0_rails6_postgres_redis_activesupport.gemfile
index 8c363e7c29c..f74317c6ed9 100644
--- a/gemfiles/jruby_9.2.21.0_rails6_postgres_redis_activesupport.gemfile
+++ b/gemfiles/jruby_9.2.21.0_rails6_postgres_redis_activesupport.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.2.21.0_rails6_postgres_redis_activesupport.gemfile.lock b/gemfiles/jruby_9.2.21.0_rails6_postgres_redis_activesupport.gemfile.lock
index 4f3972ad45c..15684881ee6 100644
--- a/gemfiles/jruby_9.2.21.0_rails6_postgres_redis_activesupport.gemfile.lock
+++ b/gemfiles/jruby_9.2.21.0_rails6_postgres_redis_activesupport.gemfile.lock
@@ -277,7 +277,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-jdbcpostgresql-adapter (>= 60)
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.2.21.0_rails6_postgres_sidekiq.gemfile b/gemfiles/jruby_9.2.21.0_rails6_postgres_sidekiq.gemfile
index dd924521c5e..841c9bf6c82 100644
--- a/gemfiles/jruby_9.2.21.0_rails6_postgres_sidekiq.gemfile
+++ b/gemfiles/jruby_9.2.21.0_rails6_postgres_sidekiq.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.2.21.0_rails6_postgres_sidekiq.gemfile.lock b/gemfiles/jruby_9.2.21.0_rails6_postgres_sidekiq.gemfile.lock
index d1510aeaa1c..1ac7d7eca6a 100644
--- a/gemfiles/jruby_9.2.21.0_rails6_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/jruby_9.2.21.0_rails6_postgres_sidekiq.gemfile.lock
@@ -267,7 +267,6 @@ PLATFORMS
 DEPENDENCIES
   activejob
   activerecord-jdbcpostgresql-adapter (>= 60)
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.2.21.0_rails6_semantic_logger.gemfile b/gemfiles/jruby_9.2.21.0_rails6_semantic_logger.gemfile
index cab48172b78..d63f3f76d94 100644
--- a/gemfiles/jruby_9.2.21.0_rails6_semantic_logger.gemfile
+++ b/gemfiles/jruby_9.2.21.0_rails6_semantic_logger.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.2.21.0_rails6_semantic_logger.gemfile.lock b/gemfiles/jruby_9.2.21.0_rails6_semantic_logger.gemfile.lock
index 407cf95569b..4da7528d385 100644
--- a/gemfiles/jruby_9.2.21.0_rails6_semantic_logger.gemfile.lock
+++ b/gemfiles/jruby_9.2.21.0_rails6_semantic_logger.gemfile.lock
@@ -259,7 +259,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-jdbcpostgresql-adapter (>= 60)
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.2.21.0_redis_3.gemfile b/gemfiles/jruby_9.2.21.0_redis_3.gemfile
index 6f7aeab1ba7..825fbaa06c1 100644
--- a/gemfiles/jruby_9.2.21.0_redis_3.gemfile
+++ b/gemfiles/jruby_9.2.21.0_redis_3.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.2.21.0_redis_3.gemfile.lock b/gemfiles/jruby_9.2.21.0_redis_3.gemfile.lock
index 3bffed1d61c..3984a48ce37 100644
--- a/gemfiles/jruby_9.2.21.0_redis_3.gemfile.lock
+++ b/gemfiles/jruby_9.2.21.0_redis_3.gemfile.lock
@@ -111,7 +111,6 @@ PLATFORMS
   universal-java-1.8
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.2.21.0_redis_4.gemfile b/gemfiles/jruby_9.2.21.0_redis_4.gemfile
index 2f18e34f21f..9b555f14314 100644
--- a/gemfiles/jruby_9.2.21.0_redis_4.gemfile
+++ b/gemfiles/jruby_9.2.21.0_redis_4.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.2.21.0_redis_4.gemfile.lock b/gemfiles/jruby_9.2.21.0_redis_4.gemfile.lock
index 90943a6ff7b..dd0686b0917 100644
--- a/gemfiles/jruby_9.2.21.0_redis_4.gemfile.lock
+++ b/gemfiles/jruby_9.2.21.0_redis_4.gemfile.lock
@@ -111,7 +111,6 @@ PLATFORMS
   universal-java-1.8
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.2.21.0_redis_5.gemfile b/gemfiles/jruby_9.2.21.0_redis_5.gemfile
index 76a8eb533a6..fb7a4541e6b 100644
--- a/gemfiles/jruby_9.2.21.0_redis_5.gemfile
+++ b/gemfiles/jruby_9.2.21.0_redis_5.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.2.21.0_redis_5.gemfile.lock b/gemfiles/jruby_9.2.21.0_redis_5.gemfile.lock
index faa783d3b41..9871e5974b1 100644
--- a/gemfiles/jruby_9.2.21.0_redis_5.gemfile.lock
+++ b/gemfiles/jruby_9.2.21.0_redis_5.gemfile.lock
@@ -115,7 +115,6 @@ PLATFORMS
   universal-java-1.8
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.2.21.0_relational_db.gemfile b/gemfiles/jruby_9.2.21.0_relational_db.gemfile
index 39a12b2bff3..32bc4ec723d 100644
--- a/gemfiles/jruby_9.2.21.0_relational_db.gemfile
+++ b/gemfiles/jruby_9.2.21.0_relational_db.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.2.21.0_relational_db.gemfile.lock b/gemfiles/jruby_9.2.21.0_relational_db.gemfile.lock
index 323af06d8db..437f9a9b241 100644
--- a/gemfiles/jruby_9.2.21.0_relational_db.gemfile.lock
+++ b/gemfiles/jruby_9.2.21.0_relational_db.gemfile.lock
@@ -152,7 +152,6 @@ DEPENDENCIES
   activerecord-jdbcmysql-adapter (>= 52)
   activerecord-jdbcpostgresql-adapter (>= 52)
   activerecord-jdbcsqlite3-adapter (>= 52)
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.2.21.0_resque2_redis3.gemfile b/gemfiles/jruby_9.2.21.0_resque2_redis3.gemfile
index b46d73d98f4..74691a1dde5 100644
--- a/gemfiles/jruby_9.2.21.0_resque2_redis3.gemfile
+++ b/gemfiles/jruby_9.2.21.0_resque2_redis3.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.2.21.0_resque2_redis3.gemfile.lock b/gemfiles/jruby_9.2.21.0_resque2_redis3.gemfile.lock
index cea972fb1ba..6650b491d8f 100644
--- a/gemfiles/jruby_9.2.21.0_resque2_redis3.gemfile.lock
+++ b/gemfiles/jruby_9.2.21.0_resque2_redis3.gemfile.lock
@@ -132,7 +132,6 @@ PLATFORMS
   universal-java-1.8
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.2.21.0_resque2_redis4.gemfile b/gemfiles/jruby_9.2.21.0_resque2_redis4.gemfile
index 3b8717bfbde..085f1abec41 100644
--- a/gemfiles/jruby_9.2.21.0_resque2_redis4.gemfile
+++ b/gemfiles/jruby_9.2.21.0_resque2_redis4.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.2.21.0_resque2_redis4.gemfile.lock b/gemfiles/jruby_9.2.21.0_resque2_redis4.gemfile.lock
index 5a3a26de9be..b9766a65793 100644
--- a/gemfiles/jruby_9.2.21.0_resque2_redis4.gemfile.lock
+++ b/gemfiles/jruby_9.2.21.0_resque2_redis4.gemfile.lock
@@ -136,7 +136,6 @@ PLATFORMS
   universal-java-1.8
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.2.21.0_sinatra.gemfile b/gemfiles/jruby_9.2.21.0_sinatra.gemfile
index e7511c21d08..cc991970928 100644
--- a/gemfiles/jruby_9.2.21.0_sinatra.gemfile
+++ b/gemfiles/jruby_9.2.21.0_sinatra.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.2.21.0_sinatra.gemfile.lock b/gemfiles/jruby_9.2.21.0_sinatra.gemfile.lock
index d7e779a4e9b..9f934a90d13 100644
--- a/gemfiles/jruby_9.2.21.0_sinatra.gemfile.lock
+++ b/gemfiles/jruby_9.2.21.0_sinatra.gemfile.lock
@@ -124,7 +124,6 @@ PLATFORMS
   universal-java-1.8
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.3.9.0_aws.gemfile b/gemfiles/jruby_9.3.9.0_aws.gemfile
index 485e2bdbbe4..68343dd5e42 100644
--- a/gemfiles/jruby_9.3.9.0_aws.gemfile
+++ b/gemfiles/jruby_9.3.9.0_aws.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.3.9.0_aws.gemfile.lock b/gemfiles/jruby_9.3.9.0_aws.gemfile.lock
index 3ee63f6d1cf..1184abdcdb4 100644
--- a/gemfiles/jruby_9.3.9.0_aws.gemfile.lock
+++ b/gemfiles/jruby_9.3.9.0_aws.gemfile.lock
@@ -1564,7 +1564,6 @@ PLATFORMS
   universal-java-11
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   aws-sdk
   benchmark-ips (~> 2.8)
diff --git a/gemfiles/jruby_9.3.9.0_contrib.gemfile b/gemfiles/jruby_9.3.9.0_contrib.gemfile
index 6cbe62f4ebc..ebbcce99cfe 100644
--- a/gemfiles/jruby_9.3.9.0_contrib.gemfile
+++ b/gemfiles/jruby_9.3.9.0_contrib.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.3.9.0_contrib.gemfile.lock b/gemfiles/jruby_9.3.9.0_contrib.gemfile.lock
index 485357a6077..13abafd6841 100644
--- a/gemfiles/jruby_9.3.9.0_contrib.gemfile.lock
+++ b/gemfiles/jruby_9.3.9.0_contrib.gemfile.lock
@@ -302,7 +302,6 @@ DEPENDENCIES
   actionpack
   actionview
   active_model_serializers (>= 0.10.0)
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.3.9.0_contrib_old.gemfile b/gemfiles/jruby_9.3.9.0_contrib_old.gemfile
index 835072e05e9..5a2407deb20 100644
--- a/gemfiles/jruby_9.3.9.0_contrib_old.gemfile
+++ b/gemfiles/jruby_9.3.9.0_contrib_old.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.3.9.0_contrib_old.gemfile.lock b/gemfiles/jruby_9.3.9.0_contrib_old.gemfile.lock
index 43c4abcb38c..8f7d64dd991 100644
--- a/gemfiles/jruby_9.3.9.0_contrib_old.gemfile.lock
+++ b/gemfiles/jruby_9.3.9.0_contrib_old.gemfile.lock
@@ -161,7 +161,6 @@ PLATFORMS
   universal-java-11
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.3.9.0_core_old.gemfile b/gemfiles/jruby_9.3.9.0_core_old.gemfile
index 87de3993bd6..778cadcca8b 100644
--- a/gemfiles/jruby_9.3.9.0_core_old.gemfile
+++ b/gemfiles/jruby_9.3.9.0_core_old.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.3.9.0_core_old.gemfile.lock b/gemfiles/jruby_9.3.9.0_core_old.gemfile.lock
index b162692afb5..2dd3e8e36c2 100644
--- a/gemfiles/jruby_9.3.9.0_core_old.gemfile.lock
+++ b/gemfiles/jruby_9.3.9.0_core_old.gemfile.lock
@@ -138,7 +138,6 @@ PLATFORMS
   universal-java-11
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.3.9.0_hanami_1.gemfile b/gemfiles/jruby_9.3.9.0_hanami_1.gemfile
index 13a334adaaa..8c809ccfecc 100644
--- a/gemfiles/jruby_9.3.9.0_hanami_1.gemfile
+++ b/gemfiles/jruby_9.3.9.0_hanami_1.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.3.9.0_hanami_1.gemfile.lock b/gemfiles/jruby_9.3.9.0_hanami_1.gemfile.lock
index c4336ceb094..abd629fa394 100644
--- a/gemfiles/jruby_9.3.9.0_hanami_1.gemfile.lock
+++ b/gemfiles/jruby_9.3.9.0_hanami_1.gemfile.lock
@@ -236,7 +236,6 @@ PLATFORMS
   universal-java-11
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.3.9.0_http.gemfile b/gemfiles/jruby_9.3.9.0_http.gemfile
index 999e8515d84..de386201287 100644
--- a/gemfiles/jruby_9.3.9.0_http.gemfile
+++ b/gemfiles/jruby_9.3.9.0_http.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.3.9.0_http.gemfile.lock b/gemfiles/jruby_9.3.9.0_http.gemfile.lock
index 6eaa322ac27..175d8424757 100644
--- a/gemfiles/jruby_9.3.9.0_http.gemfile.lock
+++ b/gemfiles/jruby_9.3.9.0_http.gemfile.lock
@@ -193,7 +193,6 @@ PLATFORMS
   universal-java-11
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.3.9.0_rails5_mysql2.gemfile b/gemfiles/jruby_9.3.9.0_rails5_mysql2.gemfile
index 2f83a980cbd..1082dfb4f20 100644
--- a/gemfiles/jruby_9.3.9.0_rails5_mysql2.gemfile
+++ b/gemfiles/jruby_9.3.9.0_rails5_mysql2.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.3.9.0_rails5_mysql2.gemfile.lock b/gemfiles/jruby_9.3.9.0_rails5_mysql2.gemfile.lock
index 67e4f7cf22f..40079be9700 100644
--- a/gemfiles/jruby_9.3.9.0_rails5_mysql2.gemfile.lock
+++ b/gemfiles/jruby_9.3.9.0_rails5_mysql2.gemfile.lock
@@ -266,7 +266,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-jdbcmysql-adapter
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.3.9.0_rails5_postgres.gemfile b/gemfiles/jruby_9.3.9.0_rails5_postgres.gemfile
index d22c1b2207c..20d3143919c 100644
--- a/gemfiles/jruby_9.3.9.0_rails5_postgres.gemfile
+++ b/gemfiles/jruby_9.3.9.0_rails5_postgres.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.3.9.0_rails5_postgres.gemfile.lock b/gemfiles/jruby_9.3.9.0_rails5_postgres.gemfile.lock
index 4cfcb034d4e..9306f798d2d 100644
--- a/gemfiles/jruby_9.3.9.0_rails5_postgres.gemfile.lock
+++ b/gemfiles/jruby_9.3.9.0_rails5_postgres.gemfile.lock
@@ -266,7 +266,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-jdbcpostgresql-adapter
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.3.9.0_rails5_postgres_redis.gemfile b/gemfiles/jruby_9.3.9.0_rails5_postgres_redis.gemfile
index 11b1fc87ce1..7fcbc26b9cd 100644
--- a/gemfiles/jruby_9.3.9.0_rails5_postgres_redis.gemfile
+++ b/gemfiles/jruby_9.3.9.0_rails5_postgres_redis.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.3.9.0_rails5_postgres_redis.gemfile.lock b/gemfiles/jruby_9.3.9.0_rails5_postgres_redis.gemfile.lock
index 8943403edd2..aceb9d7a3f4 100644
--- a/gemfiles/jruby_9.3.9.0_rails5_postgres_redis.gemfile.lock
+++ b/gemfiles/jruby_9.3.9.0_rails5_postgres_redis.gemfile.lock
@@ -267,7 +267,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-jdbcpostgresql-adapter
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.3.9.0_rails5_postgres_redis_activesupport.gemfile b/gemfiles/jruby_9.3.9.0_rails5_postgres_redis_activesupport.gemfile
index 9598ea918b1..c7867ef7aef 100644
--- a/gemfiles/jruby_9.3.9.0_rails5_postgres_redis_activesupport.gemfile
+++ b/gemfiles/jruby_9.3.9.0_rails5_postgres_redis_activesupport.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.3.9.0_rails5_postgres_redis_activesupport.gemfile.lock b/gemfiles/jruby_9.3.9.0_rails5_postgres_redis_activesupport.gemfile.lock
index e952d4006bc..beffcddf647 100644
--- a/gemfiles/jruby_9.3.9.0_rails5_postgres_redis_activesupport.gemfile.lock
+++ b/gemfiles/jruby_9.3.9.0_rails5_postgres_redis_activesupport.gemfile.lock
@@ -283,7 +283,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-jdbcpostgresql-adapter
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.3.9.0_rails5_postgres_sidekiq.gemfile b/gemfiles/jruby_9.3.9.0_rails5_postgres_sidekiq.gemfile
index 17cc419b074..04545c38f7d 100644
--- a/gemfiles/jruby_9.3.9.0_rails5_postgres_sidekiq.gemfile
+++ b/gemfiles/jruby_9.3.9.0_rails5_postgres_sidekiq.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.3.9.0_rails5_postgres_sidekiq.gemfile.lock b/gemfiles/jruby_9.3.9.0_rails5_postgres_sidekiq.gemfile.lock
index 43b345f3518..272d31e3d91 100644
--- a/gemfiles/jruby_9.3.9.0_rails5_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/jruby_9.3.9.0_rails5_postgres_sidekiq.gemfile.lock
@@ -273,7 +273,6 @@ PLATFORMS
 DEPENDENCIES
   activejob
   activerecord-jdbcpostgresql-adapter
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.3.9.0_rails5_semantic_logger.gemfile b/gemfiles/jruby_9.3.9.0_rails5_semantic_logger.gemfile
index 4bd65994d37..afbdac8475b 100644
--- a/gemfiles/jruby_9.3.9.0_rails5_semantic_logger.gemfile
+++ b/gemfiles/jruby_9.3.9.0_rails5_semantic_logger.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.3.9.0_rails5_semantic_logger.gemfile.lock b/gemfiles/jruby_9.3.9.0_rails5_semantic_logger.gemfile.lock
index 1530954e893..ab3620b4ce0 100644
--- a/gemfiles/jruby_9.3.9.0_rails5_semantic_logger.gemfile.lock
+++ b/gemfiles/jruby_9.3.9.0_rails5_semantic_logger.gemfile.lock
@@ -265,7 +265,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-jdbcpostgresql-adapter
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.3.9.0_rails61_mysql2.gemfile b/gemfiles/jruby_9.3.9.0_rails61_mysql2.gemfile
index 7d92ca55d54..7bc65ea8557 100644
--- a/gemfiles/jruby_9.3.9.0_rails61_mysql2.gemfile
+++ b/gemfiles/jruby_9.3.9.0_rails61_mysql2.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.3.9.0_rails61_mysql2.gemfile.lock b/gemfiles/jruby_9.3.9.0_rails61_mysql2.gemfile.lock
index dba5f59afe1..daadfede2a7 100644
--- a/gemfiles/jruby_9.3.9.0_rails61_mysql2.gemfile.lock
+++ b/gemfiles/jruby_9.3.9.0_rails61_mysql2.gemfile.lock
@@ -285,7 +285,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-jdbcmysql-adapter
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.3.9.0_rails61_postgres.gemfile b/gemfiles/jruby_9.3.9.0_rails61_postgres.gemfile
index d8a45b20ec0..6dbede01a91 100644
--- a/gemfiles/jruby_9.3.9.0_rails61_postgres.gemfile
+++ b/gemfiles/jruby_9.3.9.0_rails61_postgres.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.3.9.0_rails61_postgres.gemfile.lock b/gemfiles/jruby_9.3.9.0_rails61_postgres.gemfile.lock
index f3c6ceb9e5a..cba3bf954c5 100644
--- a/gemfiles/jruby_9.3.9.0_rails61_postgres.gemfile.lock
+++ b/gemfiles/jruby_9.3.9.0_rails61_postgres.gemfile.lock
@@ -285,7 +285,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-jdbcpostgresql-adapter
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.3.9.0_rails61_postgres_redis.gemfile b/gemfiles/jruby_9.3.9.0_rails61_postgres_redis.gemfile
index 2dbdc0f3e75..5e6c497afb7 100644
--- a/gemfiles/jruby_9.3.9.0_rails61_postgres_redis.gemfile
+++ b/gemfiles/jruby_9.3.9.0_rails61_postgres_redis.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.3.9.0_rails61_postgres_redis.gemfile.lock b/gemfiles/jruby_9.3.9.0_rails61_postgres_redis.gemfile.lock
index f086289eee1..cc0fbe41a83 100644
--- a/gemfiles/jruby_9.3.9.0_rails61_postgres_redis.gemfile.lock
+++ b/gemfiles/jruby_9.3.9.0_rails61_postgres_redis.gemfile.lock
@@ -286,7 +286,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-jdbcpostgresql-adapter
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.3.9.0_rails61_postgres_sidekiq.gemfile b/gemfiles/jruby_9.3.9.0_rails61_postgres_sidekiq.gemfile
index 3d7fc03edd3..8ac32d38d86 100644
--- a/gemfiles/jruby_9.3.9.0_rails61_postgres_sidekiq.gemfile
+++ b/gemfiles/jruby_9.3.9.0_rails61_postgres_sidekiq.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.3.9.0_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/jruby_9.3.9.0_rails61_postgres_sidekiq.gemfile.lock
index fcc8979679f..0bef6275bb9 100644
--- a/gemfiles/jruby_9.3.9.0_rails61_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/jruby_9.3.9.0_rails61_postgres_sidekiq.gemfile.lock
@@ -291,7 +291,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-jdbcpostgresql-adapter
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.3.9.0_rails61_semantic_logger.gemfile b/gemfiles/jruby_9.3.9.0_rails61_semantic_logger.gemfile
index 48bbe613ba2..f30c8a931d6 100644
--- a/gemfiles/jruby_9.3.9.0_rails61_semantic_logger.gemfile
+++ b/gemfiles/jruby_9.3.9.0_rails61_semantic_logger.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.3.9.0_rails61_semantic_logger.gemfile.lock b/gemfiles/jruby_9.3.9.0_rails61_semantic_logger.gemfile.lock
index 479588f18f7..0b82a932b37 100644
--- a/gemfiles/jruby_9.3.9.0_rails61_semantic_logger.gemfile.lock
+++ b/gemfiles/jruby_9.3.9.0_rails61_semantic_logger.gemfile.lock
@@ -284,7 +284,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-jdbcpostgresql-adapter
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.3.9.0_rails6_mysql2.gemfile b/gemfiles/jruby_9.3.9.0_rails6_mysql2.gemfile
index c6d72c0aa55..73298144d72 100644
--- a/gemfiles/jruby_9.3.9.0_rails6_mysql2.gemfile
+++ b/gemfiles/jruby_9.3.9.0_rails6_mysql2.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.3.9.0_rails6_mysql2.gemfile.lock b/gemfiles/jruby_9.3.9.0_rails6_mysql2.gemfile.lock
index d86e453930b..9aeb0c95f14 100644
--- a/gemfiles/jruby_9.3.9.0_rails6_mysql2.gemfile.lock
+++ b/gemfiles/jruby_9.3.9.0_rails6_mysql2.gemfile.lock
@@ -282,7 +282,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-jdbcmysql-adapter
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.3.9.0_rails6_postgres.gemfile b/gemfiles/jruby_9.3.9.0_rails6_postgres.gemfile
index a36ac36aca7..224f7c99140 100644
--- a/gemfiles/jruby_9.3.9.0_rails6_postgres.gemfile
+++ b/gemfiles/jruby_9.3.9.0_rails6_postgres.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.3.9.0_rails6_postgres.gemfile.lock b/gemfiles/jruby_9.3.9.0_rails6_postgres.gemfile.lock
index 6c7c4e9c4fc..1657861c9b3 100644
--- a/gemfiles/jruby_9.3.9.0_rails6_postgres.gemfile.lock
+++ b/gemfiles/jruby_9.3.9.0_rails6_postgres.gemfile.lock
@@ -282,7 +282,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-jdbcpostgresql-adapter
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.3.9.0_rails6_postgres_redis.gemfile b/gemfiles/jruby_9.3.9.0_rails6_postgres_redis.gemfile
index e4576ee16c4..2168fbf2377 100644
--- a/gemfiles/jruby_9.3.9.0_rails6_postgres_redis.gemfile
+++ b/gemfiles/jruby_9.3.9.0_rails6_postgres_redis.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.3.9.0_rails6_postgres_redis.gemfile.lock b/gemfiles/jruby_9.3.9.0_rails6_postgres_redis.gemfile.lock
index d005ffd1e07..3dc4b0ec1b3 100644
--- a/gemfiles/jruby_9.3.9.0_rails6_postgres_redis.gemfile.lock
+++ b/gemfiles/jruby_9.3.9.0_rails6_postgres_redis.gemfile.lock
@@ -283,7 +283,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-jdbcpostgresql-adapter
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.3.9.0_rails6_postgres_redis_activesupport.gemfile b/gemfiles/jruby_9.3.9.0_rails6_postgres_redis_activesupport.gemfile
index 0365d8d111c..29ea4303e85 100644
--- a/gemfiles/jruby_9.3.9.0_rails6_postgres_redis_activesupport.gemfile
+++ b/gemfiles/jruby_9.3.9.0_rails6_postgres_redis_activesupport.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.3.9.0_rails6_postgres_redis_activesupport.gemfile.lock b/gemfiles/jruby_9.3.9.0_rails6_postgres_redis_activesupport.gemfile.lock
index 826aec5c4ab..9912ed59bb4 100644
--- a/gemfiles/jruby_9.3.9.0_rails6_postgres_redis_activesupport.gemfile.lock
+++ b/gemfiles/jruby_9.3.9.0_rails6_postgres_redis_activesupport.gemfile.lock
@@ -299,7 +299,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-jdbcpostgresql-adapter
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.3.9.0_rails6_postgres_sidekiq.gemfile b/gemfiles/jruby_9.3.9.0_rails6_postgres_sidekiq.gemfile
index 9c4e11d5aae..6ec2cd5200d 100644
--- a/gemfiles/jruby_9.3.9.0_rails6_postgres_sidekiq.gemfile
+++ b/gemfiles/jruby_9.3.9.0_rails6_postgres_sidekiq.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.3.9.0_rails6_postgres_sidekiq.gemfile.lock b/gemfiles/jruby_9.3.9.0_rails6_postgres_sidekiq.gemfile.lock
index 8cdd4405efb..3ca4bab9521 100644
--- a/gemfiles/jruby_9.3.9.0_rails6_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/jruby_9.3.9.0_rails6_postgres_sidekiq.gemfile.lock
@@ -289,7 +289,6 @@ PLATFORMS
 DEPENDENCIES
   activejob
   activerecord-jdbcpostgresql-adapter
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.3.9.0_rails6_semantic_logger.gemfile b/gemfiles/jruby_9.3.9.0_rails6_semantic_logger.gemfile
index d0b6fdae8aa..0d73e3705d3 100644
--- a/gemfiles/jruby_9.3.9.0_rails6_semantic_logger.gemfile
+++ b/gemfiles/jruby_9.3.9.0_rails6_semantic_logger.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.3.9.0_rails6_semantic_logger.gemfile.lock b/gemfiles/jruby_9.3.9.0_rails6_semantic_logger.gemfile.lock
index fb4c3b654fe..8bf7448d36a 100644
--- a/gemfiles/jruby_9.3.9.0_rails6_semantic_logger.gemfile.lock
+++ b/gemfiles/jruby_9.3.9.0_rails6_semantic_logger.gemfile.lock
@@ -281,7 +281,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-jdbcpostgresql-adapter
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.3.9.0_redis_3.gemfile b/gemfiles/jruby_9.3.9.0_redis_3.gemfile
index 370f20125d1..e65dcd153c7 100644
--- a/gemfiles/jruby_9.3.9.0_redis_3.gemfile
+++ b/gemfiles/jruby_9.3.9.0_redis_3.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.3.9.0_redis_3.gemfile.lock b/gemfiles/jruby_9.3.9.0_redis_3.gemfile.lock
index 48b2468cee4..c5dffba02b4 100644
--- a/gemfiles/jruby_9.3.9.0_redis_3.gemfile.lock
+++ b/gemfiles/jruby_9.3.9.0_redis_3.gemfile.lock
@@ -139,7 +139,6 @@ PLATFORMS
   universal-java-11
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.3.9.0_redis_4.gemfile b/gemfiles/jruby_9.3.9.0_redis_4.gemfile
index 5af9c581af9..4a4bffee339 100644
--- a/gemfiles/jruby_9.3.9.0_redis_4.gemfile
+++ b/gemfiles/jruby_9.3.9.0_redis_4.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.3.9.0_redis_4.gemfile.lock b/gemfiles/jruby_9.3.9.0_redis_4.gemfile.lock
index d31564a43fa..d23b86e0f46 100644
--- a/gemfiles/jruby_9.3.9.0_redis_4.gemfile.lock
+++ b/gemfiles/jruby_9.3.9.0_redis_4.gemfile.lock
@@ -139,7 +139,6 @@ PLATFORMS
   universal-java-11
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.3.9.0_redis_5.gemfile b/gemfiles/jruby_9.3.9.0_redis_5.gemfile
index e69c50740ad..962d8e27952 100644
--- a/gemfiles/jruby_9.3.9.0_redis_5.gemfile
+++ b/gemfiles/jruby_9.3.9.0_redis_5.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.3.9.0_redis_5.gemfile.lock b/gemfiles/jruby_9.3.9.0_redis_5.gemfile.lock
index 62b6d5c4924..565e4bd7b0d 100644
--- a/gemfiles/jruby_9.3.9.0_redis_5.gemfile.lock
+++ b/gemfiles/jruby_9.3.9.0_redis_5.gemfile.lock
@@ -143,7 +143,6 @@ PLATFORMS
   universal-java-11
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.3.9.0_relational_db.gemfile b/gemfiles/jruby_9.3.9.0_relational_db.gemfile
index d41e9af51be..6e388aaa54b 100644
--- a/gemfiles/jruby_9.3.9.0_relational_db.gemfile
+++ b/gemfiles/jruby_9.3.9.0_relational_db.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.3.9.0_relational_db.gemfile.lock b/gemfiles/jruby_9.3.9.0_relational_db.gemfile.lock
index d04ae098e5c..26f4f4f3a06 100644
--- a/gemfiles/jruby_9.3.9.0_relational_db.gemfile.lock
+++ b/gemfiles/jruby_9.3.9.0_relational_db.gemfile.lock
@@ -178,7 +178,6 @@ DEPENDENCIES
   activerecord (~> 6.0.0)
   activerecord-jdbcmysql-adapter
   activerecord-jdbcpostgresql-adapter
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.3.9.0_resque2_redis3.gemfile b/gemfiles/jruby_9.3.9.0_resque2_redis3.gemfile
index 7363b83b2a7..89930499cf8 100644
--- a/gemfiles/jruby_9.3.9.0_resque2_redis3.gemfile
+++ b/gemfiles/jruby_9.3.9.0_resque2_redis3.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.3.9.0_resque2_redis3.gemfile.lock b/gemfiles/jruby_9.3.9.0_resque2_redis3.gemfile.lock
index 922f6bb0cab..30ac4525eba 100644
--- a/gemfiles/jruby_9.3.9.0_resque2_redis3.gemfile.lock
+++ b/gemfiles/jruby_9.3.9.0_resque2_redis3.gemfile.lock
@@ -160,7 +160,6 @@ PLATFORMS
   universal-java-11
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.3.9.0_resque2_redis4.gemfile b/gemfiles/jruby_9.3.9.0_resque2_redis4.gemfile
index 45225d02c9b..92205c80fe3 100644
--- a/gemfiles/jruby_9.3.9.0_resque2_redis4.gemfile
+++ b/gemfiles/jruby_9.3.9.0_resque2_redis4.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.3.9.0_resque2_redis4.gemfile.lock b/gemfiles/jruby_9.3.9.0_resque2_redis4.gemfile.lock
index 9c24b1d1da1..3e4886d79f9 100644
--- a/gemfiles/jruby_9.3.9.0_resque2_redis4.gemfile.lock
+++ b/gemfiles/jruby_9.3.9.0_resque2_redis4.gemfile.lock
@@ -160,7 +160,6 @@ PLATFORMS
   universal-java-11
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.3.9.0_sinatra.gemfile b/gemfiles/jruby_9.3.9.0_sinatra.gemfile
index 1b5af9fa060..895fa652b28 100644
--- a/gemfiles/jruby_9.3.9.0_sinatra.gemfile
+++ b/gemfiles/jruby_9.3.9.0_sinatra.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.3.9.0_sinatra.gemfile.lock b/gemfiles/jruby_9.3.9.0_sinatra.gemfile.lock
index cbeaaec594a..a709c185e47 100644
--- a/gemfiles/jruby_9.3.9.0_sinatra.gemfile.lock
+++ b/gemfiles/jruby_9.3.9.0_sinatra.gemfile.lock
@@ -152,7 +152,6 @@ PLATFORMS
   universal-java-11
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.4.0.0_aws.gemfile b/gemfiles/jruby_9.4.0.0_aws.gemfile
index df02fcaadb6..0627b6c79da 100644
--- a/gemfiles/jruby_9.4.0.0_aws.gemfile
+++ b/gemfiles/jruby_9.4.0.0_aws.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.4.0.0_aws.gemfile.lock b/gemfiles/jruby_9.4.0.0_aws.gemfile.lock
index 4987f0f714f..10164644b7a 100644
--- a/gemfiles/jruby_9.4.0.0_aws.gemfile.lock
+++ b/gemfiles/jruby_9.4.0.0_aws.gemfile.lock
@@ -1565,7 +1565,6 @@ PLATFORMS
   universal-java-11
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   aws-sdk
   benchmark-ips (~> 2.8)
diff --git a/gemfiles/jruby_9.4.0.0_contrib.gemfile b/gemfiles/jruby_9.4.0.0_contrib.gemfile
index 244f9387254..e34d2f23e5a 100644
--- a/gemfiles/jruby_9.4.0.0_contrib.gemfile
+++ b/gemfiles/jruby_9.4.0.0_contrib.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.4.0.0_contrib.gemfile.lock b/gemfiles/jruby_9.4.0.0_contrib.gemfile.lock
index a8c355d86fc..a208b5ad313 100644
--- a/gemfiles/jruby_9.4.0.0_contrib.gemfile.lock
+++ b/gemfiles/jruby_9.4.0.0_contrib.gemfile.lock
@@ -305,7 +305,6 @@ DEPENDENCIES
   actionpack (~> 7)
   actionview (~> 7)
   active_model_serializers (>= 0.10.0)
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.4.0.0_contrib_old.gemfile b/gemfiles/jruby_9.4.0.0_contrib_old.gemfile
index 76db378a290..28d03ee81ac 100644
--- a/gemfiles/jruby_9.4.0.0_contrib_old.gemfile
+++ b/gemfiles/jruby_9.4.0.0_contrib_old.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.4.0.0_contrib_old.gemfile.lock b/gemfiles/jruby_9.4.0.0_contrib_old.gemfile.lock
index fa85ca5e43d..bd71294c685 100644
--- a/gemfiles/jruby_9.4.0.0_contrib_old.gemfile.lock
+++ b/gemfiles/jruby_9.4.0.0_contrib_old.gemfile.lock
@@ -161,7 +161,6 @@ PLATFORMS
   universal-java-11
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.4.0.0_core_old.gemfile b/gemfiles/jruby_9.4.0.0_core_old.gemfile
index 18b05892c72..7631add9488 100644
--- a/gemfiles/jruby_9.4.0.0_core_old.gemfile
+++ b/gemfiles/jruby_9.4.0.0_core_old.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.4.0.0_core_old.gemfile.lock b/gemfiles/jruby_9.4.0.0_core_old.gemfile.lock
index d291314242b..50b8c3ecdb4 100644
--- a/gemfiles/jruby_9.4.0.0_core_old.gemfile.lock
+++ b/gemfiles/jruby_9.4.0.0_core_old.gemfile.lock
@@ -138,7 +138,6 @@ PLATFORMS
   universal-java-11
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.4.0.0_http.gemfile b/gemfiles/jruby_9.4.0.0_http.gemfile
index aa77127bffe..54d50e601e5 100644
--- a/gemfiles/jruby_9.4.0.0_http.gemfile
+++ b/gemfiles/jruby_9.4.0.0_http.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.4.0.0_http.gemfile.lock b/gemfiles/jruby_9.4.0.0_http.gemfile.lock
index 0cd6164b600..b7023143924 100644
--- a/gemfiles/jruby_9.4.0.0_http.gemfile.lock
+++ b/gemfiles/jruby_9.4.0.0_http.gemfile.lock
@@ -194,7 +194,6 @@ PLATFORMS
   universal-java-11
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.4.0.0_rails61_mysql2.gemfile b/gemfiles/jruby_9.4.0.0_rails61_mysql2.gemfile
index efc636debaa..f3c50b8c7ef 100644
--- a/gemfiles/jruby_9.4.0.0_rails61_mysql2.gemfile
+++ b/gemfiles/jruby_9.4.0.0_rails61_mysql2.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.4.0.0_rails61_mysql2.gemfile.lock b/gemfiles/jruby_9.4.0.0_rails61_mysql2.gemfile.lock
index 1649e803f6c..d5471fd44ce 100644
--- a/gemfiles/jruby_9.4.0.0_rails61_mysql2.gemfile.lock
+++ b/gemfiles/jruby_9.4.0.0_rails61_mysql2.gemfile.lock
@@ -285,7 +285,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-jdbcmysql-adapter
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.4.0.0_rails61_postgres.gemfile b/gemfiles/jruby_9.4.0.0_rails61_postgres.gemfile
index f4580c12b08..6074e0c5a28 100644
--- a/gemfiles/jruby_9.4.0.0_rails61_postgres.gemfile
+++ b/gemfiles/jruby_9.4.0.0_rails61_postgres.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.4.0.0_rails61_postgres.gemfile.lock b/gemfiles/jruby_9.4.0.0_rails61_postgres.gemfile.lock
index 0279ee493a6..4c100d93dd1 100644
--- a/gemfiles/jruby_9.4.0.0_rails61_postgres.gemfile.lock
+++ b/gemfiles/jruby_9.4.0.0_rails61_postgres.gemfile.lock
@@ -285,7 +285,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-jdbcpostgresql-adapter
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.4.0.0_rails61_postgres_redis.gemfile b/gemfiles/jruby_9.4.0.0_rails61_postgres_redis.gemfile
index f3e8d332ed1..de9e26d79db 100644
--- a/gemfiles/jruby_9.4.0.0_rails61_postgres_redis.gemfile
+++ b/gemfiles/jruby_9.4.0.0_rails61_postgres_redis.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.4.0.0_rails61_postgres_redis.gemfile.lock b/gemfiles/jruby_9.4.0.0_rails61_postgres_redis.gemfile.lock
index e4cb274c9e5..092f47de947 100644
--- a/gemfiles/jruby_9.4.0.0_rails61_postgres_redis.gemfile.lock
+++ b/gemfiles/jruby_9.4.0.0_rails61_postgres_redis.gemfile.lock
@@ -286,7 +286,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-jdbcpostgresql-adapter
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.4.0.0_rails61_postgres_sidekiq.gemfile b/gemfiles/jruby_9.4.0.0_rails61_postgres_sidekiq.gemfile
index 83abc004c5e..063c921f1cc 100644
--- a/gemfiles/jruby_9.4.0.0_rails61_postgres_sidekiq.gemfile
+++ b/gemfiles/jruby_9.4.0.0_rails61_postgres_sidekiq.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.4.0.0_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/jruby_9.4.0.0_rails61_postgres_sidekiq.gemfile.lock
index 4d8f1016ac3..2b1c71ef929 100644
--- a/gemfiles/jruby_9.4.0.0_rails61_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/jruby_9.4.0.0_rails61_postgres_sidekiq.gemfile.lock
@@ -299,7 +299,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-jdbcpostgresql-adapter
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.4.0.0_rails61_semantic_logger.gemfile b/gemfiles/jruby_9.4.0.0_rails61_semantic_logger.gemfile
index ba6639ebfa0..9111ae09b44 100644
--- a/gemfiles/jruby_9.4.0.0_rails61_semantic_logger.gemfile
+++ b/gemfiles/jruby_9.4.0.0_rails61_semantic_logger.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.4.0.0_rails61_semantic_logger.gemfile.lock b/gemfiles/jruby_9.4.0.0_rails61_semantic_logger.gemfile.lock
index 1e7727fad0e..9a3aaa8cc95 100644
--- a/gemfiles/jruby_9.4.0.0_rails61_semantic_logger.gemfile.lock
+++ b/gemfiles/jruby_9.4.0.0_rails61_semantic_logger.gemfile.lock
@@ -284,7 +284,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-jdbcpostgresql-adapter
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.4.0.0_redis_3.gemfile b/gemfiles/jruby_9.4.0.0_redis_3.gemfile
index 4b09ef00c66..9dd09ec2f6b 100644
--- a/gemfiles/jruby_9.4.0.0_redis_3.gemfile
+++ b/gemfiles/jruby_9.4.0.0_redis_3.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.4.0.0_redis_3.gemfile.lock b/gemfiles/jruby_9.4.0.0_redis_3.gemfile.lock
index 7e7ddc90ebf..f85280dcc77 100644
--- a/gemfiles/jruby_9.4.0.0_redis_3.gemfile.lock
+++ b/gemfiles/jruby_9.4.0.0_redis_3.gemfile.lock
@@ -139,7 +139,6 @@ PLATFORMS
   universal-java-11
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.4.0.0_redis_4.gemfile b/gemfiles/jruby_9.4.0.0_redis_4.gemfile
index 60a52e8b4b0..7bacda9507c 100644
--- a/gemfiles/jruby_9.4.0.0_redis_4.gemfile
+++ b/gemfiles/jruby_9.4.0.0_redis_4.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.4.0.0_redis_4.gemfile.lock b/gemfiles/jruby_9.4.0.0_redis_4.gemfile.lock
index 2cc04c3a6ab..9b717e1a980 100644
--- a/gemfiles/jruby_9.4.0.0_redis_4.gemfile.lock
+++ b/gemfiles/jruby_9.4.0.0_redis_4.gemfile.lock
@@ -139,7 +139,6 @@ PLATFORMS
   universal-java-11
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.4.0.0_redis_5.gemfile b/gemfiles/jruby_9.4.0.0_redis_5.gemfile
index d8d33db3418..dd707693ab7 100644
--- a/gemfiles/jruby_9.4.0.0_redis_5.gemfile
+++ b/gemfiles/jruby_9.4.0.0_redis_5.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.4.0.0_redis_5.gemfile.lock b/gemfiles/jruby_9.4.0.0_redis_5.gemfile.lock
index 9ff4d02f741..51caae98128 100644
--- a/gemfiles/jruby_9.4.0.0_redis_5.gemfile.lock
+++ b/gemfiles/jruby_9.4.0.0_redis_5.gemfile.lock
@@ -143,7 +143,6 @@ PLATFORMS
   universal-java-11
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.4.0.0_relational_db.gemfile b/gemfiles/jruby_9.4.0.0_relational_db.gemfile
index a5ef59209e9..91106b5ec2a 100644
--- a/gemfiles/jruby_9.4.0.0_relational_db.gemfile
+++ b/gemfiles/jruby_9.4.0.0_relational_db.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.4.0.0_relational_db.gemfile.lock b/gemfiles/jruby_9.4.0.0_relational_db.gemfile.lock
index 3f472ffcb70..2163c910f69 100644
--- a/gemfiles/jruby_9.4.0.0_relational_db.gemfile.lock
+++ b/gemfiles/jruby_9.4.0.0_relational_db.gemfile.lock
@@ -176,7 +176,6 @@ DEPENDENCIES
   activerecord (~> 7)
   activerecord-jdbcmysql-adapter
   activerecord-jdbcpostgresql-adapter
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.4.0.0_resque2_redis3.gemfile b/gemfiles/jruby_9.4.0.0_resque2_redis3.gemfile
index 7fc8bbee21d..4906218a1db 100644
--- a/gemfiles/jruby_9.4.0.0_resque2_redis3.gemfile
+++ b/gemfiles/jruby_9.4.0.0_resque2_redis3.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.4.0.0_resque2_redis3.gemfile.lock b/gemfiles/jruby_9.4.0.0_resque2_redis3.gemfile.lock
index 307bc580389..905dead7ef5 100644
--- a/gemfiles/jruby_9.4.0.0_resque2_redis3.gemfile.lock
+++ b/gemfiles/jruby_9.4.0.0_resque2_redis3.gemfile.lock
@@ -160,7 +160,6 @@ PLATFORMS
   universal-java-11
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.4.0.0_resque2_redis4.gemfile b/gemfiles/jruby_9.4.0.0_resque2_redis4.gemfile
index c1d45a7d5e6..9316041c8e7 100644
--- a/gemfiles/jruby_9.4.0.0_resque2_redis4.gemfile
+++ b/gemfiles/jruby_9.4.0.0_resque2_redis4.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.4.0.0_resque2_redis4.gemfile.lock b/gemfiles/jruby_9.4.0.0_resque2_redis4.gemfile.lock
index a86ad133467..e93c3497570 100644
--- a/gemfiles/jruby_9.4.0.0_resque2_redis4.gemfile.lock
+++ b/gemfiles/jruby_9.4.0.0_resque2_redis4.gemfile.lock
@@ -164,7 +164,6 @@ PLATFORMS
   universal-java-11
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/jruby_9.4.0.0_sinatra.gemfile b/gemfiles/jruby_9.4.0.0_sinatra.gemfile
index 0c7a9802172..fc0d8965044 100644
--- a/gemfiles/jruby_9.4.0.0_sinatra.gemfile
+++ b/gemfiles/jruby_9.4.0.0_sinatra.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/jruby_9.4.0.0_sinatra.gemfile.lock b/gemfiles/jruby_9.4.0.0_sinatra.gemfile.lock
index d0b836f29f7..bbd0c8248b5 100644
--- a/gemfiles/jruby_9.4.0.0_sinatra.gemfile.lock
+++ b/gemfiles/jruby_9.4.0.0_sinatra.gemfile.lock
@@ -152,7 +152,6 @@ PLATFORMS
   universal-java-11
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.1.10_aws.gemfile b/gemfiles/ruby_2.1.10_aws.gemfile
index c7a3f1b8145..1720b94f6e4 100644
--- a/gemfiles/ruby_2.1.10_aws.gemfile
+++ b/gemfiles/ruby_2.1.10_aws.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.2.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.1.10_aws.gemfile.lock b/gemfiles/ruby_2.1.10_aws.gemfile.lock
index eb551799173..04e9e4b9f44 100644
--- a/gemfiles/ruby_2.1.10_aws.gemfile.lock
+++ b/gemfiles/ruby_2.1.10_aws.gemfile.lock
@@ -105,7 +105,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.2.0)
   aws-sdk (~> 2.0)
   benchmark-ips (~> 2.8)
diff --git a/gemfiles/ruby_2.1.10_contrib.gemfile b/gemfiles/ruby_2.1.10_contrib.gemfile
index 3af13886987..5529ab623c7 100644
--- a/gemfiles/ruby_2.1.10_contrib.gemfile
+++ b/gemfiles/ruby_2.1.10_contrib.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.2.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.1.10_contrib.gemfile.lock b/gemfiles/ruby_2.1.10_contrib.gemfile.lock
index 50cc3528768..be0ad7b2723 100644
--- a/gemfiles/ruby_2.1.10_contrib.gemfile.lock
+++ b/gemfiles/ruby_2.1.10_contrib.gemfile.lock
@@ -183,7 +183,6 @@ PLATFORMS
 
 DEPENDENCIES
   active_model_serializers (~> 0.9.0)
-  addressable (~> 2.4.0)
   appraisal (~> 2.2.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.1.10_core_old.gemfile b/gemfiles/ruby_2.1.10_core_old.gemfile
index a6f6125930f..e8dff80458d 100644
--- a/gemfiles/ruby_2.1.10_core_old.gemfile
+++ b/gemfiles/ruby_2.1.10_core_old.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.2.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.1.10_core_old.gemfile.lock b/gemfiles/ruby_2.1.10_core_old.gemfile.lock
index 130193aa4e9..df9fc664ad0 100644
--- a/gemfiles/ruby_2.1.10_core_old.gemfile.lock
+++ b/gemfiles/ruby_2.1.10_core_old.gemfile.lock
@@ -94,7 +94,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.2.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.1.10_http.gemfile b/gemfiles/ruby_2.1.10_http.gemfile
index 3053a5bcba4..e74b40ae15a 100644
--- a/gemfiles/ruby_2.1.10_http.gemfile
+++ b/gemfiles/ruby_2.1.10_http.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.2.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.1.10_http.gemfile.lock b/gemfiles/ruby_2.1.10_http.gemfile.lock
index 318408b221d..33f18211d98 100644
--- a/gemfiles/ruby_2.1.10_http.gemfile.lock
+++ b/gemfiles/ruby_2.1.10_http.gemfile.lock
@@ -133,7 +133,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.2.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.1.10_rails32_mysql2.gemfile b/gemfiles/ruby_2.1.10_rails32_mysql2.gemfile
index 34bbacc39e5..2c14f1e4ef6 100644
--- a/gemfiles/ruby_2.1.10_rails32_mysql2.gemfile
+++ b/gemfiles/ruby_2.1.10_rails32_mysql2.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.2.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.1.10_rails32_mysql2.gemfile.lock b/gemfiles/ruby_2.1.10_rails32_mysql2.gemfile.lock
index 4ca07398188..fe2accf30f2 100644
--- a/gemfiles/ruby_2.1.10_rails32_mysql2.gemfile.lock
+++ b/gemfiles/ruby_2.1.10_rails32_mysql2.gemfile.lock
@@ -179,7 +179,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-mysql-adapter
-  addressable (~> 2.4.0)
   appraisal (~> 2.2.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.1.10_rails32_postgres.gemfile b/gemfiles/ruby_2.1.10_rails32_postgres.gemfile
index 191362ff8c7..0a619513782 100644
--- a/gemfiles/ruby_2.1.10_rails32_postgres.gemfile
+++ b/gemfiles/ruby_2.1.10_rails32_postgres.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.2.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.1.10_rails32_postgres.gemfile.lock b/gemfiles/ruby_2.1.10_rails32_postgres.gemfile.lock
index 15c4ab61a8f..356ab7a99d4 100644
--- a/gemfiles/ruby_2.1.10_rails32_postgres.gemfile.lock
+++ b/gemfiles/ruby_2.1.10_rails32_postgres.gemfile.lock
@@ -170,7 +170,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.2.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.1.10_rails32_postgres_redis.gemfile b/gemfiles/ruby_2.1.10_rails32_postgres_redis.gemfile
index 09d15cc07a5..2ea19d284ab 100644
--- a/gemfiles/ruby_2.1.10_rails32_postgres_redis.gemfile
+++ b/gemfiles/ruby_2.1.10_rails32_postgres_redis.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.2.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.1.10_rails32_postgres_redis.gemfile.lock b/gemfiles/ruby_2.1.10_rails32_postgres_redis.gemfile.lock
index 300cb6958a2..0be864dc161 100644
--- a/gemfiles/ruby_2.1.10_rails32_postgres_redis.gemfile.lock
+++ b/gemfiles/ruby_2.1.10_rails32_postgres_redis.gemfile.lock
@@ -187,7 +187,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.2.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.1.10_rails32_postgres_sidekiq.gemfile b/gemfiles/ruby_2.1.10_rails32_postgres_sidekiq.gemfile
index 648189b8077..7a064142dd4 100644
--- a/gemfiles/ruby_2.1.10_rails32_postgres_sidekiq.gemfile
+++ b/gemfiles/ruby_2.1.10_rails32_postgres_sidekiq.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.2.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.1.10_rails32_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.1.10_rails32_postgres_sidekiq.gemfile.lock
index f0fceacd131..0568c542a81 100644
--- a/gemfiles/ruby_2.1.10_rails32_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/ruby_2.1.10_rails32_postgres_sidekiq.gemfile.lock
@@ -178,7 +178,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.2.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.1.10_rails4_mysql2.gemfile b/gemfiles/ruby_2.1.10_rails4_mysql2.gemfile
index 5464798db03..2e5380b6eb3 100644
--- a/gemfiles/ruby_2.1.10_rails4_mysql2.gemfile
+++ b/gemfiles/ruby_2.1.10_rails4_mysql2.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.2.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.1.10_rails4_mysql2.gemfile.lock b/gemfiles/ruby_2.1.10_rails4_mysql2.gemfile.lock
index a15b6be8910..59def407009 100644
--- a/gemfiles/ruby_2.1.10_rails4_mysql2.gemfile.lock
+++ b/gemfiles/ruby_2.1.10_rails4_mysql2.gemfile.lock
@@ -190,7 +190,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.2.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.1.10_rails4_postgres.gemfile b/gemfiles/ruby_2.1.10_rails4_postgres.gemfile
index 779a8cb106e..a2fd10c78b9 100644
--- a/gemfiles/ruby_2.1.10_rails4_postgres.gemfile
+++ b/gemfiles/ruby_2.1.10_rails4_postgres.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.2.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.1.10_rails4_postgres.gemfile.lock b/gemfiles/ruby_2.1.10_rails4_postgres.gemfile.lock
index d7baa196454..5edac5d8ac2 100644
--- a/gemfiles/ruby_2.1.10_rails4_postgres.gemfile.lock
+++ b/gemfiles/ruby_2.1.10_rails4_postgres.gemfile.lock
@@ -190,7 +190,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.2.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.1.10_rails4_postgres_redis.gemfile b/gemfiles/ruby_2.1.10_rails4_postgres_redis.gemfile
index 5228d95d00f..bbc35d115d8 100644
--- a/gemfiles/ruby_2.1.10_rails4_postgres_redis.gemfile
+++ b/gemfiles/ruby_2.1.10_rails4_postgres_redis.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.2.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.1.10_rails4_postgres_redis.gemfile.lock b/gemfiles/ruby_2.1.10_rails4_postgres_redis.gemfile.lock
index 92fcbb23971..cbdaf2252b7 100644
--- a/gemfiles/ruby_2.1.10_rails4_postgres_redis.gemfile.lock
+++ b/gemfiles/ruby_2.1.10_rails4_postgres_redis.gemfile.lock
@@ -207,7 +207,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.2.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.1.10_rails4_semantic_logger.gemfile b/gemfiles/ruby_2.1.10_rails4_semantic_logger.gemfile
index 4b6f9051949..c8d1147d3c3 100644
--- a/gemfiles/ruby_2.1.10_rails4_semantic_logger.gemfile
+++ b/gemfiles/ruby_2.1.10_rails4_semantic_logger.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.2.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.1.10_rails4_semantic_logger.gemfile.lock b/gemfiles/ruby_2.1.10_rails4_semantic_logger.gemfile.lock
index d4e636e76ab..70a6b1d50be 100644
--- a/gemfiles/ruby_2.1.10_rails4_semantic_logger.gemfile.lock
+++ b/gemfiles/ruby_2.1.10_rails4_semantic_logger.gemfile.lock
@@ -188,7 +188,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.2.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.1.10_redis_3.gemfile b/gemfiles/ruby_2.1.10_redis_3.gemfile
index 977367022f3..8240e8e9834 100644
--- a/gemfiles/ruby_2.1.10_redis_3.gemfile
+++ b/gemfiles/ruby_2.1.10_redis_3.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.2.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.1.10_redis_3.gemfile.lock b/gemfiles/ruby_2.1.10_redis_3.gemfile.lock
index 0b868032995..5a2d8bb4570 100644
--- a/gemfiles/ruby_2.1.10_redis_3.gemfile.lock
+++ b/gemfiles/ruby_2.1.10_redis_3.gemfile.lock
@@ -95,7 +95,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.2.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.1.10_relational_db.gemfile b/gemfiles/ruby_2.1.10_relational_db.gemfile
index 08676ce3fbe..24ea46ba2b7 100644
--- a/gemfiles/ruby_2.1.10_relational_db.gemfile
+++ b/gemfiles/ruby_2.1.10_relational_db.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.2.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.1.10_relational_db.gemfile.lock b/gemfiles/ruby_2.1.10_relational_db.gemfile.lock
index 0be1ef70b6f..be546abfafd 100644
--- a/gemfiles/ruby_2.1.10_relational_db.gemfile.lock
+++ b/gemfiles/ruby_2.1.10_relational_db.gemfile.lock
@@ -125,7 +125,6 @@ PLATFORMS
 DEPENDENCIES
   activerecord (= 3.2.22.5)
   activerecord-mysql-adapter
-  addressable (~> 2.4.0)
   appraisal (~> 2.2.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.1.10_sinatra.gemfile b/gemfiles/ruby_2.1.10_sinatra.gemfile
index 5d15faec3df..7f5e2ec067d 100644
--- a/gemfiles/ruby_2.1.10_sinatra.gemfile
+++ b/gemfiles/ruby_2.1.10_sinatra.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.2.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.1.10_sinatra.gemfile.lock b/gemfiles/ruby_2.1.10_sinatra.gemfile.lock
index b8921fd15af..78174ff78b0 100644
--- a/gemfiles/ruby_2.1.10_sinatra.gemfile.lock
+++ b/gemfiles/ruby_2.1.10_sinatra.gemfile.lock
@@ -104,7 +104,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.2.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.2.10_aws.gemfile b/gemfiles/ruby_2.2.10_aws.gemfile
index 374f5f188bb..d7c4dc107b3 100644
--- a/gemfiles/ruby_2.2.10_aws.gemfile
+++ b/gemfiles/ruby_2.2.10_aws.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.2.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.2.10_aws.gemfile.lock b/gemfiles/ruby_2.2.10_aws.gemfile.lock
index 858f2528083..eab2a2fcdd6 100644
--- a/gemfiles/ruby_2.2.10_aws.gemfile.lock
+++ b/gemfiles/ruby_2.2.10_aws.gemfile.lock
@@ -1218,7 +1218,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.2.0)
   aws-sdk
   benchmark-ips (~> 2.8)
diff --git a/gemfiles/ruby_2.2.10_contrib.gemfile b/gemfiles/ruby_2.2.10_contrib.gemfile
index e1ba16570cd..7dd8143a00e 100644
--- a/gemfiles/ruby_2.2.10_contrib.gemfile
+++ b/gemfiles/ruby_2.2.10_contrib.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.2.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.2.10_contrib.gemfile.lock b/gemfiles/ruby_2.2.10_contrib.gemfile.lock
index 1274c47861e..f214d9d5542 100644
--- a/gemfiles/ruby_2.2.10_contrib.gemfile.lock
+++ b/gemfiles/ruby_2.2.10_contrib.gemfile.lock
@@ -265,7 +265,6 @@ DEPENDENCIES
   actionpack
   actionview
   active_model_serializers (>= 0.10.0)
-  addressable (~> 2.4.0)
   appraisal (~> 2.2.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.2.10_core_old.gemfile b/gemfiles/ruby_2.2.10_core_old.gemfile
index 97b675c5818..0ae4ad3b80f 100644
--- a/gemfiles/ruby_2.2.10_core_old.gemfile
+++ b/gemfiles/ruby_2.2.10_core_old.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.2.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.2.10_core_old.gemfile.lock b/gemfiles/ruby_2.2.10_core_old.gemfile.lock
index 3243b9ac0b7..08e37b05ea3 100644
--- a/gemfiles/ruby_2.2.10_core_old.gemfile.lock
+++ b/gemfiles/ruby_2.2.10_core_old.gemfile.lock
@@ -94,7 +94,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.2.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.2.10_http.gemfile b/gemfiles/ruby_2.2.10_http.gemfile
index 36b63bd2361..3f107111285 100644
--- a/gemfiles/ruby_2.2.10_http.gemfile
+++ b/gemfiles/ruby_2.2.10_http.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.2.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.2.10_http.gemfile.lock b/gemfiles/ruby_2.2.10_http.gemfile.lock
index b09f0a9dd45..b9c71e2fc9a 100644
--- a/gemfiles/ruby_2.2.10_http.gemfile.lock
+++ b/gemfiles/ruby_2.2.10_http.gemfile.lock
@@ -133,7 +133,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.2.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.2.10_rails32_mysql2.gemfile b/gemfiles/ruby_2.2.10_rails32_mysql2.gemfile
index 4aa8ca28604..d9ba6abc1c7 100644
--- a/gemfiles/ruby_2.2.10_rails32_mysql2.gemfile
+++ b/gemfiles/ruby_2.2.10_rails32_mysql2.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.2.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.2.10_rails32_mysql2.gemfile.lock b/gemfiles/ruby_2.2.10_rails32_mysql2.gemfile.lock
index aff6065944d..aa24bd54225 100644
--- a/gemfiles/ruby_2.2.10_rails32_mysql2.gemfile.lock
+++ b/gemfiles/ruby_2.2.10_rails32_mysql2.gemfile.lock
@@ -177,7 +177,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-mysql-adapter
-  addressable (~> 2.4.0)
   appraisal (~> 2.2.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.2.10_rails32_postgres.gemfile b/gemfiles/ruby_2.2.10_rails32_postgres.gemfile
index a3f56dd8737..a2771f9d78e 100644
--- a/gemfiles/ruby_2.2.10_rails32_postgres.gemfile
+++ b/gemfiles/ruby_2.2.10_rails32_postgres.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.2.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.2.10_rails32_postgres.gemfile.lock b/gemfiles/ruby_2.2.10_rails32_postgres.gemfile.lock
index f8c95be7fb4..9d3fd80d0eb 100644
--- a/gemfiles/ruby_2.2.10_rails32_postgres.gemfile.lock
+++ b/gemfiles/ruby_2.2.10_rails32_postgres.gemfile.lock
@@ -170,7 +170,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.2.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.2.10_rails32_postgres_redis.gemfile b/gemfiles/ruby_2.2.10_rails32_postgres_redis.gemfile
index 473b27ea2c4..647fa9b202f 100644
--- a/gemfiles/ruby_2.2.10_rails32_postgres_redis.gemfile
+++ b/gemfiles/ruby_2.2.10_rails32_postgres_redis.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.2.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.2.10_rails32_postgres_redis.gemfile.lock b/gemfiles/ruby_2.2.10_rails32_postgres_redis.gemfile.lock
index 7eafa01b0d6..945319f26a2 100644
--- a/gemfiles/ruby_2.2.10_rails32_postgres_redis.gemfile.lock
+++ b/gemfiles/ruby_2.2.10_rails32_postgres_redis.gemfile.lock
@@ -187,7 +187,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.2.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.2.10_rails32_postgres_sidekiq.gemfile b/gemfiles/ruby_2.2.10_rails32_postgres_sidekiq.gemfile
index ebde210f9a8..b8264950510 100644
--- a/gemfiles/ruby_2.2.10_rails32_postgres_sidekiq.gemfile
+++ b/gemfiles/ruby_2.2.10_rails32_postgres_sidekiq.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.2.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.2.10_rails32_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.2.10_rails32_postgres_sidekiq.gemfile.lock
index ec0c92a9830..6b3405acdfb 100644
--- a/gemfiles/ruby_2.2.10_rails32_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/ruby_2.2.10_rails32_postgres_sidekiq.gemfile.lock
@@ -178,7 +178,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.2.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.2.10_rails4_mysql2.gemfile b/gemfiles/ruby_2.2.10_rails4_mysql2.gemfile
index 7f3cfc9e8e3..0ba71067e2f 100644
--- a/gemfiles/ruby_2.2.10_rails4_mysql2.gemfile
+++ b/gemfiles/ruby_2.2.10_rails4_mysql2.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.2.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.2.10_rails4_mysql2.gemfile.lock b/gemfiles/ruby_2.2.10_rails4_mysql2.gemfile.lock
index 041662752e2..7edea28cabf 100644
--- a/gemfiles/ruby_2.2.10_rails4_mysql2.gemfile.lock
+++ b/gemfiles/ruby_2.2.10_rails4_mysql2.gemfile.lock
@@ -190,7 +190,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.2.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.2.10_rails4_postgres.gemfile b/gemfiles/ruby_2.2.10_rails4_postgres.gemfile
index b380a9fb871..8a7b93de80b 100644
--- a/gemfiles/ruby_2.2.10_rails4_postgres.gemfile
+++ b/gemfiles/ruby_2.2.10_rails4_postgres.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.2.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.2.10_rails4_postgres.gemfile.lock b/gemfiles/ruby_2.2.10_rails4_postgres.gemfile.lock
index 29b0ab4feb4..9ec5aa0f83a 100644
--- a/gemfiles/ruby_2.2.10_rails4_postgres.gemfile.lock
+++ b/gemfiles/ruby_2.2.10_rails4_postgres.gemfile.lock
@@ -190,7 +190,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.2.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.2.10_rails4_postgres_redis.gemfile b/gemfiles/ruby_2.2.10_rails4_postgres_redis.gemfile
index dbebdcb167e..e19bbe21a46 100644
--- a/gemfiles/ruby_2.2.10_rails4_postgres_redis.gemfile
+++ b/gemfiles/ruby_2.2.10_rails4_postgres_redis.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.2.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.2.10_rails4_postgres_redis.gemfile.lock b/gemfiles/ruby_2.2.10_rails4_postgres_redis.gemfile.lock
index cc9d048ef66..33cc3ffaba9 100644
--- a/gemfiles/ruby_2.2.10_rails4_postgres_redis.gemfile.lock
+++ b/gemfiles/ruby_2.2.10_rails4_postgres_redis.gemfile.lock
@@ -207,7 +207,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.2.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.2.10_rails4_postgres_sidekiq.gemfile b/gemfiles/ruby_2.2.10_rails4_postgres_sidekiq.gemfile
index 2593a04b951..2fb7f40eb61 100644
--- a/gemfiles/ruby_2.2.10_rails4_postgres_sidekiq.gemfile
+++ b/gemfiles/ruby_2.2.10_rails4_postgres_sidekiq.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.2.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.2.10_rails4_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.2.10_rails4_postgres_sidekiq.gemfile.lock
index 1aa70ebd711..225ced3f92b 100644
--- a/gemfiles/ruby_2.2.10_rails4_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/ruby_2.2.10_rails4_postgres_sidekiq.gemfile.lock
@@ -200,7 +200,6 @@ PLATFORMS
 
 DEPENDENCIES
   activejob
-  addressable (~> 2.4.0)
   appraisal (~> 2.2.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.2.10_rails4_semantic_logger.gemfile b/gemfiles/ruby_2.2.10_rails4_semantic_logger.gemfile
index 34b9f39fce0..54c3560d4ad 100644
--- a/gemfiles/ruby_2.2.10_rails4_semantic_logger.gemfile
+++ b/gemfiles/ruby_2.2.10_rails4_semantic_logger.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.2.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.2.10_rails4_semantic_logger.gemfile.lock b/gemfiles/ruby_2.2.10_rails4_semantic_logger.gemfile.lock
index d4e201eebbe..03729e28f49 100644
--- a/gemfiles/ruby_2.2.10_rails4_semantic_logger.gemfile.lock
+++ b/gemfiles/ruby_2.2.10_rails4_semantic_logger.gemfile.lock
@@ -188,7 +188,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.2.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.2.10_rails5_mysql2.gemfile b/gemfiles/ruby_2.2.10_rails5_mysql2.gemfile
index 939a6802b5b..fd8d9e10d38 100644
--- a/gemfiles/ruby_2.2.10_rails5_mysql2.gemfile
+++ b/gemfiles/ruby_2.2.10_rails5_mysql2.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.2.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.2.10_rails5_mysql2.gemfile.lock b/gemfiles/ruby_2.2.10_rails5_mysql2.gemfile.lock
index 8020581e0b1..076d82d9ce3 100644
--- a/gemfiles/ruby_2.2.10_rails5_mysql2.gemfile.lock
+++ b/gemfiles/ruby_2.2.10_rails5_mysql2.gemfile.lock
@@ -206,7 +206,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.2.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.2.10_rails5_postgres.gemfile b/gemfiles/ruby_2.2.10_rails5_postgres.gemfile
index a751a33a691..2e222ab193a 100644
--- a/gemfiles/ruby_2.2.10_rails5_postgres.gemfile
+++ b/gemfiles/ruby_2.2.10_rails5_postgres.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.2.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.2.10_rails5_postgres.gemfile.lock b/gemfiles/ruby_2.2.10_rails5_postgres.gemfile.lock
index 11bb7250393..40bb7e79261 100644
--- a/gemfiles/ruby_2.2.10_rails5_postgres.gemfile.lock
+++ b/gemfiles/ruby_2.2.10_rails5_postgres.gemfile.lock
@@ -206,7 +206,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.2.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.2.10_rails5_postgres_redis.gemfile b/gemfiles/ruby_2.2.10_rails5_postgres_redis.gemfile
index ad0245f81db..fedf56ce414 100644
--- a/gemfiles/ruby_2.2.10_rails5_postgres_redis.gemfile
+++ b/gemfiles/ruby_2.2.10_rails5_postgres_redis.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.2.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.2.10_rails5_postgres_redis.gemfile.lock b/gemfiles/ruby_2.2.10_rails5_postgres_redis.gemfile.lock
index dec239bd9ab..54051baba30 100644
--- a/gemfiles/ruby_2.2.10_rails5_postgres_redis.gemfile.lock
+++ b/gemfiles/ruby_2.2.10_rails5_postgres_redis.gemfile.lock
@@ -207,7 +207,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.2.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.2.10_rails5_postgres_redis_activesupport.gemfile b/gemfiles/ruby_2.2.10_rails5_postgres_redis_activesupport.gemfile
index 7f8680063f1..39bf2b59d1d 100644
--- a/gemfiles/ruby_2.2.10_rails5_postgres_redis_activesupport.gemfile
+++ b/gemfiles/ruby_2.2.10_rails5_postgres_redis_activesupport.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.2.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.2.10_rails5_postgres_redis_activesupport.gemfile.lock b/gemfiles/ruby_2.2.10_rails5_postgres_redis_activesupport.gemfile.lock
index 5b1b75952cf..693856e723c 100644
--- a/gemfiles/ruby_2.2.10_rails5_postgres_redis_activesupport.gemfile.lock
+++ b/gemfiles/ruby_2.2.10_rails5_postgres_redis_activesupport.gemfile.lock
@@ -223,7 +223,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.2.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.2.10_rails5_postgres_sidekiq.gemfile b/gemfiles/ruby_2.2.10_rails5_postgres_sidekiq.gemfile
index bef7a72c584..bfe7afef616 100644
--- a/gemfiles/ruby_2.2.10_rails5_postgres_sidekiq.gemfile
+++ b/gemfiles/ruby_2.2.10_rails5_postgres_sidekiq.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.2.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.2.10_rails5_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.2.10_rails5_postgres_sidekiq.gemfile.lock
index 61ce31fb120..b9091db0c0f 100644
--- a/gemfiles/ruby_2.2.10_rails5_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/ruby_2.2.10_rails5_postgres_sidekiq.gemfile.lock
@@ -216,7 +216,6 @@ PLATFORMS
 
 DEPENDENCIES
   activejob
-  addressable (~> 2.4.0)
   appraisal (~> 2.2.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.2.10_rails5_semantic_logger.gemfile b/gemfiles/ruby_2.2.10_rails5_semantic_logger.gemfile
index 1e59cdd48c0..1418745c355 100644
--- a/gemfiles/ruby_2.2.10_rails5_semantic_logger.gemfile
+++ b/gemfiles/ruby_2.2.10_rails5_semantic_logger.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.2.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.2.10_rails5_semantic_logger.gemfile.lock b/gemfiles/ruby_2.2.10_rails5_semantic_logger.gemfile.lock
index 288020e3df1..2ab682d4d62 100644
--- a/gemfiles/ruby_2.2.10_rails5_semantic_logger.gemfile.lock
+++ b/gemfiles/ruby_2.2.10_rails5_semantic_logger.gemfile.lock
@@ -204,7 +204,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.2.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.2.10_redis_3.gemfile b/gemfiles/ruby_2.2.10_redis_3.gemfile
index 38e3b9cc9e1..d3c303fcdda 100644
--- a/gemfiles/ruby_2.2.10_redis_3.gemfile
+++ b/gemfiles/ruby_2.2.10_redis_3.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.2.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.2.10_redis_3.gemfile.lock b/gemfiles/ruby_2.2.10_redis_3.gemfile.lock
index 07b7b6926c8..e79e803a218 100644
--- a/gemfiles/ruby_2.2.10_redis_3.gemfile.lock
+++ b/gemfiles/ruby_2.2.10_redis_3.gemfile.lock
@@ -95,7 +95,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.2.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.2.10_relational_db.gemfile b/gemfiles/ruby_2.2.10_relational_db.gemfile
index e43cad0a8dd..cc39a834673 100644
--- a/gemfiles/ruby_2.2.10_relational_db.gemfile
+++ b/gemfiles/ruby_2.2.10_relational_db.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.2.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.2.10_relational_db.gemfile.lock b/gemfiles/ruby_2.2.10_relational_db.gemfile.lock
index d7740bb70b4..4d839d44b64 100644
--- a/gemfiles/ruby_2.2.10_relational_db.gemfile.lock
+++ b/gemfiles/ruby_2.2.10_relational_db.gemfile.lock
@@ -121,7 +121,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (< 5.1.5)
-  addressable (~> 2.4.0)
   appraisal (~> 2.2.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.2.10_sinatra.gemfile b/gemfiles/ruby_2.2.10_sinatra.gemfile
index 09fbacffaea..b7b72b41739 100644
--- a/gemfiles/ruby_2.2.10_sinatra.gemfile
+++ b/gemfiles/ruby_2.2.10_sinatra.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.2.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.2.10_sinatra.gemfile.lock b/gemfiles/ruby_2.2.10_sinatra.gemfile.lock
index 7d8c639e634..f57d1968417 100644
--- a/gemfiles/ruby_2.2.10_sinatra.gemfile.lock
+++ b/gemfiles/ruby_2.2.10_sinatra.gemfile.lock
@@ -108,7 +108,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.2.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.3.8_activerecord_3.gemfile b/gemfiles/ruby_2.3.8_activerecord_3.gemfile
index ee94cfed1b2..8f4405eb54e 100644
--- a/gemfiles/ruby_2.3.8_activerecord_3.gemfile
+++ b/gemfiles/ruby_2.3.8_activerecord_3.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.3.8_activerecord_3.gemfile.lock b/gemfiles/ruby_2.3.8_activerecord_3.gemfile.lock
index 7e34f221e12..328464c14db 100644
--- a/gemfiles/ruby_2.3.8_activerecord_3.gemfile.lock
+++ b/gemfiles/ruby_2.3.8_activerecord_3.gemfile.lock
@@ -118,7 +118,6 @@ PLATFORMS
 DEPENDENCIES
   activerecord (~> 3)
   activerecord-mysql-adapter
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.3.8_aws.gemfile b/gemfiles/ruby_2.3.8_aws.gemfile
index 4cdff02b8e0..11a793e0ff4 100644
--- a/gemfiles/ruby_2.3.8_aws.gemfile
+++ b/gemfiles/ruby_2.3.8_aws.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.3.8_aws.gemfile.lock b/gemfiles/ruby_2.3.8_aws.gemfile.lock
index 90e3b989b6c..bca530e6d55 100644
--- a/gemfiles/ruby_2.3.8_aws.gemfile.lock
+++ b/gemfiles/ruby_2.3.8_aws.gemfile.lock
@@ -1517,7 +1517,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   aws-sdk
   benchmark-ips (~> 2.8)
diff --git a/gemfiles/ruby_2.3.8_contrib.gemfile b/gemfiles/ruby_2.3.8_contrib.gemfile
index df35d28c940..19802cbb617 100644
--- a/gemfiles/ruby_2.3.8_contrib.gemfile
+++ b/gemfiles/ruby_2.3.8_contrib.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.3.8_contrib.gemfile.lock b/gemfiles/ruby_2.3.8_contrib.gemfile.lock
index 207b622d8bb..9664819c8a3 100644
--- a/gemfiles/ruby_2.3.8_contrib.gemfile.lock
+++ b/gemfiles/ruby_2.3.8_contrib.gemfile.lock
@@ -261,7 +261,6 @@ DEPENDENCIES
   actionpack
   actionview
   active_model_serializers (>= 0.10.0)
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.3.8_contrib_old.gemfile b/gemfiles/ruby_2.3.8_contrib_old.gemfile
index f7621a69794..bd3bb2be88f 100644
--- a/gemfiles/ruby_2.3.8_contrib_old.gemfile
+++ b/gemfiles/ruby_2.3.8_contrib_old.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.3.8_contrib_old.gemfile.lock b/gemfiles/ruby_2.3.8_contrib_old.gemfile.lock
index 70f4791efe9..41e0de50024 100644
--- a/gemfiles/ruby_2.3.8_contrib_old.gemfile.lock
+++ b/gemfiles/ruby_2.3.8_contrib_old.gemfile.lock
@@ -114,7 +114,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.3.8_core_old.gemfile b/gemfiles/ruby_2.3.8_core_old.gemfile
index c115ae0d575..54ad397d970 100644
--- a/gemfiles/ruby_2.3.8_core_old.gemfile
+++ b/gemfiles/ruby_2.3.8_core_old.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.3.8_core_old.gemfile.lock b/gemfiles/ruby_2.3.8_core_old.gemfile.lock
index e2c1b684a05..9307ca94b2a 100644
--- a/gemfiles/ruby_2.3.8_core_old.gemfile.lock
+++ b/gemfiles/ruby_2.3.8_core_old.gemfile.lock
@@ -96,7 +96,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.3.8_hanami_1.gemfile b/gemfiles/ruby_2.3.8_hanami_1.gemfile
index 8262ae7ebcb..569026530ad 100644
--- a/gemfiles/ruby_2.3.8_hanami_1.gemfile
+++ b/gemfiles/ruby_2.3.8_hanami_1.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.3.8_hanami_1.gemfile.lock b/gemfiles/ruby_2.3.8_hanami_1.gemfile.lock
index 0ea61b2483e..323f86207f8 100644
--- a/gemfiles/ruby_2.3.8_hanami_1.gemfile.lock
+++ b/gemfiles/ruby_2.3.8_hanami_1.gemfile.lock
@@ -181,7 +181,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.3.8_http.gemfile b/gemfiles/ruby_2.3.8_http.gemfile
index d686d95442a..c552a386173 100644
--- a/gemfiles/ruby_2.3.8_http.gemfile
+++ b/gemfiles/ruby_2.3.8_http.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.3.8_http.gemfile.lock b/gemfiles/ruby_2.3.8_http.gemfile.lock
index 2477c57c054..f1eb0e6a3c4 100644
--- a/gemfiles/ruby_2.3.8_http.gemfile.lock
+++ b/gemfiles/ruby_2.3.8_http.gemfile.lock
@@ -129,7 +129,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.3.8_rails32_mysql2.gemfile b/gemfiles/ruby_2.3.8_rails32_mysql2.gemfile
index 4034ee6de17..81e5e2c9f11 100644
--- a/gemfiles/ruby_2.3.8_rails32_mysql2.gemfile
+++ b/gemfiles/ruby_2.3.8_rails32_mysql2.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.3.8_rails32_mysql2.gemfile.lock b/gemfiles/ruby_2.3.8_rails32_mysql2.gemfile.lock
index 600095b00c5..465cc87da15 100644
--- a/gemfiles/ruby_2.3.8_rails32_mysql2.gemfile.lock
+++ b/gemfiles/ruby_2.3.8_rails32_mysql2.gemfile.lock
@@ -179,7 +179,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-mysql-adapter
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.3.8_rails32_postgres.gemfile b/gemfiles/ruby_2.3.8_rails32_postgres.gemfile
index e63dfb3f7e7..6ff92638ca6 100644
--- a/gemfiles/ruby_2.3.8_rails32_postgres.gemfile
+++ b/gemfiles/ruby_2.3.8_rails32_postgres.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.3.8_rails32_postgres.gemfile.lock b/gemfiles/ruby_2.3.8_rails32_postgres.gemfile.lock
index 50e4b9c8b5f..c0df7564287 100644
--- a/gemfiles/ruby_2.3.8_rails32_postgres.gemfile.lock
+++ b/gemfiles/ruby_2.3.8_rails32_postgres.gemfile.lock
@@ -172,7 +172,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.3.8_rails32_postgres_redis.gemfile b/gemfiles/ruby_2.3.8_rails32_postgres_redis.gemfile
index ff6b436305c..720a0c6c020 100644
--- a/gemfiles/ruby_2.3.8_rails32_postgres_redis.gemfile
+++ b/gemfiles/ruby_2.3.8_rails32_postgres_redis.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.3.8_rails32_postgres_redis.gemfile.lock b/gemfiles/ruby_2.3.8_rails32_postgres_redis.gemfile.lock
index 5ccb266775b..8954106ddd0 100644
--- a/gemfiles/ruby_2.3.8_rails32_postgres_redis.gemfile.lock
+++ b/gemfiles/ruby_2.3.8_rails32_postgres_redis.gemfile.lock
@@ -189,7 +189,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.3.8_rails32_postgres_sidekiq.gemfile b/gemfiles/ruby_2.3.8_rails32_postgres_sidekiq.gemfile
index 266629f41dd..bf92f1d3850 100644
--- a/gemfiles/ruby_2.3.8_rails32_postgres_sidekiq.gemfile
+++ b/gemfiles/ruby_2.3.8_rails32_postgres_sidekiq.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.3.8_rails32_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.3.8_rails32_postgres_sidekiq.gemfile.lock
index e590fa8a885..903f443de98 100644
--- a/gemfiles/ruby_2.3.8_rails32_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/ruby_2.3.8_rails32_postgres_sidekiq.gemfile.lock
@@ -180,7 +180,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.3.8_rails4_mysql2.gemfile b/gemfiles/ruby_2.3.8_rails4_mysql2.gemfile
index ba8827afd7a..69cfffc4dd6 100644
--- a/gemfiles/ruby_2.3.8_rails4_mysql2.gemfile
+++ b/gemfiles/ruby_2.3.8_rails4_mysql2.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.3.8_rails4_mysql2.gemfile.lock b/gemfiles/ruby_2.3.8_rails4_mysql2.gemfile.lock
index 0ad6e7889b1..9bab4ba2634 100644
--- a/gemfiles/ruby_2.3.8_rails4_mysql2.gemfile.lock
+++ b/gemfiles/ruby_2.3.8_rails4_mysql2.gemfile.lock
@@ -192,7 +192,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.3.8_rails4_postgres.gemfile b/gemfiles/ruby_2.3.8_rails4_postgres.gemfile
index ce18547b916..e8974c38b85 100644
--- a/gemfiles/ruby_2.3.8_rails4_postgres.gemfile
+++ b/gemfiles/ruby_2.3.8_rails4_postgres.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.3.8_rails4_postgres.gemfile.lock b/gemfiles/ruby_2.3.8_rails4_postgres.gemfile.lock
index 23301bd8bb1..f17273270dd 100644
--- a/gemfiles/ruby_2.3.8_rails4_postgres.gemfile.lock
+++ b/gemfiles/ruby_2.3.8_rails4_postgres.gemfile.lock
@@ -192,7 +192,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.3.8_rails4_postgres_redis.gemfile b/gemfiles/ruby_2.3.8_rails4_postgres_redis.gemfile
index 87f1328a8ce..db2a50e2353 100644
--- a/gemfiles/ruby_2.3.8_rails4_postgres_redis.gemfile
+++ b/gemfiles/ruby_2.3.8_rails4_postgres_redis.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.3.8_rails4_postgres_redis.gemfile.lock b/gemfiles/ruby_2.3.8_rails4_postgres_redis.gemfile.lock
index 16cd0bc6135..0c0c66b8e2c 100644
--- a/gemfiles/ruby_2.3.8_rails4_postgres_redis.gemfile.lock
+++ b/gemfiles/ruby_2.3.8_rails4_postgres_redis.gemfile.lock
@@ -209,7 +209,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.3.8_rails4_postgres_sidekiq.gemfile b/gemfiles/ruby_2.3.8_rails4_postgres_sidekiq.gemfile
index 29ecf66ef07..d77147e3e6b 100644
--- a/gemfiles/ruby_2.3.8_rails4_postgres_sidekiq.gemfile
+++ b/gemfiles/ruby_2.3.8_rails4_postgres_sidekiq.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.3.8_rails4_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.3.8_rails4_postgres_sidekiq.gemfile.lock
index 8e7f4bf0ff8..50a6047442a 100644
--- a/gemfiles/ruby_2.3.8_rails4_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/ruby_2.3.8_rails4_postgres_sidekiq.gemfile.lock
@@ -202,7 +202,6 @@ PLATFORMS
 
 DEPENDENCIES
   activejob
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.3.8_rails4_semantic_logger.gemfile b/gemfiles/ruby_2.3.8_rails4_semantic_logger.gemfile
index 9133015569f..627ef843035 100644
--- a/gemfiles/ruby_2.3.8_rails4_semantic_logger.gemfile
+++ b/gemfiles/ruby_2.3.8_rails4_semantic_logger.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.3.8_rails4_semantic_logger.gemfile.lock b/gemfiles/ruby_2.3.8_rails4_semantic_logger.gemfile.lock
index 823da4b0c3e..b4f2241dab3 100644
--- a/gemfiles/ruby_2.3.8_rails4_semantic_logger.gemfile.lock
+++ b/gemfiles/ruby_2.3.8_rails4_semantic_logger.gemfile.lock
@@ -191,7 +191,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.3.8_rails5_mysql2.gemfile b/gemfiles/ruby_2.3.8_rails5_mysql2.gemfile
index 37895784d48..0b0123a08cd 100644
--- a/gemfiles/ruby_2.3.8_rails5_mysql2.gemfile
+++ b/gemfiles/ruby_2.3.8_rails5_mysql2.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.3.8_rails5_mysql2.gemfile.lock b/gemfiles/ruby_2.3.8_rails5_mysql2.gemfile.lock
index 302ba72cd35..3db1a2836fc 100644
--- a/gemfiles/ruby_2.3.8_rails5_mysql2.gemfile.lock
+++ b/gemfiles/ruby_2.3.8_rails5_mysql2.gemfile.lock
@@ -204,7 +204,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.3.8_rails5_postgres.gemfile b/gemfiles/ruby_2.3.8_rails5_postgres.gemfile
index 19450bd9cda..3beabe73658 100644
--- a/gemfiles/ruby_2.3.8_rails5_postgres.gemfile
+++ b/gemfiles/ruby_2.3.8_rails5_postgres.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.3.8_rails5_postgres.gemfile.lock b/gemfiles/ruby_2.3.8_rails5_postgres.gemfile.lock
index 3d2fa9158ca..f138b6f4205 100644
--- a/gemfiles/ruby_2.3.8_rails5_postgres.gemfile.lock
+++ b/gemfiles/ruby_2.3.8_rails5_postgres.gemfile.lock
@@ -204,7 +204,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.3.8_rails5_postgres_redis.gemfile b/gemfiles/ruby_2.3.8_rails5_postgres_redis.gemfile
index 39c48bda964..8fc649296c3 100644
--- a/gemfiles/ruby_2.3.8_rails5_postgres_redis.gemfile
+++ b/gemfiles/ruby_2.3.8_rails5_postgres_redis.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.3.8_rails5_postgres_redis.gemfile.lock b/gemfiles/ruby_2.3.8_rails5_postgres_redis.gemfile.lock
index 58c098da937..d1e7cd8c232 100644
--- a/gemfiles/ruby_2.3.8_rails5_postgres_redis.gemfile.lock
+++ b/gemfiles/ruby_2.3.8_rails5_postgres_redis.gemfile.lock
@@ -205,7 +205,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.3.8_rails5_postgres_redis_activesupport.gemfile b/gemfiles/ruby_2.3.8_rails5_postgres_redis_activesupport.gemfile
index 5dbdf9127f7..aeaeea106fd 100644
--- a/gemfiles/ruby_2.3.8_rails5_postgres_redis_activesupport.gemfile
+++ b/gemfiles/ruby_2.3.8_rails5_postgres_redis_activesupport.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.3.8_rails5_postgres_redis_activesupport.gemfile.lock b/gemfiles/ruby_2.3.8_rails5_postgres_redis_activesupport.gemfile.lock
index 020eeb6421c..c3a4111ec07 100644
--- a/gemfiles/ruby_2.3.8_rails5_postgres_redis_activesupport.gemfile.lock
+++ b/gemfiles/ruby_2.3.8_rails5_postgres_redis_activesupport.gemfile.lock
@@ -221,7 +221,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.3.8_rails5_postgres_sidekiq.gemfile b/gemfiles/ruby_2.3.8_rails5_postgres_sidekiq.gemfile
index 4bd974a4670..4e70368e62c 100644
--- a/gemfiles/ruby_2.3.8_rails5_postgres_sidekiq.gemfile
+++ b/gemfiles/ruby_2.3.8_rails5_postgres_sidekiq.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.3.8_rails5_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.3.8_rails5_postgres_sidekiq.gemfile.lock
index e4356ccd00c..63409eb3171 100644
--- a/gemfiles/ruby_2.3.8_rails5_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/ruby_2.3.8_rails5_postgres_sidekiq.gemfile.lock
@@ -214,7 +214,6 @@ PLATFORMS
 
 DEPENDENCIES
   activejob
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.3.8_rails5_semantic_logger.gemfile b/gemfiles/ruby_2.3.8_rails5_semantic_logger.gemfile
index f9aa0fff9e3..ab83f53af41 100644
--- a/gemfiles/ruby_2.3.8_rails5_semantic_logger.gemfile
+++ b/gemfiles/ruby_2.3.8_rails5_semantic_logger.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.3.8_rails5_semantic_logger.gemfile.lock b/gemfiles/ruby_2.3.8_rails5_semantic_logger.gemfile.lock
index 57c9017eaea..986637fc48d 100644
--- a/gemfiles/ruby_2.3.8_rails5_semantic_logger.gemfile.lock
+++ b/gemfiles/ruby_2.3.8_rails5_semantic_logger.gemfile.lock
@@ -203,7 +203,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.3.8_redis_3.gemfile b/gemfiles/ruby_2.3.8_redis_3.gemfile
index 6fe56fc7d5a..03e4f86b771 100644
--- a/gemfiles/ruby_2.3.8_redis_3.gemfile
+++ b/gemfiles/ruby_2.3.8_redis_3.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.3.8_redis_3.gemfile.lock b/gemfiles/ruby_2.3.8_redis_3.gemfile.lock
index 3a30013801f..2104bd23669 100644
--- a/gemfiles/ruby_2.3.8_redis_3.gemfile.lock
+++ b/gemfiles/ruby_2.3.8_redis_3.gemfile.lock
@@ -97,7 +97,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.3.8_relational_db.gemfile b/gemfiles/ruby_2.3.8_relational_db.gemfile
index 10ddce441de..48408db47f2 100644
--- a/gemfiles/ruby_2.3.8_relational_db.gemfile
+++ b/gemfiles/ruby_2.3.8_relational_db.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.3.8_relational_db.gemfile.lock b/gemfiles/ruby_2.3.8_relational_db.gemfile.lock
index 6aed292f7b2..6258d6aa9d2 100644
--- a/gemfiles/ruby_2.3.8_relational_db.gemfile.lock
+++ b/gemfiles/ruby_2.3.8_relational_db.gemfile.lock
@@ -121,7 +121,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (< 5.1.5)
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.3.8_resque2_redis3.gemfile b/gemfiles/ruby_2.3.8_resque2_redis3.gemfile
index 7041c22c2cb..bd283d6a7ea 100644
--- a/gemfiles/ruby_2.3.8_resque2_redis3.gemfile
+++ b/gemfiles/ruby_2.3.8_resque2_redis3.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.3.8_resque2_redis3.gemfile.lock b/gemfiles/ruby_2.3.8_resque2_redis3.gemfile.lock
index 5ad5b18b967..0fd58dcabb8 100644
--- a/gemfiles/ruby_2.3.8_resque2_redis3.gemfile.lock
+++ b/gemfiles/ruby_2.3.8_resque2_redis3.gemfile.lock
@@ -118,7 +118,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.3.8_resque2_redis4.gemfile b/gemfiles/ruby_2.3.8_resque2_redis4.gemfile
index 90f1d4e0705..23862dd5b88 100644
--- a/gemfiles/ruby_2.3.8_resque2_redis4.gemfile
+++ b/gemfiles/ruby_2.3.8_resque2_redis4.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.3.8_resque2_redis4.gemfile.lock b/gemfiles/ruby_2.3.8_resque2_redis4.gemfile.lock
index 3d965125f1f..14e8b5cbeb0 100644
--- a/gemfiles/ruby_2.3.8_resque2_redis4.gemfile.lock
+++ b/gemfiles/ruby_2.3.8_resque2_redis4.gemfile.lock
@@ -118,7 +118,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.3.8_sinatra.gemfile b/gemfiles/ruby_2.3.8_sinatra.gemfile
index 26010699183..e139ee825f9 100644
--- a/gemfiles/ruby_2.3.8_sinatra.gemfile
+++ b/gemfiles/ruby_2.3.8_sinatra.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.3.8_sinatra.gemfile.lock b/gemfiles/ruby_2.3.8_sinatra.gemfile.lock
index 84504aa26f3..11cf560e9b7 100644
--- a/gemfiles/ruby_2.3.8_sinatra.gemfile.lock
+++ b/gemfiles/ruby_2.3.8_sinatra.gemfile.lock
@@ -110,7 +110,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.4.10_activerecord_4.gemfile b/gemfiles/ruby_2.4.10_activerecord_4.gemfile
index d81d4f377b2..c13977ac949 100644
--- a/gemfiles/ruby_2.4.10_activerecord_4.gemfile
+++ b/gemfiles/ruby_2.4.10_activerecord_4.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.4.10_activerecord_4.gemfile.lock b/gemfiles/ruby_2.4.10_activerecord_4.gemfile.lock
index 629bb341d77..93e763c43bc 100644
--- a/gemfiles/ruby_2.4.10_activerecord_4.gemfile.lock
+++ b/gemfiles/ruby_2.4.10_activerecord_4.gemfile.lock
@@ -48,14 +48,18 @@ GEM
     extlz4 (0.3.4)
     ffi (1.15.5)
     google-protobuf (3.19.1)
+    google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.0.1)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     json-schema (2.8.1)
       addressable (>= 2.4)
     libdatadog (4.0.0.1.0-aarch64-linux)
+    libdatadog (4.0.0.1.0-x86_64-linux)
     libddwaf (1.14.0.0.0-aarch64-linux)
       ffi (~> 1.0)
+    libddwaf (1.14.0.0.0-x86_64-linux)
+      ffi (~> 1.0)
     makara (0.3.10)
       activerecord (>= 3.0.0)
     memory_profiler (0.9.14)
@@ -116,10 +120,10 @@ GEM
 
 PLATFORMS
   aarch64-linux
+  x86_64-linux
 
 DEPENDENCIES
   activerecord (~> 4)
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.4.10_aws.gemfile b/gemfiles/ruby_2.4.10_aws.gemfile
index 3aa45df74b9..dc13213be23 100644
--- a/gemfiles/ruby_2.4.10_aws.gemfile
+++ b/gemfiles/ruby_2.4.10_aws.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.4.10_aws.gemfile.lock b/gemfiles/ruby_2.4.10_aws.gemfile.lock
index 420cef6a2aa..d628f11fee4 100644
--- a/gemfiles/ruby_2.4.10_aws.gemfile.lock
+++ b/gemfiles/ruby_2.4.10_aws.gemfile.lock
@@ -1456,13 +1456,17 @@ GEM
     extlz4 (0.3.4)
     ffi (1.15.5)
     google-protobuf (3.19.1)
+    google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.0.1)
     jmespath (1.6.2)
     json-schema (2.8.1)
       addressable (>= 2.4)
     libdatadog (4.0.0.1.0-aarch64-linux)
+    libdatadog (4.0.0.1.0-x86_64-linux)
     libddwaf (1.14.0.0.0-aarch64-linux)
       ffi (~> 1.0)
+    libddwaf (1.14.0.0.0-x86_64-linux)
+      ffi (~> 1.0)
     memory_profiler (0.9.14)
     method_source (1.0.0)
     msgpack (1.6.1)
@@ -1519,9 +1523,9 @@ GEM
 
 PLATFORMS
   aarch64-linux
+  x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   aws-sdk
   benchmark-ips (~> 2.8)
diff --git a/gemfiles/ruby_2.4.10_contrib.gemfile b/gemfiles/ruby_2.4.10_contrib.gemfile
index 5600e86fcb7..93729f2066f 100644
--- a/gemfiles/ruby_2.4.10_contrib.gemfile
+++ b/gemfiles/ruby_2.4.10_contrib.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.4.10_contrib.gemfile.lock b/gemfiles/ruby_2.4.10_contrib.gemfile.lock
index c93e908a72e..d740346ba43 100644
--- a/gemfiles/ruby_2.4.10_contrib.gemfile.lock
+++ b/gemfiles/ruby_2.4.10_contrib.gemfile.lock
@@ -280,7 +280,6 @@ DEPENDENCIES
   actionpack
   actionview
   active_model_serializers (>= 0.10.0)
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.4.10_contrib_old.gemfile b/gemfiles/ruby_2.4.10_contrib_old.gemfile
index d140700c563..c47c6c41835 100644
--- a/gemfiles/ruby_2.4.10_contrib_old.gemfile
+++ b/gemfiles/ruby_2.4.10_contrib_old.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.4.10_contrib_old.gemfile.lock b/gemfiles/ruby_2.4.10_contrib_old.gemfile.lock
index a0a30b0e598..62bec8b673d 100644
--- a/gemfiles/ruby_2.4.10_contrib_old.gemfile.lock
+++ b/gemfiles/ruby_2.4.10_contrib_old.gemfile.lock
@@ -121,7 +121,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.4.10_core_old.gemfile b/gemfiles/ruby_2.4.10_core_old.gemfile
index 1a811c514c0..b8c4cc01ce6 100644
--- a/gemfiles/ruby_2.4.10_core_old.gemfile
+++ b/gemfiles/ruby_2.4.10_core_old.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.4.10_core_old.gemfile.lock b/gemfiles/ruby_2.4.10_core_old.gemfile.lock
index 41ed642ece3..0fb101f797c 100644
--- a/gemfiles/ruby_2.4.10_core_old.gemfile.lock
+++ b/gemfiles/ruby_2.4.10_core_old.gemfile.lock
@@ -102,7 +102,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.4.10_hanami_1.gemfile b/gemfiles/ruby_2.4.10_hanami_1.gemfile
index c509a240c46..6a7e71c6142 100644
--- a/gemfiles/ruby_2.4.10_hanami_1.gemfile
+++ b/gemfiles/ruby_2.4.10_hanami_1.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.4.10_hanami_1.gemfile.lock b/gemfiles/ruby_2.4.10_hanami_1.gemfile.lock
index 5d57c0fa479..716dfd4ad09 100644
--- a/gemfiles/ruby_2.4.10_hanami_1.gemfile.lock
+++ b/gemfiles/ruby_2.4.10_hanami_1.gemfile.lock
@@ -187,7 +187,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.4.10_http.gemfile b/gemfiles/ruby_2.4.10_http.gemfile
index 570f6e204db..672b8e88e05 100644
--- a/gemfiles/ruby_2.4.10_http.gemfile
+++ b/gemfiles/ruby_2.4.10_http.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.4.10_http.gemfile.lock b/gemfiles/ruby_2.4.10_http.gemfile.lock
index de2d04927b6..a747ebad122 100644
--- a/gemfiles/ruby_2.4.10_http.gemfile.lock
+++ b/gemfiles/ruby_2.4.10_http.gemfile.lock
@@ -66,6 +66,7 @@ GEM
       ffi (>= 1.0.0)
       rake
     google-protobuf (3.19.1)
+    google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.0.1)
     http (4.4.1)
       addressable (~> 2.3)
@@ -82,8 +83,11 @@ GEM
     json-schema (2.8.1)
       addressable (>= 2.4)
     libdatadog (4.0.0.1.0-aarch64-linux)
+    libdatadog (4.0.0.1.0-x86_64-linux)
     libddwaf (1.14.0.0.0-aarch64-linux)
       ffi (~> 1.0)
+    libddwaf (1.14.0.0.0-x86_64-linux)
+      ffi (~> 1.0)
     memory_profiler (0.9.14)
     method_source (1.0.0)
     mime-types (3.5.1)
@@ -162,9 +166,9 @@ GEM
 
 PLATFORMS
   aarch64-linux
+  x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.4.10_rails5_mysql2.gemfile b/gemfiles/ruby_2.4.10_rails5_mysql2.gemfile
index ec15b284eb0..bff1139e642 100644
--- a/gemfiles/ruby_2.4.10_rails5_mysql2.gemfile
+++ b/gemfiles/ruby_2.4.10_rails5_mysql2.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.4.10_rails5_mysql2.gemfile.lock b/gemfiles/ruby_2.4.10_rails5_mysql2.gemfile.lock
index 8a4957d64e2..bfc4a1cf416 100644
--- a/gemfiles/ruby_2.4.10_rails5_mysql2.gemfile.lock
+++ b/gemfiles/ruby_2.4.10_rails5_mysql2.gemfile.lock
@@ -210,7 +210,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.4.10_rails5_postgres.gemfile b/gemfiles/ruby_2.4.10_rails5_postgres.gemfile
index f4aa4beadc4..903b54fe3bb 100644
--- a/gemfiles/ruby_2.4.10_rails5_postgres.gemfile
+++ b/gemfiles/ruby_2.4.10_rails5_postgres.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.4.10_rails5_postgres.gemfile.lock b/gemfiles/ruby_2.4.10_rails5_postgres.gemfile.lock
index 4b14b726721..b33211526fc 100644
--- a/gemfiles/ruby_2.4.10_rails5_postgres.gemfile.lock
+++ b/gemfiles/ruby_2.4.10_rails5_postgres.gemfile.lock
@@ -210,7 +210,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.4.10_rails5_postgres_redis.gemfile b/gemfiles/ruby_2.4.10_rails5_postgres_redis.gemfile
index 328d5dfcf56..87e2f97ba91 100644
--- a/gemfiles/ruby_2.4.10_rails5_postgres_redis.gemfile
+++ b/gemfiles/ruby_2.4.10_rails5_postgres_redis.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.4.10_rails5_postgres_redis.gemfile.lock b/gemfiles/ruby_2.4.10_rails5_postgres_redis.gemfile.lock
index db704c1e749..53c66df8c07 100644
--- a/gemfiles/ruby_2.4.10_rails5_postgres_redis.gemfile.lock
+++ b/gemfiles/ruby_2.4.10_rails5_postgres_redis.gemfile.lock
@@ -211,7 +211,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.4.10_rails5_postgres_redis_activesupport.gemfile b/gemfiles/ruby_2.4.10_rails5_postgres_redis_activesupport.gemfile
index 8ebffb79d1e..3b69ed6343e 100644
--- a/gemfiles/ruby_2.4.10_rails5_postgres_redis_activesupport.gemfile
+++ b/gemfiles/ruby_2.4.10_rails5_postgres_redis_activesupport.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.4.10_rails5_postgres_redis_activesupport.gemfile.lock b/gemfiles/ruby_2.4.10_rails5_postgres_redis_activesupport.gemfile.lock
index f370914c88f..63ce8900b06 100644
--- a/gemfiles/ruby_2.4.10_rails5_postgres_redis_activesupport.gemfile.lock
+++ b/gemfiles/ruby_2.4.10_rails5_postgres_redis_activesupport.gemfile.lock
@@ -227,7 +227,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.4.10_rails5_postgres_sidekiq.gemfile b/gemfiles/ruby_2.4.10_rails5_postgres_sidekiq.gemfile
index 4562f995006..d1250605665 100644
--- a/gemfiles/ruby_2.4.10_rails5_postgres_sidekiq.gemfile
+++ b/gemfiles/ruby_2.4.10_rails5_postgres_sidekiq.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.4.10_rails5_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.4.10_rails5_postgres_sidekiq.gemfile.lock
index c1c3597c1a2..ed338964409 100644
--- a/gemfiles/ruby_2.4.10_rails5_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/ruby_2.4.10_rails5_postgres_sidekiq.gemfile.lock
@@ -220,7 +220,6 @@ PLATFORMS
 
 DEPENDENCIES
   activejob
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.4.10_rails5_semantic_logger.gemfile b/gemfiles/ruby_2.4.10_rails5_semantic_logger.gemfile
index 002d59e5d1b..192b04ce73c 100644
--- a/gemfiles/ruby_2.4.10_rails5_semantic_logger.gemfile
+++ b/gemfiles/ruby_2.4.10_rails5_semantic_logger.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.4.10_rails5_semantic_logger.gemfile.lock b/gemfiles/ruby_2.4.10_rails5_semantic_logger.gemfile.lock
index 207bbd57515..6e60e4bf3dc 100644
--- a/gemfiles/ruby_2.4.10_rails5_semantic_logger.gemfile.lock
+++ b/gemfiles/ruby_2.4.10_rails5_semantic_logger.gemfile.lock
@@ -209,7 +209,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.4.10_redis_3.gemfile b/gemfiles/ruby_2.4.10_redis_3.gemfile
index 715acb921e5..a5e3013b5e0 100644
--- a/gemfiles/ruby_2.4.10_redis_3.gemfile
+++ b/gemfiles/ruby_2.4.10_redis_3.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.4.10_redis_3.gemfile.lock b/gemfiles/ruby_2.4.10_redis_3.gemfile.lock
index 2c5fbe1197a..499bae9a21b 100644
--- a/gemfiles/ruby_2.4.10_redis_3.gemfile.lock
+++ b/gemfiles/ruby_2.4.10_redis_3.gemfile.lock
@@ -103,7 +103,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.4.10_redis_4.gemfile b/gemfiles/ruby_2.4.10_redis_4.gemfile
index c15769ee386..407c5aa3a70 100644
--- a/gemfiles/ruby_2.4.10_redis_4.gemfile
+++ b/gemfiles/ruby_2.4.10_redis_4.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.4.10_redis_4.gemfile.lock b/gemfiles/ruby_2.4.10_redis_4.gemfile.lock
index aab45659377..7e2158de29e 100644
--- a/gemfiles/ruby_2.4.10_redis_4.gemfile.lock
+++ b/gemfiles/ruby_2.4.10_redis_4.gemfile.lock
@@ -103,7 +103,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.4.10_relational_db.gemfile b/gemfiles/ruby_2.4.10_relational_db.gemfile
index 7ccc802e858..71b9068874c 100644
--- a/gemfiles/ruby_2.4.10_relational_db.gemfile
+++ b/gemfiles/ruby_2.4.10_relational_db.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.4.10_relational_db.gemfile.lock b/gemfiles/ruby_2.4.10_relational_db.gemfile.lock
index 88b7e5ee486..a986c16be89 100644
--- a/gemfiles/ruby_2.4.10_relational_db.gemfile.lock
+++ b/gemfiles/ruby_2.4.10_relational_db.gemfile.lock
@@ -52,6 +52,7 @@ GEM
     extlz4 (0.3.4)
     ffi (1.15.5)
     google-protobuf (3.19.1)
+    google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.0.1)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
@@ -63,6 +64,8 @@ GEM
       ffi (~> 1.0)
     libddwaf (1.14.0.0.0-x86_64-linux)
       ffi (~> 1.0)
+    makara (0.5.0)
+      activerecord (>= 3.0.0)
     memory_profiler (0.9.14)
     method_source (1.0.0)
     minitest (5.15.0)
@@ -123,10 +126,10 @@ GEM
 
 PLATFORMS
   aarch64-linux
+  x86_64-linux
 
 DEPENDENCIES
   activerecord (< 5.1.5)
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.4.10_resque2_redis3.gemfile b/gemfiles/ruby_2.4.10_resque2_redis3.gemfile
index 4749c806f02..90f8c8b86b2 100644
--- a/gemfiles/ruby_2.4.10_resque2_redis3.gemfile
+++ b/gemfiles/ruby_2.4.10_resque2_redis3.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.4.10_resque2_redis3.gemfile.lock b/gemfiles/ruby_2.4.10_resque2_redis3.gemfile.lock
index d56d2141863..125da3244e7 100644
--- a/gemfiles/ruby_2.4.10_resque2_redis3.gemfile.lock
+++ b/gemfiles/ruby_2.4.10_resque2_redis3.gemfile.lock
@@ -124,7 +124,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.4.10_resque2_redis4.gemfile b/gemfiles/ruby_2.4.10_resque2_redis4.gemfile
index 8b52e9b657f..493027b3940 100644
--- a/gemfiles/ruby_2.4.10_resque2_redis4.gemfile
+++ b/gemfiles/ruby_2.4.10_resque2_redis4.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.4.10_resque2_redis4.gemfile.lock b/gemfiles/ruby_2.4.10_resque2_redis4.gemfile.lock
index 957218c923c..7dd48fb9561 100644
--- a/gemfiles/ruby_2.4.10_resque2_redis4.gemfile.lock
+++ b/gemfiles/ruby_2.4.10_resque2_redis4.gemfile.lock
@@ -124,7 +124,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.4.10_sinatra.gemfile b/gemfiles/ruby_2.4.10_sinatra.gemfile
index ad109472b22..b57784161d9 100644
--- a/gemfiles/ruby_2.4.10_sinatra.gemfile
+++ b/gemfiles/ruby_2.4.10_sinatra.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.4.10_sinatra.gemfile.lock b/gemfiles/ruby_2.4.10_sinatra.gemfile.lock
index 4274ab4757d..c3361c2f5da 100644
--- a/gemfiles/ruby_2.4.10_sinatra.gemfile.lock
+++ b/gemfiles/ruby_2.4.10_sinatra.gemfile.lock
@@ -116,7 +116,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.5.9_aws.gemfile b/gemfiles/ruby_2.5.9_aws.gemfile
index dccd2829967..b1fea5b51f1 100644
--- a/gemfiles/ruby_2.5.9_aws.gemfile
+++ b/gemfiles/ruby_2.5.9_aws.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.5.9_aws.gemfile.lock b/gemfiles/ruby_2.5.9_aws.gemfile.lock
index c2db4ab0b29..7b3d781ac07 100644
--- a/gemfiles/ruby_2.5.9_aws.gemfile.lock
+++ b/gemfiles/ruby_2.5.9_aws.gemfile.lock
@@ -1469,13 +1469,17 @@ GEM
     extlz4 (0.3.4)
     ffi (1.15.5)
     google-protobuf (3.19.1)
+    google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.0.1)
     jmespath (1.6.2)
     json-schema (2.8.1)
       addressable (>= 2.4)
     libdatadog (4.0.0.1.0-aarch64-linux)
+    libdatadog (4.0.0.1.0-x86_64-linux)
     libddwaf (1.14.0.0.0-aarch64-linux)
       ffi (~> 1.0)
+    libddwaf (1.14.0.0.0-x86_64-linux)
+      ffi (~> 1.0)
     memory_profiler (0.9.14)
     method_source (1.0.0)
     msgpack (1.7.2)
@@ -1537,9 +1541,9 @@ GEM
 
 PLATFORMS
   aarch64-linux
+  x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   aws-sdk
   benchmark-ips (~> 2.8)
diff --git a/gemfiles/ruby_2.5.9_contrib.gemfile b/gemfiles/ruby_2.5.9_contrib.gemfile
index 846b412382a..1f8f70d9905 100644
--- a/gemfiles/ruby_2.5.9_contrib.gemfile
+++ b/gemfiles/ruby_2.5.9_contrib.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.5.9_contrib.gemfile.lock b/gemfiles/ruby_2.5.9_contrib.gemfile.lock
index c9b3316e4d0..10ef1163f3d 100644
--- a/gemfiles/ruby_2.5.9_contrib.gemfile.lock
+++ b/gemfiles/ruby_2.5.9_contrib.gemfile.lock
@@ -298,7 +298,6 @@ DEPENDENCIES
   actionpack
   actionview
   active_model_serializers (>= 0.10.0)
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.5.9_contrib_old.gemfile b/gemfiles/ruby_2.5.9_contrib_old.gemfile
index 76dee6e5c7f..a5c8ccf51cb 100644
--- a/gemfiles/ruby_2.5.9_contrib_old.gemfile
+++ b/gemfiles/ruby_2.5.9_contrib_old.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.5.9_contrib_old.gemfile.lock b/gemfiles/ruby_2.5.9_contrib_old.gemfile.lock
index e0921995164..9ae9f0e37ac 100644
--- a/gemfiles/ruby_2.5.9_contrib_old.gemfile.lock
+++ b/gemfiles/ruby_2.5.9_contrib_old.gemfile.lock
@@ -183,7 +183,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.5.9_core_old.gemfile b/gemfiles/ruby_2.5.9_core_old.gemfile
index 48ab2b51d85..5db8dd890b2 100644
--- a/gemfiles/ruby_2.5.9_core_old.gemfile
+++ b/gemfiles/ruby_2.5.9_core_old.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.5.9_core_old.gemfile.lock b/gemfiles/ruby_2.5.9_core_old.gemfile.lock
index 308758a255e..af5cb819395 100644
--- a/gemfiles/ruby_2.5.9_core_old.gemfile.lock
+++ b/gemfiles/ruby_2.5.9_core_old.gemfile.lock
@@ -120,7 +120,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.5.9_hanami_1.gemfile b/gemfiles/ruby_2.5.9_hanami_1.gemfile
index 172024aecce..d6957ffd092 100644
--- a/gemfiles/ruby_2.5.9_hanami_1.gemfile
+++ b/gemfiles/ruby_2.5.9_hanami_1.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.5.9_hanami_1.gemfile.lock b/gemfiles/ruby_2.5.9_hanami_1.gemfile.lock
index c8ac8817141..7116e79405c 100644
--- a/gemfiles/ruby_2.5.9_hanami_1.gemfile.lock
+++ b/gemfiles/ruby_2.5.9_hanami_1.gemfile.lock
@@ -224,7 +224,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.5.9_http.gemfile b/gemfiles/ruby_2.5.9_http.gemfile
index da8abd5d471..440fa6ac3c6 100644
--- a/gemfiles/ruby_2.5.9_http.gemfile
+++ b/gemfiles/ruby_2.5.9_http.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.5.9_http.gemfile.lock b/gemfiles/ruby_2.5.9_http.gemfile.lock
index 39d88d9e80a..1f2e9d4dc07 100644
--- a/gemfiles/ruby_2.5.9_http.gemfile.lock
+++ b/gemfiles/ruby_2.5.9_http.gemfile.lock
@@ -87,6 +87,7 @@ GEM
       ffi (>= 1.0.0)
       rake
     google-protobuf (3.19.1)
+    google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.0.1)
     http (5.0.1)
       addressable (~> 2.3)
@@ -101,8 +102,11 @@ GEM
     json-schema (2.8.1)
       addressable (>= 2.4)
     libdatadog (4.0.0.1.0-aarch64-linux)
+    libdatadog (4.0.0.1.0-x86_64-linux)
     libddwaf (1.14.0.0.0-aarch64-linux)
       ffi (~> 1.0)
+    libddwaf (1.14.0.0.0-x86_64-linux)
+      ffi (~> 1.0)
     llhttp-ffi (0.3.1)
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
@@ -189,9 +193,9 @@ GEM
 
 PLATFORMS
   aarch64-linux
+  x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.5.9_rails5_mysql2.gemfile b/gemfiles/ruby_2.5.9_rails5_mysql2.gemfile
index b52c4b5060c..e94549fceda 100644
--- a/gemfiles/ruby_2.5.9_rails5_mysql2.gemfile
+++ b/gemfiles/ruby_2.5.9_rails5_mysql2.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.5.9_rails5_mysql2.gemfile.lock b/gemfiles/ruby_2.5.9_rails5_mysql2.gemfile.lock
index 207e50ec4d9..79e06ba873e 100644
--- a/gemfiles/ruby_2.5.9_rails5_mysql2.gemfile.lock
+++ b/gemfiles/ruby_2.5.9_rails5_mysql2.gemfile.lock
@@ -232,7 +232,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.5.9_rails5_postgres.gemfile b/gemfiles/ruby_2.5.9_rails5_postgres.gemfile
index aea4ad43812..a4d86254f9e 100644
--- a/gemfiles/ruby_2.5.9_rails5_postgres.gemfile
+++ b/gemfiles/ruby_2.5.9_rails5_postgres.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.5.9_rails5_postgres.gemfile.lock b/gemfiles/ruby_2.5.9_rails5_postgres.gemfile.lock
index 05a5af2c054..7d0efd81806 100644
--- a/gemfiles/ruby_2.5.9_rails5_postgres.gemfile.lock
+++ b/gemfiles/ruby_2.5.9_rails5_postgres.gemfile.lock
@@ -252,7 +252,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.5.9_rails5_postgres_redis.gemfile b/gemfiles/ruby_2.5.9_rails5_postgres_redis.gemfile
index 27b898b483d..a32abb24ba0 100644
--- a/gemfiles/ruby_2.5.9_rails5_postgres_redis.gemfile
+++ b/gemfiles/ruby_2.5.9_rails5_postgres_redis.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.5.9_rails5_postgres_redis.gemfile.lock b/gemfiles/ruby_2.5.9_rails5_postgres_redis.gemfile.lock
index 33358b7edbb..9e0cec26508 100644
--- a/gemfiles/ruby_2.5.9_rails5_postgres_redis.gemfile.lock
+++ b/gemfiles/ruby_2.5.9_rails5_postgres_redis.gemfile.lock
@@ -257,7 +257,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.5.9_rails5_postgres_redis_activesupport.gemfile b/gemfiles/ruby_2.5.9_rails5_postgres_redis_activesupport.gemfile
index 76ac2a31fa1..6fec12b9cb7 100644
--- a/gemfiles/ruby_2.5.9_rails5_postgres_redis_activesupport.gemfile
+++ b/gemfiles/ruby_2.5.9_rails5_postgres_redis_activesupport.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.5.9_rails5_postgres_redis_activesupport.gemfile.lock b/gemfiles/ruby_2.5.9_rails5_postgres_redis_activesupport.gemfile.lock
index 7dbca6c6ce2..5a5ec1265fc 100644
--- a/gemfiles/ruby_2.5.9_rails5_postgres_redis_activesupport.gemfile.lock
+++ b/gemfiles/ruby_2.5.9_rails5_postgres_redis_activesupport.gemfile.lock
@@ -269,7 +269,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.5.9_rails5_postgres_sidekiq.gemfile b/gemfiles/ruby_2.5.9_rails5_postgres_sidekiq.gemfile
index f62196fe741..39bb13bc6c2 100644
--- a/gemfiles/ruby_2.5.9_rails5_postgres_sidekiq.gemfile
+++ b/gemfiles/ruby_2.5.9_rails5_postgres_sidekiq.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.5.9_rails5_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.5.9_rails5_postgres_sidekiq.gemfile.lock
index bf932eda32d..9c6d97b3868 100644
--- a/gemfiles/ruby_2.5.9_rails5_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/ruby_2.5.9_rails5_postgres_sidekiq.gemfile.lock
@@ -259,7 +259,6 @@ PLATFORMS
 
 DEPENDENCIES
   activejob
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.5.9_rails5_semantic_logger.gemfile b/gemfiles/ruby_2.5.9_rails5_semantic_logger.gemfile
index e6dda470977..14e4df51d60 100644
--- a/gemfiles/ruby_2.5.9_rails5_semantic_logger.gemfile
+++ b/gemfiles/ruby_2.5.9_rails5_semantic_logger.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.5.9_rails5_semantic_logger.gemfile.lock b/gemfiles/ruby_2.5.9_rails5_semantic_logger.gemfile.lock
index d50b4673730..3efe0880013 100644
--- a/gemfiles/ruby_2.5.9_rails5_semantic_logger.gemfile.lock
+++ b/gemfiles/ruby_2.5.9_rails5_semantic_logger.gemfile.lock
@@ -251,7 +251,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.5.9_rails61_mysql2.gemfile b/gemfiles/ruby_2.5.9_rails61_mysql2.gemfile
index 7e0b6308d0e..ccd459f1fc6 100644
--- a/gemfiles/ruby_2.5.9_rails61_mysql2.gemfile
+++ b/gemfiles/ruby_2.5.9_rails61_mysql2.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.5.9_rails61_mysql2.gemfile.lock b/gemfiles/ruby_2.5.9_rails61_mysql2.gemfile.lock
index b3118a3160f..bc2a98a423e 100644
--- a/gemfiles/ruby_2.5.9_rails61_mysql2.gemfile.lock
+++ b/gemfiles/ruby_2.5.9_rails61_mysql2.gemfile.lock
@@ -251,7 +251,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.5.9_rails61_postgres.gemfile b/gemfiles/ruby_2.5.9_rails61_postgres.gemfile
index 96207ab8fa5..c17c949b560 100644
--- a/gemfiles/ruby_2.5.9_rails61_postgres.gemfile
+++ b/gemfiles/ruby_2.5.9_rails61_postgres.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.5.9_rails61_postgres.gemfile.lock b/gemfiles/ruby_2.5.9_rails61_postgres.gemfile.lock
index 0f8bb053814..34f7aacda4c 100644
--- a/gemfiles/ruby_2.5.9_rails61_postgres.gemfile.lock
+++ b/gemfiles/ruby_2.5.9_rails61_postgres.gemfile.lock
@@ -271,7 +271,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.5.9_rails61_postgres_redis.gemfile b/gemfiles/ruby_2.5.9_rails61_postgres_redis.gemfile
index 30347553fd6..46bb1a2e81b 100644
--- a/gemfiles/ruby_2.5.9_rails61_postgres_redis.gemfile
+++ b/gemfiles/ruby_2.5.9_rails61_postgres_redis.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.5.9_rails61_postgres_redis.gemfile.lock b/gemfiles/ruby_2.5.9_rails61_postgres_redis.gemfile.lock
index d5206bbd463..c308ea025e8 100644
--- a/gemfiles/ruby_2.5.9_rails61_postgres_redis.gemfile.lock
+++ b/gemfiles/ruby_2.5.9_rails61_postgres_redis.gemfile.lock
@@ -276,7 +276,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.5.9_rails61_postgres_sidekiq.gemfile b/gemfiles/ruby_2.5.9_rails61_postgres_sidekiq.gemfile
index b2f79654139..3738e69e30f 100644
--- a/gemfiles/ruby_2.5.9_rails61_postgres_sidekiq.gemfile
+++ b/gemfiles/ruby_2.5.9_rails61_postgres_sidekiq.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.5.9_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.5.9_rails61_postgres_sidekiq.gemfile.lock
index 7a07e8cc889..70ba7630965 100644
--- a/gemfiles/ruby_2.5.9_rails61_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/ruby_2.5.9_rails61_postgres_sidekiq.gemfile.lock
@@ -277,7 +277,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.5.9_rails61_semantic_logger.gemfile b/gemfiles/ruby_2.5.9_rails61_semantic_logger.gemfile
index 5cb03c9357d..613cd71729c 100644
--- a/gemfiles/ruby_2.5.9_rails61_semantic_logger.gemfile
+++ b/gemfiles/ruby_2.5.9_rails61_semantic_logger.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.5.9_rails61_semantic_logger.gemfile.lock b/gemfiles/ruby_2.5.9_rails61_semantic_logger.gemfile.lock
index 2fccbe01024..e416f61f18f 100644
--- a/gemfiles/ruby_2.5.9_rails61_semantic_logger.gemfile.lock
+++ b/gemfiles/ruby_2.5.9_rails61_semantic_logger.gemfile.lock
@@ -270,7 +270,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.5.9_rails6_mysql2.gemfile b/gemfiles/ruby_2.5.9_rails6_mysql2.gemfile
index e875b92c96c..ce70afcbc2e 100644
--- a/gemfiles/ruby_2.5.9_rails6_mysql2.gemfile
+++ b/gemfiles/ruby_2.5.9_rails6_mysql2.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.5.9_rails6_mysql2.gemfile.lock b/gemfiles/ruby_2.5.9_rails6_mysql2.gemfile.lock
index a89d9786edf..4420ba0bcb2 100644
--- a/gemfiles/ruby_2.5.9_rails6_mysql2.gemfile.lock
+++ b/gemfiles/ruby_2.5.9_rails6_mysql2.gemfile.lock
@@ -248,7 +248,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.5.9_rails6_postgres.gemfile b/gemfiles/ruby_2.5.9_rails6_postgres.gemfile
index 3d4f7314539..cecb20d3846 100644
--- a/gemfiles/ruby_2.5.9_rails6_postgres.gemfile
+++ b/gemfiles/ruby_2.5.9_rails6_postgres.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.5.9_rails6_postgres.gemfile.lock b/gemfiles/ruby_2.5.9_rails6_postgres.gemfile.lock
index f402fc9c64e..da7b4c85e2e 100644
--- a/gemfiles/ruby_2.5.9_rails6_postgres.gemfile.lock
+++ b/gemfiles/ruby_2.5.9_rails6_postgres.gemfile.lock
@@ -268,7 +268,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.5.9_rails6_postgres_redis.gemfile b/gemfiles/ruby_2.5.9_rails6_postgres_redis.gemfile
index 8202dac6491..0ac9f34480b 100644
--- a/gemfiles/ruby_2.5.9_rails6_postgres_redis.gemfile
+++ b/gemfiles/ruby_2.5.9_rails6_postgres_redis.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.5.9_rails6_postgres_redis.gemfile.lock b/gemfiles/ruby_2.5.9_rails6_postgres_redis.gemfile.lock
index d2b134a2eee..a5b2ca13db5 100644
--- a/gemfiles/ruby_2.5.9_rails6_postgres_redis.gemfile.lock
+++ b/gemfiles/ruby_2.5.9_rails6_postgres_redis.gemfile.lock
@@ -273,7 +273,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.5.9_rails6_postgres_redis_activesupport.gemfile b/gemfiles/ruby_2.5.9_rails6_postgres_redis_activesupport.gemfile
index db45311b1bc..3c675436849 100644
--- a/gemfiles/ruby_2.5.9_rails6_postgres_redis_activesupport.gemfile
+++ b/gemfiles/ruby_2.5.9_rails6_postgres_redis_activesupport.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.5.9_rails6_postgres_redis_activesupport.gemfile.lock b/gemfiles/ruby_2.5.9_rails6_postgres_redis_activesupport.gemfile.lock
index 39b64712ef1..2a05a939fb8 100644
--- a/gemfiles/ruby_2.5.9_rails6_postgres_redis_activesupport.gemfile.lock
+++ b/gemfiles/ruby_2.5.9_rails6_postgres_redis_activesupport.gemfile.lock
@@ -285,7 +285,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.5.9_rails6_postgres_sidekiq.gemfile b/gemfiles/ruby_2.5.9_rails6_postgres_sidekiq.gemfile
index ed3173cfe04..8fdcbb93160 100644
--- a/gemfiles/ruby_2.5.9_rails6_postgres_sidekiq.gemfile
+++ b/gemfiles/ruby_2.5.9_rails6_postgres_sidekiq.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.5.9_rails6_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.5.9_rails6_postgres_sidekiq.gemfile.lock
index e62a3d9184e..9b1236b671b 100644
--- a/gemfiles/ruby_2.5.9_rails6_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/ruby_2.5.9_rails6_postgres_sidekiq.gemfile.lock
@@ -275,7 +275,6 @@ PLATFORMS
 
 DEPENDENCIES
   activejob
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.5.9_rails6_semantic_logger.gemfile b/gemfiles/ruby_2.5.9_rails6_semantic_logger.gemfile
index 8b39d7a4834..2b4155b2ea3 100644
--- a/gemfiles/ruby_2.5.9_rails6_semantic_logger.gemfile
+++ b/gemfiles/ruby_2.5.9_rails6_semantic_logger.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.5.9_rails6_semantic_logger.gemfile.lock b/gemfiles/ruby_2.5.9_rails6_semantic_logger.gemfile.lock
index 09dd925b640..687715eef8a 100644
--- a/gemfiles/ruby_2.5.9_rails6_semantic_logger.gemfile.lock
+++ b/gemfiles/ruby_2.5.9_rails6_semantic_logger.gemfile.lock
@@ -267,7 +267,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.5.9_redis_3.gemfile b/gemfiles/ruby_2.5.9_redis_3.gemfile
index c26ed96614f..31c5fee68dc 100644
--- a/gemfiles/ruby_2.5.9_redis_3.gemfile
+++ b/gemfiles/ruby_2.5.9_redis_3.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.5.9_redis_3.gemfile.lock b/gemfiles/ruby_2.5.9_redis_3.gemfile.lock
index 19afd167dcf..c8fa4e8d535 100644
--- a/gemfiles/ruby_2.5.9_redis_3.gemfile.lock
+++ b/gemfiles/ruby_2.5.9_redis_3.gemfile.lock
@@ -121,7 +121,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.5.9_redis_4.gemfile b/gemfiles/ruby_2.5.9_redis_4.gemfile
index 25b4f1a0aa6..533bded2803 100644
--- a/gemfiles/ruby_2.5.9_redis_4.gemfile
+++ b/gemfiles/ruby_2.5.9_redis_4.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.5.9_redis_4.gemfile.lock b/gemfiles/ruby_2.5.9_redis_4.gemfile.lock
index aa0a154e835..2c13d522949 100644
--- a/gemfiles/ruby_2.5.9_redis_4.gemfile.lock
+++ b/gemfiles/ruby_2.5.9_redis_4.gemfile.lock
@@ -121,7 +121,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.5.9_redis_5.gemfile b/gemfiles/ruby_2.5.9_redis_5.gemfile
index 98a6c9ecb89..0fc84248146 100644
--- a/gemfiles/ruby_2.5.9_redis_5.gemfile
+++ b/gemfiles/ruby_2.5.9_redis_5.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.5.9_redis_5.gemfile.lock b/gemfiles/ruby_2.5.9_redis_5.gemfile.lock
index ee686b3bbe3..3e4edab6dea 100644
--- a/gemfiles/ruby_2.5.9_redis_5.gemfile.lock
+++ b/gemfiles/ruby_2.5.9_redis_5.gemfile.lock
@@ -125,7 +125,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.5.9_relational_db.gemfile b/gemfiles/ruby_2.5.9_relational_db.gemfile
index dd541ebefb2..a1d78830a38 100644
--- a/gemfiles/ruby_2.5.9_relational_db.gemfile
+++ b/gemfiles/ruby_2.5.9_relational_db.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.5.9_relational_db.gemfile.lock b/gemfiles/ruby_2.5.9_relational_db.gemfile.lock
index 03227b963f9..c650deb77b6 100644
--- a/gemfiles/ruby_2.5.9_relational_db.gemfile.lock
+++ b/gemfiles/ruby_2.5.9_relational_db.gemfile.lock
@@ -65,6 +65,7 @@ GEM
     extlz4 (0.3.4)
     ffi (1.15.5)
     google-protobuf (3.19.1)
+    google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.0.1)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
@@ -76,6 +77,8 @@ GEM
       ffi (~> 1.0)
     libddwaf (1.14.0.0.0-x86_64-linux)
       ffi (~> 1.0)
+    makara (0.5.1)
+      activerecord (>= 5.2.0)
     memory_profiler (0.9.14)
     method_source (1.0.0)
     minitest (5.15.0)
@@ -141,10 +144,10 @@ GEM
 
 PLATFORMS
   aarch64-linux
+  x86_64-linux
 
 DEPENDENCIES
   activerecord (~> 5)
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.5.9_resque2_redis3.gemfile b/gemfiles/ruby_2.5.9_resque2_redis3.gemfile
index f447714fa38..f4497da1585 100644
--- a/gemfiles/ruby_2.5.9_resque2_redis3.gemfile
+++ b/gemfiles/ruby_2.5.9_resque2_redis3.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.5.9_resque2_redis3.gemfile.lock b/gemfiles/ruby_2.5.9_resque2_redis3.gemfile.lock
index 6d7ddea40ce..9defafd91e2 100644
--- a/gemfiles/ruby_2.5.9_resque2_redis3.gemfile.lock
+++ b/gemfiles/ruby_2.5.9_resque2_redis3.gemfile.lock
@@ -142,7 +142,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.5.9_resque2_redis4.gemfile b/gemfiles/ruby_2.5.9_resque2_redis4.gemfile
index 473322f11e7..0c3fb185c00 100644
--- a/gemfiles/ruby_2.5.9_resque2_redis4.gemfile
+++ b/gemfiles/ruby_2.5.9_resque2_redis4.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.5.9_resque2_redis4.gemfile.lock b/gemfiles/ruby_2.5.9_resque2_redis4.gemfile.lock
index 3e8c2a0f98c..85c91c62151 100644
--- a/gemfiles/ruby_2.5.9_resque2_redis4.gemfile.lock
+++ b/gemfiles/ruby_2.5.9_resque2_redis4.gemfile.lock
@@ -146,7 +146,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.5.9_sinatra.gemfile b/gemfiles/ruby_2.5.9_sinatra.gemfile
index 75cb27f3bbb..05697e00aa8 100644
--- a/gemfiles/ruby_2.5.9_sinatra.gemfile
+++ b/gemfiles/ruby_2.5.9_sinatra.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.5.9_sinatra.gemfile.lock b/gemfiles/ruby_2.5.9_sinatra.gemfile.lock
index ec0097fbf37..a55d2b8f102 100644
--- a/gemfiles/ruby_2.5.9_sinatra.gemfile.lock
+++ b/gemfiles/ruby_2.5.9_sinatra.gemfile.lock
@@ -134,7 +134,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.6.10_aws.gemfile b/gemfiles/ruby_2.6.10_aws.gemfile
index d9b7e81f613..9f2165c3ae1 100644
--- a/gemfiles/ruby_2.6.10_aws.gemfile
+++ b/gemfiles/ruby_2.6.10_aws.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.6.10_aws.gemfile.lock b/gemfiles/ruby_2.6.10_aws.gemfile.lock
index 338e792d205..970ff935916 100644
--- a/gemfiles/ruby_2.6.10_aws.gemfile.lock
+++ b/gemfiles/ruby_2.6.10_aws.gemfile.lock
@@ -1471,14 +1471,18 @@ GEM
     extlz4 (0.3.4)
     ffi (1.15.5)
     google-protobuf (3.19.1)
+    google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.0.1)
     jmespath (1.6.2)
     json (2.6.3)
     json-schema (2.8.1)
       addressable (>= 2.4)
     libdatadog (4.0.0.1.0-aarch64-linux)
+    libdatadog (4.0.0.1.0-x86_64-linux)
     libddwaf (1.14.0.0.0-aarch64-linux)
       ffi (~> 1.0)
+    libddwaf (1.14.0.0.0-x86_64-linux)
+      ffi (~> 1.0)
     memory_profiler (0.9.14)
     method_source (1.0.0)
     msgpack (1.7.2)
@@ -1569,9 +1573,9 @@ GEM
 
 PLATFORMS
   aarch64-linux
+  x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   aws-sdk
   benchmark-ips (~> 2.8)
diff --git a/gemfiles/ruby_2.6.10_contrib.gemfile b/gemfiles/ruby_2.6.10_contrib.gemfile
index ded448fccc8..d9e5b56eaa0 100644
--- a/gemfiles/ruby_2.6.10_contrib.gemfile
+++ b/gemfiles/ruby_2.6.10_contrib.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.6.10_contrib.gemfile.lock b/gemfiles/ruby_2.6.10_contrib.gemfile.lock
index c43161eb4c5..6cd9c2b9268 100644
--- a/gemfiles/ruby_2.6.10_contrib.gemfile.lock
+++ b/gemfiles/ruby_2.6.10_contrib.gemfile.lock
@@ -334,7 +334,6 @@ DEPENDENCIES
   actionpack
   actionview
   active_model_serializers (>= 0.10.0)
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.6.10_contrib_old.gemfile b/gemfiles/ruby_2.6.10_contrib_old.gemfile
index 3a02b89fb19..c57d3e0b6e7 100644
--- a/gemfiles/ruby_2.6.10_contrib_old.gemfile
+++ b/gemfiles/ruby_2.6.10_contrib_old.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.6.10_contrib_old.gemfile.lock b/gemfiles/ruby_2.6.10_contrib_old.gemfile.lock
index 11f5272a83d..e2878df3f5b 100644
--- a/gemfiles/ruby_2.6.10_contrib_old.gemfile.lock
+++ b/gemfiles/ruby_2.6.10_contrib_old.gemfile.lock
@@ -213,7 +213,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.6.10_core_old.gemfile b/gemfiles/ruby_2.6.10_core_old.gemfile
index bd8273ef2ff..94f4be95452 100644
--- a/gemfiles/ruby_2.6.10_core_old.gemfile
+++ b/gemfiles/ruby_2.6.10_core_old.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.6.10_core_old.gemfile.lock b/gemfiles/ruby_2.6.10_core_old.gemfile.lock
index f8cd8d9472c..4a66271451a 100644
--- a/gemfiles/ruby_2.6.10_core_old.gemfile.lock
+++ b/gemfiles/ruby_2.6.10_core_old.gemfile.lock
@@ -150,7 +150,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.6.10_hanami_1.gemfile b/gemfiles/ruby_2.6.10_hanami_1.gemfile
index f5e445cdf52..eee10d97f8f 100644
--- a/gemfiles/ruby_2.6.10_hanami_1.gemfile
+++ b/gemfiles/ruby_2.6.10_hanami_1.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.6.10_hanami_1.gemfile.lock b/gemfiles/ruby_2.6.10_hanami_1.gemfile.lock
index 098024486bb..2d8f2c52f74 100644
--- a/gemfiles/ruby_2.6.10_hanami_1.gemfile.lock
+++ b/gemfiles/ruby_2.6.10_hanami_1.gemfile.lock
@@ -248,7 +248,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.6.10_http.gemfile b/gemfiles/ruby_2.6.10_http.gemfile
index 2fafaa0dd17..1f3a5648c7e 100644
--- a/gemfiles/ruby_2.6.10_http.gemfile
+++ b/gemfiles/ruby_2.6.10_http.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.6.10_http.gemfile.lock b/gemfiles/ruby_2.6.10_http.gemfile.lock
index 72de9885801..a69c24393ee 100644
--- a/gemfiles/ruby_2.6.10_http.gemfile.lock
+++ b/gemfiles/ruby_2.6.10_http.gemfile.lock
@@ -70,6 +70,7 @@ GEM
       ffi (>= 1.0.0)
       rake
     google-protobuf (3.19.1)
+    google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.0.1)
     http (5.0.1)
       addressable (~> 2.3)
@@ -85,8 +86,11 @@ GEM
     json-schema (2.8.1)
       addressable (>= 2.4)
     libdatadog (4.0.0.1.0-aarch64-linux)
+    libdatadog (4.0.0.1.0-x86_64-linux)
     libddwaf (1.14.0.0.0-aarch64-linux)
       ffi (~> 1.0)
+    libddwaf (1.14.0.0.0-x86_64-linux)
+      ffi (~> 1.0)
     llhttp-ffi (0.3.1)
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
@@ -201,9 +205,9 @@ GEM
 
 PLATFORMS
   aarch64-linux
+  x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.6.10_opentelemetry.gemfile b/gemfiles/ruby_2.6.10_opentelemetry.gemfile
index 021f8e6b3c8..103931f96ff 100644
--- a/gemfiles/ruby_2.6.10_opentelemetry.gemfile
+++ b/gemfiles/ruby_2.6.10_opentelemetry.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.6.10_opentelemetry.gemfile.lock b/gemfiles/ruby_2.6.10_opentelemetry.gemfile.lock
index a9f23c444d6..6194fbc62ba 100755
--- a/gemfiles/ruby_2.6.10_opentelemetry.gemfile.lock
+++ b/gemfiles/ruby_2.6.10_opentelemetry.gemfile.lock
@@ -162,7 +162,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.6.10_rails5_mysql2.gemfile b/gemfiles/ruby_2.6.10_rails5_mysql2.gemfile
index d9cfa143731..c1e4cb2fad5 100644
--- a/gemfiles/ruby_2.6.10_rails5_mysql2.gemfile
+++ b/gemfiles/ruby_2.6.10_rails5_mysql2.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.6.10_rails5_mysql2.gemfile.lock b/gemfiles/ruby_2.6.10_rails5_mysql2.gemfile.lock
index 004e365d9e4..66ea920dbe5 100644
--- a/gemfiles/ruby_2.6.10_rails5_mysql2.gemfile.lock
+++ b/gemfiles/ruby_2.6.10_rails5_mysql2.gemfile.lock
@@ -274,7 +274,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.6.10_rails5_postgres.gemfile b/gemfiles/ruby_2.6.10_rails5_postgres.gemfile
index 121e7cd6abc..7cb47442b5d 100644
--- a/gemfiles/ruby_2.6.10_rails5_postgres.gemfile
+++ b/gemfiles/ruby_2.6.10_rails5_postgres.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.6.10_rails5_postgres.gemfile.lock b/gemfiles/ruby_2.6.10_rails5_postgres.gemfile.lock
index 4548ec86070..2ea9be85761 100644
--- a/gemfiles/ruby_2.6.10_rails5_postgres.gemfile.lock
+++ b/gemfiles/ruby_2.6.10_rails5_postgres.gemfile.lock
@@ -274,7 +274,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.6.10_rails5_postgres_redis.gemfile b/gemfiles/ruby_2.6.10_rails5_postgres_redis.gemfile
index 50075217d6d..3dcda839b55 100644
--- a/gemfiles/ruby_2.6.10_rails5_postgres_redis.gemfile
+++ b/gemfiles/ruby_2.6.10_rails5_postgres_redis.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.6.10_rails5_postgres_redis.gemfile.lock b/gemfiles/ruby_2.6.10_rails5_postgres_redis.gemfile.lock
index 49eb52156b5..4e1b6f88372 100644
--- a/gemfiles/ruby_2.6.10_rails5_postgres_redis.gemfile.lock
+++ b/gemfiles/ruby_2.6.10_rails5_postgres_redis.gemfile.lock
@@ -275,7 +275,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.6.10_rails5_postgres_redis_activesupport.gemfile b/gemfiles/ruby_2.6.10_rails5_postgres_redis_activesupport.gemfile
index 1ddcb8142a6..9daeda8a079 100644
--- a/gemfiles/ruby_2.6.10_rails5_postgres_redis_activesupport.gemfile
+++ b/gemfiles/ruby_2.6.10_rails5_postgres_redis_activesupport.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.6.10_rails5_postgres_redis_activesupport.gemfile.lock b/gemfiles/ruby_2.6.10_rails5_postgres_redis_activesupport.gemfile.lock
index 175fa5836cd..7376cda33f5 100644
--- a/gemfiles/ruby_2.6.10_rails5_postgres_redis_activesupport.gemfile.lock
+++ b/gemfiles/ruby_2.6.10_rails5_postgres_redis_activesupport.gemfile.lock
@@ -291,7 +291,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.6.10_rails5_postgres_sidekiq.gemfile b/gemfiles/ruby_2.6.10_rails5_postgres_sidekiq.gemfile
index 7e81b4422f4..b9c9a089a25 100644
--- a/gemfiles/ruby_2.6.10_rails5_postgres_sidekiq.gemfile
+++ b/gemfiles/ruby_2.6.10_rails5_postgres_sidekiq.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.6.10_rails5_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.6.10_rails5_postgres_sidekiq.gemfile.lock
index 2fc337b921c..f589ecf7e52 100644
--- a/gemfiles/ruby_2.6.10_rails5_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/ruby_2.6.10_rails5_postgres_sidekiq.gemfile.lock
@@ -281,7 +281,6 @@ PLATFORMS
 
 DEPENDENCIES
   activejob
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.6.10_rails5_semantic_logger.gemfile b/gemfiles/ruby_2.6.10_rails5_semantic_logger.gemfile
index 254d2d3f0c6..5ba2b0e03f5 100644
--- a/gemfiles/ruby_2.6.10_rails5_semantic_logger.gemfile
+++ b/gemfiles/ruby_2.6.10_rails5_semantic_logger.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.6.10_rails5_semantic_logger.gemfile.lock b/gemfiles/ruby_2.6.10_rails5_semantic_logger.gemfile.lock
index 729bf7c0c39..da87eb07bfa 100644
--- a/gemfiles/ruby_2.6.10_rails5_semantic_logger.gemfile.lock
+++ b/gemfiles/ruby_2.6.10_rails5_semantic_logger.gemfile.lock
@@ -273,7 +273,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.6.10_rails61_mysql2.gemfile b/gemfiles/ruby_2.6.10_rails61_mysql2.gemfile
index 9daee4ec281..a4281818685 100644
--- a/gemfiles/ruby_2.6.10_rails61_mysql2.gemfile
+++ b/gemfiles/ruby_2.6.10_rails61_mysql2.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.6.10_rails61_mysql2.gemfile.lock b/gemfiles/ruby_2.6.10_rails61_mysql2.gemfile.lock
index dc03a772c1e..62d4b9921de 100644
--- a/gemfiles/ruby_2.6.10_rails61_mysql2.gemfile.lock
+++ b/gemfiles/ruby_2.6.10_rails61_mysql2.gemfile.lock
@@ -293,7 +293,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.6.10_rails61_postgres.gemfile b/gemfiles/ruby_2.6.10_rails61_postgres.gemfile
index 6d9045872e5..a64200b83da 100644
--- a/gemfiles/ruby_2.6.10_rails61_postgres.gemfile
+++ b/gemfiles/ruby_2.6.10_rails61_postgres.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.6.10_rails61_postgres.gemfile.lock b/gemfiles/ruby_2.6.10_rails61_postgres.gemfile.lock
index e009b7fe13d..b62397a0945 100644
--- a/gemfiles/ruby_2.6.10_rails61_postgres.gemfile.lock
+++ b/gemfiles/ruby_2.6.10_rails61_postgres.gemfile.lock
@@ -293,7 +293,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.6.10_rails61_postgres_redis.gemfile b/gemfiles/ruby_2.6.10_rails61_postgres_redis.gemfile
index e3c9dcd5c72..b32d57b113b 100644
--- a/gemfiles/ruby_2.6.10_rails61_postgres_redis.gemfile
+++ b/gemfiles/ruby_2.6.10_rails61_postgres_redis.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.6.10_rails61_postgres_redis.gemfile.lock b/gemfiles/ruby_2.6.10_rails61_postgres_redis.gemfile.lock
index aad0ce48f9a..41c6c9e35a1 100644
--- a/gemfiles/ruby_2.6.10_rails61_postgres_redis.gemfile.lock
+++ b/gemfiles/ruby_2.6.10_rails61_postgres_redis.gemfile.lock
@@ -294,7 +294,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.6.10_rails61_postgres_sidekiq.gemfile b/gemfiles/ruby_2.6.10_rails61_postgres_sidekiq.gemfile
index a815efe178c..e8b1a096037 100644
--- a/gemfiles/ruby_2.6.10_rails61_postgres_sidekiq.gemfile
+++ b/gemfiles/ruby_2.6.10_rails61_postgres_sidekiq.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.6.10_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.6.10_rails61_postgres_sidekiq.gemfile.lock
index 2a1c7393670..de5247fc883 100644
--- a/gemfiles/ruby_2.6.10_rails61_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/ruby_2.6.10_rails61_postgres_sidekiq.gemfile.lock
@@ -299,7 +299,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.6.10_rails61_semantic_logger.gemfile b/gemfiles/ruby_2.6.10_rails61_semantic_logger.gemfile
index eaae7904483..0cf76038288 100644
--- a/gemfiles/ruby_2.6.10_rails61_semantic_logger.gemfile
+++ b/gemfiles/ruby_2.6.10_rails61_semantic_logger.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.6.10_rails61_semantic_logger.gemfile.lock b/gemfiles/ruby_2.6.10_rails61_semantic_logger.gemfile.lock
index 86570bf0d14..abfae1bb0f0 100644
--- a/gemfiles/ruby_2.6.10_rails61_semantic_logger.gemfile.lock
+++ b/gemfiles/ruby_2.6.10_rails61_semantic_logger.gemfile.lock
@@ -292,7 +292,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.6.10_rails6_mysql2.gemfile b/gemfiles/ruby_2.6.10_rails6_mysql2.gemfile
index d4a7c964b40..071197e509f 100644
--- a/gemfiles/ruby_2.6.10_rails6_mysql2.gemfile
+++ b/gemfiles/ruby_2.6.10_rails6_mysql2.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.6.10_rails6_mysql2.gemfile.lock b/gemfiles/ruby_2.6.10_rails6_mysql2.gemfile.lock
index bad24f3a4f2..787cfc1629c 100644
--- a/gemfiles/ruby_2.6.10_rails6_mysql2.gemfile.lock
+++ b/gemfiles/ruby_2.6.10_rails6_mysql2.gemfile.lock
@@ -290,7 +290,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.6.10_rails6_postgres.gemfile b/gemfiles/ruby_2.6.10_rails6_postgres.gemfile
index 9b36776abd6..ebd980d6c4e 100644
--- a/gemfiles/ruby_2.6.10_rails6_postgres.gemfile
+++ b/gemfiles/ruby_2.6.10_rails6_postgres.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.6.10_rails6_postgres.gemfile.lock b/gemfiles/ruby_2.6.10_rails6_postgres.gemfile.lock
index e8a8df2dd1d..5354c0c67fa 100644
--- a/gemfiles/ruby_2.6.10_rails6_postgres.gemfile.lock
+++ b/gemfiles/ruby_2.6.10_rails6_postgres.gemfile.lock
@@ -290,7 +290,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.6.10_rails6_postgres_redis.gemfile b/gemfiles/ruby_2.6.10_rails6_postgres_redis.gemfile
index f623fd4e9a7..3cd85f202cc 100644
--- a/gemfiles/ruby_2.6.10_rails6_postgres_redis.gemfile
+++ b/gemfiles/ruby_2.6.10_rails6_postgres_redis.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.6.10_rails6_postgres_redis.gemfile.lock b/gemfiles/ruby_2.6.10_rails6_postgres_redis.gemfile.lock
index edeb627d962..1d760bb084f 100644
--- a/gemfiles/ruby_2.6.10_rails6_postgres_redis.gemfile.lock
+++ b/gemfiles/ruby_2.6.10_rails6_postgres_redis.gemfile.lock
@@ -291,7 +291,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.6.10_rails6_postgres_redis_activesupport.gemfile b/gemfiles/ruby_2.6.10_rails6_postgres_redis_activesupport.gemfile
index f0060635057..16817fb9a1f 100644
--- a/gemfiles/ruby_2.6.10_rails6_postgres_redis_activesupport.gemfile
+++ b/gemfiles/ruby_2.6.10_rails6_postgres_redis_activesupport.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.6.10_rails6_postgres_redis_activesupport.gemfile.lock b/gemfiles/ruby_2.6.10_rails6_postgres_redis_activesupport.gemfile.lock
index 66d4361c24c..09e6dfe5154 100644
--- a/gemfiles/ruby_2.6.10_rails6_postgres_redis_activesupport.gemfile.lock
+++ b/gemfiles/ruby_2.6.10_rails6_postgres_redis_activesupport.gemfile.lock
@@ -307,7 +307,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.6.10_rails6_postgres_sidekiq.gemfile b/gemfiles/ruby_2.6.10_rails6_postgres_sidekiq.gemfile
index 637632b6c23..762cf8acc31 100644
--- a/gemfiles/ruby_2.6.10_rails6_postgres_sidekiq.gemfile
+++ b/gemfiles/ruby_2.6.10_rails6_postgres_sidekiq.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.6.10_rails6_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.6.10_rails6_postgres_sidekiq.gemfile.lock
index 0e93002a553..c93611e50ba 100644
--- a/gemfiles/ruby_2.6.10_rails6_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/ruby_2.6.10_rails6_postgres_sidekiq.gemfile.lock
@@ -297,7 +297,6 @@ PLATFORMS
 
 DEPENDENCIES
   activejob
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.6.10_rails6_semantic_logger.gemfile b/gemfiles/ruby_2.6.10_rails6_semantic_logger.gemfile
index 0eea83a1b50..b61c321133b 100644
--- a/gemfiles/ruby_2.6.10_rails6_semantic_logger.gemfile
+++ b/gemfiles/ruby_2.6.10_rails6_semantic_logger.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.6.10_rails6_semantic_logger.gemfile.lock b/gemfiles/ruby_2.6.10_rails6_semantic_logger.gemfile.lock
index b4c90952da4..154b92b81ec 100644
--- a/gemfiles/ruby_2.6.10_rails6_semantic_logger.gemfile.lock
+++ b/gemfiles/ruby_2.6.10_rails6_semantic_logger.gemfile.lock
@@ -289,7 +289,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.6.10_redis_3.gemfile b/gemfiles/ruby_2.6.10_redis_3.gemfile
index 9059dee6f95..dd774c67174 100644
--- a/gemfiles/ruby_2.6.10_redis_3.gemfile
+++ b/gemfiles/ruby_2.6.10_redis_3.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.6.10_redis_3.gemfile.lock b/gemfiles/ruby_2.6.10_redis_3.gemfile.lock
index d24bfd6208c..a21ed6bbf2d 100644
--- a/gemfiles/ruby_2.6.10_redis_3.gemfile.lock
+++ b/gemfiles/ruby_2.6.10_redis_3.gemfile.lock
@@ -151,7 +151,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.6.10_redis_4.gemfile b/gemfiles/ruby_2.6.10_redis_4.gemfile
index aa7cb6c168b..777f1c36639 100644
--- a/gemfiles/ruby_2.6.10_redis_4.gemfile
+++ b/gemfiles/ruby_2.6.10_redis_4.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.6.10_redis_4.gemfile.lock b/gemfiles/ruby_2.6.10_redis_4.gemfile.lock
index 9ee123fcd14..041e0ca1d7d 100644
--- a/gemfiles/ruby_2.6.10_redis_4.gemfile.lock
+++ b/gemfiles/ruby_2.6.10_redis_4.gemfile.lock
@@ -151,7 +151,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.6.10_redis_5.gemfile b/gemfiles/ruby_2.6.10_redis_5.gemfile
index 6d2a73f18bd..a75b3ca848c 100644
--- a/gemfiles/ruby_2.6.10_redis_5.gemfile
+++ b/gemfiles/ruby_2.6.10_redis_5.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.6.10_redis_5.gemfile.lock b/gemfiles/ruby_2.6.10_redis_5.gemfile.lock
index 1e5ad3e1a5b..d2d140daa27 100644
--- a/gemfiles/ruby_2.6.10_redis_5.gemfile.lock
+++ b/gemfiles/ruby_2.6.10_redis_5.gemfile.lock
@@ -155,7 +155,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.6.10_relational_db.gemfile b/gemfiles/ruby_2.6.10_relational_db.gemfile
index de78527add7..7d1123e6f62 100644
--- a/gemfiles/ruby_2.6.10_relational_db.gemfile
+++ b/gemfiles/ruby_2.6.10_relational_db.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.6.10_relational_db.gemfile.lock b/gemfiles/ruby_2.6.10_relational_db.gemfile.lock
index fff14ee4d79..4dd49a03efa 100644
--- a/gemfiles/ruby_2.6.10_relational_db.gemfile.lock
+++ b/gemfiles/ruby_2.6.10_relational_db.gemfile.lock
@@ -66,6 +66,7 @@ GEM
     extlz4 (0.3.4)
     ffi (1.15.5)
     google-protobuf (3.19.1)
+    google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.0.1)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
@@ -78,6 +79,8 @@ GEM
       ffi (~> 1.0)
     libddwaf (1.14.0.0.0-x86_64-linux)
       ffi (~> 1.0)
+    makara (0.5.1)
+      activerecord (>= 5.2.0)
     memory_profiler (0.9.14)
     method_source (1.0.0)
     minitest (5.20.0)
@@ -173,10 +176,10 @@ GEM
 
 PLATFORMS
   aarch64-linux
+  x86_64-linux
 
 DEPENDENCIES
   activerecord (~> 6.0.0)
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.6.10_resque2_redis3.gemfile b/gemfiles/ruby_2.6.10_resque2_redis3.gemfile
index d69e4f65804..6a5764ce176 100644
--- a/gemfiles/ruby_2.6.10_resque2_redis3.gemfile
+++ b/gemfiles/ruby_2.6.10_resque2_redis3.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.6.10_resque2_redis3.gemfile.lock b/gemfiles/ruby_2.6.10_resque2_redis3.gemfile.lock
index ae87e5fc64e..c019bad3d9b 100644
--- a/gemfiles/ruby_2.6.10_resque2_redis3.gemfile.lock
+++ b/gemfiles/ruby_2.6.10_resque2_redis3.gemfile.lock
@@ -172,7 +172,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.6.10_resque2_redis4.gemfile b/gemfiles/ruby_2.6.10_resque2_redis4.gemfile
index bbd243f5ae0..b43d9f39706 100644
--- a/gemfiles/ruby_2.6.10_resque2_redis4.gemfile
+++ b/gemfiles/ruby_2.6.10_resque2_redis4.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.6.10_resque2_redis4.gemfile.lock b/gemfiles/ruby_2.6.10_resque2_redis4.gemfile.lock
index d68c9e20728..7b27db84b56 100644
--- a/gemfiles/ruby_2.6.10_resque2_redis4.gemfile.lock
+++ b/gemfiles/ruby_2.6.10_resque2_redis4.gemfile.lock
@@ -172,7 +172,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.6.10_sinatra.gemfile b/gemfiles/ruby_2.6.10_sinatra.gemfile
index 19cfed9d54c..35472176459 100644
--- a/gemfiles/ruby_2.6.10_sinatra.gemfile
+++ b/gemfiles/ruby_2.6.10_sinatra.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.6.10_sinatra.gemfile.lock b/gemfiles/ruby_2.6.10_sinatra.gemfile.lock
index 1036e056461..8347a4de8c7 100644
--- a/gemfiles/ruby_2.6.10_sinatra.gemfile.lock
+++ b/gemfiles/ruby_2.6.10_sinatra.gemfile.lock
@@ -164,7 +164,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.7.6_aws.gemfile b/gemfiles/ruby_2.7.6_aws.gemfile
index ccc87ac74a0..62aa91a1177 100644
--- a/gemfiles/ruby_2.7.6_aws.gemfile
+++ b/gemfiles/ruby_2.7.6_aws.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.7.6_aws.gemfile.lock b/gemfiles/ruby_2.7.6_aws.gemfile.lock
index ce30125f67d..41bd618c8cd 100644
--- a/gemfiles/ruby_2.7.6_aws.gemfile.lock
+++ b/gemfiles/ruby_2.7.6_aws.gemfile.lock
@@ -1471,14 +1471,18 @@ GEM
     extlz4 (0.3.4)
     ffi (1.15.5)
     google-protobuf (3.24.2-aarch64-linux)
+    google-protobuf (3.24.2-x86_64-linux)
     hashdiff (1.0.1)
     jmespath (1.6.2)
     json (2.6.3)
     json-schema (2.8.1)
       addressable (>= 2.4)
     libdatadog (4.0.0.1.0-aarch64-linux)
+    libdatadog (4.0.0.1.0-x86_64-linux)
     libddwaf (1.14.0.0.0-aarch64-linux)
       ffi (~> 1.0)
+    libddwaf (1.14.0.0.0-x86_64-linux)
+      ffi (~> 1.0)
     memory_profiler (0.9.14)
     method_source (1.0.0)
     msgpack (1.7.2)
@@ -1569,9 +1573,9 @@ GEM
 
 PLATFORMS
   aarch64-linux
+  x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   aws-sdk
   benchmark-ips (~> 2.8)
diff --git a/gemfiles/ruby_2.7.6_contrib.gemfile b/gemfiles/ruby_2.7.6_contrib.gemfile
index 8a6a135a60e..2ba0384f0df 100644
--- a/gemfiles/ruby_2.7.6_contrib.gemfile
+++ b/gemfiles/ruby_2.7.6_contrib.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.7.6_contrib.gemfile.lock b/gemfiles/ruby_2.7.6_contrib.gemfile.lock
index 0cf7a30ed16..d6cdbee34f7 100644
--- a/gemfiles/ruby_2.7.6_contrib.gemfile.lock
+++ b/gemfiles/ruby_2.7.6_contrib.gemfile.lock
@@ -324,7 +324,6 @@ DEPENDENCIES
   actionpack
   actionview
   active_model_serializers (>= 0.10.0)
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.7.6_contrib_old.gemfile b/gemfiles/ruby_2.7.6_contrib_old.gemfile
index 7a494f695e4..e5fa6e1764c 100644
--- a/gemfiles/ruby_2.7.6_contrib_old.gemfile
+++ b/gemfiles/ruby_2.7.6_contrib_old.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.7.6_contrib_old.gemfile.lock b/gemfiles/ruby_2.7.6_contrib_old.gemfile.lock
index db85300b7b3..ba2ec81f4ba 100644
--- a/gemfiles/ruby_2.7.6_contrib_old.gemfile.lock
+++ b/gemfiles/ruby_2.7.6_contrib_old.gemfile.lock
@@ -213,7 +213,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.7.6_core_old.gemfile b/gemfiles/ruby_2.7.6_core_old.gemfile
index b3190454b4d..b83ea2197db 100644
--- a/gemfiles/ruby_2.7.6_core_old.gemfile
+++ b/gemfiles/ruby_2.7.6_core_old.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.7.6_core_old.gemfile.lock b/gemfiles/ruby_2.7.6_core_old.gemfile.lock
index 36615164313..53f8ce74fcb 100644
--- a/gemfiles/ruby_2.7.6_core_old.gemfile.lock
+++ b/gemfiles/ruby_2.7.6_core_old.gemfile.lock
@@ -150,7 +150,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.7.6_hanami_1.gemfile b/gemfiles/ruby_2.7.6_hanami_1.gemfile
index 6558c95e54f..2993604c7e9 100644
--- a/gemfiles/ruby_2.7.6_hanami_1.gemfile
+++ b/gemfiles/ruby_2.7.6_hanami_1.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.7.6_hanami_1.gemfile.lock b/gemfiles/ruby_2.7.6_hanami_1.gemfile.lock
index 7156d4c0e64..38c182fbf94 100644
--- a/gemfiles/ruby_2.7.6_hanami_1.gemfile.lock
+++ b/gemfiles/ruby_2.7.6_hanami_1.gemfile.lock
@@ -250,7 +250,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.7.6_http.gemfile b/gemfiles/ruby_2.7.6_http.gemfile
index f0ca30c724b..1c07cb87d1b 100644
--- a/gemfiles/ruby_2.7.6_http.gemfile
+++ b/gemfiles/ruby_2.7.6_http.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.7.6_http.gemfile.lock b/gemfiles/ruby_2.7.6_http.gemfile.lock
index d4c1aef58b4..cfc8eff5dce 100644
--- a/gemfiles/ruby_2.7.6_http.gemfile.lock
+++ b/gemfiles/ruby_2.7.6_http.gemfile.lock
@@ -70,6 +70,7 @@ GEM
       ffi (>= 1.0.0)
       rake
     google-protobuf (3.24.3-aarch64-linux)
+    google-protobuf (3.24.3-x86_64-linux)
     hashdiff (1.0.1)
     http (5.0.1)
       addressable (~> 2.3)
@@ -85,8 +86,11 @@ GEM
     json-schema (2.8.1)
       addressable (>= 2.4)
     libdatadog (4.0.0.1.0-aarch64-linux)
+    libdatadog (4.0.0.1.0-x86_64-linux)
     libddwaf (1.14.0.0.0-aarch64-linux)
       ffi (~> 1.0)
+    libddwaf (1.14.0.0.0-x86_64-linux)
+      ffi (~> 1.0)
     llhttp-ffi (0.3.1)
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
@@ -201,9 +205,9 @@ GEM
 
 PLATFORMS
   aarch64-linux
+  x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.7.6_opentelemetry.gemfile b/gemfiles/ruby_2.7.6_opentelemetry.gemfile
index 68a1aa31e5f..f3e563c825e 100644
--- a/gemfiles/ruby_2.7.6_opentelemetry.gemfile
+++ b/gemfiles/ruby_2.7.6_opentelemetry.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.7.6_opentelemetry.gemfile.lock b/gemfiles/ruby_2.7.6_opentelemetry.gemfile.lock
index 95eb8d91c3c..f7c49ef70d6 100755
--- a/gemfiles/ruby_2.7.6_opentelemetry.gemfile.lock
+++ b/gemfiles/ruby_2.7.6_opentelemetry.gemfile.lock
@@ -162,7 +162,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.7.6_rails5_mysql2.gemfile b/gemfiles/ruby_2.7.6_rails5_mysql2.gemfile
index cc3058bbed0..f4a2a065dbc 100644
--- a/gemfiles/ruby_2.7.6_rails5_mysql2.gemfile
+++ b/gemfiles/ruby_2.7.6_rails5_mysql2.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.7.6_rails5_mysql2.gemfile.lock b/gemfiles/ruby_2.7.6_rails5_mysql2.gemfile.lock
index 5d8ce680dcc..5b6eb7633b0 100644
--- a/gemfiles/ruby_2.7.6_rails5_mysql2.gemfile.lock
+++ b/gemfiles/ruby_2.7.6_rails5_mysql2.gemfile.lock
@@ -274,7 +274,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.7.6_rails5_postgres.gemfile b/gemfiles/ruby_2.7.6_rails5_postgres.gemfile
index d8cad2ae7d4..f1c622d4cce 100644
--- a/gemfiles/ruby_2.7.6_rails5_postgres.gemfile
+++ b/gemfiles/ruby_2.7.6_rails5_postgres.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.7.6_rails5_postgres.gemfile.lock b/gemfiles/ruby_2.7.6_rails5_postgres.gemfile.lock
index ecf3249f23a..f3c992a1627 100644
--- a/gemfiles/ruby_2.7.6_rails5_postgres.gemfile.lock
+++ b/gemfiles/ruby_2.7.6_rails5_postgres.gemfile.lock
@@ -274,7 +274,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.7.6_rails5_postgres_redis.gemfile b/gemfiles/ruby_2.7.6_rails5_postgres_redis.gemfile
index bde51928787..09bb66e95ec 100644
--- a/gemfiles/ruby_2.7.6_rails5_postgres_redis.gemfile
+++ b/gemfiles/ruby_2.7.6_rails5_postgres_redis.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.7.6_rails5_postgres_redis.gemfile.lock b/gemfiles/ruby_2.7.6_rails5_postgres_redis.gemfile.lock
index 817105ae710..ac4a9bbb990 100644
--- a/gemfiles/ruby_2.7.6_rails5_postgres_redis.gemfile.lock
+++ b/gemfiles/ruby_2.7.6_rails5_postgres_redis.gemfile.lock
@@ -275,7 +275,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.7.6_rails5_postgres_redis_activesupport.gemfile b/gemfiles/ruby_2.7.6_rails5_postgres_redis_activesupport.gemfile
index a6603a9d24d..3a4e7682edb 100644
--- a/gemfiles/ruby_2.7.6_rails5_postgres_redis_activesupport.gemfile
+++ b/gemfiles/ruby_2.7.6_rails5_postgres_redis_activesupport.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.7.6_rails5_postgres_redis_activesupport.gemfile.lock b/gemfiles/ruby_2.7.6_rails5_postgres_redis_activesupport.gemfile.lock
index 5ceeba0acc5..3596d53edbd 100644
--- a/gemfiles/ruby_2.7.6_rails5_postgres_redis_activesupport.gemfile.lock
+++ b/gemfiles/ruby_2.7.6_rails5_postgres_redis_activesupport.gemfile.lock
@@ -291,7 +291,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.7.6_rails5_postgres_sidekiq.gemfile b/gemfiles/ruby_2.7.6_rails5_postgres_sidekiq.gemfile
index 8c27b408412..804276a4621 100644
--- a/gemfiles/ruby_2.7.6_rails5_postgres_sidekiq.gemfile
+++ b/gemfiles/ruby_2.7.6_rails5_postgres_sidekiq.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.7.6_rails5_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.7.6_rails5_postgres_sidekiq.gemfile.lock
index f8ab02f8e7c..aaf553a7ceb 100644
--- a/gemfiles/ruby_2.7.6_rails5_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/ruby_2.7.6_rails5_postgres_sidekiq.gemfile.lock
@@ -281,7 +281,6 @@ PLATFORMS
 
 DEPENDENCIES
   activejob
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.7.6_rails5_semantic_logger.gemfile b/gemfiles/ruby_2.7.6_rails5_semantic_logger.gemfile
index 97b4efed8a4..2f559e94005 100644
--- a/gemfiles/ruby_2.7.6_rails5_semantic_logger.gemfile
+++ b/gemfiles/ruby_2.7.6_rails5_semantic_logger.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.7.6_rails5_semantic_logger.gemfile.lock b/gemfiles/ruby_2.7.6_rails5_semantic_logger.gemfile.lock
index ee3c3539aa1..bdf9e99fb13 100644
--- a/gemfiles/ruby_2.7.6_rails5_semantic_logger.gemfile.lock
+++ b/gemfiles/ruby_2.7.6_rails5_semantic_logger.gemfile.lock
@@ -273,7 +273,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.7.6_rails61_mysql2.gemfile b/gemfiles/ruby_2.7.6_rails61_mysql2.gemfile
index 334485bc29c..ede4b3a53d6 100644
--- a/gemfiles/ruby_2.7.6_rails61_mysql2.gemfile
+++ b/gemfiles/ruby_2.7.6_rails61_mysql2.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.7.6_rails61_mysql2.gemfile.lock b/gemfiles/ruby_2.7.6_rails61_mysql2.gemfile.lock
index f8e8a4ac002..3581b13d0fd 100644
--- a/gemfiles/ruby_2.7.6_rails61_mysql2.gemfile.lock
+++ b/gemfiles/ruby_2.7.6_rails61_mysql2.gemfile.lock
@@ -293,7 +293,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.7.6_rails61_postgres.gemfile b/gemfiles/ruby_2.7.6_rails61_postgres.gemfile
index acf0c82c312..8251f9d4bfd 100644
--- a/gemfiles/ruby_2.7.6_rails61_postgres.gemfile
+++ b/gemfiles/ruby_2.7.6_rails61_postgres.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.7.6_rails61_postgres.gemfile.lock b/gemfiles/ruby_2.7.6_rails61_postgres.gemfile.lock
index 2fedaf91ba3..e35c7af3b09 100644
--- a/gemfiles/ruby_2.7.6_rails61_postgres.gemfile.lock
+++ b/gemfiles/ruby_2.7.6_rails61_postgres.gemfile.lock
@@ -293,7 +293,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.7.6_rails61_postgres_redis.gemfile b/gemfiles/ruby_2.7.6_rails61_postgres_redis.gemfile
index 01e93e5f123..bbff7c99824 100644
--- a/gemfiles/ruby_2.7.6_rails61_postgres_redis.gemfile
+++ b/gemfiles/ruby_2.7.6_rails61_postgres_redis.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.7.6_rails61_postgres_redis.gemfile.lock b/gemfiles/ruby_2.7.6_rails61_postgres_redis.gemfile.lock
index 579ccc6cc64..48b06df3c5f 100644
--- a/gemfiles/ruby_2.7.6_rails61_postgres_redis.gemfile.lock
+++ b/gemfiles/ruby_2.7.6_rails61_postgres_redis.gemfile.lock
@@ -294,7 +294,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.7.6_rails61_postgres_sidekiq.gemfile b/gemfiles/ruby_2.7.6_rails61_postgres_sidekiq.gemfile
index ab4eff99f63..e9dc9a69d60 100644
--- a/gemfiles/ruby_2.7.6_rails61_postgres_sidekiq.gemfile
+++ b/gemfiles/ruby_2.7.6_rails61_postgres_sidekiq.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.7.6_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.7.6_rails61_postgres_sidekiq.gemfile.lock
index 994b294a734..dab03a5a448 100644
--- a/gemfiles/ruby_2.7.6_rails61_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/ruby_2.7.6_rails61_postgres_sidekiq.gemfile.lock
@@ -301,7 +301,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.7.6_rails61_semantic_logger.gemfile b/gemfiles/ruby_2.7.6_rails61_semantic_logger.gemfile
index d1efc393d19..a931926e252 100644
--- a/gemfiles/ruby_2.7.6_rails61_semantic_logger.gemfile
+++ b/gemfiles/ruby_2.7.6_rails61_semantic_logger.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.7.6_rails61_semantic_logger.gemfile.lock b/gemfiles/ruby_2.7.6_rails61_semantic_logger.gemfile.lock
index d3687cf54ac..6333436a1ea 100644
--- a/gemfiles/ruby_2.7.6_rails61_semantic_logger.gemfile.lock
+++ b/gemfiles/ruby_2.7.6_rails61_semantic_logger.gemfile.lock
@@ -292,7 +292,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.7.6_rails6_mysql2.gemfile b/gemfiles/ruby_2.7.6_rails6_mysql2.gemfile
index aa687ca4552..284961e25c6 100644
--- a/gemfiles/ruby_2.7.6_rails6_mysql2.gemfile
+++ b/gemfiles/ruby_2.7.6_rails6_mysql2.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.7.6_rails6_mysql2.gemfile.lock b/gemfiles/ruby_2.7.6_rails6_mysql2.gemfile.lock
index fceff642cfe..fc58949e03e 100644
--- a/gemfiles/ruby_2.7.6_rails6_mysql2.gemfile.lock
+++ b/gemfiles/ruby_2.7.6_rails6_mysql2.gemfile.lock
@@ -290,7 +290,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.7.6_rails6_postgres.gemfile b/gemfiles/ruby_2.7.6_rails6_postgres.gemfile
index 3188081938b..8ccf48fde85 100644
--- a/gemfiles/ruby_2.7.6_rails6_postgres.gemfile
+++ b/gemfiles/ruby_2.7.6_rails6_postgres.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.7.6_rails6_postgres.gemfile.lock b/gemfiles/ruby_2.7.6_rails6_postgres.gemfile.lock
index 91846802817..00244a93451 100644
--- a/gemfiles/ruby_2.7.6_rails6_postgres.gemfile.lock
+++ b/gemfiles/ruby_2.7.6_rails6_postgres.gemfile.lock
@@ -290,7 +290,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.7.6_rails6_postgres_redis.gemfile b/gemfiles/ruby_2.7.6_rails6_postgres_redis.gemfile
index c019de36a27..43663b81c21 100644
--- a/gemfiles/ruby_2.7.6_rails6_postgres_redis.gemfile
+++ b/gemfiles/ruby_2.7.6_rails6_postgres_redis.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.7.6_rails6_postgres_redis.gemfile.lock b/gemfiles/ruby_2.7.6_rails6_postgres_redis.gemfile.lock
index fabe9f33540..4dcc590b554 100644
--- a/gemfiles/ruby_2.7.6_rails6_postgres_redis.gemfile.lock
+++ b/gemfiles/ruby_2.7.6_rails6_postgres_redis.gemfile.lock
@@ -291,7 +291,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.7.6_rails6_postgres_redis_activesupport.gemfile b/gemfiles/ruby_2.7.6_rails6_postgres_redis_activesupport.gemfile
index 1edb4994d4a..d8fbab131a0 100644
--- a/gemfiles/ruby_2.7.6_rails6_postgres_redis_activesupport.gemfile
+++ b/gemfiles/ruby_2.7.6_rails6_postgres_redis_activesupport.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.7.6_rails6_postgres_redis_activesupport.gemfile.lock b/gemfiles/ruby_2.7.6_rails6_postgres_redis_activesupport.gemfile.lock
index 7cc8e6b8fe9..2efbb762651 100644
--- a/gemfiles/ruby_2.7.6_rails6_postgres_redis_activesupport.gemfile.lock
+++ b/gemfiles/ruby_2.7.6_rails6_postgres_redis_activesupport.gemfile.lock
@@ -307,7 +307,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.7.6_rails6_postgres_sidekiq.gemfile b/gemfiles/ruby_2.7.6_rails6_postgres_sidekiq.gemfile
index 77f4b6cb285..e7336353896 100644
--- a/gemfiles/ruby_2.7.6_rails6_postgres_sidekiq.gemfile
+++ b/gemfiles/ruby_2.7.6_rails6_postgres_sidekiq.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.7.6_rails6_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.7.6_rails6_postgres_sidekiq.gemfile.lock
index 1ff3568d60f..8f28344c321 100644
--- a/gemfiles/ruby_2.7.6_rails6_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/ruby_2.7.6_rails6_postgres_sidekiq.gemfile.lock
@@ -297,7 +297,6 @@ PLATFORMS
 
 DEPENDENCIES
   activejob
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.7.6_rails6_semantic_logger.gemfile b/gemfiles/ruby_2.7.6_rails6_semantic_logger.gemfile
index 397dc9b9ced..b38c7b42906 100644
--- a/gemfiles/ruby_2.7.6_rails6_semantic_logger.gemfile
+++ b/gemfiles/ruby_2.7.6_rails6_semantic_logger.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.7.6_rails6_semantic_logger.gemfile.lock b/gemfiles/ruby_2.7.6_rails6_semantic_logger.gemfile.lock
index fb7e8834f60..7348127ce19 100644
--- a/gemfiles/ruby_2.7.6_rails6_semantic_logger.gemfile.lock
+++ b/gemfiles/ruby_2.7.6_rails6_semantic_logger.gemfile.lock
@@ -289,7 +289,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.7.6_redis_3.gemfile b/gemfiles/ruby_2.7.6_redis_3.gemfile
index 27f2cc1a4d8..dc6de75e1fd 100644
--- a/gemfiles/ruby_2.7.6_redis_3.gemfile
+++ b/gemfiles/ruby_2.7.6_redis_3.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.7.6_redis_3.gemfile.lock b/gemfiles/ruby_2.7.6_redis_3.gemfile.lock
index 80b481b6f58..0a04fa34d72 100644
--- a/gemfiles/ruby_2.7.6_redis_3.gemfile.lock
+++ b/gemfiles/ruby_2.7.6_redis_3.gemfile.lock
@@ -151,7 +151,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.7.6_redis_4.gemfile b/gemfiles/ruby_2.7.6_redis_4.gemfile
index 33c686682e1..d027b85b754 100644
--- a/gemfiles/ruby_2.7.6_redis_4.gemfile
+++ b/gemfiles/ruby_2.7.6_redis_4.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.7.6_redis_4.gemfile.lock b/gemfiles/ruby_2.7.6_redis_4.gemfile.lock
index 586ef8cb5e7..888e2faf805 100644
--- a/gemfiles/ruby_2.7.6_redis_4.gemfile.lock
+++ b/gemfiles/ruby_2.7.6_redis_4.gemfile.lock
@@ -151,7 +151,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.7.6_redis_5.gemfile b/gemfiles/ruby_2.7.6_redis_5.gemfile
index cbbfb65114e..f701fa334ea 100644
--- a/gemfiles/ruby_2.7.6_redis_5.gemfile
+++ b/gemfiles/ruby_2.7.6_redis_5.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.7.6_redis_5.gemfile.lock b/gemfiles/ruby_2.7.6_redis_5.gemfile.lock
index 0f51eb09870..6aa34a6ef82 100644
--- a/gemfiles/ruby_2.7.6_redis_5.gemfile.lock
+++ b/gemfiles/ruby_2.7.6_redis_5.gemfile.lock
@@ -155,7 +155,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.7.6_relational_db.gemfile b/gemfiles/ruby_2.7.6_relational_db.gemfile
index d6f29e1487b..83ee62e600f 100644
--- a/gemfiles/ruby_2.7.6_relational_db.gemfile
+++ b/gemfiles/ruby_2.7.6_relational_db.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.7.6_relational_db.gemfile.lock b/gemfiles/ruby_2.7.6_relational_db.gemfile.lock
index e1379e3973e..b180b0fbf37 100644
--- a/gemfiles/ruby_2.7.6_relational_db.gemfile.lock
+++ b/gemfiles/ruby_2.7.6_relational_db.gemfile.lock
@@ -66,6 +66,7 @@ GEM
     extlz4 (0.3.4)
     ffi (1.15.5)
     google-protobuf (3.24.3-aarch64-linux)
+    google-protobuf (3.24.3-x86_64-linux)
     hashdiff (1.0.1)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
@@ -78,6 +79,8 @@ GEM
       ffi (~> 1.0)
     libddwaf (1.14.0.0.0-x86_64-linux)
       ffi (~> 1.0)
+    makara (0.5.1)
+      activerecord (>= 5.2.0)
     memory_profiler (0.9.14)
     method_source (1.0.0)
     minitest (5.20.0)
@@ -172,10 +175,10 @@ GEM
 
 PLATFORMS
   aarch64-linux
+  x86_64-linux
 
 DEPENDENCIES
   activerecord (~> 6.1.0)
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.7.6_resque2_redis3.gemfile b/gemfiles/ruby_2.7.6_resque2_redis3.gemfile
index 35f17fb5c4f..a6436c67dae 100644
--- a/gemfiles/ruby_2.7.6_resque2_redis3.gemfile
+++ b/gemfiles/ruby_2.7.6_resque2_redis3.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.7.6_resque2_redis3.gemfile.lock b/gemfiles/ruby_2.7.6_resque2_redis3.gemfile.lock
index 1b8ee602452..06614782996 100644
--- a/gemfiles/ruby_2.7.6_resque2_redis3.gemfile.lock
+++ b/gemfiles/ruby_2.7.6_resque2_redis3.gemfile.lock
@@ -172,7 +172,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.7.6_resque2_redis4.gemfile b/gemfiles/ruby_2.7.6_resque2_redis4.gemfile
index ba62de34a52..3bbd99351c2 100644
--- a/gemfiles/ruby_2.7.6_resque2_redis4.gemfile
+++ b/gemfiles/ruby_2.7.6_resque2_redis4.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.7.6_resque2_redis4.gemfile.lock b/gemfiles/ruby_2.7.6_resque2_redis4.gemfile.lock
index 933605e6ead..8733f21856f 100644
--- a/gemfiles/ruby_2.7.6_resque2_redis4.gemfile.lock
+++ b/gemfiles/ruby_2.7.6_resque2_redis4.gemfile.lock
@@ -172,7 +172,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_2.7.6_sinatra.gemfile b/gemfiles/ruby_2.7.6_sinatra.gemfile
index bdca6032f52..7556010769f 100644
--- a/gemfiles/ruby_2.7.6_sinatra.gemfile
+++ b/gemfiles/ruby_2.7.6_sinatra.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_2.7.6_sinatra.gemfile.lock b/gemfiles/ruby_2.7.6_sinatra.gemfile.lock
index cea60f8e731..bf52ca83f75 100644
--- a/gemfiles/ruby_2.7.6_sinatra.gemfile.lock
+++ b/gemfiles/ruby_2.7.6_sinatra.gemfile.lock
@@ -164,7 +164,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.0.4_aws.gemfile b/gemfiles/ruby_3.0.4_aws.gemfile
index a30c7ab0085..327e2769968 100644
--- a/gemfiles/ruby_3.0.4_aws.gemfile
+++ b/gemfiles/ruby_3.0.4_aws.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.0.4_aws.gemfile.lock b/gemfiles/ruby_3.0.4_aws.gemfile.lock
index f4eb4bc94f9..f1b85e5da80 100644
--- a/gemfiles/ruby_3.0.4_aws.gemfile.lock
+++ b/gemfiles/ruby_3.0.4_aws.gemfile.lock
@@ -1471,14 +1471,18 @@ GEM
     extlz4 (0.3.4)
     ffi (1.15.5)
     google-protobuf (3.24.2-aarch64-linux)
+    google-protobuf (3.24.2-x86_64-linux)
     hashdiff (1.0.1)
     jmespath (1.6.2)
     json (2.6.3)
     json-schema (2.8.1)
       addressable (>= 2.4)
     libdatadog (4.0.0.1.0-aarch64-linux)
+    libdatadog (4.0.0.1.0-x86_64-linux)
     libddwaf (1.14.0.0.0-aarch64-linux)
       ffi (~> 1.0)
+    libddwaf (1.14.0.0.0-x86_64-linux)
+      ffi (~> 1.0)
     memory_profiler (0.9.14)
     method_source (1.0.0)
     msgpack (1.7.2)
@@ -1570,9 +1574,9 @@ GEM
 
 PLATFORMS
   aarch64-linux
+  x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   aws-sdk
   benchmark-ips (~> 2.8)
diff --git a/gemfiles/ruby_3.0.4_contrib.gemfile b/gemfiles/ruby_3.0.4_contrib.gemfile
index 93ddb7359e3..36c93e39f06 100644
--- a/gemfiles/ruby_3.0.4_contrib.gemfile
+++ b/gemfiles/ruby_3.0.4_contrib.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.0.4_contrib.gemfile.lock b/gemfiles/ruby_3.0.4_contrib.gemfile.lock
index 124ef1b7337..f283d4cdd09 100644
--- a/gemfiles/ruby_3.0.4_contrib.gemfile.lock
+++ b/gemfiles/ruby_3.0.4_contrib.gemfile.lock
@@ -331,7 +331,6 @@ DEPENDENCIES
   actionpack (~> 7)
   actionview (~> 7)
   active_model_serializers (>= 0.10.0)
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.0.4_contrib_old.gemfile b/gemfiles/ruby_3.0.4_contrib_old.gemfile
index 6ab984e46da..4dba68adc9d 100644
--- a/gemfiles/ruby_3.0.4_contrib_old.gemfile
+++ b/gemfiles/ruby_3.0.4_contrib_old.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.0.4_contrib_old.gemfile.lock b/gemfiles/ruby_3.0.4_contrib_old.gemfile.lock
index 22bac92978c..7abb853ea56 100644
--- a/gemfiles/ruby_3.0.4_contrib_old.gemfile.lock
+++ b/gemfiles/ruby_3.0.4_contrib_old.gemfile.lock
@@ -213,7 +213,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.0.4_core_old.gemfile b/gemfiles/ruby_3.0.4_core_old.gemfile
index 4ec7e3773c0..e5541d39095 100644
--- a/gemfiles/ruby_3.0.4_core_old.gemfile
+++ b/gemfiles/ruby_3.0.4_core_old.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.0.4_core_old.gemfile.lock b/gemfiles/ruby_3.0.4_core_old.gemfile.lock
index ad1f890c274..079e62fa220 100644
--- a/gemfiles/ruby_3.0.4_core_old.gemfile.lock
+++ b/gemfiles/ruby_3.0.4_core_old.gemfile.lock
@@ -150,7 +150,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.0.4_http.gemfile b/gemfiles/ruby_3.0.4_http.gemfile
index 78b03ef8978..51dbfdef679 100644
--- a/gemfiles/ruby_3.0.4_http.gemfile
+++ b/gemfiles/ruby_3.0.4_http.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.0.4_http.gemfile.lock b/gemfiles/ruby_3.0.4_http.gemfile.lock
index ff4f88128d3..6814a7b950c 100644
--- a/gemfiles/ruby_3.0.4_http.gemfile.lock
+++ b/gemfiles/ruby_3.0.4_http.gemfile.lock
@@ -70,6 +70,7 @@ GEM
       ffi (>= 1.0.0)
       rake
     google-protobuf (3.24.3-aarch64-linux)
+    google-protobuf (3.24.3-x86_64-linux)
     hashdiff (1.0.1)
     http (5.0.1)
       addressable (~> 2.3)
@@ -85,8 +86,11 @@ GEM
     json-schema (2.8.1)
       addressable (>= 2.4)
     libdatadog (4.0.0.1.0-aarch64-linux)
+    libdatadog (4.0.0.1.0-x86_64-linux)
     libddwaf (1.14.0.0.0-aarch64-linux)
       ffi (~> 1.0)
+    libddwaf (1.14.0.0.0-x86_64-linux)
+      ffi (~> 1.0)
     llhttp-ffi (0.3.1)
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
@@ -202,9 +206,9 @@ GEM
 
 PLATFORMS
   aarch64-linux
+  x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.0.4_opentelemetry.gemfile b/gemfiles/ruby_3.0.4_opentelemetry.gemfile
index 2c747d1d7b4..f1e98f39272 100644
--- a/gemfiles/ruby_3.0.4_opentelemetry.gemfile
+++ b/gemfiles/ruby_3.0.4_opentelemetry.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.0.4_opentelemetry.gemfile.lock b/gemfiles/ruby_3.0.4_opentelemetry.gemfile.lock
index 3feab7fae18..eb6b5c2eac6 100755
--- a/gemfiles/ruby_3.0.4_opentelemetry.gemfile.lock
+++ b/gemfiles/ruby_3.0.4_opentelemetry.gemfile.lock
@@ -162,7 +162,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.0.4_rails61_mysql2.gemfile b/gemfiles/ruby_3.0.4_rails61_mysql2.gemfile
index 0bed00ca565..498e5602ca2 100644
--- a/gemfiles/ruby_3.0.4_rails61_mysql2.gemfile
+++ b/gemfiles/ruby_3.0.4_rails61_mysql2.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.0.4_rails61_mysql2.gemfile.lock b/gemfiles/ruby_3.0.4_rails61_mysql2.gemfile.lock
index e484bd556a1..08062e48683 100644
--- a/gemfiles/ruby_3.0.4_rails61_mysql2.gemfile.lock
+++ b/gemfiles/ruby_3.0.4_rails61_mysql2.gemfile.lock
@@ -293,7 +293,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.0.4_rails61_postgres.gemfile b/gemfiles/ruby_3.0.4_rails61_postgres.gemfile
index 477f7dc4943..e8ccfcaa501 100644
--- a/gemfiles/ruby_3.0.4_rails61_postgres.gemfile
+++ b/gemfiles/ruby_3.0.4_rails61_postgres.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.0.4_rails61_postgres.gemfile.lock b/gemfiles/ruby_3.0.4_rails61_postgres.gemfile.lock
index 16af3f22004..21bb7837900 100644
--- a/gemfiles/ruby_3.0.4_rails61_postgres.gemfile.lock
+++ b/gemfiles/ruby_3.0.4_rails61_postgres.gemfile.lock
@@ -293,7 +293,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.0.4_rails61_postgres_redis.gemfile b/gemfiles/ruby_3.0.4_rails61_postgres_redis.gemfile
index e9d1d8ca040..d41f3711d2c 100644
--- a/gemfiles/ruby_3.0.4_rails61_postgres_redis.gemfile
+++ b/gemfiles/ruby_3.0.4_rails61_postgres_redis.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.0.4_rails61_postgres_redis.gemfile.lock b/gemfiles/ruby_3.0.4_rails61_postgres_redis.gemfile.lock
index 58024b0d5b4..1d5795a404b 100644
--- a/gemfiles/ruby_3.0.4_rails61_postgres_redis.gemfile.lock
+++ b/gemfiles/ruby_3.0.4_rails61_postgres_redis.gemfile.lock
@@ -294,7 +294,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.0.4_rails61_postgres_sidekiq.gemfile b/gemfiles/ruby_3.0.4_rails61_postgres_sidekiq.gemfile
index d75a2b30a93..069e34b00cf 100644
--- a/gemfiles/ruby_3.0.4_rails61_postgres_sidekiq.gemfile
+++ b/gemfiles/ruby_3.0.4_rails61_postgres_sidekiq.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.0.4_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_3.0.4_rails61_postgres_sidekiq.gemfile.lock
index 7de98249cbb..c3e115b442b 100644
--- a/gemfiles/ruby_3.0.4_rails61_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/ruby_3.0.4_rails61_postgres_sidekiq.gemfile.lock
@@ -307,7 +307,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.0.4_rails61_semantic_logger.gemfile b/gemfiles/ruby_3.0.4_rails61_semantic_logger.gemfile
index 0c14d3ecee2..49d63ac4226 100644
--- a/gemfiles/ruby_3.0.4_rails61_semantic_logger.gemfile
+++ b/gemfiles/ruby_3.0.4_rails61_semantic_logger.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.0.4_rails61_semantic_logger.gemfile.lock b/gemfiles/ruby_3.0.4_rails61_semantic_logger.gemfile.lock
index ad083911306..fd6476cba45 100644
--- a/gemfiles/ruby_3.0.4_rails61_semantic_logger.gemfile.lock
+++ b/gemfiles/ruby_3.0.4_rails61_semantic_logger.gemfile.lock
@@ -292,7 +292,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.0.4_redis_3.gemfile b/gemfiles/ruby_3.0.4_redis_3.gemfile
index 67ade73ec03..32fd9275f34 100644
--- a/gemfiles/ruby_3.0.4_redis_3.gemfile
+++ b/gemfiles/ruby_3.0.4_redis_3.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.0.4_redis_3.gemfile.lock b/gemfiles/ruby_3.0.4_redis_3.gemfile.lock
index b00f9b395d1..7e7ad391d8f 100644
--- a/gemfiles/ruby_3.0.4_redis_3.gemfile.lock
+++ b/gemfiles/ruby_3.0.4_redis_3.gemfile.lock
@@ -151,7 +151,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.0.4_redis_4.gemfile b/gemfiles/ruby_3.0.4_redis_4.gemfile
index 054c9a3b0e5..64c578b91b9 100644
--- a/gemfiles/ruby_3.0.4_redis_4.gemfile
+++ b/gemfiles/ruby_3.0.4_redis_4.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.0.4_redis_4.gemfile.lock b/gemfiles/ruby_3.0.4_redis_4.gemfile.lock
index b78d4d36fe0..501a88c97be 100644
--- a/gemfiles/ruby_3.0.4_redis_4.gemfile.lock
+++ b/gemfiles/ruby_3.0.4_redis_4.gemfile.lock
@@ -151,7 +151,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.0.4_redis_5.gemfile b/gemfiles/ruby_3.0.4_redis_5.gemfile
index ae8117902be..fad7224676e 100644
--- a/gemfiles/ruby_3.0.4_redis_5.gemfile
+++ b/gemfiles/ruby_3.0.4_redis_5.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.0.4_redis_5.gemfile.lock b/gemfiles/ruby_3.0.4_redis_5.gemfile.lock
index 09251f6e048..23524931840 100644
--- a/gemfiles/ruby_3.0.4_redis_5.gemfile.lock
+++ b/gemfiles/ruby_3.0.4_redis_5.gemfile.lock
@@ -155,7 +155,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.0.4_relational_db.gemfile b/gemfiles/ruby_3.0.4_relational_db.gemfile
index 76d5a5f6310..81682b6b036 100644
--- a/gemfiles/ruby_3.0.4_relational_db.gemfile
+++ b/gemfiles/ruby_3.0.4_relational_db.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.0.4_relational_db.gemfile.lock b/gemfiles/ruby_3.0.4_relational_db.gemfile.lock
index 9b2b821b5ff..3864b9d40c2 100644
--- a/gemfiles/ruby_3.0.4_relational_db.gemfile.lock
+++ b/gemfiles/ruby_3.0.4_relational_db.gemfile.lock
@@ -65,6 +65,7 @@ GEM
     extlz4 (0.3.4)
     ffi (1.15.5)
     google-protobuf (3.24.3-aarch64-linux)
+    google-protobuf (3.24.3-x86_64-linux)
     hashdiff (1.0.1)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
@@ -159,6 +160,7 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     sqlite3 (1.6.6-aarch64-linux)
+    sqlite3 (1.6.6-x86_64-linux)
     thor (1.2.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
@@ -173,10 +175,10 @@ GEM
 
 PLATFORMS
   aarch64-linux
+  x86_64-linux
 
 DEPENDENCIES
   activerecord (~> 7)
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.0.4_resque2_redis3.gemfile b/gemfiles/ruby_3.0.4_resque2_redis3.gemfile
index 0c88e148230..7ff08bf66a4 100644
--- a/gemfiles/ruby_3.0.4_resque2_redis3.gemfile
+++ b/gemfiles/ruby_3.0.4_resque2_redis3.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.0.4_resque2_redis3.gemfile.lock b/gemfiles/ruby_3.0.4_resque2_redis3.gemfile.lock
index 6f6a4509967..2f0ce682ffe 100644
--- a/gemfiles/ruby_3.0.4_resque2_redis3.gemfile.lock
+++ b/gemfiles/ruby_3.0.4_resque2_redis3.gemfile.lock
@@ -172,7 +172,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.0.4_resque2_redis4.gemfile b/gemfiles/ruby_3.0.4_resque2_redis4.gemfile
index d361de43441..ec0bb7835ed 100644
--- a/gemfiles/ruby_3.0.4_resque2_redis4.gemfile
+++ b/gemfiles/ruby_3.0.4_resque2_redis4.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.0.4_resque2_redis4.gemfile.lock b/gemfiles/ruby_3.0.4_resque2_redis4.gemfile.lock
index 9cca10398e1..9207d7133fe 100644
--- a/gemfiles/ruby_3.0.4_resque2_redis4.gemfile.lock
+++ b/gemfiles/ruby_3.0.4_resque2_redis4.gemfile.lock
@@ -176,7 +176,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.0.4_sinatra.gemfile b/gemfiles/ruby_3.0.4_sinatra.gemfile
index 7ca9792cf07..b2fb6fbee62 100644
--- a/gemfiles/ruby_3.0.4_sinatra.gemfile
+++ b/gemfiles/ruby_3.0.4_sinatra.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.0.4_sinatra.gemfile.lock b/gemfiles/ruby_3.0.4_sinatra.gemfile.lock
index a95bfa199e2..94df3959325 100644
--- a/gemfiles/ruby_3.0.4_sinatra.gemfile.lock
+++ b/gemfiles/ruby_3.0.4_sinatra.gemfile.lock
@@ -164,7 +164,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.1.2_aws.gemfile b/gemfiles/ruby_3.1.2_aws.gemfile
index a30c7ab0085..327e2769968 100644
--- a/gemfiles/ruby_3.1.2_aws.gemfile
+++ b/gemfiles/ruby_3.1.2_aws.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.1.2_aws.gemfile.lock b/gemfiles/ruby_3.1.2_aws.gemfile.lock
index f4eb4bc94f9..f1b85e5da80 100644
--- a/gemfiles/ruby_3.1.2_aws.gemfile.lock
+++ b/gemfiles/ruby_3.1.2_aws.gemfile.lock
@@ -1471,14 +1471,18 @@ GEM
     extlz4 (0.3.4)
     ffi (1.15.5)
     google-protobuf (3.24.2-aarch64-linux)
+    google-protobuf (3.24.2-x86_64-linux)
     hashdiff (1.0.1)
     jmespath (1.6.2)
     json (2.6.3)
     json-schema (2.8.1)
       addressable (>= 2.4)
     libdatadog (4.0.0.1.0-aarch64-linux)
+    libdatadog (4.0.0.1.0-x86_64-linux)
     libddwaf (1.14.0.0.0-aarch64-linux)
       ffi (~> 1.0)
+    libddwaf (1.14.0.0.0-x86_64-linux)
+      ffi (~> 1.0)
     memory_profiler (0.9.14)
     method_source (1.0.0)
     msgpack (1.7.2)
@@ -1570,9 +1574,9 @@ GEM
 
 PLATFORMS
   aarch64-linux
+  x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   aws-sdk
   benchmark-ips (~> 2.8)
diff --git a/gemfiles/ruby_3.1.2_contrib.gemfile b/gemfiles/ruby_3.1.2_contrib.gemfile
index 93ddb7359e3..36c93e39f06 100644
--- a/gemfiles/ruby_3.1.2_contrib.gemfile
+++ b/gemfiles/ruby_3.1.2_contrib.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.1.2_contrib.gemfile.lock b/gemfiles/ruby_3.1.2_contrib.gemfile.lock
index 124ef1b7337..f283d4cdd09 100644
--- a/gemfiles/ruby_3.1.2_contrib.gemfile.lock
+++ b/gemfiles/ruby_3.1.2_contrib.gemfile.lock
@@ -331,7 +331,6 @@ DEPENDENCIES
   actionpack (~> 7)
   actionview (~> 7)
   active_model_serializers (>= 0.10.0)
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.1.2_contrib_old.gemfile b/gemfiles/ruby_3.1.2_contrib_old.gemfile
index 6ab984e46da..4dba68adc9d 100644
--- a/gemfiles/ruby_3.1.2_contrib_old.gemfile
+++ b/gemfiles/ruby_3.1.2_contrib_old.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.1.2_contrib_old.gemfile.lock b/gemfiles/ruby_3.1.2_contrib_old.gemfile.lock
index 22bac92978c..7abb853ea56 100644
--- a/gemfiles/ruby_3.1.2_contrib_old.gemfile.lock
+++ b/gemfiles/ruby_3.1.2_contrib_old.gemfile.lock
@@ -213,7 +213,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.1.2_core_old.gemfile b/gemfiles/ruby_3.1.2_core_old.gemfile
index 4ec7e3773c0..e5541d39095 100644
--- a/gemfiles/ruby_3.1.2_core_old.gemfile
+++ b/gemfiles/ruby_3.1.2_core_old.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.1.2_core_old.gemfile.lock b/gemfiles/ruby_3.1.2_core_old.gemfile.lock
index ad1f890c274..079e62fa220 100644
--- a/gemfiles/ruby_3.1.2_core_old.gemfile.lock
+++ b/gemfiles/ruby_3.1.2_core_old.gemfile.lock
@@ -150,7 +150,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.1.2_http.gemfile b/gemfiles/ruby_3.1.2_http.gemfile
index 78b03ef8978..51dbfdef679 100644
--- a/gemfiles/ruby_3.1.2_http.gemfile
+++ b/gemfiles/ruby_3.1.2_http.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.1.2_http.gemfile.lock b/gemfiles/ruby_3.1.2_http.gemfile.lock
index ff4f88128d3..6814a7b950c 100644
--- a/gemfiles/ruby_3.1.2_http.gemfile.lock
+++ b/gemfiles/ruby_3.1.2_http.gemfile.lock
@@ -70,6 +70,7 @@ GEM
       ffi (>= 1.0.0)
       rake
     google-protobuf (3.24.3-aarch64-linux)
+    google-protobuf (3.24.3-x86_64-linux)
     hashdiff (1.0.1)
     http (5.0.1)
       addressable (~> 2.3)
@@ -85,8 +86,11 @@ GEM
     json-schema (2.8.1)
       addressable (>= 2.4)
     libdatadog (4.0.0.1.0-aarch64-linux)
+    libdatadog (4.0.0.1.0-x86_64-linux)
     libddwaf (1.14.0.0.0-aarch64-linux)
       ffi (~> 1.0)
+    libddwaf (1.14.0.0.0-x86_64-linux)
+      ffi (~> 1.0)
     llhttp-ffi (0.3.1)
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
@@ -202,9 +206,9 @@ GEM
 
 PLATFORMS
   aarch64-linux
+  x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.1.2_opentelemetry.gemfile b/gemfiles/ruby_3.1.2_opentelemetry.gemfile
index 2c747d1d7b4..f1e98f39272 100644
--- a/gemfiles/ruby_3.1.2_opentelemetry.gemfile
+++ b/gemfiles/ruby_3.1.2_opentelemetry.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.1.2_opentelemetry.gemfile.lock b/gemfiles/ruby_3.1.2_opentelemetry.gemfile.lock
index 6d4a2f85361..cb936acbdef 100644
--- a/gemfiles/ruby_3.1.2_opentelemetry.gemfile.lock
+++ b/gemfiles/ruby_3.1.2_opentelemetry.gemfile.lock
@@ -167,7 +167,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.1.2_rails61_mysql2.gemfile b/gemfiles/ruby_3.1.2_rails61_mysql2.gemfile
index 0bed00ca565..498e5602ca2 100644
--- a/gemfiles/ruby_3.1.2_rails61_mysql2.gemfile
+++ b/gemfiles/ruby_3.1.2_rails61_mysql2.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.1.2_rails61_mysql2.gemfile.lock b/gemfiles/ruby_3.1.2_rails61_mysql2.gemfile.lock
index e484bd556a1..08062e48683 100644
--- a/gemfiles/ruby_3.1.2_rails61_mysql2.gemfile.lock
+++ b/gemfiles/ruby_3.1.2_rails61_mysql2.gemfile.lock
@@ -293,7 +293,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.1.2_rails61_postgres.gemfile b/gemfiles/ruby_3.1.2_rails61_postgres.gemfile
index 477f7dc4943..e8ccfcaa501 100644
--- a/gemfiles/ruby_3.1.2_rails61_postgres.gemfile
+++ b/gemfiles/ruby_3.1.2_rails61_postgres.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.1.2_rails61_postgres.gemfile.lock b/gemfiles/ruby_3.1.2_rails61_postgres.gemfile.lock
index 16af3f22004..21bb7837900 100644
--- a/gemfiles/ruby_3.1.2_rails61_postgres.gemfile.lock
+++ b/gemfiles/ruby_3.1.2_rails61_postgres.gemfile.lock
@@ -293,7 +293,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.1.2_rails61_postgres_redis.gemfile b/gemfiles/ruby_3.1.2_rails61_postgres_redis.gemfile
index e9d1d8ca040..d41f3711d2c 100644
--- a/gemfiles/ruby_3.1.2_rails61_postgres_redis.gemfile
+++ b/gemfiles/ruby_3.1.2_rails61_postgres_redis.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.1.2_rails61_postgres_redis.gemfile.lock b/gemfiles/ruby_3.1.2_rails61_postgres_redis.gemfile.lock
index 58024b0d5b4..1d5795a404b 100644
--- a/gemfiles/ruby_3.1.2_rails61_postgres_redis.gemfile.lock
+++ b/gemfiles/ruby_3.1.2_rails61_postgres_redis.gemfile.lock
@@ -294,7 +294,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.1.2_rails61_postgres_sidekiq.gemfile b/gemfiles/ruby_3.1.2_rails61_postgres_sidekiq.gemfile
index d75a2b30a93..069e34b00cf 100644
--- a/gemfiles/ruby_3.1.2_rails61_postgres_sidekiq.gemfile
+++ b/gemfiles/ruby_3.1.2_rails61_postgres_sidekiq.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.1.2_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_3.1.2_rails61_postgres_sidekiq.gemfile.lock
index 7de98249cbb..c3e115b442b 100644
--- a/gemfiles/ruby_3.1.2_rails61_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/ruby_3.1.2_rails61_postgres_sidekiq.gemfile.lock
@@ -307,7 +307,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.1.2_rails61_semantic_logger.gemfile b/gemfiles/ruby_3.1.2_rails61_semantic_logger.gemfile
index 0c14d3ecee2..49d63ac4226 100644
--- a/gemfiles/ruby_3.1.2_rails61_semantic_logger.gemfile
+++ b/gemfiles/ruby_3.1.2_rails61_semantic_logger.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.1.2_rails61_semantic_logger.gemfile.lock b/gemfiles/ruby_3.1.2_rails61_semantic_logger.gemfile.lock
index ad083911306..fd6476cba45 100644
--- a/gemfiles/ruby_3.1.2_rails61_semantic_logger.gemfile.lock
+++ b/gemfiles/ruby_3.1.2_rails61_semantic_logger.gemfile.lock
@@ -292,7 +292,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.1.2_redis_3.gemfile b/gemfiles/ruby_3.1.2_redis_3.gemfile
index 67ade73ec03..32fd9275f34 100644
--- a/gemfiles/ruby_3.1.2_redis_3.gemfile
+++ b/gemfiles/ruby_3.1.2_redis_3.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.1.2_redis_3.gemfile.lock b/gemfiles/ruby_3.1.2_redis_3.gemfile.lock
index b00f9b395d1..7e7ad391d8f 100644
--- a/gemfiles/ruby_3.1.2_redis_3.gemfile.lock
+++ b/gemfiles/ruby_3.1.2_redis_3.gemfile.lock
@@ -151,7 +151,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.1.2_redis_4.gemfile b/gemfiles/ruby_3.1.2_redis_4.gemfile
index 054c9a3b0e5..64c578b91b9 100644
--- a/gemfiles/ruby_3.1.2_redis_4.gemfile
+++ b/gemfiles/ruby_3.1.2_redis_4.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.1.2_redis_4.gemfile.lock b/gemfiles/ruby_3.1.2_redis_4.gemfile.lock
index b78d4d36fe0..501a88c97be 100644
--- a/gemfiles/ruby_3.1.2_redis_4.gemfile.lock
+++ b/gemfiles/ruby_3.1.2_redis_4.gemfile.lock
@@ -151,7 +151,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.1.2_redis_5.gemfile b/gemfiles/ruby_3.1.2_redis_5.gemfile
index ae8117902be..fad7224676e 100644
--- a/gemfiles/ruby_3.1.2_redis_5.gemfile
+++ b/gemfiles/ruby_3.1.2_redis_5.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.1.2_redis_5.gemfile.lock b/gemfiles/ruby_3.1.2_redis_5.gemfile.lock
index 09251f6e048..23524931840 100644
--- a/gemfiles/ruby_3.1.2_redis_5.gemfile.lock
+++ b/gemfiles/ruby_3.1.2_redis_5.gemfile.lock
@@ -155,7 +155,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.1.2_relational_db.gemfile b/gemfiles/ruby_3.1.2_relational_db.gemfile
index 76d5a5f6310..81682b6b036 100644
--- a/gemfiles/ruby_3.1.2_relational_db.gemfile
+++ b/gemfiles/ruby_3.1.2_relational_db.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.1.2_relational_db.gemfile.lock b/gemfiles/ruby_3.1.2_relational_db.gemfile.lock
index c66f4c1f341..3864b9d40c2 100644
--- a/gemfiles/ruby_3.1.2_relational_db.gemfile.lock
+++ b/gemfiles/ruby_3.1.2_relational_db.gemfile.lock
@@ -65,6 +65,7 @@ GEM
     extlz4 (0.3.4)
     ffi (1.15.5)
     google-protobuf (3.24.3-aarch64-linux)
+    google-protobuf (3.24.3-x86_64-linux)
     hashdiff (1.0.1)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
@@ -77,6 +78,8 @@ GEM
       ffi (~> 1.0)
     libddwaf (1.14.0.0.0-x86_64-linux)
       ffi (~> 1.0)
+    makara (0.6.0.pre)
+      activerecord (>= 5.2.0)
     memory_profiler (0.9.14)
     method_source (1.0.0)
     minitest (5.20.0)
@@ -157,6 +160,7 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     sqlite3 (1.6.6-aarch64-linux)
+    sqlite3 (1.6.6-x86_64-linux)
     thor (1.2.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
@@ -171,10 +175,10 @@ GEM
 
 PLATFORMS
   aarch64-linux
+  x86_64-linux
 
 DEPENDENCIES
   activerecord (~> 7)
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.1.2_resque2_redis3.gemfile b/gemfiles/ruby_3.1.2_resque2_redis3.gemfile
index 0c88e148230..7ff08bf66a4 100644
--- a/gemfiles/ruby_3.1.2_resque2_redis3.gemfile
+++ b/gemfiles/ruby_3.1.2_resque2_redis3.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.1.2_resque2_redis3.gemfile.lock b/gemfiles/ruby_3.1.2_resque2_redis3.gemfile.lock
index 6f6a4509967..2f0ce682ffe 100644
--- a/gemfiles/ruby_3.1.2_resque2_redis3.gemfile.lock
+++ b/gemfiles/ruby_3.1.2_resque2_redis3.gemfile.lock
@@ -172,7 +172,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.1.2_resque2_redis4.gemfile b/gemfiles/ruby_3.1.2_resque2_redis4.gemfile
index d361de43441..ec0bb7835ed 100644
--- a/gemfiles/ruby_3.1.2_resque2_redis4.gemfile
+++ b/gemfiles/ruby_3.1.2_resque2_redis4.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.1.2_resque2_redis4.gemfile.lock b/gemfiles/ruby_3.1.2_resque2_redis4.gemfile.lock
index 9cca10398e1..9207d7133fe 100644
--- a/gemfiles/ruby_3.1.2_resque2_redis4.gemfile.lock
+++ b/gemfiles/ruby_3.1.2_resque2_redis4.gemfile.lock
@@ -176,7 +176,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.1.2_sinatra.gemfile b/gemfiles/ruby_3.1.2_sinatra.gemfile
index 7ca9792cf07..b2fb6fbee62 100644
--- a/gemfiles/ruby_3.1.2_sinatra.gemfile
+++ b/gemfiles/ruby_3.1.2_sinatra.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.1.2_sinatra.gemfile.lock b/gemfiles/ruby_3.1.2_sinatra.gemfile.lock
index a95bfa199e2..94df3959325 100644
--- a/gemfiles/ruby_3.1.2_sinatra.gemfile.lock
+++ b/gemfiles/ruby_3.1.2_sinatra.gemfile.lock
@@ -164,7 +164,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.2.0_aws.gemfile b/gemfiles/ruby_3.2.0_aws.gemfile
index 21a80c679af..30acc9d9216 100644
--- a/gemfiles/ruby_3.2.0_aws.gemfile
+++ b/gemfiles/ruby_3.2.0_aws.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.2.0_aws.gemfile.lock b/gemfiles/ruby_3.2.0_aws.gemfile.lock
index e5016b233d1..16846a0f465 100644
--- a/gemfiles/ruby_3.2.0_aws.gemfile.lock
+++ b/gemfiles/ruby_3.2.0_aws.gemfile.lock
@@ -1470,14 +1470,18 @@ GEM
     extlz4 (0.3.4)
     ffi (1.15.5)
     google-protobuf (3.24.2-aarch64-linux)
+    google-protobuf (3.24.2-x86_64-linux)
     hashdiff (1.0.1)
     jmespath (1.6.2)
     json (2.6.3)
     json-schema (2.8.1)
       addressable (>= 2.4)
     libdatadog (4.0.0.1.0-aarch64-linux)
+    libdatadog (4.0.0.1.0-x86_64-linux)
     libddwaf (1.14.0.0.0-aarch64-linux)
       ffi (~> 1.0)
+    libddwaf (1.14.0.0.0-x86_64-linux)
+      ffi (~> 1.0)
     memory_profiler (0.9.14)
     method_source (1.0.0)
     msgpack (1.7.2)
@@ -1566,9 +1570,9 @@ GEM
 
 PLATFORMS
   aarch64-linux
+  x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   aws-sdk
   benchmark-ips (~> 2.8)
diff --git a/gemfiles/ruby_3.2.0_contrib.gemfile b/gemfiles/ruby_3.2.0_contrib.gemfile
index a6642dbab3b..f2c84a41d9a 100644
--- a/gemfiles/ruby_3.2.0_contrib.gemfile
+++ b/gemfiles/ruby_3.2.0_contrib.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.2.0_contrib.gemfile.lock b/gemfiles/ruby_3.2.0_contrib.gemfile.lock
index 96850854ba7..28768192575 100644
--- a/gemfiles/ruby_3.2.0_contrib.gemfile.lock
+++ b/gemfiles/ruby_3.2.0_contrib.gemfile.lock
@@ -325,7 +325,6 @@ DEPENDENCIES
   actionpack (~> 7)
   actionview (~> 7)
   active_model_serializers (>= 0.10.0)
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.2.0_contrib_old.gemfile b/gemfiles/ruby_3.2.0_contrib_old.gemfile
index 8e0d25e768d..118ba0c5885 100644
--- a/gemfiles/ruby_3.2.0_contrib_old.gemfile
+++ b/gemfiles/ruby_3.2.0_contrib_old.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.2.0_contrib_old.gemfile.lock b/gemfiles/ruby_3.2.0_contrib_old.gemfile.lock
index 78728b3788c..46beaf1414f 100644
--- a/gemfiles/ruby_3.2.0_contrib_old.gemfile.lock
+++ b/gemfiles/ruby_3.2.0_contrib_old.gemfile.lock
@@ -209,7 +209,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.2.0_core_old.gemfile b/gemfiles/ruby_3.2.0_core_old.gemfile
index df73c7ef022..78027b8ec1a 100644
--- a/gemfiles/ruby_3.2.0_core_old.gemfile
+++ b/gemfiles/ruby_3.2.0_core_old.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.2.0_core_old.gemfile.lock b/gemfiles/ruby_3.2.0_core_old.gemfile.lock
index eb75f029cb1..cf5e8972db0 100644
--- a/gemfiles/ruby_3.2.0_core_old.gemfile.lock
+++ b/gemfiles/ruby_3.2.0_core_old.gemfile.lock
@@ -146,7 +146,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.2.0_http.gemfile b/gemfiles/ruby_3.2.0_http.gemfile
index 13588e2113b..b02a88ba50b 100644
--- a/gemfiles/ruby_3.2.0_http.gemfile
+++ b/gemfiles/ruby_3.2.0_http.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.2.0_http.gemfile.lock b/gemfiles/ruby_3.2.0_http.gemfile.lock
index c550f5b45eb..d6a92ab7881 100644
--- a/gemfiles/ruby_3.2.0_http.gemfile.lock
+++ b/gemfiles/ruby_3.2.0_http.gemfile.lock
@@ -69,6 +69,7 @@ GEM
       ffi (>= 1.0.0)
       rake
     google-protobuf (3.24.3-aarch64-linux)
+    google-protobuf (3.24.3-x86_64-linux)
     hashdiff (1.0.1)
     http (5.0.1)
       addressable (~> 2.3)
@@ -84,8 +85,11 @@ GEM
     json-schema (2.8.1)
       addressable (>= 2.4)
     libdatadog (4.0.0.1.0-aarch64-linux)
+    libdatadog (4.0.0.1.0-x86_64-linux)
     libddwaf (1.14.0.0.0-aarch64-linux)
       ffi (~> 1.0)
+    libddwaf (1.14.0.0.0-x86_64-linux)
+      ffi (~> 1.0)
     llhttp-ffi (0.3.1)
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
@@ -198,9 +202,9 @@ GEM
 
 PLATFORMS
   aarch64-linux
+  x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.2.0_opentelemetry.gemfile b/gemfiles/ruby_3.2.0_opentelemetry.gemfile
index 8a5235b54e7..57959103576 100644
--- a/gemfiles/ruby_3.2.0_opentelemetry.gemfile
+++ b/gemfiles/ruby_3.2.0_opentelemetry.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.2.0_opentelemetry.gemfile.lock b/gemfiles/ruby_3.2.0_opentelemetry.gemfile.lock
index 606609ea5f3..4b25029c5b1 100644
--- a/gemfiles/ruby_3.2.0_opentelemetry.gemfile.lock
+++ b/gemfiles/ruby_3.2.0_opentelemetry.gemfile.lock
@@ -158,7 +158,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.2.0_rails61_mysql2.gemfile b/gemfiles/ruby_3.2.0_rails61_mysql2.gemfile
index 5a565aaecfe..833bc4eabe2 100644
--- a/gemfiles/ruby_3.2.0_rails61_mysql2.gemfile
+++ b/gemfiles/ruby_3.2.0_rails61_mysql2.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.2.0_rails61_mysql2.gemfile.lock b/gemfiles/ruby_3.2.0_rails61_mysql2.gemfile.lock
index 2d1a16bce12..0ab960407c3 100644
--- a/gemfiles/ruby_3.2.0_rails61_mysql2.gemfile.lock
+++ b/gemfiles/ruby_3.2.0_rails61_mysql2.gemfile.lock
@@ -287,7 +287,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.2.0_rails61_postgres.gemfile b/gemfiles/ruby_3.2.0_rails61_postgres.gemfile
index 0c0fdc0389f..16376edd2f4 100644
--- a/gemfiles/ruby_3.2.0_rails61_postgres.gemfile
+++ b/gemfiles/ruby_3.2.0_rails61_postgres.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.2.0_rails61_postgres.gemfile.lock b/gemfiles/ruby_3.2.0_rails61_postgres.gemfile.lock
index d283832f00c..0af90aca1b4 100644
--- a/gemfiles/ruby_3.2.0_rails61_postgres.gemfile.lock
+++ b/gemfiles/ruby_3.2.0_rails61_postgres.gemfile.lock
@@ -289,7 +289,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.2.0_rails61_postgres_redis.gemfile b/gemfiles/ruby_3.2.0_rails61_postgres_redis.gemfile
index d41233869a8..75d643209ba 100644
--- a/gemfiles/ruby_3.2.0_rails61_postgres_redis.gemfile
+++ b/gemfiles/ruby_3.2.0_rails61_postgres_redis.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.2.0_rails61_postgres_redis.gemfile.lock b/gemfiles/ruby_3.2.0_rails61_postgres_redis.gemfile.lock
index 0d0d2427132..d5b81231b80 100644
--- a/gemfiles/ruby_3.2.0_rails61_postgres_redis.gemfile.lock
+++ b/gemfiles/ruby_3.2.0_rails61_postgres_redis.gemfile.lock
@@ -290,7 +290,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.2.0_rails61_postgres_sidekiq.gemfile b/gemfiles/ruby_3.2.0_rails61_postgres_sidekiq.gemfile
index 000b5c62e44..1a7f0d85960 100644
--- a/gemfiles/ruby_3.2.0_rails61_postgres_sidekiq.gemfile
+++ b/gemfiles/ruby_3.2.0_rails61_postgres_sidekiq.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.2.0_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_3.2.0_rails61_postgres_sidekiq.gemfile.lock
index 57493a9dd00..f4f9fe7e560 100644
--- a/gemfiles/ruby_3.2.0_rails61_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/ruby_3.2.0_rails61_postgres_sidekiq.gemfile.lock
@@ -303,7 +303,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.2.0_rails61_semantic_logger.gemfile b/gemfiles/ruby_3.2.0_rails61_semantic_logger.gemfile
index 86a50de175a..3a748f6a9fc 100644
--- a/gemfiles/ruby_3.2.0_rails61_semantic_logger.gemfile
+++ b/gemfiles/ruby_3.2.0_rails61_semantic_logger.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.2.0_rails61_semantic_logger.gemfile.lock b/gemfiles/ruby_3.2.0_rails61_semantic_logger.gemfile.lock
index 1e719d7decf..0e1ddef7506 100644
--- a/gemfiles/ruby_3.2.0_rails61_semantic_logger.gemfile.lock
+++ b/gemfiles/ruby_3.2.0_rails61_semantic_logger.gemfile.lock
@@ -288,7 +288,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.2.0_redis_3.gemfile b/gemfiles/ruby_3.2.0_redis_3.gemfile
index 7b6191575f9..c5c21aa3325 100644
--- a/gemfiles/ruby_3.2.0_redis_3.gemfile
+++ b/gemfiles/ruby_3.2.0_redis_3.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.2.0_redis_3.gemfile.lock b/gemfiles/ruby_3.2.0_redis_3.gemfile.lock
index ee6fde42963..558bd94ae10 100644
--- a/gemfiles/ruby_3.2.0_redis_3.gemfile.lock
+++ b/gemfiles/ruby_3.2.0_redis_3.gemfile.lock
@@ -147,7 +147,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.2.0_redis_4.gemfile b/gemfiles/ruby_3.2.0_redis_4.gemfile
index 6550593169e..121f9b60b89 100644
--- a/gemfiles/ruby_3.2.0_redis_4.gemfile
+++ b/gemfiles/ruby_3.2.0_redis_4.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.2.0_redis_4.gemfile.lock b/gemfiles/ruby_3.2.0_redis_4.gemfile.lock
index 24d034b9f4e..b97df5e84d9 100644
--- a/gemfiles/ruby_3.2.0_redis_4.gemfile.lock
+++ b/gemfiles/ruby_3.2.0_redis_4.gemfile.lock
@@ -147,7 +147,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.2.0_redis_5.gemfile b/gemfiles/ruby_3.2.0_redis_5.gemfile
index 4ed9a903557..ad403514c02 100644
--- a/gemfiles/ruby_3.2.0_redis_5.gemfile
+++ b/gemfiles/ruby_3.2.0_redis_5.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.2.0_redis_5.gemfile.lock b/gemfiles/ruby_3.2.0_redis_5.gemfile.lock
index a844e031724..3830bf4166c 100644
--- a/gemfiles/ruby_3.2.0_redis_5.gemfile.lock
+++ b/gemfiles/ruby_3.2.0_redis_5.gemfile.lock
@@ -151,7 +151,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.2.0_relational_db.gemfile b/gemfiles/ruby_3.2.0_relational_db.gemfile
index 523a1331f26..cfd81d7580a 100644
--- a/gemfiles/ruby_3.2.0_relational_db.gemfile
+++ b/gemfiles/ruby_3.2.0_relational_db.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.2.0_relational_db.gemfile.lock b/gemfiles/ruby_3.2.0_relational_db.gemfile.lock
index 82fd1d6fc45..3ca71946acb 100644
--- a/gemfiles/ruby_3.2.0_relational_db.gemfile.lock
+++ b/gemfiles/ruby_3.2.0_relational_db.gemfile.lock
@@ -64,6 +64,7 @@ GEM
     extlz4 (0.3.4)
     ffi (1.15.5)
     google-protobuf (3.24.3-aarch64-linux)
+    google-protobuf (3.24.3-x86_64-linux)
     hashdiff (1.0.1)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
@@ -76,6 +77,8 @@ GEM
       ffi (~> 1.0)
     libddwaf (1.14.0.0.0-x86_64-linux)
       ffi (~> 1.0)
+    makara (0.6.0.pre)
+      activerecord (>= 5.2.0)
     memory_profiler (0.9.14)
     method_source (1.0.0)
     minitest (5.20.0)
@@ -153,6 +156,7 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     sqlite3 (1.6.6-aarch64-linux)
+    sqlite3 (1.6.6-x86_64-linux)
     thor (1.2.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
@@ -167,10 +171,10 @@ GEM
 
 PLATFORMS
   aarch64-linux
+  x86_64-linux
 
 DEPENDENCIES
   activerecord (~> 7)
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.2.0_resque2_redis3.gemfile b/gemfiles/ruby_3.2.0_resque2_redis3.gemfile
index 61133a5da63..e0e3d2d8d4a 100644
--- a/gemfiles/ruby_3.2.0_resque2_redis3.gemfile
+++ b/gemfiles/ruby_3.2.0_resque2_redis3.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.2.0_resque2_redis3.gemfile.lock b/gemfiles/ruby_3.2.0_resque2_redis3.gemfile.lock
index 56904070320..095a8fbfdb1 100644
--- a/gemfiles/ruby_3.2.0_resque2_redis3.gemfile.lock
+++ b/gemfiles/ruby_3.2.0_resque2_redis3.gemfile.lock
@@ -168,7 +168,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.2.0_resque2_redis4.gemfile b/gemfiles/ruby_3.2.0_resque2_redis4.gemfile
index 62434bc2549..175e7347244 100644
--- a/gemfiles/ruby_3.2.0_resque2_redis4.gemfile
+++ b/gemfiles/ruby_3.2.0_resque2_redis4.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.2.0_resque2_redis4.gemfile.lock b/gemfiles/ruby_3.2.0_resque2_redis4.gemfile.lock
index e7d79c6c8b2..d57e919b776 100644
--- a/gemfiles/ruby_3.2.0_resque2_redis4.gemfile.lock
+++ b/gemfiles/ruby_3.2.0_resque2_redis4.gemfile.lock
@@ -172,7 +172,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.2.0_sinatra.gemfile b/gemfiles/ruby_3.2.0_sinatra.gemfile
index a427f166e5c..ba3d4679127 100644
--- a/gemfiles/ruby_3.2.0_sinatra.gemfile
+++ b/gemfiles/ruby_3.2.0_sinatra.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.2.0_sinatra.gemfile.lock b/gemfiles/ruby_3.2.0_sinatra.gemfile.lock
index 82cd93a4d8e..7050e262065 100644
--- a/gemfiles/ruby_3.2.0_sinatra.gemfile.lock
+++ b/gemfiles/ruby_3.2.0_sinatra.gemfile.lock
@@ -160,7 +160,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.3.0_aws.gemfile b/gemfiles/ruby_3.3.0_aws.gemfile
index 21a80c679af..30acc9d9216 100644
--- a/gemfiles/ruby_3.3.0_aws.gemfile
+++ b/gemfiles/ruby_3.3.0_aws.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.3.0_aws.gemfile.lock b/gemfiles/ruby_3.3.0_aws.gemfile.lock
index 1e7ee7268b1..e4790f203f5 100644
--- a/gemfiles/ruby_3.3.0_aws.gemfile.lock
+++ b/gemfiles/ruby_3.3.0_aws.gemfile.lock
@@ -1476,8 +1476,11 @@ GEM
     json-schema (2.8.1)
       addressable (>= 2.4)
     libdatadog (4.0.0.1.0-aarch64-linux)
+    libdatadog (4.0.0.1.0-x86_64-linux)
     libddwaf (1.14.0.0.0-aarch64-linux)
       ffi (~> 1.0)
+    libddwaf (1.14.0.0.0-x86_64-linux)
+      ffi (~> 1.0)
     memory_profiler (0.9.14)
     method_source (1.0.0)
     msgpack (1.7.2)
@@ -1566,9 +1569,9 @@ GEM
 
 PLATFORMS
   aarch64-linux
+  x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   aws-sdk
   benchmark-ips (~> 2.8)
diff --git a/gemfiles/ruby_3.3.0_contrib.gemfile b/gemfiles/ruby_3.3.0_contrib.gemfile
index a6642dbab3b..f2c84a41d9a 100644
--- a/gemfiles/ruby_3.3.0_contrib.gemfile
+++ b/gemfiles/ruby_3.3.0_contrib.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.3.0_contrib.gemfile.lock b/gemfiles/ruby_3.3.0_contrib.gemfile.lock
index 0828be74c3f..20afd57b24c 100644
--- a/gemfiles/ruby_3.3.0_contrib.gemfile.lock
+++ b/gemfiles/ruby_3.3.0_contrib.gemfile.lock
@@ -322,7 +322,6 @@ DEPENDENCIES
   actionpack (~> 7)
   actionview (~> 7)
   active_model_serializers (>= 0.10.0)
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.3.0_contrib_old.gemfile b/gemfiles/ruby_3.3.0_contrib_old.gemfile
index 8e0d25e768d..118ba0c5885 100644
--- a/gemfiles/ruby_3.3.0_contrib_old.gemfile
+++ b/gemfiles/ruby_3.3.0_contrib_old.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.3.0_contrib_old.gemfile.lock b/gemfiles/ruby_3.3.0_contrib_old.gemfile.lock
index 0de7c5de9a4..72fca5483c7 100644
--- a/gemfiles/ruby_3.3.0_contrib_old.gemfile.lock
+++ b/gemfiles/ruby_3.3.0_contrib_old.gemfile.lock
@@ -207,7 +207,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.3.0_core_old.gemfile b/gemfiles/ruby_3.3.0_core_old.gemfile
index df73c7ef022..78027b8ec1a 100644
--- a/gemfiles/ruby_3.3.0_core_old.gemfile
+++ b/gemfiles/ruby_3.3.0_core_old.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.3.0_core_old.gemfile.lock b/gemfiles/ruby_3.3.0_core_old.gemfile.lock
index 7f4053453db..a577f9bf307 100644
--- a/gemfiles/ruby_3.3.0_core_old.gemfile.lock
+++ b/gemfiles/ruby_3.3.0_core_old.gemfile.lock
@@ -144,7 +144,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.3.0_http.gemfile b/gemfiles/ruby_3.3.0_http.gemfile
index 13588e2113b..b02a88ba50b 100644
--- a/gemfiles/ruby_3.3.0_http.gemfile
+++ b/gemfiles/ruby_3.3.0_http.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.3.0_http.gemfile.lock b/gemfiles/ruby_3.3.0_http.gemfile.lock
index aefeab6a2b4..c84b61a239a 100644
--- a/gemfiles/ruby_3.3.0_http.gemfile.lock
+++ b/gemfiles/ruby_3.3.0_http.gemfile.lock
@@ -84,8 +84,11 @@ GEM
     json-schema (2.8.1)
       addressable (>= 2.4)
     libdatadog (4.0.0.1.0-aarch64-linux)
+    libdatadog (4.0.0.1.0-x86_64-linux)
     libddwaf (1.14.0.0.0-aarch64-linux)
       ffi (~> 1.0)
+    libddwaf (1.14.0.0.0-x86_64-linux)
+      ffi (~> 1.0)
     llhttp-ffi (0.3.1)
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
@@ -198,9 +201,9 @@ GEM
 
 PLATFORMS
   aarch64-linux
+  x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.3.0_opentelemetry.gemfile b/gemfiles/ruby_3.3.0_opentelemetry.gemfile
index 8a5235b54e7..57959103576 100644
--- a/gemfiles/ruby_3.3.0_opentelemetry.gemfile
+++ b/gemfiles/ruby_3.3.0_opentelemetry.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.3.0_opentelemetry.gemfile.lock b/gemfiles/ruby_3.3.0_opentelemetry.gemfile.lock
index a2ff0d911a6..2874238ffa7 100644
--- a/gemfiles/ruby_3.3.0_opentelemetry.gemfile.lock
+++ b/gemfiles/ruby_3.3.0_opentelemetry.gemfile.lock
@@ -156,7 +156,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.3.0_rails61_mysql2.gemfile b/gemfiles/ruby_3.3.0_rails61_mysql2.gemfile
index 5a565aaecfe..833bc4eabe2 100644
--- a/gemfiles/ruby_3.3.0_rails61_mysql2.gemfile
+++ b/gemfiles/ruby_3.3.0_rails61_mysql2.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.3.0_rails61_mysql2.gemfile.lock b/gemfiles/ruby_3.3.0_rails61_mysql2.gemfile.lock
index ded9b4803a1..f85df6aff80 100644
--- a/gemfiles/ruby_3.3.0_rails61_mysql2.gemfile.lock
+++ b/gemfiles/ruby_3.3.0_rails61_mysql2.gemfile.lock
@@ -287,7 +287,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.3.0_rails61_postgres.gemfile b/gemfiles/ruby_3.3.0_rails61_postgres.gemfile
index 0c0fdc0389f..16376edd2f4 100644
--- a/gemfiles/ruby_3.3.0_rails61_postgres.gemfile
+++ b/gemfiles/ruby_3.3.0_rails61_postgres.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.3.0_rails61_postgres.gemfile.lock b/gemfiles/ruby_3.3.0_rails61_postgres.gemfile.lock
index e8c7b312a9e..6709ebafb64 100644
--- a/gemfiles/ruby_3.3.0_rails61_postgres.gemfile.lock
+++ b/gemfiles/ruby_3.3.0_rails61_postgres.gemfile.lock
@@ -287,7 +287,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.3.0_rails61_postgres_redis.gemfile b/gemfiles/ruby_3.3.0_rails61_postgres_redis.gemfile
index d41233869a8..75d643209ba 100644
--- a/gemfiles/ruby_3.3.0_rails61_postgres_redis.gemfile
+++ b/gemfiles/ruby_3.3.0_rails61_postgres_redis.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.3.0_rails61_postgres_redis.gemfile.lock b/gemfiles/ruby_3.3.0_rails61_postgres_redis.gemfile.lock
index cd9ae414098..9cdc05c6105 100644
--- a/gemfiles/ruby_3.3.0_rails61_postgres_redis.gemfile.lock
+++ b/gemfiles/ruby_3.3.0_rails61_postgres_redis.gemfile.lock
@@ -288,7 +288,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.3.0_rails61_postgres_sidekiq.gemfile b/gemfiles/ruby_3.3.0_rails61_postgres_sidekiq.gemfile
index 000b5c62e44..1a7f0d85960 100644
--- a/gemfiles/ruby_3.3.0_rails61_postgres_sidekiq.gemfile
+++ b/gemfiles/ruby_3.3.0_rails61_postgres_sidekiq.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.3.0_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_3.3.0_rails61_postgres_sidekiq.gemfile.lock
index f418668416d..e959c3bb82e 100644
--- a/gemfiles/ruby_3.3.0_rails61_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/ruby_3.3.0_rails61_postgres_sidekiq.gemfile.lock
@@ -301,7 +301,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.3.0_rails61_semantic_logger.gemfile b/gemfiles/ruby_3.3.0_rails61_semantic_logger.gemfile
index 86a50de175a..3a748f6a9fc 100644
--- a/gemfiles/ruby_3.3.0_rails61_semantic_logger.gemfile
+++ b/gemfiles/ruby_3.3.0_rails61_semantic_logger.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.3.0_rails61_semantic_logger.gemfile.lock b/gemfiles/ruby_3.3.0_rails61_semantic_logger.gemfile.lock
index f93ea9e3f4b..be83d9d3b7c 100644
--- a/gemfiles/ruby_3.3.0_rails61_semantic_logger.gemfile.lock
+++ b/gemfiles/ruby_3.3.0_rails61_semantic_logger.gemfile.lock
@@ -286,7 +286,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.3.0_redis_3.gemfile b/gemfiles/ruby_3.3.0_redis_3.gemfile
index 7b6191575f9..c5c21aa3325 100644
--- a/gemfiles/ruby_3.3.0_redis_3.gemfile
+++ b/gemfiles/ruby_3.3.0_redis_3.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.3.0_redis_3.gemfile.lock b/gemfiles/ruby_3.3.0_redis_3.gemfile.lock
index 207314a729b..70854f6c121 100644
--- a/gemfiles/ruby_3.3.0_redis_3.gemfile.lock
+++ b/gemfiles/ruby_3.3.0_redis_3.gemfile.lock
@@ -145,7 +145,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.3.0_redis_4.gemfile b/gemfiles/ruby_3.3.0_redis_4.gemfile
index 6550593169e..121f9b60b89 100644
--- a/gemfiles/ruby_3.3.0_redis_4.gemfile
+++ b/gemfiles/ruby_3.3.0_redis_4.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.3.0_redis_4.gemfile.lock b/gemfiles/ruby_3.3.0_redis_4.gemfile.lock
index e3140402e5a..4d0ea9d1b55 100644
--- a/gemfiles/ruby_3.3.0_redis_4.gemfile.lock
+++ b/gemfiles/ruby_3.3.0_redis_4.gemfile.lock
@@ -145,7 +145,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.3.0_redis_5.gemfile b/gemfiles/ruby_3.3.0_redis_5.gemfile
index 4ed9a903557..ad403514c02 100644
--- a/gemfiles/ruby_3.3.0_redis_5.gemfile
+++ b/gemfiles/ruby_3.3.0_redis_5.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.3.0_redis_5.gemfile.lock b/gemfiles/ruby_3.3.0_redis_5.gemfile.lock
index cfd925687ea..057c9eadfb8 100644
--- a/gemfiles/ruby_3.3.0_redis_5.gemfile.lock
+++ b/gemfiles/ruby_3.3.0_redis_5.gemfile.lock
@@ -149,7 +149,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.3.0_relational_db.gemfile b/gemfiles/ruby_3.3.0_relational_db.gemfile
index 523a1331f26..cfd81d7580a 100644
--- a/gemfiles/ruby_3.3.0_relational_db.gemfile
+++ b/gemfiles/ruby_3.3.0_relational_db.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.3.0_relational_db.gemfile.lock b/gemfiles/ruby_3.3.0_relational_db.gemfile.lock
index 9ada9d56f40..f525d1db576 100644
--- a/gemfiles/ruby_3.3.0_relational_db.gemfile.lock
+++ b/gemfiles/ruby_3.3.0_relational_db.gemfile.lock
@@ -76,6 +76,8 @@ GEM
       ffi (~> 1.0)
     libddwaf (1.14.0.0.0-x86_64-linux)
       ffi (~> 1.0)
+    makara (0.6.0.pre)
+      activerecord (>= 5.2.0)
     memory_profiler (0.9.14)
     method_source (1.0.0)
     mini_portile2 (2.8.4)
@@ -169,10 +171,10 @@ GEM
 
 PLATFORMS
   aarch64-linux
+  x86_64-linux
 
 DEPENDENCIES
   activerecord (~> 7)
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.3.0_resque2_redis3.gemfile b/gemfiles/ruby_3.3.0_resque2_redis3.gemfile
index 61133a5da63..e0e3d2d8d4a 100644
--- a/gemfiles/ruby_3.3.0_resque2_redis3.gemfile
+++ b/gemfiles/ruby_3.3.0_resque2_redis3.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.3.0_resque2_redis3.gemfile.lock b/gemfiles/ruby_3.3.0_resque2_redis3.gemfile.lock
index 3886b3e4fd8..eb868875147 100644
--- a/gemfiles/ruby_3.3.0_resque2_redis3.gemfile.lock
+++ b/gemfiles/ruby_3.3.0_resque2_redis3.gemfile.lock
@@ -166,7 +166,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.3.0_resque2_redis4.gemfile b/gemfiles/ruby_3.3.0_resque2_redis4.gemfile
index 62434bc2549..175e7347244 100644
--- a/gemfiles/ruby_3.3.0_resque2_redis4.gemfile
+++ b/gemfiles/ruby_3.3.0_resque2_redis4.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.3.0_resque2_redis4.gemfile.lock b/gemfiles/ruby_3.3.0_resque2_redis4.gemfile.lock
index 5139490a210..e1b4d2a2cbc 100644
--- a/gemfiles/ruby_3.3.0_resque2_redis4.gemfile.lock
+++ b/gemfiles/ruby_3.3.0_resque2_redis4.gemfile.lock
@@ -170,7 +170,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)
diff --git a/gemfiles/ruby_3.3.0_sinatra.gemfile b/gemfiles/ruby_3.3.0_sinatra.gemfile
index a427f166e5c..ba3d4679127 100644
--- a/gemfiles/ruby_3.3.0_sinatra.gemfile
+++ b/gemfiles/ruby_3.3.0_sinatra.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "addressable", "~> 2.4.0"
 gem "appraisal", "~> 2.4.0"
 gem "benchmark-ips", "~> 2.8"
 gem "benchmark-memory", "< 0.2"
diff --git a/gemfiles/ruby_3.3.0_sinatra.gemfile.lock b/gemfiles/ruby_3.3.0_sinatra.gemfile.lock
index e9afde933eb..bc3974e1639 100644
--- a/gemfiles/ruby_3.3.0_sinatra.gemfile.lock
+++ b/gemfiles/ruby_3.3.0_sinatra.gemfile.lock
@@ -158,7 +158,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  addressable (~> 2.4.0)
   appraisal (~> 2.4.0)
   benchmark-ips (~> 2.8)
   benchmark-memory (< 0.2)