diff --git a/Gemfile.lock b/Gemfile.lock index 15bef56bc..bd217dc74 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -191,10 +191,10 @@ GEM nokogiri (~> 1.12) rinku (~> 2.0) sanitize (~> 6) - govuk_app_config (9.13.1) + govuk_app_config (9.14.0) logstasher (~> 2.1) opentelemetry-exporter-otlp (>= 0.25, < 0.29) - opentelemetry-instrumentation-all (>= 0.39.1, < 0.62.0) + opentelemetry-instrumentation-all (>= 0.39.1, < 0.63.0) opentelemetry-sdk (~> 1.2) plek (>= 4, < 6) prometheus_exporter (~> 2.0) @@ -384,10 +384,10 @@ GEM opentelemetry-instrumentation-active_record (0.7.2) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-active_support (0.5.3) + opentelemetry-instrumentation-active_support (0.6.0) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-all (0.61.0) + opentelemetry-instrumentation-all (0.62.1) opentelemetry-instrumentation-active_model_serializers (~> 0.20.1) opentelemetry-instrumentation-aws_lambda (~> 0.1.0) opentelemetry-instrumentation-aws_sdk (~> 0.5.0) @@ -398,7 +398,7 @@ GEM opentelemetry-instrumentation-ethon (~> 0.21.1) opentelemetry-instrumentation-excon (~> 0.22.0) opentelemetry-instrumentation-faraday (~> 0.24.0) - opentelemetry-instrumentation-grape (~> 0.1.3) + opentelemetry-instrumentation-grape (~> 0.2.0) opentelemetry-instrumentation-graphql (~> 0.28.0) opentelemetry-instrumentation-gruf (~> 0.2.0) opentelemetry-instrumentation-http (~> 0.23.1) @@ -412,7 +412,7 @@ GEM opentelemetry-instrumentation-que (~> 0.8.0) opentelemetry-instrumentation-racecar (~> 0.3.0) opentelemetry-instrumentation-rack (~> 0.24.0) - opentelemetry-instrumentation-rails (~> 0.30.0) + opentelemetry-instrumentation-rails (~> 0.31.0) opentelemetry-instrumentation-rake (~> 0.2.1) opentelemetry-instrumentation-rdkafka (~> 0.4.0) opentelemetry-instrumentation-redis (~> 0.25.1) @@ -420,7 +420,7 @@ GEM opentelemetry-instrumentation-restclient (~> 0.22.1) opentelemetry-instrumentation-ruby_kafka (~> 0.21.0) opentelemetry-instrumentation-sidekiq (~> 0.25.0) - opentelemetry-instrumentation-sinatra (~> 0.23.1) + opentelemetry-instrumentation-sinatra (~> 0.24.0) opentelemetry-instrumentation-trilogy (~> 0.59.0) opentelemetry-instrumentation-aws_lambda (0.1.1) opentelemetry-api (~> 1.0) @@ -453,7 +453,7 @@ GEM opentelemetry-instrumentation-faraday (0.24.6) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-grape (0.1.8) + opentelemetry-instrumentation-grape (0.2.0) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-rack (~> 0.21) @@ -499,14 +499,14 @@ GEM opentelemetry-instrumentation-rack (0.24.6) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-rails (0.30.2) + opentelemetry-instrumentation-rails (0.31.1) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-action_mailer (~> 0.1.0) 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-active_support (~> 0.6.0) opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-rake (0.2.2) opentelemetry-api (~> 1.0) @@ -529,7 +529,7 @@ GEM opentelemetry-instrumentation-sidekiq (0.25.7) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-sinatra (0.23.5) + opentelemetry-instrumentation-sinatra (0.24.1) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-rack (~> 0.21) diff --git a/config/application.rb b/config/application.rb index bb629db75..b4663457c 100644 --- a/config/application.rb +++ b/config/application.rb @@ -36,7 +36,7 @@ class Application < Rails::Application config.i18n.raise_on_missing_translations = true config.i18n.load_path += Dir[Rails.root.join("config/locales/**/*.yml")] config.active_job.queue_adapter = :sidekiq - config.time_zone = "London" + config.govuk_time_zone = "London" config.eager_load_paths << Rails.root.join("lib") config.autoload_paths << Rails.root.join("lib") config.exceptions_app = routes