Merge pull request #87 from alphagov/ruby33

Upgrade to Ruby 3.3
alphagov · Apr 29, 2024 · 63d3e5f · 63d3e5f
2 parents d68ba1c + 23bd0a3
commit 63d3e5f
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 54 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-3.2.2
+3.3.1
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-ARG ruby_version=3.2.2
+ARG ruby_version=3.3.1
 ARG base_image=ghcr.io/alphagov/govuk-ruby-base:$ruby_version
 ARG builder_image=ghcr.io/alphagov/govuk-ruby-builder:$ruby_version
 

diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-ruby "3.2.2"
+ruby "3.3.1"
 
 gem "rails", "~> 7.1.2"
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -153,10 +153,10 @@ GEM
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
-    govuk_app_config (9.7.0)
+    govuk_app_config (9.11.0)
       logstasher (~> 2.1)
       opentelemetry-exporter-otlp (>= 0.25, < 0.27)
-      opentelemetry-instrumentation-all (>= 0.39.1, < 0.52.0)
+      opentelemetry-instrumentation-all (>= 0.39.1, < 0.61.0)
       opentelemetry-sdk (~> 1.2)
       plek (>= 4, < 6)
       prometheus_exporter (~> 2.0)
@@ -227,12 +227,12 @@ GEM
     net-smtp (0.4.0.1)
       net-protocol
     netrc (0.11.0)
-    nio4r (2.7.0)
-    nokogiri (1.16.3-aarch64-linux)
+    nio4r (2.7.1)
+    nokogiri (1.16.4-aarch64-linux)
       racc (~> 1.4)
-    nokogiri (1.16.3-x86_64-darwin)
+    nokogiri (1.16.4-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.3-x86_64-linux)
+    nokogiri (1.16.4-x86_64-linux)
       racc (~> 1.4)
     null_logger (0.0.1)
     opentelemetry-api (1.2.5)
@@ -245,52 +245,56 @@ GEM
       opentelemetry-common (~> 0.20)
       opentelemetry-sdk (~> 1.2)
       opentelemetry-semantic_conventions
-    opentelemetry-instrumentation-action_pack (0.7.1)
+    opentelemetry-helpers-mysql (0.1.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-common (~> 0.20)
+    opentelemetry-helpers-sql-obfuscation (0.1.0)
+      opentelemetry-common (~> 0.20)
+    opentelemetry-instrumentation-action_pack (0.9.0)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
       opentelemetry-instrumentation-rack (~> 0.21)
-    opentelemetry-instrumentation-action_view (0.6.1)
+    opentelemetry-instrumentation-action_view (0.7.0)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-active_support (~> 0.1)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-active_job (0.6.1)
+    opentelemetry-instrumentation-active_job (0.7.1)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
     opentelemetry-instrumentation-active_model_serializers (0.20.1)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-active_record (0.6.3)
+    opentelemetry-instrumentation-active_record (0.7.1)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-      ruby2_keywords
-    opentelemetry-instrumentation-active_support (0.4.4)
+    opentelemetry-instrumentation-active_support (0.5.1)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-all (0.51.1)
+    opentelemetry-instrumentation-all (0.60.0)
       opentelemetry-instrumentation-active_model_serializers (~> 0.20.1)
       opentelemetry-instrumentation-aws_sdk (~> 0.5.0)
       opentelemetry-instrumentation-bunny (~> 0.21.0)
       opentelemetry-instrumentation-concurrent_ruby (~> 0.21.1)
       opentelemetry-instrumentation-dalli (~> 0.25.0)
       opentelemetry-instrumentation-delayed_job (~> 0.22.0)
       opentelemetry-instrumentation-ethon (~> 0.21.1)
-      opentelemetry-instrumentation-excon (~> 0.21.1)
-      opentelemetry-instrumentation-faraday (~> 0.23.1)
+      opentelemetry-instrumentation-excon (~> 0.22.0)
+      opentelemetry-instrumentation-faraday (~> 0.24.0)
       opentelemetry-instrumentation-grape (~> 0.1.3)
-      opentelemetry-instrumentation-graphql (~> 0.26.2)
-      opentelemetry-instrumentation-gruf (~> 0.1.0)
+      opentelemetry-instrumentation-graphql (~> 0.28.0)
+      opentelemetry-instrumentation-gruf (~> 0.2.0)
       opentelemetry-instrumentation-http (~> 0.23.1)
       opentelemetry-instrumentation-http_client (~> 0.22.1)
       opentelemetry-instrumentation-koala (~> 0.20.1)
       opentelemetry-instrumentation-lmdb (~> 0.22.1)
       opentelemetry-instrumentation-mongo (~> 0.22.1)
-      opentelemetry-instrumentation-mysql2 (~> 0.25.0)
+      opentelemetry-instrumentation-mysql2 (~> 0.27.0)
       opentelemetry-instrumentation-net_http (~> 0.22.1)
-      opentelemetry-instrumentation-pg (~> 0.26.0)
-      opentelemetry-instrumentation-que (~> 0.7.0)
+      opentelemetry-instrumentation-pg (~> 0.27.0)
+      opentelemetry-instrumentation-que (~> 0.8.0)
       opentelemetry-instrumentation-racecar (~> 0.3.0)
-      opentelemetry-instrumentation-rack (~> 0.23.1)
-      opentelemetry-instrumentation-rails (~> 0.28.0)
+      opentelemetry-instrumentation-rack (~> 0.24.0)
+      opentelemetry-instrumentation-rails (~> 0.30.0)
       opentelemetry-instrumentation-rake (~> 0.2.1)
       opentelemetry-instrumentation-rdkafka (~> 0.4.0)
       opentelemetry-instrumentation-redis (~> 0.25.1)
@@ -299,7 +303,7 @@ GEM
       opentelemetry-instrumentation-ruby_kafka (~> 0.21.0)
       opentelemetry-instrumentation-sidekiq (~> 0.25.0)
       opentelemetry-instrumentation-sinatra (~> 0.23.1)
-      opentelemetry-instrumentation-trilogy (~> 0.57.0)
+      opentelemetry-instrumentation-trilogy (~> 0.59.0)
     opentelemetry-instrumentation-aws_sdk (0.5.1)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
@@ -323,22 +327,22 @@ GEM
       opentelemetry-api (~> 1.0)
       opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-excon (0.21.3)
+    opentelemetry-instrumentation-excon (0.22.0)
       opentelemetry-api (~> 1.0)
       opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-faraday (0.23.4)
+    opentelemetry-instrumentation-faraday (0.24.1)
       opentelemetry-api (~> 1.0)
       opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
     opentelemetry-instrumentation-grape (0.1.6)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
       opentelemetry-instrumentation-rack (~> 0.21)
-    opentelemetry-instrumentation-graphql (0.26.8)
+    opentelemetry-instrumentation-graphql (0.28.1)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-gruf (0.1.1)
+    opentelemetry-instrumentation-gruf (0.2.0)
       opentelemetry-api (>= 1.0.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
     opentelemetry-instrumentation-http (0.23.2)
@@ -358,38 +362,41 @@ GEM
     opentelemetry-instrumentation-mongo (0.22.2)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-mysql2 (0.25.0)
+    opentelemetry-instrumentation-mysql2 (0.27.0)
       opentelemetry-api (~> 1.0)
+      opentelemetry-helpers-mysql
+      opentelemetry-helpers-sql-obfuscation
       opentelemetry-instrumentation-base (~> 0.22.1)
     opentelemetry-instrumentation-net_http (0.22.4)
       opentelemetry-api (~> 1.0)
       opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-pg (0.26.1)
+    opentelemetry-instrumentation-pg (0.27.1)
       opentelemetry-api (~> 1.0)
+      opentelemetry-helpers-sql-obfuscation
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-que (0.7.1)
+    opentelemetry-instrumentation-que (0.8.0)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-racecar (0.3.0)
+    opentelemetry-instrumentation-racecar (0.3.1)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-rack (0.23.5)
+    opentelemetry-instrumentation-rack (0.24.1)
       opentelemetry-api (~> 1.0)
       opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-rails (0.28.1)
+    opentelemetry-instrumentation-rails (0.30.0)
       opentelemetry-api (~> 1.0)
-      opentelemetry-instrumentation-action_pack (~> 0.7.0)
-      opentelemetry-instrumentation-action_view (~> 0.6.0)
-      opentelemetry-instrumentation-active_job (~> 0.6.0)
-      opentelemetry-instrumentation-active_record (~> 0.6.1)
-      opentelemetry-instrumentation-active_support (~> 0.4.1)
+      opentelemetry-instrumentation-action_pack (~> 0.9.0)
+      opentelemetry-instrumentation-action_view (~> 0.7.0)
+      opentelemetry-instrumentation-active_job (~> 0.7.0)
+      opentelemetry-instrumentation-active_record (~> 0.7.0)
+      opentelemetry-instrumentation-active_support (~> 0.5.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
     opentelemetry-instrumentation-rake (0.2.1)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-rdkafka (0.4.2)
+    opentelemetry-instrumentation-rdkafka (0.4.3)
       opentelemetry-api (~> 1.0)
       opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
@@ -416,13 +423,15 @@ GEM
       opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
       opentelemetry-instrumentation-rack (~> 0.21)
-    opentelemetry-instrumentation-trilogy (0.57.0)
+    opentelemetry-instrumentation-trilogy (0.59.2)
       opentelemetry-api (~> 1.0)
+      opentelemetry-helpers-mysql
+      opentelemetry-helpers-sql-obfuscation
       opentelemetry-instrumentation-base (~> 0.22.1)
       opentelemetry-semantic_conventions (>= 1.8.0)
-    opentelemetry-registry (0.3.0)
+    opentelemetry-registry (0.3.1)
       opentelemetry-api (~> 1.1)
-    opentelemetry-sdk (1.4.0)
+    opentelemetry-sdk (1.4.1)
       opentelemetry-api (~> 1.1)
       opentelemetry-common (~> 0.20)
       opentelemetry-registry (~> 0.2)
@@ -434,7 +443,7 @@ GEM
     parser (3.2.2.4)
       ast (~> 2.4.1)
       racc
-    plek (5.0.0)
+    plek (5.1.0)
     prometheus_exporter (2.1.0)
       webrick
     psych (5.1.2)
@@ -443,7 +452,7 @@ GEM
     puma (6.4.2)
       nio4r (~> 2.0)
     racc (1.7.3)
-    rack (3.0.9.1)
+    rack (3.0.10)
     rack-proxy (0.7.7)
       rack
     rack-session (2.0.0)
@@ -483,11 +492,11 @@ GEM
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.1.0)
-    rdoc (6.6.2)
+    rake (13.2.1)
+    rdoc (6.6.3.1)
       psych (>= 4.0.0)
     regexp_parser (2.8.2)
-    reline (0.4.3)
+    reline (0.5.4)
       io-console (~> 0.5)
     representable (3.2.0)
       declarative (< 0.1.0)
@@ -568,10 +577,10 @@ GEM
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
-    sentry-rails (5.17.1)
+    sentry-rails (5.17.3)
       railties (>= 5.0)
-      sentry-ruby (~> 5.17.1)
-    sentry-ruby (5.17.1)
+      sentry-ruby (~> 5.17.3)
+    sentry-ruby (5.17.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
     signet (0.18.0)
@@ -633,7 +642,7 @@ DEPENDENCIES
   web-console
 
 RUBY VERSION
-   ruby 3.2.2p53
+   ruby 3.3.1p55
 
 BUNDLED WITH
    2.4.10