From a8b0f53af5c9f0fc81afad635289bfb1dff11353 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2024 11:55:44 +0000 Subject: [PATCH 1/2] Bump govuk_app_config from 9.11.2 to 9.12.0 Bumps [govuk_app_config](https://github.com/alphagov/govuk_app_config) from 9.11.2 to 9.12.0. - [Changelog](https://github.com/alphagov/govuk_app_config/blob/main/CHANGELOG.md) - [Commits](https://github.com/alphagov/govuk_app_config/compare/v9.11.2...v9.12.0) --- updated-dependencies: - dependency-name: govuk_app_config dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 97 +++++++++++++++++++++++++++------------------------- 1 file changed, 51 insertions(+), 46 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7bec26f7..d0fbd44b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -148,16 +148,24 @@ GEM warden-oauth2 (~> 0.0.1) globalid (1.2.1) activesupport (>= 6.1) - google-protobuf (3.25.3) - google-protobuf (3.25.3-aarch64-linux) - google-protobuf (3.25.3-arm64-darwin) - google-protobuf (3.25.3-x86_64-linux) - googleapis-common-protos-types (1.14.0) - google-protobuf (~> 3.18) - govuk_app_config (9.11.2) + google-protobuf (4.27.1) + bigdecimal + rake (>= 13) + google-protobuf (4.27.1-aarch64-linux) + bigdecimal + rake (>= 13) + google-protobuf (4.27.1-arm64-darwin) + bigdecimal + rake (>= 13) + google-protobuf (4.27.1-x86_64-linux) + bigdecimal + rake (>= 13) + googleapis-common-protos-types (1.15.0) + google-protobuf (>= 3.18, < 5.a) + govuk_app_config (9.12.0) 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) @@ -257,18 +265,22 @@ 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) opentelemetry-sdk (~> 1.2) opentelemetry-semantic_conventions - opentelemetry-helpers-mysql (0.1.0) + opentelemetry-helpers-mysql (0.1.1) opentelemetry-api (~> 1.0) - opentelemetry-common (~> 0.20) - opentelemetry-helpers-sql-obfuscation (0.1.0) - opentelemetry-common (~> 0.20) + opentelemetry-common (~> 0.21) + opentelemetry-helpers-sql-obfuscation (0.1.1) + opentelemetry-common (~> 0.21) + opentelemetry-instrumentation-action_mailer (0.1.0) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-active_support (~> 0.1) + opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-action_pack (0.9.0) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) @@ -286,11 +298,12 @@ GEM opentelemetry-instrumentation-active_record (0.7.2) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-active_support (0.5.1) + 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) @@ -323,11 +336,15 @@ 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.2) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-base (0.22.3) + opentelemetry-instrumentation-base (0.22.4) opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.21) opentelemetry-registry (~> 0.1) opentelemetry-instrumentation-bunny (0.21.3) opentelemetry-api (~> 1.0) @@ -335,24 +352,20 @@ GEM opentelemetry-instrumentation-concurrent_ruby (0.21.3) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-dalli (0.25.2) + opentelemetry-instrumentation-dalli (0.25.3) opentelemetry-api (~> 1.0) - opentelemetry-common (~> 0.21.0) opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-delayed_job (0.22.2) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-ethon (0.21.5) + opentelemetry-instrumentation-ethon (0.21.7) opentelemetry-api (~> 1.0) - opentelemetry-common (~> 0.21.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-excon (0.22.2) + opentelemetry-instrumentation-excon (0.22.3) opentelemetry-api (~> 1.0) - opentelemetry-common (~> 0.21.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-faraday (0.24.3) + opentelemetry-instrumentation-faraday (0.24.5) opentelemetry-api (~> 1.0) - opentelemetry-common (~> 0.21.0) opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-grape (0.1.8) opentelemetry-api (~> 1.0) @@ -367,13 +380,11 @@ GEM opentelemetry-instrumentation-http (0.23.3) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-http_client (0.22.5) + opentelemetry-instrumentation-http_client (0.22.6) opentelemetry-api (~> 1.0) - opentelemetry-common (~> 0.21.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-koala (0.20.4) + opentelemetry-instrumentation-koala (0.20.5) opentelemetry-api (~> 1.0) - opentelemetry-common (~> 0.21.0) opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-lmdb (0.22.2) opentelemetry-api (~> 1.0) @@ -386,9 +397,8 @@ GEM opentelemetry-helpers-mysql opentelemetry-helpers-sql-obfuscation opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-net_http (0.22.5) + opentelemetry-instrumentation-net_http (0.22.6) opentelemetry-api (~> 1.0) - opentelemetry-common (~> 0.21.0) opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-pg (0.27.3) opentelemetry-api (~> 1.0) @@ -400,12 +410,12 @@ GEM opentelemetry-instrumentation-racecar (0.3.2) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-rack (0.24.4) + opentelemetry-instrumentation-rack (0.24.5) opentelemetry-api (~> 1.0) - opentelemetry-common (~> 0.21.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-rails (0.30.1) + opentelemetry-instrumentation-rails (0.30.2) 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) @@ -415,31 +425,26 @@ GEM opentelemetry-instrumentation-rake (0.2.2) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-rdkafka (0.4.5) + opentelemetry-instrumentation-rdkafka (0.4.6) opentelemetry-api (~> 1.0) - opentelemetry-common (~> 0.21.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-redis (0.25.5) + opentelemetry-instrumentation-redis (0.25.6) opentelemetry-api (~> 1.0) - opentelemetry-common (~> 0.21.0) opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-resque (0.5.2) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-restclient (0.22.5) + opentelemetry-instrumentation-restclient (0.22.6) opentelemetry-api (~> 1.0) - opentelemetry-common (~> 0.21.0) opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-ruby_kafka (0.21.1) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-sidekiq (0.25.4) + opentelemetry-instrumentation-sidekiq (0.25.5) opentelemetry-api (~> 1.0) - opentelemetry-common (~> 0.21.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-sinatra (0.23.4) + opentelemetry-instrumentation-sinatra (0.23.5) opentelemetry-api (~> 1.0) - opentelemetry-common (~> 0.21.0) opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-rack (~> 0.21) opentelemetry-instrumentation-trilogy (0.59.3) @@ -485,7 +490,7 @@ GEM parslet (2.0.0) pg (1.5.6) plek (5.2.0) - prometheus_exporter (2.1.0) + prometheus_exporter (2.1.1) webrick pry (0.14.1) coderay (~> 1.1) From 35b7ce7f92f78269e370c04ed175aa40365175a4 Mon Sep 17 00:00:00 2001 From: Ynda Jas Date: Tue, 25 Jun 2024 10:36:44 +0100 Subject: [PATCH 2/2] Update Rake task logging expectation a8b0f53 bumped `govuk_app_config` from 9.11.2 to 9.12.0, which set the `time_zone` to London in all GOV.UK apps. This appears to change how the timezone is reported when calling `updated_at` on a record: what was `UTC` is now `+0000`. This change resulted in a couple of failing tests, but only related to console logging within a Rake task, so we should be fine just to update our expectations here --- .../tasks/data_hygiene/content_item_deduplicator_spec.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spec/lib/tasks/data_hygiene/content_item_deduplicator_spec.rb b/spec/lib/tasks/data_hygiene/content_item_deduplicator_spec.rb index c3171860..1aedf7e6 100644 --- a/spec/lib/tasks/data_hygiene/content_item_deduplicator_spec.rb +++ b/spec/lib/tasks/data_hygiene/content_item_deduplicator_spec.rb @@ -14,10 +14,10 @@ create(:content_item, content_id: content_item.content_id, locale: "en") expect(Rails.logger).to receive(:info).with("These duplicates were destroyed...") - expect(Rails.logger).to receive(:info).with("#{content_item.content_id},cy,2020-02-27 00:00:00 UTC,#{content_item.base_path}") + expect(Rails.logger).to receive(:info).with("#{content_item.content_id},cy,2020-02-27 00:00:00 +0000,#{content_item.base_path}") expect(Rails.logger).to receive(:info).twice.with("-----------------------------------------------------------------") expect(Rails.logger).to receive(:info).with("These records were preserved...") - expect(Rails.logger).to receive(:info).with("#{content_item.content_id},cy,2020-02-27 00:00:00 UTC,#{content_item2.base_path}") + expect(Rails.logger).to receive(:info).with("#{content_item.content_id},cy,2020-02-27 00:00:00 +0000,#{content_item2.base_path}") expect(Rails.logger).to receive(:info).with("2 duplicates found.") expect(Rails.logger).to receive(:info).with("1 records were removed.") expect(Rails.logger).to receive(:info).with("1 records were preserved.") @@ -33,10 +33,10 @@ create(:content_item, content_id: content_item.content_id, locale: "fr") expect(Rails.logger).to receive(:info).with("These duplicates would be destroyed...") - expect(Rails.logger).to receive(:info).with("#{content_item.content_id},en,2020-02-27 00:00:00 UTC,#{content_item.base_path}") + expect(Rails.logger).to receive(:info).with("#{content_item.content_id},en,2020-02-27 00:00:00 +0000,#{content_item.base_path}") expect(Rails.logger).to receive(:info).twice.with("-----------------------------------------------------------------") expect(Rails.logger).to receive(:info).with("These records would be preserved...") - expect(Rails.logger).to receive(:info).with("#{content_item.content_id},en,2020-02-27 00:00:00 UTC,#{content_item2.base_path}") + expect(Rails.logger).to receive(:info).with("#{content_item.content_id},en,2020-02-27 00:00:00 +0000,#{content_item2.base_path}") expect(Rails.logger).to receive(:info).with("2 duplicates found.") expect(Rails.logger).to receive(:info).with("1 records would be removed.") expect(Rails.logger).to receive(:info).with("1 records would be preserved.")