From e7b7982fe74206f384613265dd69cbc006b7f570 Mon Sep 17 00:00:00 2001 From: manu vasconcelos Date: Tue, 18 Jul 2023 13:26:44 -0300 Subject: [PATCH 1/2] update rails to 6.1.7.4 while keepimg sidekiq under 7 delayed extensions was removed in sidekiq 7 and that breaks things for us https://github.com/sidekiq/sidekiq/blob/main/Changes.md#640 --- Gemfile | 2 +- Gemfile.lock | 340 ++++++++++++++++++++++++++------------------------- 2 files changed, 172 insertions(+), 170 deletions(-) diff --git a/Gemfile b/Gemfile index a346b6f3..0d461ac2 100644 --- a/Gemfile +++ b/Gemfile @@ -46,7 +46,7 @@ gem 'retryable' gem 'puma', '5.6.4' gem 'rack-cors', :require => 'rack/cors' gem 'rails-perftest' -gem 'sidekiq' +gem 'sidekiq', '< 7' gem 'redis', '4.3.1' gem 'nokogiri', '1.14.3', require: false gem 'htmlentities', require: false diff --git a/Gemfile.lock b/Gemfile.lock index abb4a97d..822c378e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -21,102 +21,102 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (6.1.7.3) - actionpack (= 6.1.7.3) - activesupport (= 6.1.7.3) + actioncable (6.1.7.4) + actionpack (= 6.1.7.4) + activesupport (= 6.1.7.4) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.7.3) - actionpack (= 6.1.7.3) - activejob (= 6.1.7.3) - activerecord (= 6.1.7.3) - activestorage (= 6.1.7.3) - activesupport (= 6.1.7.3) + actionmailbox (6.1.7.4) + actionpack (= 6.1.7.4) + activejob (= 6.1.7.4) + activerecord (= 6.1.7.4) + activestorage (= 6.1.7.4) + activesupport (= 6.1.7.4) mail (>= 2.7.1) - actionmailer (6.1.7.3) - actionpack (= 6.1.7.3) - actionview (= 6.1.7.3) - activejob (= 6.1.7.3) - activesupport (= 6.1.7.3) + actionmailer (6.1.7.4) + actionpack (= 6.1.7.4) + actionview (= 6.1.7.4) + activejob (= 6.1.7.4) + activesupport (= 6.1.7.4) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.7.3) - actionview (= 6.1.7.3) - activesupport (= 6.1.7.3) + actionpack (6.1.7.4) + actionview (= 6.1.7.4) + activesupport (= 6.1.7.4) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.7.3) - actionpack (= 6.1.7.3) - activerecord (= 6.1.7.3) - activestorage (= 6.1.7.3) - activesupport (= 6.1.7.3) + actiontext (6.1.7.4) + actionpack (= 6.1.7.4) + activerecord (= 6.1.7.4) + activestorage (= 6.1.7.4) + activesupport (= 6.1.7.4) nokogiri (>= 1.8.5) - actionview (6.1.7.3) - activesupport (= 6.1.7.3) + actionview (6.1.7.4) + activesupport (= 6.1.7.4) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.7.3) - activesupport (= 6.1.7.3) + activejob (6.1.7.4) + activesupport (= 6.1.7.4) globalid (>= 0.3.6) - activemodel (6.1.7.3) - activesupport (= 6.1.7.3) - activerecord (6.1.7.3) - activemodel (= 6.1.7.3) - activesupport (= 6.1.7.3) - activestorage (6.1.7.3) - actionpack (= 6.1.7.3) - activejob (= 6.1.7.3) - activerecord (= 6.1.7.3) - activesupport (= 6.1.7.3) + activemodel (6.1.7.4) + activesupport (= 6.1.7.4) + activerecord (6.1.7.4) + activemodel (= 6.1.7.4) + activesupport (= 6.1.7.4) + activestorage (6.1.7.4) + actionpack (= 6.1.7.4) + activejob (= 6.1.7.4) + activerecord (= 6.1.7.4) + activesupport (= 6.1.7.4) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (6.1.7.3) + activesupport (6.1.7.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - addressable (2.8.1) + addressable (2.8.4) public_suffix (>= 2.0.2, < 6.0) ansi (1.5.0) awesome_print (1.9.2) aws-eventstream (1.2.0) - aws-partitions (1.585.0) - aws-sdk-core (3.130.2) + aws-partitions (1.787.0) + aws-sdk-core (3.178.0) aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.525.0) + aws-partitions (~> 1, >= 1.651.0) + aws-sigv4 (~> 1.5) + jmespath (~> 1, >= 1.6.1) + aws-sdk-kms (1.71.0) + aws-sdk-core (~> 3, >= 3.177.0) aws-sigv4 (~> 1.1) - jmespath (~> 1.0) - aws-sdk-kms (1.56.0) - aws-sdk-core (~> 3, >= 3.127.0) - aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.114.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-s3 (1.130.0) + aws-sdk-core (~> 3, >= 3.177.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.4) - aws-sigv4 (1.5.0) + aws-sigv4 (~> 1.6) + aws-sigv4 (1.6.0) aws-eventstream (~> 1, >= 1.0.2) - benchmark-ips (2.10.0) + benchmark-ips (2.12.0) bindex (0.8.1) - buftok (0.2.0) + buftok (0.3.0) builder (3.2.4) byebug (11.1.3) codeclimate-test-reporter (1.0.8) simplecov (<= 0.13) concurrent-ruby (1.2.2) - connection_pool (2.2.5) + connection_pool (2.4.1) crack (0.4.5) rexml crass (1.0.6) date (3.3.3) - dead_end (3.1.1) + dead_end (4.0.0) derailed (0.1.0) derailed_benchmarks - derailed_benchmarks (2.1.1) + derailed_benchmarks (2.1.2) benchmark-ips (~> 2) dead_end get_process_mem (~> 0) @@ -143,30 +143,30 @@ GEM ffi (~> 1.0) globalid (1.1.0) activesupport (>= 5.0) - google-protobuf (3.21.12) - googleapis-common-protos-types (1.4.0) + google-protobuf (3.23.4) + googleapis-common-protos-types (1.7.0) google-protobuf (~> 3.14) hashdiff (1.0.1) heapy (0.2.0) thor htmlentities (4.3.4) - http (4.4.1) - addressable (~> 2.3) + http (5.1.1) + addressable (~> 2.8) http-cookie (~> 1.0) http-form_data (~> 2.2) - http-parser (~> 1.2.0) - http-cookie (1.0.4) + llhttp-ffi (~> 0.4.0) + http-cookie (1.0.5) domain_name (~> 0.5) http-form_data (2.3.0) - http-parser (1.2.3) - ffi-compiler (>= 1.0, < 2.0) - http_parser.rb (0.6.0) - i18n (1.13.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) - jmespath (1.6.1) - json (2.6.1) + jmespath (1.6.2) + json (2.6.3) json-schema (2.8.1) addressable (>= 2.4) + llhttp-ffi (0.4.0) + ffi-compiler (~> 1.0) + rake (~> 13.0) lograge (0.12.0) actionpack (>= 4) activesupport (>= 4) @@ -186,20 +186,20 @@ GEM marcel (1.0.2) memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) - memory_profiler (1.0.0) + memory_profiler (1.0.1) method_source (1.0.0) mini_histogram (0.3.1) mini_mime (1.1.2) - mini_portile2 (2.8.1) + mini_portile2 (2.8.4) minitest (5.10.1) minitest-retry (0.2.2) minitest (>= 5.0) mocha (1.14.0) - multipart-post (2.1.1) + multipart-post (2.3.0) naught (1.1.0) net-http (0.3.2) uri - net-imap (0.3.4) + net-imap (0.3.6) date net-protocol net-pop (0.1.2) @@ -213,121 +213,123 @@ GEM mini_portile2 (~> 2.8.0) racc (~> 1.4) open_uri_redirections (0.2.1) - opentelemetry-api (1.1.0) - opentelemetry-common (0.19.6) + opentelemetry-api (1.2.0) + opentelemetry-common (0.19.7) opentelemetry-api (~> 1.0) - opentelemetry-exporter-otlp (0.24.0) + opentelemetry-exporter-otlp (0.25.0) google-protobuf (~> 3.19) googleapis-common-protos-types (~> 1.3) opentelemetry-api (~> 1.1) opentelemetry-common (~> 0.19.6) opentelemetry-sdk (~> 1.2) opentelemetry-semantic_conventions - opentelemetry-instrumentation-action_pack (0.3.2) + opentelemetry-instrumentation-action_pack (0.7.0) opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.21.0) + opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-rack (~> 0.21) - opentelemetry-instrumentation-action_view (0.3.0) + opentelemetry-instrumentation-action_view (0.6.0) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-active_support (~> 0.1) - opentelemetry-instrumentation-base (~> 0.20) - opentelemetry-instrumentation-active_job (0.3.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-active_job (0.5.1) opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.21.0) - opentelemetry-instrumentation-active_record (0.4.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-active_record (0.6.1) opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.21.0) + opentelemetry-instrumentation-base (~> 0.22.1) ruby2_keywords - opentelemetry-instrumentation-active_support (0.2.0) + opentelemetry-instrumentation-active_support (0.4.1) opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.21.0) - opentelemetry-instrumentation-aws_sdk (0.3.1) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-aws_sdk (0.4.1) opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.21.0) - opentelemetry-instrumentation-base (0.21.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-base (0.22.1) opentelemetry-api (~> 1.0) opentelemetry-registry (~> 0.1) - opentelemetry-instrumentation-concurrent_ruby (0.20.0) + opentelemetry-instrumentation-concurrent_ruby (0.21.1) opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.21.0) - opentelemetry-instrumentation-http (0.20.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-http (0.23.1) opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.21.0) - opentelemetry-instrumentation-net_http (0.21.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-net_http (0.22.1) opentelemetry-api (~> 1.0) opentelemetry-common (~> 0.19.3) - opentelemetry-instrumentation-base (~> 0.21.0) - opentelemetry-instrumentation-rack (0.21.1) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-rack (0.23.2) opentelemetry-api (~> 1.0) opentelemetry-common (~> 0.19.3) - opentelemetry-instrumentation-base (~> 0.21.0) - opentelemetry-instrumentation-rails (0.23.1) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-rails (0.27.1) opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-action_pack (~> 0.3.1) - opentelemetry-instrumentation-action_view (~> 0.3.0) - opentelemetry-instrumentation-active_record (~> 0.4.0) - opentelemetry-instrumentation-active_support (~> 0.2.0) - opentelemetry-instrumentation-base (~> 0.21.0) - opentelemetry-instrumentation-rake (0.1.0) + opentelemetry-instrumentation-action_pack (~> 0.7.0) + opentelemetry-instrumentation-action_view (~> 0.6.0) + opentelemetry-instrumentation-active_job (~> 0.5.1) + opentelemetry-instrumentation-active_record (~> 0.6.1) + opentelemetry-instrumentation-active_support (~> 0.4.1) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-rake (0.2.1) opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.21.0) - opentelemetry-instrumentation-sidekiq (0.22.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-sidekiq (0.24.1) opentelemetry-api (~> 1.0) opentelemetry-common (~> 0.19.3) - opentelemetry-instrumentation-base (~> 0.21.0) - opentelemetry-registry (0.2.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-registry (0.3.0) opentelemetry-api (~> 1.1) - opentelemetry-sdk (1.2.0) + opentelemetry-sdk (1.2.1) opentelemetry-api (~> 1.1) opentelemetry-common (~> 0.19.3) opentelemetry-registry (~> 0.2) opentelemetry-semantic_conventions - opentelemetry-semantic_conventions (1.8.0) + opentelemetry-semantic_conventions (1.10.0) opentelemetry-api (~> 1.0) - parallel (1.22.1) - parallel_tests (3.8.1) + parallel (1.23.0) + parallel_tests (4.2.1) parallel pg (1.1.0) public_suffix (4.0.7) puma (5.6.4) nio4r (~> 2.0) - racc (1.6.2) + racc (1.7.1) rack (2.2.7) - rack-cors (1.1.1) + rack-cors (2.0.1) rack (>= 2.0.0) rack-protection (2.0.1) rack rack-test (2.1.0) rack (>= 1.3) railroady (1.6.0) - rails (6.1.7.3) - actioncable (= 6.1.7.3) - actionmailbox (= 6.1.7.3) - actionmailer (= 6.1.7.3) - actionpack (= 6.1.7.3) - actiontext (= 6.1.7.3) - actionview (= 6.1.7.3) - activejob (= 6.1.7.3) - activemodel (= 6.1.7.3) - activerecord (= 6.1.7.3) - activestorage (= 6.1.7.3) - activesupport (= 6.1.7.3) + rails (6.1.7.4) + actioncable (= 6.1.7.4) + actionmailbox (= 6.1.7.4) + actionmailer (= 6.1.7.4) + actionpack (= 6.1.7.4) + actiontext (= 6.1.7.4) + actionview (= 6.1.7.4) + activejob (= 6.1.7.4) + activemodel (= 6.1.7.4) + activerecord (= 6.1.7.4) + activestorage (= 6.1.7.4) + activesupport (= 6.1.7.4) bundler (>= 1.15.0) - railties (= 6.1.7.3) + railties (= 6.1.7.4) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) activesupport (>= 5.0.1.rc1) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + rails-dom-testing (2.1.1) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) rails-html-sanitizer (1.4.4) loofah (~> 2.19, >= 2.19.1) rails-perftest (0.0.7) - railties (6.1.7.3) - actionpack (= 6.1.7.3) - activesupport (= 6.1.7.3) + railties (6.1.7.4) + actionpack (= 6.1.7.4) + activesupport (= 6.1.7.4) method_source rake (>= 12.2) thor (~> 1.0) @@ -335,34 +337,34 @@ GEM redis (4.3.1) request_store (1.5.1) rack (>= 1.4) - responders (3.0.1) - actionpack (>= 5.0) - railties (>= 5.0) + responders (3.1.0) + actionpack (>= 5.2) + railties (>= 5.2) retryable (3.0.5) rexml (3.2.5) - rspec-core (3.11.0) - rspec-support (~> 3.11.0) - rspec-expectations (3.11.0) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-mocks (3.11.1) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-rails (5.1.2) - actionpack (>= 5.2) - activesupport (>= 5.2) - railties (>= 5.2) - rspec-core (~> 3.10) - rspec-expectations (~> 3.10) - rspec-mocks (~> 3.10) - rspec-support (~> 3.10) - rspec-support (3.11.0) - rswag-api (2.5.1) + rspec-support (~> 3.12.0) + rspec-rails (6.0.3) + actionpack (>= 6.1) + activesupport (>= 6.1) + railties (>= 6.1) + rspec-core (~> 3.12) + rspec-expectations (~> 3.12) + rspec-mocks (~> 3.12) + rspec-support (~> 3.12) + rspec-support (3.12.1) + rswag-api (2.10.1) railties (>= 3.1, < 7.1) - rswag-ui (2.5.1) + rswag-ui (2.10.1) actionpack (>= 3.1, < 7.1) railties (>= 3.1, < 7.1) - ruby-statistics (3.0.0) + ruby-statistics (3.0.2) ruby2_keywords (0.0.5) sass-rails (6.0.0) sassc-rails (~> 2.1, >= 2.1.1) @@ -374,15 +376,15 @@ GEM sprockets (> 3.0) sprockets-rails tilt - sentry-rails (5.8.0) + sentry-rails (5.10.0) railties (>= 5.0) - sentry-ruby (~> 5.8.0) - sentry-ruby (5.8.0) + sentry-ruby (~> 5.10.0) + sentry-ruby (5.10.0) concurrent-ruby (~> 1.0, >= 1.0.2) - sentry-sidekiq (5.8.0) - sentry-ruby (~> 5.8.0) + sentry-sidekiq (5.10.0) + sentry-ruby (~> 5.10.0) sidekiq (>= 3.0) - sidekiq (6.4.2) + sidekiq (6.5.1) connection_pool (>= 2.2.2) rack (~> 2.0) redis (>= 4.2.0) @@ -406,17 +408,17 @@ GEM sprockets (>= 3.0.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - thor (1.2.1) + thor (1.2.2) thread_safe (0.3.6) - tilt (2.0.10) - timeout (0.3.2) - twitter (7.0.0) + tilt (2.2.0) + timeout (0.4.0) + twitter (8.0.0) addressable (~> 2.3) - buftok (~> 0.2.0) + buftok (~> 0.3.0) equalizer (~> 0.0.11) - http (~> 4.0) - http-form_data (~> 2.0) - http_parser.rb (~> 0.6.0) + http (~> 5.1) + http-form_data (~> 2.3) + llhttp-ffi (~> 0.4.0) memoizable (~> 0.4.0) multipart-post (~> 2.0) naught (~> 1.0) @@ -425,15 +427,15 @@ GEM concurrent-ruby (~> 1.0) unf (0.1.4) unf_ext - unf_ext (0.0.8.1) - unicode-display_width (2.1.0) + unf_ext (0.0.8.2) + unicode-display_width (2.4.2) uri (0.12.2) web-console (3.5.1) actionview (>= 5.0) activemodel (>= 5.0) bindex (>= 0.4.0) railties (>= 5.0) - webmock (3.14.0) + webmock (3.18.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -442,7 +444,7 @@ GEM websocket-extensions (0.1.5) yt (0.25.40) activesupport - zeitwerk (2.6.7) + zeitwerk (2.6.8) PLATFORMS ruby @@ -506,7 +508,7 @@ DEPENDENCIES sentry-rails sentry-ruby sentry-sidekiq - sidekiq + sidekiq (< 7) simplecov (= 0.13.0) simplecov-console spring From 6af1098084bc8b216c793561af78fcfb7ce6d8de Mon Sep 17 00:00:00 2001 From: manu vasconcelos Date: Tue, 18 Jul 2023 16:15:58 -0300 Subject: [PATCH 2/2] downgrade addressable to 2.8.1 There seems to be a super old monkey patch in postrank that messes with the normalize method, starting at 2.8.2 version. Until postrank fixes that we can only go up to 2.8.1 relevant links: https://github.com/sporkmonger/addressable/issues/513 https://github.com/sporkmonger/addressable/issues/506 https://github.com/postrank-labs/postrank-uri/issues/49 --- Gemfile | 4 ++-- Gemfile.lock | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 0d461ac2..ae5e3363 100644 --- a/Gemfile +++ b/Gemfile @@ -18,7 +18,7 @@ group :development do end group :test do gem 'parallel_tests' - gem "mocha", "~> 1.14.0", require: false + gem "mocha", '~> 1.14.0', require: false gem 'simplecov', '0.13.0', require: false gem 'simplecov-console', require: false gem 'codeclimate-test-reporter', '1.0.8', group: :test, require: nil @@ -73,7 +73,7 @@ gem 'opentelemetry-instrumentation-rack' gem 'opentelemetry-instrumentation-rails' gem 'opentelemetry-instrumentation-rake' gem 'opentelemetry-instrumentation-sidekiq' -gem 'addressable' +gem 'addressable', '2.8.1' # Adding this removes some deprecation warnings, caused by double-loading of the net-protocol library # (see https://github.com/ruby/net-imap/issues/16). We *might* be able to remove this after upgrading to Ruby 3 gem 'net-http' diff --git a/Gemfile.lock b/Gemfile.lock index 822c378e..e5ee732f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -80,7 +80,7 @@ GEM minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - addressable (2.8.4) + addressable (2.8.1) public_suffix (>= 2.0.2, < 6.0) ansi (1.5.0) awesome_print (1.9.2) @@ -450,7 +450,7 @@ PLATFORMS ruby DEPENDENCIES - addressable + addressable (= 2.8.1) awesome_print aws-sdk-s3 byebug