Fix brownout requests in analytics logs missing user information; Dependency updates; Prevent duplicative CI runs

.github/workflows/main.yml

@@ -2,9 +2,14 @@ name: CI
 
 on:
   push:
-    branches: "**"
+    branches:
+      - main
   pull_request:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: natlabrockies/api-umbrella

Gemfile

@@ -6,13 +6,13 @@ ruby "~> 3.1"
 gem "thor", "~> 1.5.0"
 
 # Tests
-gem "minitest", "~> 5.26.2"
+gem "minitest", "~> 5.26"
 
 # CLI helper for running tests
 gem "minitest-sprint", "~> 1.3.0"
 
 # More test outputs
-gem "minitest-reporters", "~> 1.7.1"
+gem "minitest-reporters", "~> 1.8.0"
 
 # For an "after_all" callback.
 gem "minitest-hooks", "~> 1.5.0"
@@ -25,23 +25,23 @@ gem "minitest-ci", "~> 3.4.0"
 
 # Ruby lint/style checker
 gem "rubocop", "~> 1.81", :require => false
-gem "rubocop-minitest", "~> 0.38.2", :require => false
+gem "rubocop-minitest", "~> 0.39.1", :require => false
 
 # Running background processes
 gem "childprocess"
 
 # Making HTTP requests
-gem "typhoeus", "~> 1.5.0"
+gem "typhoeus", "~> 1.6.0"
 
 # JSON parsing
-gem "multi_json", "~> 1.19.1"
+gem "multi_json", "~> 1.19"
 gem "oj", "~> 3.16"
 
 # Database libraries
 gem "activerecord", "~> 7.2.3", :require => "active_record"
 gem "pg", "~> 1.6.2"
 gem "opensearch-ruby", "~> 3.4.0"
-gem "faraday-typhoeus", "~> 1.1.0"
+gem "faraday-typhoeus", "~> 2.0.0"
 gem "active_attr", "~> 0.17.2"
 
 # Factories for test database data
@@ -51,14 +51,14 @@ gem "factory_bot", "~> 6.5.6"
 gem "rails_compatible_cookies_utils", "~> 0.1.0"
 
 # URL parsing/generation
-gem "addressable", "~> 2.8.0"
+gem "addressable", "~> 2.9.0"
 
 # Browser/JavaScript integration tests
 gem "capybara", "~> 3.32"
 gem "selenium-webdriver", "~> 4.32"
 
 # Take screenshots on capybara test failures
-gem "capybara-screenshot", "~> 1.0.22"
+gem "capybara-screenshot", "~> 1.0.27"
 
 # Adds support for `assert_text` for shadow DOM tests.
 gem "capybara-shadowdom", "~> 0.3.0"
@@ -79,7 +79,7 @@ gem "concurrent-ruby", "~> 1.3.3"
 gem "zonebie", "~> 0.6.1"
 
 # Encrypting admin passwords.
-gem "bcrypt", "~> 3.1.21"
+gem "bcrypt", "~> 3.1.22"
 
 # Encrypting/decrypting database values.
 gem "encryptor", "~> 3.0.0"

Gemfile.lock

@@ -1,9 +1,9 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.2.3)
-      actionview (= 7.2.3)
-      activesupport (= 7.2.3)
+    actionpack (7.2.3.1)
+      actionview (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
       cgi
       nokogiri (>= 1.8.5)
       racc
@@ -13,8 +13,8 @@ GEM
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actionview (7.2.3)
-      activesupport (= 7.2.3)
+    actionview (7.2.3.1)
+      activesupport (= 7.2.3.1)
       builder (~> 3.1)
       cgi
       erubi (~> 1.11)
@@ -24,13 +24,13 @@ GEM
       actionpack (>= 3.0.2, < 8.2)
       activemodel (>= 3.0.2, < 8.2)
       activesupport (>= 3.0.2, < 8.2)
-    activemodel (7.2.3)
-      activesupport (= 7.2.3)
-    activerecord (7.2.3)
-      activemodel (= 7.2.3)
-      activesupport (= 7.2.3)
+    activemodel (7.2.3.1)
+      activesupport (= 7.2.3.1)
+    activerecord (7.2.3.1)
+      activemodel (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
       timeout (>= 0.4.0)
-    activesupport (7.2.3)
+    activesupport (7.2.3.1)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -39,18 +39,18 @@ GEM
       drb
       i18n (>= 1.6, < 2)
       logger (>= 1.4.2)
-      minitest (>= 5.1)
+      minitest (>= 5.1, < 6)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
-    addressable (2.8.8)
+    addressable (2.9.0)
       public_suffix (>= 2.0.2, < 8.0)
-    ansi (1.5.0)
+    ansi (1.6.0)
     ast (2.4.3)
     awesome_print (1.9.2)
     base64 (0.3.0)
-    bcrypt (3.1.21)
+    bcrypt (3.1.22)
     benchmark (0.5.0)
-    bigdecimal (4.0.1)
+    bigdecimal (4.1.2)
     builder (3.3.0)
     capybara (3.40.0)
       addressable
@@ -61,7 +61,7 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    capybara-screenshot (1.0.26)
+    capybara-screenshot (1.0.27)
       capybara (>= 1.0, < 4)
       launchy
     capybara-shadowdom (0.3.0)
@@ -75,48 +75,49 @@ GEM
     drb (2.2.3)
     encryptor (3.0.0)
     erubi (1.13.1)
-    ethon (0.15.0)
+    ethon (0.18.0)
       ffi (>= 1.15.0)
+      logger
     factory_bot (6.5.6)
       activesupport (>= 6.1.0)
-    faker (3.6.0)
+    faker (3.6.1)
       i18n (>= 1.8.11, < 2)
     faraday (2.14.1)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
     faraday-net_http (3.4.2)
       net-http (~> 0.5)
-    faraday-typhoeus (1.1.0)
+    faraday-typhoeus (2.0.0)
       faraday (~> 2.0)
       typhoeus (~> 1.4)
-    ffi (1.17.3)
+    ffi (1.17.4)
     i18n (1.14.8)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
-    json (2.18.1)
+    json (2.19.4)
     language_server-protocol (3.17.0.5)
     launchy (3.1.1)
       addressable (~> 2.8)
       childprocess (~> 5.0)
       logger (~> 1.6)
     lint_roller (1.1.0)
     logger (1.7.0)
-    loofah (2.25.0)
+    loofah (2.25.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     matrix (0.4.3)
     mini_mime (1.1.5)
     mini_portile2 (2.8.9)
-    minitest (5.26.2)
+    minitest (5.27.0)
     minitest-ci (3.4.0)
       minitest (>= 5.0.6)
     minitest-hooks (1.5.3)
       minitest (> 5.3)
-    minitest-reporters (1.7.1)
+    minitest-reporters (1.8.0)
       ansi
       builder
-      minitest (>= 5.0)
+      minitest (>= 5.0, < 7)
       ruby-progressbar
     minitest-retry (0.3.1)
       minitest (>= 5.0)
@@ -132,15 +133,15 @@ GEM
     nokogiri (1.18.10)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    oj (3.16.15)
+    oj (3.17.0)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
     opensearch-ruby (3.4.0)
       faraday (>= 1.0, < 3)
       multi_json (>= 1.0)
     ostruct (0.6.3)
-    parallel (1.27.0)
-    parser (3.3.10.2)
+    parallel (1.28.0)
+    parser (3.3.11.1)
       ast (~> 2.4.1)
       racc
     path_expander (1.1.3)
@@ -150,8 +151,8 @@ GEM
     prism (1.9.0)
     public_suffix (6.0.2)
     racc (1.8.1)
-    rack (3.2.5)
-    rack-session (2.1.1)
+    rack (3.2.6)
+    rack-session (2.1.2)
       base64 (>= 0.1.0)
       rack (>= 3.0.0)
     rack-test (2.2.0)
@@ -160,28 +161,28 @@ GEM
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.2)
-      loofah (~> 2.21)
+    rails-html-sanitizer (1.7.0)
+      loofah (~> 2.25)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
     rails_compatible_cookies_utils (0.1.2)
     rainbow (3.1.1)
-    regexp_parser (2.11.3)
+    regexp_parser (2.12.0)
     rexml (3.4.4)
-    rubocop (1.84.2)
+    rubocop (1.86.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
-      parallel (~> 1.10)
+      parallel (>= 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
       rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.49.0)
+    rubocop-ast (1.49.1)
       parser (>= 3.3.7.2)
       prism (~> 1.7)
-    rubocop-minitest (0.38.2)
+    rubocop-minitest (0.39.1)
       lint_roller (~> 1.1)
       rubocop (>= 1.75.0, < 2.0)
       rubocop-ast (>= 1.38.0, < 2.0)
@@ -195,9 +196,9 @@ GEM
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
     thor (1.5.0)
-    timeout (0.6.0)
-    typhoeus (1.5.0)
-      ethon (>= 0.9.0, < 0.16.0)
+    timeout (0.6.1)
+    typhoeus (1.6.0)
+      ethon (>= 0.18.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (3.2.0)
@@ -219,26 +220,26 @@ DEPENDENCIES
   active_attr (~> 0.17.2)
   activerecord (~> 7.2.3)
   activesupport (~> 7.2.3)
-  addressable (~> 2.8.0)
+  addressable (~> 2.9.0)
   awesome_print (~> 1.9.2)
-  bcrypt (~> 3.1.21)
+  bcrypt (~> 3.1.22)
   capybara (~> 3.32)
-  capybara-screenshot (~> 1.0.22)
+  capybara-screenshot (~> 1.0.27)
   capybara-shadowdom (~> 0.3.0)
   childprocess
   concurrent-ruby (~> 1.3.3)
   encryptor (~> 3.0.0)
   factory_bot (~> 6.5.6)
   faker (~> 3.0)
-  faraday-typhoeus (~> 1.1.0)
+  faraday-typhoeus (~> 2.0.0)
   ice_nine (~> 0.11.2)
-  minitest (~> 5.26.2)
+  minitest (~> 5.26)
   minitest-ci (~> 3.4.0)
   minitest-hooks (~> 1.5.0)
-  minitest-reporters (~> 1.7.1)
+  minitest-reporters (~> 1.8.0)
   minitest-retry (~> 0.3.0)
   minitest-sprint (~> 1.3.0)
-  multi_json (~> 1.19.1)
+  multi_json (~> 1.19)
   net-smtp (~> 0.5.0)
   nokogiri (~> 1.18)
   oj (~> 3.16)
@@ -247,10 +248,10 @@ DEPENDENCIES
   rails_compatible_cookies_utils (~> 0.1.0)
   rainbow (~> 3.1.1)
   rubocop (~> 1.81)
-  rubocop-minitest (~> 0.38.2)
+  rubocop-minitest (~> 0.39.1)
   selenium-webdriver (~> 4.32)
   thor (~> 1.5.0)
-  typhoeus (~> 1.5.0)
+  typhoeus (~> 1.6.0)
   zonebie (~> 0.6.1)
 
 RUBY VERSION

Makefile.in

@@ -15,7 +15,7 @@ export PREFIX=$(prefix)
 default: all
 
 # Download and locally install the "task" tool.
-task_version:=3.48.0
+task_version:=3.50.0
 $(source_dir)/tasks/bootstrap-$(task_version): ;
 $(work_dir)/stamp/bootstrap-$(task_version): $(source_dir)/tasks/bootstrap-$(task_version)
 	$(source_dir)/tasks/bootstrap-$(task_version)

src/api-umbrella-git-1.rockspec

@@ -6,11 +6,11 @@ source = {
 }
 
 dependencies = {
-  "argparse ~> 0.7.1",
+  "argparse ~> 0.7.2",
   "bcrypt ~> 2.3",
-  "dkjson ~> 2.8",
+  "dkjson ~> 2.9",
   "inspect ~> 3.1.3",
-  "lapis ~> 1.17.0",
+  "lapis ~> 1.18.0",
   "libcidr-ffi ~> 1.0.0",
   "lua-resty-http ~> 0.17.2",
   "lua-resty-mail ~> 1.2.0",
@@ -24,7 +24,7 @@ dependencies = {
   "luajit-zstd ~> 0.2.3",
   "lualdap ~> 1.4.0",
   "luaposix ~> 36.3",
-  "luautf8 ~> 0.2.0",
+  "luautf8 ~> 0.2.1",
   "lustache ~> 1.3.1",
   "lyaml ~> 6.2.8",
   "penlight ~> 1.15.0",

src/api-umbrella/admin-ui/app/components/stats/query-form.js

@@ -330,6 +330,7 @@ export default class QueryForm extends Component {
             'over_rate_limit': 'over_rate_limit',
             'internal_server_error': 'internal_server_error',
             'https_required': 'https_required',
+            'scheduled_brownout': 'scheduled_brownout',
           },
         },
         {