Merge remote-tracking branch 'parent/main' into upstream-20250328

lib/mastodon/middleware/prometheus_queue_time.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Mastodon
+  module Middleware
+    class PrometheusQueueTime < ::PrometheusExporter::Middleware
+      # Overwrite to only collect the queue time metric
+      def call(env)
+        queue_time = measure_queue_time(env)
+
+        result = @app.call(env)
+
+        result
+      ensure
+        obj = {
+          type: 'web',
+          queue_time: queue_time,
+          default_labels: {},
+        }
+
+        @client.send_json(obj)
+      end
+    end
+  end
+end

lib/mastodon/version.rb

@@ -96,7 +96,7 @@ module Mastodon
 
     def api_versions
       {
-        mastodon: 4,
+        mastodon: 5,
         kmyblue: KMYBLUE_API_VERSION,
       }
     end