Merge branch 'main' into fix-cycle-release-dates

Author: plural

Dockerfile

@@ -3,7 +3,7 @@
 #####################################################################
 FROM ruby:3.3.6-alpine3.20 AS build
 
-RUN apk -U upgrade && apk add --no-cache gcompat postgresql-client build-base libpq-dev tzdata \
+RUN apk -U upgrade && apk add --no-cache gcompat git postgresql-client build-base libpq-dev tzdata \
   && rm -rf /var/cache/apk/*
 
 RUN gem install rails
@@ -33,7 +33,7 @@ COPY . $RAILS_ROOT/
 #####################################################################
 FROM ruby:3.3.6-alpine3.20 AS final
 
-RUN apk -U upgrade && apk add --no-cache gcompat postgresql-client tzdata \
+RUN apk -U upgrade && apk add --no-cache gcompat git postgresql-client tzdata \
   && rm -rf /var/cache/apk/*
 
 ENV RAILS_ROOT /var/www/nrdb-api

Gemfile

@@ -55,7 +55,8 @@ gem 'reverse_markdown'
 
 group :development, :test do
   gem 'brakeman'
-  gem 'bullet'
+  # Lock to 8.0.3 because we don't have CSP middleware and the next version crashes without it.
+  gem 'bullet', '8.0.3'
   gem 'bundler-audit', '~> 0.9.0'
   # See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem
   gem 'debug', platforms: %i[mri mingw x64_mingw]

Gemfile.lock

@@ -103,7 +103,7 @@ GEM
       bundler (>= 1.2.0, < 3)
       thor (~> 1.0)
     concurrent-ruby (1.3.5)
-    connection_pool (2.5.0)
+    connection_pool (2.5.1)
     crass (1.0.6)
     date (3.4.1)
     debug (1.10.0)
@@ -204,7 +204,7 @@ GEM
     minitest (5.25.5)
     msgpack (1.8.0)
     mustache (1.1.1)
-    net-imap (0.5.6)
+    net-imap (0.5.7)
       date
       net-protocol
     net-pop (0.1.2)
@@ -214,7 +214,7 @@ GEM
     net-smtp (0.5.1)
       net-protocol
     nio4r (2.7.4)
-    nokogiri (1.18.7)
+    nokogiri (1.18.8)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     opentelemetry-api (1.5.0)
@@ -230,6 +230,8 @@ GEM
     opentelemetry-helpers-mysql (0.2.0)
       opentelemetry-api (~> 1.0)
       opentelemetry-common (~> 0.21)
+    opentelemetry-helpers-sql (0.1.1)
+      opentelemetry-api (~> 1.0)
     opentelemetry-helpers-sql-obfuscation (0.3.0)
       opentelemetry-common (~> 0.21)
     opentelemetry-instrumentation-action_mailer (0.4.0)
@@ -261,19 +263,20 @@ GEM
     opentelemetry-instrumentation-active_support (0.8.0)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.23.0)
-    opentelemetry-instrumentation-all (0.74.0)
+    opentelemetry-instrumentation-all (0.75.1)
       opentelemetry-instrumentation-active_model_serializers (~> 0.22.0)
       opentelemetry-instrumentation-aws_lambda (~> 0.3.0)
       opentelemetry-instrumentation-aws_sdk (~> 0.8.0)
       opentelemetry-instrumentation-bunny (~> 0.22.0)
       opentelemetry-instrumentation-concurrent_ruby (~> 0.22.0)
-      opentelemetry-instrumentation-dalli (~> 0.26.0)
+      opentelemetry-instrumentation-dalli (~> 0.27.0)
       opentelemetry-instrumentation-delayed_job (~> 0.23.0)
       opentelemetry-instrumentation-ethon (~> 0.22.0)
       opentelemetry-instrumentation-excon (~> 0.23.0)
       opentelemetry-instrumentation-faraday (~> 0.26.0)
       opentelemetry-instrumentation-grape (~> 0.3.0)
       opentelemetry-instrumentation-graphql (~> 0.29.0)
+      opentelemetry-instrumentation-grpc (~> 0.2.0)
       opentelemetry-instrumentation-gruf (~> 0.3.0)
       opentelemetry-instrumentation-http (~> 0.24.0)
       opentelemetry-instrumentation-http_client (~> 0.23.0)
@@ -312,7 +315,7 @@ GEM
     opentelemetry-instrumentation-concurrent_ruby (0.22.0)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.23.0)
-    opentelemetry-instrumentation-dalli (0.26.0)
+    opentelemetry-instrumentation-dalli (0.27.0)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.23.0)
     opentelemetry-instrumentation-delayed_job (0.23.0)
@@ -334,6 +337,9 @@ GEM
     opentelemetry-instrumentation-graphql (0.29.0)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.23.0)
+    opentelemetry-instrumentation-grpc (0.2.1)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-base (~> 0.23.0)
     opentelemetry-instrumentation-gruf (0.3.0)
       opentelemetry-api (>= 1.0.0)
       opentelemetry-instrumentation-base (~> 0.23.0)
@@ -352,16 +358,18 @@ GEM
     opentelemetry-instrumentation-mongo (0.23.0)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.23.0)
-    opentelemetry-instrumentation-mysql2 (0.29.0)
+    opentelemetry-instrumentation-mysql2 (0.29.1)
       opentelemetry-api (~> 1.0)
       opentelemetry-helpers-mysql
+      opentelemetry-helpers-sql
       opentelemetry-helpers-sql-obfuscation
       opentelemetry-instrumentation-base (~> 0.23.0)
     opentelemetry-instrumentation-net_http (0.23.0)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.23.0)
-    opentelemetry-instrumentation-pg (0.30.0)
+    opentelemetry-instrumentation-pg (0.30.1)
       opentelemetry-api (~> 1.0)
+      opentelemetry-helpers-sql
       opentelemetry-helpers-sql-obfuscation
       opentelemetry-instrumentation-base (~> 0.23.0)
     opentelemetry-instrumentation-que (0.9.0)
@@ -409,9 +417,10 @@ GEM
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.23.0)
       opentelemetry-instrumentation-rack (~> 0.21)
-    opentelemetry-instrumentation-trilogy (0.61.0)
+    opentelemetry-instrumentation-trilogy (0.61.1)
       opentelemetry-api (~> 1.0)
       opentelemetry-helpers-mysql
+      opentelemetry-helpers-sql
       opentelemetry-helpers-sql-obfuscation
       opentelemetry-instrumentation-base (~> 0.23.0)
       opentelemetry-semantic_conventions (>= 1.8.0)
@@ -425,8 +434,8 @@ GEM
     opentelemetry-semantic_conventions (1.11.0)
       opentelemetry-api (~> 1.0)
     ostruct (0.6.1)
-    parallel (1.26.3)
-    parser (3.3.7.4)
+    parallel (1.27.0)
+    parser (3.3.8.0)
       ast (~> 2.4.1)
       racc
     parslet (2.0.0)
@@ -441,7 +450,7 @@ GEM
     puma (6.6.0)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (3.1.12)
+    rack (3.1.13)
     rack-cors (2.0.2)
       rack (>= 2.0.0)
     rack-session (2.1.0)
@@ -527,7 +536,7 @@ GEM
       rubocop-ast (>= 1.44.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.44.0)
+    rubocop-ast (1.44.1)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
     rubocop-factory_bot (2.27.1)
@@ -539,7 +548,7 @@ GEM
       rack (>= 1.1)
       rubocop (>= 1.75.0, < 2.0)
       rubocop-ast (>= 1.38.0, < 2.0)
-    rubocop-rspec (3.5.0)
+    rubocop-rspec (3.6.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
     rubocop-rspec_rails (2.31.0)
@@ -560,8 +569,9 @@ GEM
       simplecov (~> 0.19)
     simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
-    sprockets (4.2.1)
+    sprockets (4.2.2)
       concurrent-ruby (~> 1.0)
+      logger
       rack (>= 2.2.4, < 4)
     sprockets-rails (3.5.2)
       actionpack (>= 6.1)
@@ -594,7 +604,7 @@ DEPENDENCIES
   apitome
   bootsnap
   brakeman
-  bullet
+  bullet (= 8.0.3)
   bundler-audit (~> 0.9.0)
   debug
   factory_bot_rails