Merge pull request #8 from trade-tariff/BAU-updates

BAU: Update govuk_publishing_components

.ruby-version

@@ -1 +1 @@
-3.1.3
+3.3.0

Gemfile.lock

@@ -164,10 +164,10 @@ GEM
     google-protobuf (3.25.3-x86_64-linux)
     googleapis-common-protos-types (1.14.0)
       google-protobuf (~> 3.18)
-    govuk_app_config (9.8.2)
+    govuk_app_config (9.9.2)
       logstasher (~> 2.1)
       opentelemetry-exporter-otlp (>= 0.25, < 0.27)
-      opentelemetry-instrumentation-all (>= 0.39.1, < 0.57.0)
+      opentelemetry-instrumentation-all (>= 0.39.1, < 0.61.0)
       opentelemetry-sdk (~> 1.2)
       plek (>= 4, < 6)
       prometheus_exporter (~> 2.0)
@@ -179,7 +179,7 @@ GEM
     govuk_personalisation (0.16.0)
       plek (>= 1.9.0)
       rails (>= 6, < 8)
-    govuk_publishing_components (37.10.0)
+    govuk_publishing_components (38.0.1)
       govuk_app_config
       govuk_personalisation (>= 0.7.0)
       kramdown
@@ -318,7 +318,7 @@ GEM
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.4.0.1)
+    net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.1)
     nokogiri (1.16.3)
@@ -344,6 +344,11 @@ GEM
       opentelemetry-common (~> 0.20)
       opentelemetry-sdk (~> 1.2)
       opentelemetry-semantic_conventions
+    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)
@@ -358,14 +363,13 @@ GEM
     opentelemetry-instrumentation-active_model_serializers (0.20.1)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-active_record (0.7.0)
+    opentelemetry-instrumentation-active_record (0.7.1)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-      ruby2_keywords
     opentelemetry-instrumentation-active_support (0.5.1)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-all (0.56.0)
+    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)
@@ -374,19 +378,19 @@ GEM
       opentelemetry-instrumentation-delayed_job (~> 0.22.0)
       opentelemetry-instrumentation-ethon (~> 0.21.1)
       opentelemetry-instrumentation-excon (~> 0.22.0)
-      opentelemetry-instrumentation-faraday (~> 0.23.1)
+      opentelemetry-instrumentation-faraday (~> 0.24.0)
       opentelemetry-instrumentation-grape (~> 0.1.3)
-      opentelemetry-instrumentation-graphql (~> 0.27.0)
-      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.24.0)
       opentelemetry-instrumentation-rails (~> 0.30.0)
@@ -398,7 +402,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.58.0)
+      opentelemetry-instrumentation-trilogy (~> 0.59.0)
     opentelemetry-instrumentation-aws_sdk (0.5.1)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
@@ -426,18 +430,18 @@ GEM
       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.27.0)
+    opentelemetry-instrumentation-graphql (0.28.0)
       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)
@@ -457,23 +461,26 @@ 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.24.0)
+    opentelemetry-instrumentation-rack (0.24.1)
       opentelemetry-api (~> 1.0)
       opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
@@ -488,7 +495,7 @@ GEM
     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)
@@ -515,13 +522,15 @@ GEM
       opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
       opentelemetry-instrumentation-rack (~> 0.21)
-    opentelemetry-instrumentation-trilogy (0.58.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.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)
@@ -584,7 +593,7 @@ GEM
       thor (~> 1.0)
       zeitwerk (~> 2.5)
     rainbow (3.1.1)
-    rake (13.2.0)
+    rake (13.2.1)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
@@ -656,10 +665,10 @@ GEM
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
-    sentry-rails (5.17.1)
+    sentry-rails (5.17.2)
       railties (>= 5.0)
-      sentry-ruby (~> 5.17.1)
-    sentry-ruby (5.17.1)
+      sentry-ruby (~> 5.17.2)
+    sentry-ruby (5.17.2)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
     servolux (0.13.0)

data/repos.yml

@@ -3,7 +3,7 @@
   team: "#trade-tariff-write"
 
 - repo_name: trade-tariff-testing
-  type: Infrastructure
+  type: Testing
   team: "#trade-tariff-write"
 
 - repo_name: trade-tariff-frontend
@@ -19,17 +19,13 @@
   team: "#trade-tariff-write"
 
 - repo_name: trade-tariff-tech-docs
-  type: Frontend
+  type: Static site
   team: "#trade-tariff-write"
 
 - repo_name: trade-tariff-dev-hub-backend
   type: APIs
   team: "#trade-tariff-write"
 
-- repo_name: trade-tariff-lambdas-dev-hub-backups
-  type: Lambdas
-  team: "#trade-tariff-write"
-
 - repo_name: trade-tariff-duty-calculator
   type: Frontend
   team: "#trade-tariff-write"
@@ -47,19 +43,19 @@
   team: "#trade-tariff-write"
 
 - repo_name: process-appendix-5a
-  type: Infrastructure
+  type: Utilities
   team: "#trade-tariff-write"
 
 - repo_name: trade-tariff-tools
-  type: Infrastructure
+  type: Utilities
   team: "#trade-tariff-write"
 
 - repo_name: trade-tariff-api-docs
-  type: APIs
+  type: Static site
   team: "#trade-tariff-write"
 
 - repo_name: electronic-tariff-file
-  type: Infrastructure
+  type: Utilities
   team: "#trade-tariff-write"
 
 - repo_name: trade-tariff-ci-orb
@@ -71,47 +67,51 @@
   team: "#trade-tariff-write"
 
 - repo_name: routing-filter
-  type: Infrastructure
+  type: Gems
   team: "#trade-tariff-write"
 
 - repo_name: download-CDS-files
-  type: Infrastructure
+  type: Utilities
   team: "#trade-tariff-write"
 
 - repo_name: uktt
-  type: APIs
+  type: Gems
   team: "#trade-tariff-write"
 
 - repo_name: rules-of-origin-builder-uk
-  type: Frontend
+  type: Utilities
+  team: "#trade-tariff-write"
+
+- repo_name: rules-of-origin-builder-xi
+  type: Utilities
   team: "#trade-tariff-write"
 
 - repo_name: ott-prototype
-  type: Frontend
+  type: Prototyping
   team: "#trade-tariff-write"
 
 - repo_name: trade-tariff-performance-testing
-  type: Infrastructure
+  type: Testing
   team: "#trade-tariff-write"
 
 - repo_name: trade-tariff-reporting
-  type: Infrastructure
+  type: Static site
   team: "#trade-tariff-write"
 
 - repo_name: trade-tariff-lambdas-appendix5a
   type: Lambdas
   team: "#trade-tariff-write"
 
 - repo_name: preference-utilisation-analysis
-  type: Infrastructure
+  type: Utilities
   team: "#trade-tariff-write"
 
 - repo_name: trade-tariff-cloudwatch-synthetics-canaries
   type: Infrastructure
   team: "#trade-tariff-write"
 
 - repo_name: basic-python-tariff-query
-  type: APIs
+  type: Utilities
   team: "#trade-tariff-write"
 
 - repo_name: trade-tariff-lambdas-uk-issues-mailer
@@ -127,13 +127,9 @@
   team: "#trade-tariff-write"
 
 - repo_name: deliverables-report-writer
-  type: Infrastructure
+  type: Utilities
   team: "#trade-tariff-write"
 
 - repo_name: trade-tariff-lambdas-uk-daily-file-mailer
   type: Lambdas
   team: "#trade-tariff-write"
-
-- repo_name: rules-of-origin-builder-xi
-  type: Frontend
-  team: "#trade-tariff-write"