sidekiq 7.0.2 → 7.0.5

data/lib/sidekiq/capsule.rb

@@ -21,12 +21,16 @@ module Sidekiq
     attr_reader :name
     attr_reader :queues
     attr_accessor :concurrency
+    attr_reader :mode
+    attr_reader :weights
 
     def initialize(name, config)
       @name = name
       @config = config
       @queues = ["default"]
+      @weights = {"default" => 0}
       @concurrency = config[:concurrency]
+      @mode = :strict
     end
 
     def fetcher
@@ -41,15 +45,28 @@ module Sidekiq
       fetcher&.bulk_requeue([])
     end
 
+    # Sidekiq checks queues in three modes:
+    # - :strict - all queues have 0 weight and are checked strictly in order
+    # - :weighted - queues have arbitrary weight between 1 and N
+    # - :random - all queues have weight of 1
     def queues=(val)
+      @weights = {}
       @queues = Array(val).each_with_object([]) do |qstr, memo|
         arr = qstr
         arr = qstr.split(",") if qstr.is_a?(String)
         name, weight = arr
+        @weights[name] = weight.to_i
         [weight.to_i, 1].max.times do
           memo << name
         end
       end
+      @mode = if @weights.values.all?(&:zero?)
+        :strict
+      elsif @weights.values.all? { |x| x == 1 }
+        :random
+      else
+        :weighted
+      end
     end
 
     # Allow the middleware to be different per-capsule.

data/lib/sidekiq/cli.rb

@@ -77,13 +77,14 @@ module Sidekiq # :nodoc:
       raise "You are connecting to Redis #{ver}, Sidekiq requires Redis 6.2.0 or greater" if ver < Gem::Version.new("6.2.0")
 
       maxmemory_policy = info["maxmemory_policy"]
-      if maxmemory_policy != "noeviction"
+      if maxmemory_policy != "noeviction" && maxmemory_policy != ""
+        # Redis Enterprise Cloud returns "" for their policy 😳
         logger.warn <<~EOM
 
 
           WARNING: Your Redis instance will evict Sidekiq data under heavy load.
           The 'noeviction' maxmemory policy is recommended (current policy: '#{maxmemory_policy}').
-          See: https://github.com/mperham/sidekiq/wiki/Using-Redis#memory
+          See: https://github.com/sidekiq/sidekiq/wiki/Using-Redis#memory
 
         EOM
       end

data/lib/sidekiq/component.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Sidekiq
   ##
   # Sidekiq::Component assumes a config instance is available at @config

data/lib/sidekiq/config.rb

@@ -129,7 +129,7 @@ module Sidekiq
     def new_redis_pool(size, name = "unset")
       # connection pool is lazy, it will not create connections unless you actually need them
       # so don't be skimpy!
-      RedisConnection.create(@redis_config.merge(size: size, logger: logger, pool_name: name))
+      RedisConnection.create({size: size, logger: logger, pool_name: name}.merge(@redis_config))
     end
 
     def redis_info

data/lib/sidekiq/embedded.rb

@@ -49,7 +49,7 @@ module Sidekiq
 
           WARNING: Your Redis instance will evict Sidekiq data under heavy load.
           The 'noeviction' maxmemory policy is recommended (current policy: '#{maxmemory_policy}').
-          See: https://github.com/mperham/sidekiq/wiki/Using-Redis#memory
+          See: https://github.com/sidekiq/sidekiq/wiki/Using-Redis#memory
 
         EOM
       end

data/lib/sidekiq/fetch.rb

@@ -30,11 +30,9 @@ module Sidekiq # :nodoc:
     def initialize(cap)
       raise ArgumentError, "missing queue list" unless cap.queues
       @config = cap
-      @strictly_ordered_queues = (config.queues.size == config.queues.uniq.size)
+      @strictly_ordered_queues = cap.mode == :strict
       @queues = config.queues.map { |q| "queue:#{q}" }
-      if @strictly_ordered_queues
-        @queues.uniq!
-      end
+      @queues.uniq! if @strictly_ordered_queues
     end
 
     def retrieve_work

data/lib/sidekiq/job_retry.rb

@@ -49,7 +49,7 @@ module Sidekiq
   # The default number of retries is 25 which works out to about 3 weeks
   # You can change the default maximum number of retries in your initializer:
   #
-  #   Sidekiq.options[:max_retries] = 7
+  #   Sidekiq.default_configuration[:max_retries] = 7
   #
   # or limit the number of retries for a particular job and send retries to
   # a low priority queue with:

data/lib/sidekiq/job_util.rb

@@ -17,18 +17,24 @@ module Sidekiq
 
     def verify_json(item)
       job_class = item["wrapped"] || item["class"]
-      if Sidekiq::Config::DEFAULTS[:on_complex_arguments] == :raise
-        msg = <<~EOM
-          Job arguments to #{job_class} must be native JSON types, see https://github.com/mperham/sidekiq/wiki/Best-Practices.
-          To disable this error, add `Sidekiq.strict_args!(false)` to your initializer.
-        EOM
-        raise(ArgumentError, msg) unless json_safe?(item)
-      elsif Sidekiq::Config::DEFAULTS[:on_complex_arguments] == :warn
-        warn <<~EOM unless json_safe?(item)
-          Job arguments to #{job_class} do not serialize to JSON safely. This will raise an error in
-          Sidekiq 7.0. See https://github.com/mperham/sidekiq/wiki/Best-Practices or raise an error today
-          by calling `Sidekiq.strict_args!` during Sidekiq initialization.
-        EOM
+      args = item["args"]
+      mode = Sidekiq::Config::DEFAULTS[:on_complex_arguments]
+
+      if mode == :raise || mode == :warn
+        unless json_safe?(args)
+          unsafe_item = json_unsafe_item(args)
+          msg = <<~EOM
+            Job arguments to #{job_class} must be native JSON types, but #{unsafe_item.inspect} is a #{unsafe_item.class}.
+            See https://github.com/sidekiq/sidekiq/wiki/Best-Practices.
+            To disable this error, add `Sidekiq.strict_args!(false)` to your initializer.
+          EOM
+
+          if mode == :raise
+            raise(ArgumentError, msg)
+          else
+            warn(msg)
+          end
+        end
       end
     end
 
@@ -64,8 +70,50 @@ module Sidekiq
 
     private
 
+    RECURSIVE_JSON_SAFE = {
+      Integer => ->(val) { true },
+      Float => ->(val) { true },
+      TrueClass => ->(val) { true },
+      FalseClass => ->(val) { true },
+      NilClass => ->(val) { true },
+      String => ->(val) { true },
+      Array => ->(val) {
+        val.all? { |e| RECURSIVE_JSON_SAFE[e.class].call(e) }
+      },
+      Hash => ->(val) {
+        val.all? { |k, v| String === k && RECURSIVE_JSON_SAFE[v.class].call(v) }
+      }
+    }
+
+    RECURSIVE_JSON_SAFE.default = ->(_val) { false }
+    RECURSIVE_JSON_SAFE.compare_by_identity
+    private_constant :RECURSIVE_JSON_SAFE
+
     def json_safe?(item)
-      JSON.parse(JSON.dump(item["args"])) == item["args"]
+      RECURSIVE_JSON_SAFE[item.class].call(item)
+    end
+
+    def json_unsafe_item(item)
+      case item
+      when String, Integer, Float, TrueClass, FalseClass, NilClass
+        nil
+      when Array
+        item.each do |e|
+          unsafe_item = json_unsafe_item(e)
+          return unsafe_item unless unsafe_item.nil?
+        end
+        nil
+      when Hash
+        item.each do |k, v|
+          return k unless String === k
+
+          unsafe_item = json_unsafe_item(v)
+          return unsafe_item unless unsafe_item.nil?
+        end
+        nil
+      else
+        item
+      end
     end
   end
 end

data/lib/sidekiq/launcher.rb

@@ -161,7 +161,7 @@ module Sidekiq
         fails = procd = 0
         kb = memory_usage(::Process.pid)
 
-        _, exists, _, _, msg = redis { |conn|
+        _, exists, _, _, signal = redis { |conn|
           conn.multi { |transaction|
             transaction.sadd("processes", [key])
             transaction.exists(key)
@@ -180,9 +180,7 @@ module Sidekiq
         fire_event(:heartbeat) unless exists > 0
         fire_event(:beat, oneshot: false)
 
-        return unless msg
-
-        ::Process.kill(msg, ::Process.pid)
+        ::Process.kill(signal, ::Process.pid) if signal && !@embedded
       rescue => e
         # ignore all redis/network issues
         logger.error("heartbeat: #{e}")
@@ -216,7 +214,7 @@ module Sidekiq
           Last RTT readings were #{RTT_READINGS.buffer.inspect}, ideally these should be < 1000.
           Ensure Redis is running in the same AZ or datacenter as Sidekiq.
           If these values are close to 100,000, that means your Sidekiq process may be
-          CPU-saturated; reduce your concurrency and/or see https://github.com/mperham/sidekiq/discussions/5039
+          CPU-saturated; reduce your concurrency and/or see https://github.com/sidekiq/sidekiq/discussions/5039
         EOM
         RTT_READINGS.reset
       end
@@ -251,13 +249,18 @@ module Sidekiq
         "tag" => @config[:tag] || "",
         "concurrency" => @config.total_concurrency,
         "queues" => @config.capsules.values.flat_map { |cap| cap.queues }.uniq,
-        "weights" => @config.capsules.values.flat_map { |cap| cap.queues }.tally,
+        "weights" => to_weights,
         "labels" => @config[:labels].to_a,
         "identity" => identity,
-        "version" => Sidekiq::VERSION
+        "version" => Sidekiq::VERSION,
+        "embedded" => @embedded
       }
     end
 
+    def to_weights
+      @config.capsules.values.map(&:weights)
+    end
+
     def to_json
       # this data changes infrequently so dump it to a string
       # now so we don't need to dump it every heartbeat.

data/lib/sidekiq/metrics/tracking.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "time"
 require "sidekiq"
 require "sidekiq/metrics/shared"

data/lib/sidekiq/middleware/chain.rb

@@ -166,23 +166,26 @@ module Sidekiq
 
       # Used by Sidekiq to execute the middleware at runtime
       # @api private
-      def invoke(*args)
+      def invoke(*args, &block)
         return yield if empty?
 
         chain = retrieve
-        traverse_chain = proc do
-          if chain.empty?
-            yield
-          else
-            chain.shift.call(*args, &traverse_chain)
+        traverse(chain, 0, args, &block)
+      end
+
+      private
+
+      def traverse(chain, index, args, &block)
+        if index >= chain.size
+          yield
+        else
+          chain[index].call(*args) do
+            traverse(chain, index + 1, args, &block)
           end
         end
-        traverse_chain.call
       end
     end
 
-    private
-
     # Represents each link in the middleware chain
     # @api private
     class Entry

data/lib/sidekiq/middleware/current_attributes.rb

@@ -22,13 +22,11 @@ module Sidekiq
       end
 
       def call(_, job, _, _)
-        attrs = @strklass.constantize.attributes
-        if attrs.any?
-          if job.has_key?("cattr")
-            job["cattr"].merge!(attrs)
-          else
-            job["cattr"] = attrs
-          end
+        if !job.has_key?("cattr")
+          attrs = @strklass.constantize.attributes
+          # Retries can push the job N times, we don't
+          # want retries to reset cattr. #5692, #5090
+          job["cattr"] = attrs if attrs.any?
         end
         yield
       end

data/lib/sidekiq/monitor.rb

@@ -16,8 +16,6 @@ class Sidekiq::Monitor
         return
       end
       send(section)
-    rescue => e
-      abort "Couldn't get status: #{e}"
     end
 
     def all
@@ -58,7 +56,7 @@ class Sidekiq::Monitor
         #   {"default" => 1, "critical" => 10}
         queues =
           if process["weights"]
-            process["weights"].sort_by { |queue| queue[0] }.map { |queue| queue.join(": ") }
+            process["weights"].sort_by { |queue| queue[0] }.map { |capsule| capsule.map { |name, weight| (weight > 0) ? "#{name}: #{weight}" : name }.join(", ") }
           else
             process["queues"].sort
           end

data/lib/sidekiq/processor.rb

@@ -146,6 +146,9 @@ module Sidekiq
       end
     end
 
+    IGNORE_SHUTDOWN_INTERRUPTS = {Sidekiq::Shutdown => :never}
+    private_constant :IGNORE_SHUTDOWN_INTERRUPTS
+
     def process(uow)
       jobstr = uow.job
       queue = uow.queue_name
@@ -195,7 +198,7 @@ module Sidekiq
       ensure
         if ack
           # We don't want a shutdown signal to interrupt job acknowledgment.
-          Thread.handle_interrupt(Sidekiq::Shutdown => :never) do
+          Thread.handle_interrupt(IGNORE_SHUTDOWN_INTERRUPTS) do
             uow.acknowledge
           end
         end

data/lib/sidekiq/rails.rb

@@ -11,7 +11,8 @@ module Sidekiq
       end
 
       def call
-        @app.reloader.wrap do
+        params = (::Rails::VERSION::STRING >= "7.1") ? {source: "job.sidekiq"} : {}
+        @app.reloader.wrap(**params) do
           yield
         end
       end

data/lib/sidekiq/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Sidekiq
-  VERSION = "7.0.2"
+  VERSION = "7.0.5"
   MAJOR = 7
 end

data/lib/sidekiq/web/application.rb

@@ -20,6 +20,12 @@ module Sidekiq
       "worker-src 'self'",
       "base-uri 'self'"
     ].join("; ").freeze
+    METRICS_PERIODS = {
+      "1h" => 60,
+      "2h" => 120,
+      "4h" => 240,
+      "8h" => 480
+    }
 
     def initialize(klass)
       @klass = klass
@@ -62,14 +68,20 @@ module Sidekiq
 
     get "/metrics" do
       q = Sidekiq::Metrics::Query.new
-      @query_result = q.top_jobs
+      @period = params[:period]
+      @periods = METRICS_PERIODS
+      minutes = @periods.fetch(@period, @periods.values.first)
+      @query_result = q.top_jobs(minutes: minutes)
       erb(:metrics)
     end
 
     get "/metrics/:name" do
       @name = route_params[:name]
+      @period = params[:period]
       q = Sidekiq::Metrics::Query.new
-      @query_result = q.for_job(@name)
+      @periods = METRICS_PERIODS
+      minutes = @periods.fetch(@period, @periods.values.first)
+      @query_result = q.for_job(@name, minutes: minutes)
       erb(:metrics_for_job)
     end
 
@@ -82,11 +94,14 @@ module Sidekiq
 
     post "/busy" do
       if params["identity"]
-        p = Sidekiq::Process.new("identity" => params["identity"])
-        p.quiet! if params["quiet"]
-        p.stop! if params["stop"]
+        pro = Sidekiq::ProcessSet[params["identity"]]
+
+        pro.quiet! if params["quiet"]
+        pro.stop! if params["stop"]
       else
         processes.each do |pro|
+          next if pro.embedded?
+
           pro.quiet! if params["quiet"]
           pro.stop! if params["stop"]
         end

data/lib/sidekiq/web/helpers.rb

@@ -15,7 +15,7 @@ module Sidekiq
       # so extensions can be localized
       @strings[lang] ||= settings.locales.each_with_object({}) do |path, global|
         find_locale_files(lang).each do |file|
-          strs = YAML.safe_load(File.open(file))
+          strs = YAML.safe_load(File.read(file))
           global.merge!(strs[lang])
         end
       end
@@ -118,7 +118,7 @@ module Sidekiq
       }.join(" ")
     end
 
-    # mperham/sidekiq#3243
+    # sidekiq/sidekiq#3243
     def unfiltered?
       yield unless env["PATH_INFO"].start_with?("/filter/")
     end
@@ -161,6 +161,14 @@ module Sidekiq
       end
     end
 
+    def busy_weights(capsule_weights)
+      # backwards compat with 7.0.0, remove in 7.1
+      cw = [capsule_weights].flatten
+      cw.map { |hash|
+        hash.map { |name, weight| (weight > 0) ? +name << ": " << weight.to_s : name }.join(", ")
+      }.join("; ")
+    end
+
     def stats
       @stats ||= Sidekiq::Stats.new
     end

data/sidekiq.gemspec

@@ -2,7 +2,7 @@ require_relative "lib/sidekiq/version"
 
 Gem::Specification.new do |gem|
   gem.authors = ["Mike Perham"]
-  gem.email = ["mperham@gmail.com"]
+  gem.email = ["info@contribsys.com"]
   gem.summary = "Simple, efficient background processing for Ruby"
   gem.description = "Simple, efficient background processing for Ruby."
   gem.homepage = "https://sidekiq.org"
@@ -16,10 +16,10 @@ Gem::Specification.new do |gem|
 
   gem.metadata = {
     "homepage_uri" => "https://sidekiq.org",
-    "bug_tracker_uri" => "https://github.com/mperham/sidekiq/issues",
-    "documentation_uri" => "https://github.com/mperham/sidekiq/wiki",
-    "changelog_uri" => "https://github.com/mperham/sidekiq/blob/main/Changes.md",
-    "source_code_uri" => "https://github.com/mperham/sidekiq"
+    "bug_tracker_uri" => "https://github.com/sidekiq/sidekiq/issues",
+    "documentation_uri" => "https://github.com/sidekiq/sidekiq/wiki",
+    "changelog_uri" => "https://github.com/sidekiq/sidekiq/blob/main/Changes.md",
+    "source_code_uri" => "https://github.com/sidekiq/sidekiq"
   }
 
   gem.add_dependency "redis-client", ">= 0.11.0"
@@ -28,23 +28,11 @@ Gem::Specification.new do |gem|
   gem.add_dependency "concurrent-ruby", "< 2"
   gem.post_install_message = <<~EOM
     
-    ####################################################
-    
-    
-      █████████  █████ ██████████   ██████████ █████   ████ █████    ██████       ██████████       █████
-     ███░░░░░███░░███ ░░███░░░░███ ░░███░░░░░█░░███   ███░ ░░███   ███░░░░███    ░███░░░░███     ███░░░███
-    ░███    ░░░  ░███  ░███   ░░███ ░███  █ ░  ░███  ███    ░███  ███    ░░███   ░░░    ███     ███   ░░███
-    ░░█████████  ░███  ░███    ░███ ░██████    ░███████     ░███ ░███     ░███         ███     ░███    ░███
-     ░░░░░░░░███ ░███  ░███    ░███ ░███░░█    ░███░░███    ░███ ░███   ██░███        ███      ░███    ░███
-     ███    ░███ ░███  ░███    ███  ░███ ░   █ ░███ ░░███   ░███ ░░███ ░░████        ███       ░░███   ███
-    ░░█████████  █████ ██████████   ██████████ █████ ░░████ █████ ░░░██████░██      ███      ██ ░░░█████░
-     ░░░░░░░░░  ░░░░░ ░░░░░░░░░░   ░░░░░░░░░░ ░░░░░   ░░░░ ░░░░░    ░░░░░░ ░░      ░░░      ░░    ░░░░░░
-    
+    Welcome to Sidekiq 7.0!
     
     1. Use `gem 'sidekiq', '<7'` in your Gemfile if you don't want this new version.
-    2. Read the release notes at https://github.com/mperham/sidekiq/blob/main/docs/7.0-Upgrade.md
-    3. Search for open/closed issues at https://github.com/mperham/sidekiq/issues/
-    
-    ####################################################
+    2. Read the release notes at https://github.com/sidekiq/sidekiq/blob/main/docs/7.0-Upgrade.md
+    3. If you have problems, search for open/closed issues at https://github.com/sidekiq/sidekiq/issues/
+
   EOM
 end

data/web/assets/javascripts/metrics.js

@@ -4,6 +4,14 @@ class JobMetricsOverviewChart extends BaseChart {
     this.swatches = [];
     this.visibleKls = options.visibleKls;
 
+    const countBuckets = this.options.labels.length / 60;
+    this.labelBuckets = this.options.labels.reduce((acc, label, index) => {
+      const bucket = Math.floor(index / countBuckets);
+      acc[bucket] = acc[bucket] || [];
+      acc[bucket].push(label);
+      return acc;
+    }, []);
+
     this.init();
   }
 
@@ -52,7 +60,7 @@ class JobMetricsOverviewChart extends BaseChart {
 
     return {
       label: kls,
-      data: this.options.series[kls],
+      data: this.buildSeries(kls),
       borderColor: color,
       backgroundColor: color,
       borderWidth: 2,
@@ -60,6 +68,26 @@ class JobMetricsOverviewChart extends BaseChart {
     };
   }
 
+  buildSeries(kls) {
+    // `series` is an object that maps labels to counts => { "20:15" => 2, "20:16" => 3, ... }
+    const series = this.options.series[kls];
+    return this.labelBuckets.reduce((acc, labels) => {
+      const bucketValues = labels.map(label => series[label]).filter(v => v);
+      if (bucketValues.length > 0) {
+        // Sum up the values for each bucket that has data.
+        // The new label is the bucket's first label, its start time.
+        acc[labels[0]] = bucketValues.reduce((a, b) => a + b, 0);
+      }
+      return acc;
+    }, {});
+  }
+
+  buildTooltipTitle(items) {
+    const [first, ...rest] = this.labelBuckets.find((labels) => labels[0] === items[0].label);
+    const title = [first, rest[rest.length - 1]].filter(v => v).join(" - ");
+    return `${title} UTC`
+  }
+
   get chartOptions() {
     return {
       ...super.chartOptions,
@@ -80,7 +108,7 @@ class JobMetricsOverviewChart extends BaseChart {
         tooltip: {
           ...super.chartOptions.plugins.tooltip,
           callbacks: {
-            title: (items) => `${items[0].label} UTC`,
+            title: (items) => this.buildTooltipTitle(items),
             label: (item) =>
               `${item.dataset.label}: ${item.parsed.y.toFixed(1)} ` +
               `${this.options.units}`,

data/web/assets/stylesheets/application.css

@@ -72,7 +72,7 @@ h1, h2, h3 {
   line-height: 45px;
 }
 
-.header-container {
+.header-container, .header-container .page-title-container {
   display: flex;
   justify-content: space-between;
   align-items: center;

data/web/locales/da.yml

@@ -1,11 +1,12 @@
 # elements like %{queue} are variables and should not be translated
 da:
-  Actions: Actions
+  Actions: Handlinger
   AddToQueue: Tilføj til kø
   AreYouSure: Er du sikker?
   AreYouSureDeleteJob: Er du sikker på at du vil slette dette job?
   AreYouSureDeleteQueue: Er du sikker på at du vil slette %{queue} køen?
   Arguments: Argumenter
+  AvgExecutionTime: Gennemsnitlig eksekveringstid
   Busy: Travl
   Class: Klasse
   Connections: Forbindelser
@@ -18,21 +19,25 @@ da:
   Enqueued: I kø
   Error: Fejl
   ErrorBacktrace: Fejl backtrace
-  ErrorClass: Fejl klasse
-  ErrorMessage: Fejl besked
+  ErrorClass: Fejlklasse
+  ErrorMessage: Fejlbesked
   Extras: Ekstra
   Failed: Fejlet
+  Failure: Fejl
   Failures: Fejl
   GoBack: ← Tilbage
   History: Historik
   Job: Job
   Jobs: Jobs
+  Latency: Forsinkelse
   LastRetry: Sidste forsøg
   LivePoll: Live Poll
   MemoryUsage: RAM forbrug
+  Name: Navn
   Namespace: Namespace
   NextRetry: Næste forsøg
   NoDeadJobsFound: Ingen døde jobs fundet
+  NoJobMetricsFound: Ingen nylig job-metrics blev fundet
   NoRetriesFound: Ingen gen-forsøg var fundet
   NoScheduledFound: Ingen jobs i kø fundet
   OneMonth: 1 måned
@@ -43,7 +48,7 @@ da:
   Processes: Processer
   Queue: Kø
   Queues: Køer
-  Realtime: Real-time
+  Realtime: Realtid
   Retries: Forsøg
   RetryAll: Forsøg alle
   RetryCount: Antal forsøg
@@ -56,10 +61,12 @@ da:
   Started: Startet
   Status: Status
   StopPolling: Stop Polling
+  Success: Succes
   Thread: Tråd
   Threads: Tråde
   ThreeMonths: 3 måneder
   Time: Tid
+  TotalExecutionTime: Total eksekveringstid
   Uptime: Oppetid (dage)
   Version: Version
   When: Når

data/web/views/_footer.erb

@@ -12,10 +12,10 @@
             <p id="serverUtcTime" class="navbar-text server-utc-time"><%= server_utc_time %></p>
           </li>
           <li>
-            <p class="navbar-text"><a rel=help href="https://github.com/mperham/sidekiq/wiki">docs</a></p>
+            <p class="navbar-text"><a rel=help href="https://github.com/sidekiq/sidekiq/wiki">docs</a></p>
           </li>
           <li>
-            <p class="navbar-text"><a rel=external href="https://github.com/mperham/sidekiq/tree/main/web/locales"><%= locale %></a></p>
+            <p class="navbar-text"><a rel=external href="https://github.com/sidekiq/sidekiq/tree/main/web/locales"><%= locale %></a></p>
           </li>
         </ul>
     </div>