prometheus_exporter 2.0.8 → 2.1.1

data/lib/prometheus_exporter/server/active_record_collector.rb

@@ -2,7 +2,8 @@
 
 module PrometheusExporter::Server
   class ActiveRecordCollector < TypeCollector
-    MAX_ACTIVERECORD_METRIC_AGE = 60
+    MAX_METRIC_AGE = 60
+
     ACTIVE_RECORD_GAUGES = {
       connections: "Total connections in pool",
       busy: "Connections in use in pool",
@@ -13,7 +14,12 @@ module PrometheusExporter::Server
     }
 
     def initialize
-      @active_record_metrics = []
+      @active_record_metrics = MetricsContainer.new(ttl: MAX_METRIC_AGE)
+      @active_record_metrics.filter = -> (new_metric, old_metric) do
+        new_metric["pid"] == old_metric["pid"] &&
+        new_metric["hostname"] == old_metric["hostname"] &&
+        new_metric["metric_labels"]["pool_name"] == old_metric["metric_labels"]["pool_name"]
+      end
     end
 
     def type
@@ -26,7 +32,7 @@ module PrometheusExporter::Server
       metrics = {}
 
       @active_record_metrics.map do |m|
-        metric_key = (m["metric_labels"] || {}).merge("pid" => m["pid"])
+        metric_key = (m["metric_labels"] || {}).merge("pid" => m["pid"], "hostname" => m["hostname"])
         metric_key.merge!(m["custom_labels"]) if m["custom_labels"]
 
         ACTIVE_RECORD_GAUGES.map do |k, help|
@@ -42,16 +48,6 @@ module PrometheusExporter::Server
     end
 
     def collect(obj)
-      now = ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
-
-      obj["created_at"] = now
-
-      @active_record_metrics.delete_if do |current|
-        (obj["pid"] == current["pid"] && obj["hostname"] == current["hostname"] &&
-         obj["metric_labels"]["pool_name"] == current["metric_labels"]["pool_name"]) ||
-          (current["created_at"] + MAX_ACTIVERECORD_METRIC_AGE < now)
-      end
-
       @active_record_metrics << obj
     end
   end

data/lib/prometheus_exporter/server/collector.rb

@@ -23,6 +23,7 @@ module PrometheusExporter::Server
       register_collector(ActiveRecordCollector.new)
       register_collector(ShoryukenCollector.new)
       register_collector(ResqueCollector.new)
+      register_collector(GoodJobCollector.new)
     end
 
     def register_collector(collector)

data/lib/prometheus_exporter/server/delayed_job_collector.rb

@@ -5,6 +5,7 @@ module PrometheusExporter::Server
     def initialize
       @delayed_jobs_total = nil
       @delayed_job_duration_seconds = nil
+      @delayed_job_latency_seconds_total = nil
       @delayed_jobs_total = nil
       @delayed_failed_jobs_total = nil
       @delayed_jobs_max_attempts_reached_total = nil
@@ -25,6 +26,7 @@ module PrometheusExporter::Server
 
       ensure_delayed_job_metrics
       @delayed_job_duration_seconds.observe(obj["duration"], counter_labels)
+      @delayed_job_latency_seconds_total.observe(obj["latency"], counter_labels)
       @delayed_jobs_total.observe(1, counter_labels)
       @delayed_failed_jobs_total.observe(1, counter_labels) if !obj["success"]
       @delayed_jobs_max_attempts_reached_total.observe(1, counter_labels) if obj["attempts"] >= obj["max_attempts"]
@@ -38,7 +40,7 @@ module PrometheusExporter::Server
 
     def metrics
       if @delayed_jobs_total
-        [@delayed_job_duration_seconds, @delayed_jobs_total, @delayed_failed_jobs_total,
+        [@delayed_job_duration_seconds, @delayed_job_latency_seconds_total, @delayed_jobs_total, @delayed_failed_jobs_total,
          @delayed_jobs_max_attempts_reached_total, @delayed_job_duration_seconds_summary, @delayed_job_attempts_summary,
          @delayed_jobs_enqueued, @delayed_jobs_pending]
       else
@@ -55,6 +57,10 @@ module PrometheusExporter::Server
         PrometheusExporter::Metric::Counter.new(
           "delayed_job_duration_seconds", "Total time spent in delayed jobs.")
 
+        @delayed_job_latency_seconds_total =
+        PrometheusExporter::Metric::Counter.new(
+          "delayed_job_latency_seconds_total", "Total delayed jobs latency.")
+
         @delayed_jobs_total =
         PrometheusExporter::Metric::Counter.new(
           "delayed_jobs_total", "Total number of delayed jobs executed.")

data/lib/prometheus_exporter/server/good_job_collector.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module PrometheusExporter::Server
+  class GoodJobCollector < TypeCollector
+    MAX_METRIC_AGE = 30
+    GOOD_JOB_GAUGES = {
+      scheduled: "Total number of scheduled GoodJob jobs.",
+      retried: "Total number of retried GoodJob jobs.",
+      queued: "Total number of queued GoodJob jobs.",
+      running: "Total number of running GoodJob jobs.",
+      finished: "Total number of finished GoodJob jobs.",
+      succeeded: "Total number of succeeded GoodJob jobs.",
+      discarded: "Total number of discarded GoodJob jobs."
+    }
+
+    def initialize
+      @good_job_metrics = MetricsContainer.new(ttl: MAX_METRIC_AGE)
+      @gauges = {}
+    end
+
+    def type
+      "good_job"
+    end
+
+    def metrics
+      return [] if good_job_metrics.length == 0
+
+      good_job_metrics.map do |metric|
+        labels = metric.fetch("custom_labels", {})
+
+        GOOD_JOB_GAUGES.map do |name, help|
+          value = metric[name.to_s]
+
+          if value
+            gauge = gauges[name] ||= PrometheusExporter::Metric::Gauge.new("good_job_#{name}", help)
+            gauge.observe(value, labels)
+          end
+        end
+      end
+
+      gauges.values
+    end
+
+    def collect(object)
+      @good_job_metrics << object
+    end
+
+    private
+
+    attr_reader :good_job_metrics, :gauges
+  end
+end

data/lib/prometheus_exporter/server/process_collector.rb

@@ -3,7 +3,8 @@
 module PrometheusExporter::Server
 
   class ProcessCollector < TypeCollector
-    MAX_PROCESS_METRIC_AGE = 60
+    MAX_METRIC_AGE = 60
+
     PROCESS_GAUGES = {
       heap_free_slots: "Free ruby heap slots.",
       heap_live_slots: "Used ruby heap slots.",
@@ -12,6 +13,8 @@ module PrometheusExporter::Server
       v8_physical_size: "Physical size consumed by V8 heaps.",
       v8_heap_count: "Number of V8 contexts running.",
       rss: "Total RSS used by process.",
+      malloc_increase_bytes_limit: 'Limit before Ruby triggers a GC against current objects (bytes).',
+      oldmalloc_increase_bytes_limit: 'Limit before Ruby triggers a major GC against old objects (bytes).'
     }
 
     PROCESS_COUNTERS = {
@@ -21,7 +24,10 @@ module PrometheusExporter::Server
     }
 
     def initialize
-      @process_metrics = []
+      @process_metrics = MetricsContainer.new(ttl: MAX_METRIC_AGE)
+      @process_metrics.filter = -> (new_metric, old_metric) do
+        new_metric["pid"] == old_metric["pid"] && new_metric["hostname"] == old_metric["hostname"]
+      end
     end
 
     def type
@@ -34,8 +40,8 @@ module PrometheusExporter::Server
       metrics = {}
 
       @process_metrics.map do |m|
-        metric_key = m["metric_labels"].merge("pid" => m["pid"])
-        metric_key.merge!(m["custom_labels"] || {})
+        metric_key = (m["metric_labels"] || {}).merge("pid" => m["pid"], "hostname" => m["hostname"])
+        metric_key.merge!(m["custom_labels"]) if m["custom_labels"]
 
         PROCESS_GAUGES.map do |k, help|
           k = k.to_s
@@ -58,15 +64,6 @@ module PrometheusExporter::Server
     end
 
     def collect(obj)
-      now = ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
-
-      obj["created_at"] = now
-
-      @process_metrics.delete_if do |current|
-        (obj["pid"] == current["pid"] && obj["hostname"] == current["hostname"]) ||
-          (current["created_at"] + MAX_PROCESS_METRIC_AGE < now)
-      end
-
       @process_metrics << obj
     end
   end

data/lib/prometheus_exporter/server/puma_collector.rb

@@ -14,7 +14,7 @@ module PrometheusExporter::Server
     }
 
     def initialize
-      @puma_metrics = MetricsContainer.new
+      @puma_metrics = MetricsContainer.new(ttl: MAX_PUMA_METRIC_AGE)
       @puma_metrics.filter = -> (new_metric, old_metric) do
         new_metric["pid"] == old_metric["pid"] && new_metric["hostname"] == old_metric["hostname"]
       end

data/lib/prometheus_exporter/server/resque_collector.rb

@@ -2,7 +2,7 @@
 
 module PrometheusExporter::Server
   class ResqueCollector < TypeCollector
-    MAX_RESQUE_METRIC_AGE = 30
+    MAX_METRIC_AGE = 30
     RESQUE_GAUGES = {
       processed_jobs: "Total number of processed Resque jobs.",
       failed_jobs: "Total number of failed Resque jobs.",
@@ -13,7 +13,7 @@ module PrometheusExporter::Server
     }
 
     def initialize
-      @resque_metrics = []
+      @resque_metrics = MetricsContainer.new(ttl: MAX_METRIC_AGE)
       @gauges = {}
     end
 
@@ -40,11 +40,7 @@ module PrometheusExporter::Server
     end
 
     def collect(object)
-      now = ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
-
-      object["created_at"] = now
-      resque_metrics.delete_if { |metric| metric["created_at"] + MAX_RESQUE_METRIC_AGE < now }
-      resque_metrics << object
+      @resque_metrics << object
     end
 
     private

data/lib/prometheus_exporter/server/sidekiq_process_collector.rb

@@ -2,7 +2,7 @@
 
 module PrometheusExporter::Server
   class SidekiqProcessCollector < PrometheusExporter::Server::TypeCollector
-    MAX_SIDEKIQ_METRIC_AGE = 60
+    MAX_METRIC_AGE = 60
 
     SIDEKIQ_PROCESS_GAUGES = {
       'busy' => 'Number of running jobs',
@@ -12,7 +12,7 @@ module PrometheusExporter::Server
     attr_reader :sidekiq_metrics, :gauges
 
     def initialize
-      @sidekiq_metrics = MetricsContainer.new(ttl: MAX_SIDEKIQ_METRIC_AGE)
+      @sidekiq_metrics = MetricsContainer.new(ttl: MAX_METRIC_AGE)
       @gauges = {}
     end
 

data/lib/prometheus_exporter/server/sidekiq_queue_collector.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module PrometheusExporter::Server
   class SidekiqQueueCollector < TypeCollector
-    MAX_SIDEKIQ_METRIC_AGE = 60
+    MAX_METRIC_AGE = 60
 
     SIDEKIQ_QUEUE_GAUGES = {
       'backlog' => 'Size of the sidekiq queue.',
@@ -11,7 +11,7 @@ module PrometheusExporter::Server
     attr_reader :sidekiq_metrics, :gauges
 
     def initialize
-      @sidekiq_metrics = MetricsContainer.new
+      @sidekiq_metrics = MetricsContainer.new(ttl: MAX_METRIC_AGE)
       @gauges = {}
     end
 

data/lib/prometheus_exporter/server/sidekiq_stats_collector.rb

@@ -2,7 +2,7 @@
 
 module PrometheusExporter::Server
   class SidekiqStatsCollector < TypeCollector
-    MAX_SIDEKIQ_METRIC_AGE = 60
+    MAX_METRIC_AGE = 60
 
     SIDEKIQ_STATS_GAUGES = {
       'dead_size' => 'Size of dead the queue',
@@ -18,7 +18,7 @@ module PrometheusExporter::Server
     attr_reader :sidekiq_metrics, :gauges
 
     def initialize
-      @sidekiq_metrics = MetricsContainer.new(ttl: MAX_SIDEKIQ_METRIC_AGE)
+      @sidekiq_metrics = MetricsContainer.new(ttl: MAX_METRIC_AGE)
       @gauges = {}
     end
 

data/lib/prometheus_exporter/server/unicorn_collector.rb

@@ -2,47 +2,46 @@
 
 # custom type collector for prometheus_exporter for handling the metrics sent from
 # PrometheusExporter::Instrumentation::Unicorn
-class PrometheusExporter::Server::UnicornCollector < PrometheusExporter::Server::TypeCollector
-  MAX_UNICORN_METRIC_AGE = 60
-
-  UNICORN_GAUGES = {
-    workers: 'Number of unicorn workers.',
-    active_workers: 'Number of active unicorn workers',
-    request_backlog: 'Number of requests waiting to be processed by a unicorn worker.'
-  }.freeze
-
-  def initialize
-    @unicorn_metrics = []
-  end
+module PrometheusExporter::Server
+  class UnicornCollector < PrometheusExporter::Server::TypeCollector
+    MAX_METRIC_AGE = 60
+
+    UNICORN_GAUGES = {
+      workers: 'Number of unicorn workers.',
+      active_workers: 'Number of active unicorn workers',
+      request_backlog: 'Number of requests waiting to be processed by a unicorn worker.'
+    }.freeze
+
+    def initialize
+      @unicorn_metrics = MetricsContainer.new(ttl: MAX_METRIC_AGE)
+    end
 
-  def type
-    'unicorn'
-  end
+    def type
+      'unicorn'
+    end
 
-  def metrics
-    return [] if @unicorn_metrics.length.zero?
+    def metrics
+      return [] if @unicorn_metrics.length.zero?
 
-    metrics = {}
+      metrics = {}
 
-    @unicorn_metrics.map do |m|
-      labels = m["custom_labels"] || {}
+      @unicorn_metrics.map do |m|
+        labels = m["custom_labels"] || {}
 
-      UNICORN_GAUGES.map do |k, help|
-        k = k.to_s
-        if (v = m[k])
-          g = metrics[k] ||= PrometheusExporter::Metric::Gauge.new("unicorn_#{k}", help)
-          g.observe(v, labels)
+        UNICORN_GAUGES.map do |k, help|
+          k = k.to_s
+          if (v = m[k])
+            g = metrics[k] ||= PrometheusExporter::Metric::Gauge.new("unicorn_#{k}", help)
+            g.observe(v, labels)
+          end
         end
       end
-    end
 
-    metrics.values
-  end
+      metrics.values
+    end
 
-  def collect(obj)
-    now = ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
-    obj["created_at"] = now
-    @unicorn_metrics.delete_if { |m| m['created_at'] + MAX_UNICORN_METRIC_AGE < now }
-    @unicorn_metrics << obj
+    def collect(obj)
+      @unicorn_metrics << obj
+    end
   end
 end

data/lib/prometheus_exporter/server/web_server.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'webrick'
-require 'timeout'
-require 'zlib'
-require 'stringio'
+require "webrick"
+require "timeout"
+require "zlib"
+require "stringio"
 
 module PrometheusExporter::Server
   class WebServer
@@ -18,11 +18,23 @@ module PrometheusExporter::Server
       @auth = opts[:auth]
       @realm = opts[:realm] || PrometheusExporter::DEFAULT_REALM
 
-      @metrics_total = PrometheusExporter::Metric::Counter.new("collector_metrics_total", "Total metrics processed by exporter web.")
+      @metrics_total =
+        PrometheusExporter::Metric::Counter.new(
+          "collector_metrics_total",
+          "Total metrics processed by exporter web."
+        )
 
-      @sessions_total = PrometheusExporter::Metric::Counter.new("collector_sessions_total", "Total send_metric sessions processed by exporter web.")
+      @sessions_total =
+        PrometheusExporter::Metric::Counter.new(
+          "collector_sessions_total",
+          "Total send_metric sessions processed by exporter web."
+        )
 
-      @bad_metrics_total = PrometheusExporter::Metric::Counter.new("collector_bad_metrics_total", "Total mis-handled metrics by collector.")
+      @bad_metrics_total =
+        PrometheusExporter::Metric::Counter.new(
+          "collector_bad_metrics_total",
+          "Total mis-handled metrics by collector."
+        )
 
       @metrics_total.observe(0)
       @sessions_total.observe(0)
@@ -34,7 +46,7 @@ module PrometheusExporter::Server
       if @verbose
         @access_log = [
           [$stderr, WEBrick::AccessLog::COMMON_LOG_FORMAT],
-          [$stderr, WEBrick::AccessLog::REFERER_LOG_FORMAT],
+          [$stderr, WEBrick::AccessLog::REFERER_LOG_FORMAT]
         ]
         @logger = WEBrick::Log.new(log_target || $stderr)
       else
@@ -42,23 +54,26 @@ module PrometheusExporter::Server
         @logger = WEBrick::Log.new(log_target || "/dev/null")
       end
 
-      @logger.info "Using Basic Authentication via #{@auth}" if @verbose && @auth
+      if @verbose && @auth
+        @logger.info "Using Basic Authentication via #{@auth}"
+      end
 
-      if %w(ALL ANY).include?(@bind)
+      if %w[ALL ANY].include?(@bind)
         @logger.info "Listening on both 0.0.0.0/:: network interfaces"
         @bind = nil
       end
 
-      @server = WEBrick::HTTPServer.new(
-        Port: @port,
-        BindAddress: @bind,
-        Logger: @logger,
-        AccessLog: @access_log,
-      )
-
-      @server.mount_proc '/' do |req, res|
-        res['Content-Type'] = 'text/plain; charset=utf-8'
-        if req.path == '/metrics'
+      @server =
+        WEBrick::HTTPServer.new(
+          Port: @port,
+          BindAddress: @bind,
+          Logger: @logger,
+          AccessLog: @access_log
+        )
+
+      @server.mount_proc "/" do |req, res|
+        res["Content-Type"] = "text/plain; charset=utf-8"
+        if req.path == "/metrics"
           authenticate(req, res) if @auth
 
           res.status = 200
@@ -76,13 +91,14 @@ module PrometheusExporter::Server
           else
             res.body = metrics
           end
-        elsif req.path == '/send-metrics'
+        elsif req.path == "/send-metrics"
           handle_metrics(req, res)
-        elsif req.path == '/ping'
-          res.body = 'PONG'
+        elsif req.path == "/ping"
+          res.body = "PONG"
         else
           res.status = 404
-          res.body = "Not Found! The Prometheus Ruby Exporter only listens on /ping, /metrics and /send-metrics"
+          res.body =
+            "Not Found! The Prometheus Ruby Exporter only listens on /ping, /metrics and /send-metrics"
         end
       end
     end
@@ -94,13 +110,11 @@ module PrometheusExporter::Server
           @metrics_total.observe
           @collector.process(block)
         rescue => e
-          if @verbose
-            @logger.error "\n\n#{e.inspect}\n#{e.backtrace}\n\n"
-          end
+          @logger.error "\n\n#{e.inspect}\n#{e.backtrace}\n\n" if @verbose
           @bad_metrics_total.observe
           res.body = "Bad Metrics #{e}"
           res.status = e.respond_to?(:status_code) ? e.status_code : 500
-          return
+          break
         end
       end
 
@@ -109,13 +123,14 @@ module PrometheusExporter::Server
     end
 
     def start
-      @runner ||= Thread.start do
-        begin
-          @server.start
-        rescue => e
-          @logger.error "Failed to start prometheus collector web on port #{@port}: #{e}"
+      @runner ||=
+        Thread.start do
+          begin
+            @server.start
+          rescue => e
+            @logger.error "Failed to start prometheus collector web on port #{@port}: #{e}"
+          end
         end
-      end
     end
 
     def stop
@@ -125,7 +140,7 @@ module PrometheusExporter::Server
     def metrics
       metric_text = nil
       begin
-        Timeout::timeout(@timeout) do
+        Timeout.timeout(@timeout) do
           metric_text = @collector.prometheus_metrics_text
         end
       rescue Timeout::Error
@@ -158,9 +173,18 @@ module PrometheusExporter::Server
     end
 
     def get_rss
-      @pagesize ||= `getconf PAGESIZE`.to_i rescue 4096
+      @pagesize ||=
+        begin
+          `getconf PAGESIZE`.to_i
+        rescue StandardError
+          4096
+        end
       @pid ||= Process.pid
-      File.read("/proc/#{@pid}/statm").split(' ')[1].to_i * @pagesize rescue 0
+      begin
+        File.read("/proc/#{@pid}/statm").split(" ")[1].to_i * @pagesize
+      rescue StandardError
+        0
+      end
     end
 
     def add_gauge(name, help, value)
@@ -171,10 +195,12 @@ module PrometheusExporter::Server
 
     def authenticate(req, res)
       htpasswd = WEBrick::HTTPAuth::Htpasswd.new(@auth)
-      basic_auth = WEBrick::HTTPAuth::BasicAuth.new({ Realm: @realm, UserDB: htpasswd, Logger: @logger })
+      basic_auth =
+        WEBrick::HTTPAuth::BasicAuth.new(
+          { Realm: @realm, UserDB: htpasswd, Logger: @logger }
+        )
 
       basic_auth.authenticate(req, res)
     end
-
   end
 end

data/lib/prometheus_exporter/server.rb

@@ -19,3 +19,4 @@ require_relative "server/unicorn_collector"
 require_relative "server/active_record_collector"
 require_relative "server/shoryuken_collector"
 require_relative "server/resque_collector"
+require_relative "server/good_job_collector"

data/lib/prometheus_exporter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PrometheusExporter
-  VERSION = "2.0.8"
+  VERSION = "2.1.1"
 end

data/lib/prometheus_exporter.rb

@@ -2,21 +2,21 @@
 
 require_relative "prometheus_exporter/version"
 require "json"
-require "thread"
 
 module PrometheusExporter
   # per: https://github.com/prometheus/prometheus/wiki/Default-port-allocations
   DEFAULT_PORT = 9394
-  DEFAULT_BIND_ADDRESS = 'localhost'
-  DEFAULT_PREFIX = 'ruby_'
+  DEFAULT_BIND_ADDRESS = "localhost"
+  DEFAULT_PREFIX = "ruby_"
   DEFAULT_LABEL = {}
   DEFAULT_TIMEOUT = 2
-  DEFAULT_REALM = 'Prometheus Exporter'
+  DEFAULT_REALM = "Prometheus Exporter"
 
   class OjCompat
     def self.parse(obj)
       Oj.compat_load(obj)
     end
+
     def self.dump(obj)
       Oj.dump(obj, mode: :compat)
     end
@@ -25,7 +25,7 @@ module PrometheusExporter
   def self.hostname
     @hostname ||=
       begin
-        require 'socket'
+        require "socket"
         Socket.gethostname
       rescue => e
         STDERR.puts "Unable to lookup hostname #{e}"
@@ -45,13 +45,12 @@ module PrometheusExporter
   def self.has_oj?
     (
       @@has_oj ||=
-       begin
-         require 'oj'
-         :true
-       rescue LoadError
-         :false
-       end
-    ) == :true
+        begin
+          require "oj"
+          :T
+        rescue LoadError
+          :F
+        end
+    ) == :T
   end
-
 end

data/prometheus_exporter.gemspec

@@ -15,8 +15,6 @@ Gem::Specification.new do |spec|
   spec.homepage             = "https://github.com/discourse/prometheus_exporter"
   spec.license              = "MIT"
 
-  spec.post_install_message = "prometheus_exporter will only bind to localhost by default as of v0.5"
-
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features|bin)/})
   end
@@ -29,14 +27,14 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop", ">= 0.69"
   spec.add_development_dependency "bundler", ">= 2.1.4"
   spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "minitest", "~> 5.15.0" # https://github.com/qrush/m/issues/93
+  spec.add_development_dependency "minitest", "~> 5.23.0"
   spec.add_development_dependency "guard", "~> 2.0"
-  spec.add_development_dependency "mini_racer", "~> 0.5.0"
+  spec.add_development_dependency "mini_racer", "~> 0.12.0"
   spec.add_development_dependency "guard-minitest", "~> 2.0"
   spec.add_development_dependency "oj", "~> 3.0"
-  spec.add_development_dependency "rack-test", "~> 0.8.3"
+  spec.add_development_dependency "rack-test", "~> 2.1.0"
   spec.add_development_dependency "minitest-stub-const", "~> 0.6"
-  spec.add_development_dependency "rubocop-discourse", ">2"
+  spec.add_development_dependency "rubocop-discourse", ">= 3"
   spec.add_development_dependency "appraisal", "~> 2.3"
   spec.add_development_dependency "activerecord", "~> 6.0.0"
   spec.add_development_dependency "redis", "> 5"
@@ -44,5 +42,5 @@ Gem::Specification.new do |spec|
   if !RUBY_ENGINE == 'jruby'
     spec.add_development_dependency "raindrops", "~> 0.19"
   end
-  spec.required_ruby_version = '>= 2.6.0'
+  spec.required_ruby_version = '>= 3.0.0'
 end