Merge pull request #1944 from alphagov/dependabot/bundler/govuk_app_c…

…onfig-9.13.1

Bump govuk_app_config from 9.11.2 to 9.13.1

Gemfile.lock

@@ -170,10 +170,10 @@ GEM
       nokogiri (~> 1.12)
       rinku (~> 2.0)
       sanitize (~> 6)
-    govuk_app_config (9.11.2)
+    govuk_app_config (9.13.1)
       logstasher (~> 2.1)
-      opentelemetry-exporter-otlp (>= 0.25, < 0.27)
-      opentelemetry-instrumentation-all (>= 0.39.1, < 0.61.0)
+      opentelemetry-exporter-otlp (>= 0.25, < 0.29)
+      opentelemetry-instrumentation-all (>= 0.39.1, < 0.62.0)
       opentelemetry-sdk (~> 1.2)
       plek (>= 4, < 6)
       prometheus_exporter (~> 2.0)
@@ -304,8 +304,8 @@ GEM
     opentelemetry-api (1.2.5)
     opentelemetry-common (0.21.0)
       opentelemetry-api (~> 1.0)
-    opentelemetry-exporter-otlp (0.26.3)
-      google-protobuf (~> 3.14)
+    opentelemetry-exporter-otlp (0.28.0)
+      google-protobuf (>= 3.18)
       googleapis-common-protos-types (~> 1.3)
       opentelemetry-api (~> 1.1)
       opentelemetry-common (~> 0.20)
@@ -340,8 +340,9 @@ GEM
     opentelemetry-instrumentation-active_support (0.5.3)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-all (0.60.0)
+    opentelemetry-instrumentation-all (0.61.0)
       opentelemetry-instrumentation-active_model_serializers (~> 0.20.1)
+      opentelemetry-instrumentation-aws_lambda (~> 0.1.0)
       opentelemetry-instrumentation-aws_sdk (~> 0.5.0)
       opentelemetry-instrumentation-bunny (~> 0.21.0)
       opentelemetry-instrumentation-concurrent_ruby (~> 0.21.1)
@@ -374,6 +375,9 @@ GEM
       opentelemetry-instrumentation-sidekiq (~> 0.25.0)
       opentelemetry-instrumentation-sinatra (~> 0.23.1)
       opentelemetry-instrumentation-trilogy (~> 0.59.0)
+    opentelemetry-instrumentation-aws_lambda (0.1.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-base (~> 0.22.1)
     opentelemetry-instrumentation-aws_sdk (0.5.3)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)

config/application.rb

@@ -47,7 +47,15 @@ class Application < Rails::Application
     config.assets.prefix = "/assets/travel-advice-publisher"
 
     config.slimmer.use_cache = true
-    # config.time_zone = "Central Time (US & Canada)"
+
+    # Even though most GOV.UK apps use the London time_zone, travel-advice-publisher does want to
+    # present times in UTC (as it's an international audience), so we set that as the default time_zone
+    initializer "publishing_api.configure_timezone",
+                after: "govuk_app_config.configure_timezone",
+                before: "active_support.initialize_time_zone" do
+      config.time_zone = "UTC"
+    end
+
     # config.eager_load_paths << Rails.root.join("extras")
   end
 end