From 735365a367add91790e8e00a44b78f9933622c6b Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Thu, 19 Oct 2017 14:48:27 +0300
Subject: [PATCH] rename BackgroundMigration to SidekiqMigration

---
 ...kiq_transaction.rb => background_transaction.rb} |  2 +-
 lib/gitlab/metrics/histogram_buckets.rb             |  0
 lib/gitlab/metrics/sidekiq_middleware.rb            |  2 +-
 .../gitlab/metrics/background_transaction_spec.rb   | 13 +++++++++++++
 spec/lib/gitlab/metrics/rack_middleware_spec.rb     |  2 +-
 spec/lib/gitlab/metrics/sidekiq_middleware_spec.rb  |  2 +-
 6 files changed, 17 insertions(+), 4 deletions(-)
 rename lib/gitlab/metrics/{sidekiq_transaction.rb => background_transaction.rb} (84%)
 delete mode 100644 lib/gitlab/metrics/histogram_buckets.rb
 create mode 100644 spec/lib/gitlab/metrics/background_transaction_spec.rb

diff --git a/lib/gitlab/metrics/sidekiq_transaction.rb b/lib/gitlab/metrics/background_transaction.rb
similarity index 84%
rename from lib/gitlab/metrics/sidekiq_transaction.rb
rename to lib/gitlab/metrics/background_transaction.rb
index 797594f12e1..d01de5eef0a 100644
--- a/lib/gitlab/metrics/sidekiq_transaction.rb
+++ b/lib/gitlab/metrics/background_transaction.rb
@@ -1,6 +1,6 @@
 module Gitlab
   module Metrics
-    class SidekiqTransaction < Transaction
+    class BackgroundTransaction < Transaction
       def initialize(worker_class)
         super()
         @worker_class = worker_class
diff --git a/lib/gitlab/metrics/histogram_buckets.rb b/lib/gitlab/metrics/histogram_buckets.rb
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/lib/gitlab/metrics/sidekiq_middleware.rb b/lib/gitlab/metrics/sidekiq_middleware.rb
index 4dbf404f857..55c707d5386 100644
--- a/lib/gitlab/metrics/sidekiq_middleware.rb
+++ b/lib/gitlab/metrics/sidekiq_middleware.rb
@@ -5,7 +5,7 @@ module Gitlab
     # This middleware is intended to be used as a server-side middleware.
     class SidekiqMiddleware
       def call(worker, message, queue)
-        trans = SidekiqTransaction.new(worker.class)
+        trans = BackgroundTransaction.new(worker.class)
 
         begin
           # Old gitlad-shell messages don't provide enqueued_at/created_at attributes
diff --git a/spec/lib/gitlab/metrics/background_transaction_spec.rb b/spec/lib/gitlab/metrics/background_transaction_spec.rb
new file mode 100644
index 00000000000..96052b8dc2f
--- /dev/null
+++ b/spec/lib/gitlab/metrics/background_transaction_spec.rb
@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe Gitlab::Metrics::BackgroundTransaction do
+  let(:test_worker_class) { double(:class, name: 'TestWorker') }
+
+  subject { described_class.new(test_worker_class) }
+
+  describe '#action' do
+    it 'returns transaction action name' do
+      expect(subject.action).to eq('TestWorker#perform')
+    end
+  end
+end
diff --git a/spec/lib/gitlab/metrics/rack_middleware_spec.rb b/spec/lib/gitlab/metrics/rack_middleware_spec.rb
index f6ce1805ca7..b84387204ee 100644
--- a/spec/lib/gitlab/metrics/rack_middleware_spec.rb
+++ b/spec/lib/gitlab/metrics/rack_middleware_spec.rb
@@ -32,7 +32,7 @@ describe Gitlab::Metrics::RackMiddleware do
     let(:transaction) { middleware.transaction_from_env(env) }
 
     it 'returns a Transaction' do
-      expect(transaction).to be_an_instance_of(Gitlab::Metrics::Transaction)
+      expect(transaction).to be_an_instance_of(Gitlab::Metrics::WebTransaction)
     end
 
     it 'stores the request method and URI in the transaction as values' do
diff --git a/spec/lib/gitlab/metrics/sidekiq_middleware_spec.rb b/spec/lib/gitlab/metrics/sidekiq_middleware_spec.rb
index 4fa5b64abbf..ef5c490c9f7 100644
--- a/spec/lib/gitlab/metrics/sidekiq_middleware_spec.rb
+++ b/spec/lib/gitlab/metrics/sidekiq_middleware_spec.rb
@@ -5,7 +5,7 @@ describe Gitlab::Metrics::SidekiqMiddleware do
   let(:message) { { 'args' => ['test'], 'enqueued_at' => Time.new(2016, 6, 23, 6, 59).to_f } }
 
   def run(worker, message)
-    expect(Gitlab::Metrics::Transaction).to receive(:new)
+    expect(Gitlab::Metrics::BackgroundTransaction).to receive(:new)
       .with(worker.class)
       .and_call_original