gitlab-exporter 13.3.0 → 13.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a115af5d2f6c523fe9a6fb55e09e47bbae42b6fdee96d20e2f0987e758546be
-  data.tar.gz: cbb66dac910580239114923f0b70ad40a6580cac4a1b29e69e308559c6619e3e
+  metadata.gz: 5ffa16533118568301cba662228785262ac08d3fb58d85572b6a02199316732d
+  data.tar.gz: 26fe29073fb946867318bef4dd785653d6385ebd51fa8f8ae431bebab3daf3a8
 SHA512:
-  metadata.gz: bfe2f5921dbd280826ba2e959d1bdc09fdf721f691e32c31f12e8948805a4103b30e29cc3286b56be1c4fd9d7e766b5b5e4b7df8ae117d1a53a6b03e4bfdda7d
-  data.tar.gz: d0dde2e781ad6599e7944c400d2efd92272b43c813229a26754cf944da6972563154c35d9f5f1f75678ecb4537edef61cb6cc13f0a8cb433a7a5922b4c755993
+  metadata.gz: d422202e989b82e4222a6bcc6610a2d62421da260e4a8e014b40458778ea0a64f135afb02269bb6f3513cea4cbeb3c127d3b917c6152c9c46f4403b241896f0f
+  data.tar.gz: e2a470642b3f97b3d9e19007bfeb365af4abe4fe7a71079a5fdcccae31939fa7b786c24a0f580c5f9a27c52edbb6c052bcea6055df89403d2e5c673caef3ee7c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-exporter (13.3.0)
+    gitlab-exporter (13.3.1)
       connection_pool (= 2.2.5)
       faraday (~> 1.8.0)
       pg (= 1.5.3)

data/lib/gitlab_exporter/sidekiq.rb

@@ -23,6 +23,9 @@ module GitLab
       # needed to be re-initialized
       POOL_TIMEOUT = 90
 
+      # Lock for Sidekiq.redis which we need to modify, but is not concurrency safe.
+      SIDEKIQ_REDIS_LOCK = Mutex.new
+
       PrometheusMetrics.describe("sidekiq_enqueued_jobs",
                                  "Total number of jobs enqueued by class name. Only inspects the first #{PROBE_JOBS_LIMIT} jobs per queue.") # rubocop:disable Layout/LineLength
 
@@ -211,16 +214,15 @@ module GitLab
       end
 
       def with_sidekiq(namespaced = true)
-        # TODO: this is not concurrent safe as we change global context
-        # It means that we are unable to use many different sidekiq's
-        # which is not a problem as of now
-        Sidekiq.configure_client do |config|
-          config.redis = self.class.connection_pool[redis_options(namespaced)]
-        end
+        SIDEKIQ_REDIS_LOCK.synchronize {
+          Sidekiq.configure_client do |config|
+            config.redis = self.class.connection_pool[redis_options(namespaced)]
+          end
 
-        return unless connected?
+          return unless connected?
 
-        yield
+          yield
+        }
       end
 
       def redis_options(namespaced = true)

data/lib/gitlab_exporter/version.rb

@@ -1,5 +1,5 @@
 module GitLab
   module Exporter
-    VERSION = "13.3.0".freeze
+    VERSION = "13.3.1".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-exporter
 version: !ruby/object:Gem::Version
-  version: 13.3.0
+  version: 13.3.1
 platform: ruby
 authors:
 - Pablo Carranza