Fix trace tag interpolation, and add a test

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 75487913facec230fab68e7aa7a48625a613c167..71317a646dc5bb4a1ea030f046b27406fded2510 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -4,62 +4,62 @@ GEM
     SystemTimer (1.2.3)
     aasm (5.1.1)
       concurrent-ruby (~> 1.0)
     SystemTimer (1.2.3)
     aasm (5.1.1)
       concurrent-ruby (~> 1.0)

-    actioncable (6.0.3.3)
-      actionpack (= 6.0.3.3)
+    actioncable (6.0.3.4)
+      actionpack (= 6.0.3.4)

       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)

-    actionmailbox (6.0.3.3)
-      actionpack (= 6.0.3.3)
-      activejob (= 6.0.3.3)
-      activerecord (= 6.0.3.3)
-      activestorage (= 6.0.3.3)
-      activesupport (= 6.0.3.3)
+    actionmailbox (6.0.3.4)
+      actionpack (= 6.0.3.4)
+      activejob (= 6.0.3.4)
+      activerecord (= 6.0.3.4)
+      activestorage (= 6.0.3.4)
+      activesupport (= 6.0.3.4)

       mail (>= 2.7.1)
       mail (>= 2.7.1)

-    actionmailer (6.0.3.3)
-      actionpack (= 6.0.3.3)
-      actionview (= 6.0.3.3)
-      activejob (= 6.0.3.3)
+    actionmailer (6.0.3.4)
+      actionpack (= 6.0.3.4)
+      actionview (= 6.0.3.4)
+      activejob (= 6.0.3.4)

       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)

-    actionpack (6.0.3.3)
-      actionview (= 6.0.3.3)
-      activesupport (= 6.0.3.3)
+    actionpack (6.0.3.4)
+      actionview (= 6.0.3.4)
+      activesupport (= 6.0.3.4)

       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
     actionpack-page_caching (1.2.3)
       actionpack (>= 5.0.0)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
     actionpack-page_caching (1.2.3)
       actionpack (>= 5.0.0)

-    actiontext (6.0.3.3)
-      actionpack (= 6.0.3.3)
-      activerecord (= 6.0.3.3)
-      activestorage (= 6.0.3.3)
-      activesupport (= 6.0.3.3)
+    actiontext (6.0.3.4)
+      actionpack (= 6.0.3.4)
+      activerecord (= 6.0.3.4)
+      activestorage (= 6.0.3.4)
+      activesupport (= 6.0.3.4)

       nokogiri (>= 1.8.5)
       nokogiri (>= 1.8.5)

-    actionview (6.0.3.3)
-      activesupport (= 6.0.3.3)
+    actionview (6.0.3.4)
+      activesupport (= 6.0.3.4)

       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
     active_record_union (1.3.0)
       activerecord (>= 4.0)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
     active_record_union (1.3.0)
       activerecord (>= 4.0)

-    activejob (6.0.3.3)
-      activesupport (= 6.0.3.3)
+    activejob (6.0.3.4)
+      activesupport (= 6.0.3.4)

       globalid (>= 0.3.6)
       globalid (>= 0.3.6)

-    activemodel (6.0.3.3)
-      activesupport (= 6.0.3.3)
-    activerecord (6.0.3.3)
-      activemodel (= 6.0.3.3)
-      activesupport (= 6.0.3.3)
-    activerecord-import (1.0.6)
+    activemodel (6.0.3.4)
+      activesupport (= 6.0.3.4)
+    activerecord (6.0.3.4)
+      activemodel (= 6.0.3.4)
+      activesupport (= 6.0.3.4)
+    activerecord-import (1.0.7)

       activerecord (>= 3.2)
       activerecord (>= 3.2)

-    activestorage (6.0.3.3)
-      actionpack (= 6.0.3.3)
-      activejob (= 6.0.3.3)
-      activerecord (= 6.0.3.3)
+    activestorage (6.0.3.4)
+      actionpack (= 6.0.3.4)
+      activejob (= 6.0.3.4)
+      activerecord (= 6.0.3.4)

       marcel (~> 0.3.1)
       marcel (~> 0.3.1)

-    activesupport (6.0.3.3)
+    activesupport (6.0.3.4)

       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)


@@ -71,11 +71,11 @@ GEM
       activerecord (>= 3.2, < 7.0)
       rake (>= 10.4, < 14.0)
     ast (2.4.1)
       activerecord (>= 3.2, < 7.0)
       rake (>= 10.4, < 14.0)
     ast (2.4.1)

-    autoprefixer-rails (10.0.1.0)
+    autoprefixer-rails (10.0.2.0)

       execjs
     aws-eventstream (1.1.0)
       execjs
     aws-eventstream (1.1.0)

-    aws-partitions (1.380.0)
-    aws-sdk-core (3.109.0)
+    aws-partitions (1.390.0)
+    aws-sdk-core (3.109.2)

       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)


@@ -83,13 +83,13 @@ GEM
     aws-sdk-kms (1.39.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-kms (1.39.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)

-    aws-sdk-s3 (1.83.0)
+    aws-sdk-s3 (1.84.1)

       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.2.2)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.2.2)
       aws-eventstream (~> 1, >= 1.0.2)

-    better_errors (2.8.3)
+    better_errors (2.9.1)

       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)


@@ -104,9 +104,9 @@ GEM
     bigdecimal (1.1.0)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     bigdecimal (1.1.0)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)

-    bootsnap (1.4.8)
+    bootsnap (1.5.1)

       msgpack (~> 1.0)
       msgpack (~> 1.0)

-    bootstrap (4.5.2)
+    bootstrap (4.5.3)

       autoprefixer-rails (>= 9.1.0)
       popper_js (>= 1.14.3, < 2)
       sassc-rails (>= 2.0.0)
       autoprefixer-rails (>= 9.1.0)
       popper_js (>= 1.14.3, < 2)
       sassc-rails (>= 2.0.0)


@@ -131,7 +131,7 @@ GEM
       xpath (~> 3.2)
     childprocess (3.0.0)
     coderay (1.1.3)
       xpath (~> 3.2)
     childprocess (3.0.0)
     coderay (1.1.3)

-    composite_primary_keys (12.0.2)
+    composite_primary_keys (12.0.3)

       activerecord (~> 6.0.0)
     concurrent-ruby (1.1.7)
     config (2.2.1)
       activerecord (~> 6.0.0)
     concurrent-ruby (1.1.7)
     config (2.2.1)


@@ -209,8 +209,9 @@ GEM
     factory_bot_rails (6.1.0)
       factory_bot (~> 6.1.0)
       railties (>= 5.0.0)
     factory_bot_rails (6.1.0)
       factory_bot (~> 6.1.0)
       railties (>= 5.0.0)

-    faraday (1.0.1)
+    faraday (1.1.0)

       multipart-post (>= 1.2, < 3)
       multipart-post (>= 1.2, < 3)

+      ruby2_keywords

     ffi (1.13.1)
     ffi-libarchive (1.0.4)
       ffi (~> 1.0)
     ffi (1.13.1)
     ffi-libarchive (1.0.4)
       ffi (~> 1.0)


@@ -226,7 +227,7 @@ GEM
     http_accept_language (2.1.1)
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)
     http_accept_language (2.1.1)
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)

-    i18n-js (3.7.1)
+    i18n-js (3.8.0)

       i18n (>= 0.6.6)
     image_optim (0.27.1)
       exifr (~> 1.2, >= 1.2.2)
       i18n (>= 0.6.6)
     image_optim (0.27.1)
       exifr (~> 1.2, >= 1.2.2)


@@ -252,8 +253,8 @@ GEM
     kgio (2.11.3)
     kramdown (2.3.0)
       rexml
     kgio (2.11.3)
     kramdown (2.3.0)
       rexml

-    libxml-ruby (3.2.0)
-    listen (3.2.1)
+    libxml-ruby (3.2.1)
+    listen (3.3.1)

       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     logstash-event (1.2.02)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     logstash-event (1.2.02)


@@ -271,7 +272,7 @@ GEM
     maxminddb (0.1.22)
     method_source (1.0.0)
     mimemagic (0.3.5)
     maxminddb (0.1.22)
     method_source (1.0.0)
     mimemagic (0.3.5)

-    mini_magick (4.10.1)
+    mini_magick (4.11.0)

     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.14.2)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.14.2)


@@ -299,7 +300,7 @@ GEM
     omniauth (1.9.1)
       hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
     omniauth (1.9.1)
       hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)

-    omniauth-facebook (7.0.0)
+    omniauth-facebook (8.0.0)

       omniauth-oauth2 (~> 1.2)
     omniauth-github (1.4.0)
       omniauth (~> 1.5)
       omniauth-oauth2 (~> 1.2)
     omniauth-github (1.4.0)
       omniauth (~> 1.5)


@@ -324,15 +325,15 @@ GEM
       multi_json (~> 1.12)
       omniauth-oauth2 (~> 1.4)
     openstreetmap-deadlock_retry (1.3.0)
       multi_json (~> 1.12)
       omniauth-oauth2 (~> 1.4)
     openstreetmap-deadlock_retry (1.3.0)

-    parallel (1.19.2)
-    parser (2.7.1.5)
+    parallel (1.20.0)
+    parser (2.7.2.0)

       ast (~> 2.4.1)
     pg (1.2.3)
     popper_js (1.16.0)
     progress (3.5.2)
     psych (3.2.0)
     public_suffix (4.0.6)
       ast (~> 2.4.1)
     pg (1.2.3)
     popper_js (1.16.0)
     progress (3.5.2)
     psych (3.2.0)
     public_suffix (4.0.6)

-    puma (5.0.2)
+    puma (5.0.4)

       nio4r (~> 2.0)
     quad_tile (1.0.1)
     r2 (0.2.7)
       nio4r (~> 2.0)
     quad_tile (1.0.1)
     r2 (0.2.7)


@@ -345,20 +346,20 @@ GEM
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rack-uri_sanitizer (0.0.2)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rack-uri_sanitizer (0.0.2)

-    rails (6.0.3.3)
-      actioncable (= 6.0.3.3)
-      actionmailbox (= 6.0.3.3)
-      actionmailer (= 6.0.3.3)
-      actionpack (= 6.0.3.3)
-      actiontext (= 6.0.3.3)
-      actionview (= 6.0.3.3)
-      activejob (= 6.0.3.3)
-      activemodel (= 6.0.3.3)
-      activerecord (= 6.0.3.3)
-      activestorage (= 6.0.3.3)
-      activesupport (= 6.0.3.3)
+    rails (6.0.3.4)
+      actioncable (= 6.0.3.4)
+      actionmailbox (= 6.0.3.4)
+      actionmailer (= 6.0.3.4)
+      actionpack (= 6.0.3.4)
+      actiontext (= 6.0.3.4)
+      actionview (= 6.0.3.4)
+      activejob (= 6.0.3.4)
+      activemodel (= 6.0.3.4)
+      activerecord (= 6.0.3.4)
+      activestorage (= 6.0.3.4)
+      activesupport (= 6.0.3.4)

       bundler (>= 1.3.0)
       bundler (>= 1.3.0)

-      railties (= 6.0.3.3)
+      railties (= 6.0.3.4)

       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)


@@ -372,9 +373,9 @@ GEM
     rails-i18n (6.0.0)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 7)
     rails-i18n (6.0.0)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 7)

-    railties (6.0.3.3)
-      actionpack (= 6.0.3.3)
-      activesupport (= 6.0.3.3)
+    railties (6.0.3.4)
+      actionpack (= 6.0.3.4)
+      activesupport (= 6.0.3.4)

       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)


@@ -383,27 +384,27 @@ GEM
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)

-    regexp_parser (1.8.1)
+    regexp_parser (1.8.2)

     request_store (1.5.0)
       rack (>= 1.4)
     rexml (3.2.4)
     rinku (2.0.6)
     rotp (6.2.0)
     request_store (1.5.0)
       rack (>= 1.4)
     rexml (3.2.4)
     rinku (2.0.6)
     rotp (6.2.0)

-    rubocop (0.92.0)
+    rubocop (0.93.1)

       parallel (~> 1.10)
       parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
       parallel (~> 1.10)
       parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)

-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8)

       rexml
       rexml

-      rubocop-ast (>= 0.5.0)
+      rubocop-ast (>= 0.6.0)

       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)

-    rubocop-ast (0.7.1)
+    rubocop-ast (1.1.1)

       parser (>= 2.7.1.5)
     rubocop-minitest (0.10.1)
       rubocop (>= 0.87)
       parser (>= 2.7.1.5)
     rubocop-minitest (0.10.1)
       rubocop (>= 0.87)

-    rubocop-performance (1.8.1)
-      rubocop (>= 0.87.0)
+    rubocop-performance (1.9.0)
+      rubocop (>= 0.90.0, < 2.0)

       rubocop-ast (>= 0.4.0)
     rubocop-rails (2.8.1)
       activesupport (>= 4.2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rails (2.8.1)
       activesupport (>= 4.2.0)


@@ -411,6 +412,7 @@ GEM
       rubocop (>= 0.87.0)
     ruby-openid (2.9.2)
     ruby-progressbar (1.10.1)
       rubocop (>= 0.87.0)
     ruby-openid (2.9.2)
     ruby-progressbar (1.10.1)

+    ruby2_keywords (0.0.2)

     rubyzip (2.3.0)
     sanitize (5.2.1)
       crass (~> 1.0.2)
     rubyzip (2.3.0)
     sanitize (5.2.1)
       crass (~> 1.0.2)


@@ -441,7 +443,7 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)

-    strong_migrations (0.7.1)
+    strong_migrations (0.7.2)

       activerecord (>= 5)
     sync (0.5.0)
     term-ansicolor (1.7.1)
       activerecord (>= 5)
     sync (0.5.0)
     term-ansicolor (1.7.1)


@@ -451,7 +453,7 @@ GEM
     tilt (2.0.10)
     tins (1.25.0)
       sync
     tilt (2.0.10)
     tins (1.25.0)
       sync

-    tzinfo (1.2.7)
+    tzinfo (1.2.8)

       thread_safe (~> 0.1)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
       thread_safe (~> 0.1)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)


@@ -459,7 +461,7 @@ GEM
     validates_email_format_of (1.6.3)
       i18n
     vendorer (0.2.0)
     validates_email_format_of (1.6.3)
       i18n
     vendorer (0.2.0)

-    webmock (3.9.1)
+    webmock (3.10.0)

       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)


@@ -468,7 +470,7 @@ GEM
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)

-    zeitwerk (2.4.0)
+    zeitwerk (2.4.1)

 
 PLATFORMS
   ruby
 
 PLATFORMS
   ruby


@@ -537,7 +539,7 @@ DEPENDENCIES
   r2 (~> 0.2.7)
   rack-cors
   rack-uri_sanitizer
   r2 (~> 0.2.7)
   rack-cors
   rack-uri_sanitizer

-  rails (= 6.0.3.3)
+  rails (= 6.0.3.4)

   rails-controller-testing
   rails-i18n (~> 6.0.0)
   rinku (>= 2.0.6)
   rails-controller-testing
   rails-i18n (~> 6.0.0)
   rinku (>= 2.0.6)