Add latest changes from gitlab-org/gitlab@master

2 files changed, 115 insertions, 2 deletions

diff --git a/spec/lib/gitlab/sidekiq_middleware/client_metrics_spec.rb b/spec/lib/gitlab/sidekiq_middleware/client_metrics_spec.rb
new file mode 100644
index 00000000000..6516016e67f
--- /dev/null
+++ b/spec/lib/gitlab/sidekiq_middleware/client_metrics_spec.rb
@@ -0,0 +1,113 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::SidekiqMiddleware::ClientMetrics do
+  context "with worker attribution" do
+    subject { described_class.new }
+
+    let(:queue) { :test }
+    let(:worker_class) { worker.class }
+    let(:job) { {} }
+    let(:default_labels) { { queue: queue.to_s, boundary: "", external_dependencies: "no", feature_category: "", latency_sensitive: "no" } }
+
+    shared_examples "a metrics client middleware" do
+      context "with mocked prometheus" do
+        let(:enqueued_jobs_metric) { double('enqueued jobs metric', increment: true) }
+
+        before do
+          allow(Gitlab::Metrics).to receive(:counter).with(described_class::ENQUEUED, anything).and_return(enqueued_jobs_metric)
+        end
+
+        describe '#call' do
+          it 'yields block' do
+            expect { |b| subject.call(worker, job, :test, double, &b) }.to yield_control.once
+          end
+
+          it 'increments enqueued jobs metric' do
+            expect(enqueued_jobs_metric).to receive(:increment).with(labels, 1)
+
+            subject.call(worker, job, :test, double) { nil }
+          end
+        end
+      end
+    end
+
+    context "when workers are not attributed" do
+      class TestNonAttributedWorker
+        include Sidekiq::Worker
+      end
+
+      it_behaves_like "a metrics client middleware" do
+        let(:worker) { TestNonAttributedWorker.new }
+        let(:labels) { default_labels }
+      end
+    end
+
+    context "when workers are attributed" do
+      def create_attributed_worker_class(latency_sensitive, external_dependencies, resource_boundary, category)
+        Class.new do
+          include Sidekiq::Worker
+          include WorkerAttributes
+
+          latency_sensitive_worker! if latency_sensitive
+          worker_has_external_dependencies! if external_dependencies
+          worker_resource_boundary resource_boundary unless resource_boundary == :unknown
+          feature_category category unless category.nil?
+        end
+      end
+
+      let(:latency_sensitive) { false }
+      let(:external_dependencies) { false }
+      let(:resource_boundary) { :unknown }
+      let(:feature_category) { nil }
+      let(:worker_class) { create_attributed_worker_class(latency_sensitive, external_dependencies, resource_boundary, feature_category) }
+      let(:worker) { worker_class.new }
+
+      context "latency sensitive" do
+        it_behaves_like "a metrics client middleware" do
+          let(:latency_sensitive) { true }
+          let(:labels) { default_labels.merge(latency_sensitive: "yes") }
+        end
+      end
+
+      context "external dependencies" do
+        it_behaves_like "a metrics client middleware" do
+          let(:external_dependencies) { true }
+          let(:labels) { default_labels.merge(external_dependencies: "yes") }
+        end
+      end
+
+      context "cpu boundary" do
+        it_behaves_like "a metrics client middleware" do
+          let(:resource_boundary) { :cpu }
+          let(:labels) { default_labels.merge(boundary: "cpu") }
+        end
+      end
+
+      context "memory boundary" do
+        it_behaves_like "a metrics client middleware" do
+          let(:resource_boundary) { :memory }
+          let(:labels) { default_labels.merge(boundary: "memory") }
+        end
+      end
+
+      context "feature category" do
+        it_behaves_like "a metrics client middleware" do
+          let(:feature_category) { :authentication }
+          let(:labels) { default_labels.merge(feature_category: "authentication") }
+        end
+      end
+
+      context "combined" do
+        it_behaves_like "a metrics client middleware" do
+          let(:latency_sensitive) { true }
+          let(:external_dependencies) { true }
+          let(:resource_boundary) { :cpu }
+          let(:feature_category) { :authentication }
+          let(:labels) { default_labels.merge(latency_sensitive: "yes", external_dependencies: "yes", boundary: "cpu", feature_category: "authentication") }
+        end
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/sidekiq_middleware/metrics_spec.rb b/spec/lib/gitlab/sidekiq_middleware/server_metrics_spec.rb
index 36c6f377bde..65a961b34f8 100644
--- a/spec/lib/gitlab/sidekiq_middleware/metrics_spec.rb
+++ b/spec/lib/gitlab/sidekiq_middleware/server_metrics_spec.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'fast_spec_helper'
+require 'spec_helper'
 
-describe Gitlab::SidekiqMiddleware::Metrics do
+describe Gitlab::SidekiqMiddleware::ServerMetrics do
   context "with worker attribution" do
     subject { described_class.new }