Merge branch 'instrument-repository-archive-worker' into 'master'

Instrument Repository.clean_old_archives

This is done so we have some metrics for https://gitlab.com/gitlab-org/gitlab-ce/issues/15256.

See merge request !3742

CHANGELOG

@@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date.
 
 v 8.7.0 (unreleased)
   - Method instrumentation now uses Module#prepend instead of aliasing methods
+  - Repository.clean_old_archives is now instrumented
   - The Projects::HousekeepingService class has extra instrumentation
   - All service classes (those residing in app/services) are now instrumented
   - Developers can now add custom tags to transactions

app/models/repository.rb

@@ -12,12 +12,14 @@ class Repository
   attr_accessor :path_with_namespace, :project
 
   def self.clean_old_archives
+    Gitlab::Metrics.measure(:clean_old_archives) do
       repository_downloads_path = Gitlab.config.gitlab.repository_downloads_path
 
       return unless File.directory?(repository_downloads_path)
 
       Gitlab::Popen.popen(%W(find #{repository_downloads_path} -not -path #{repository_downloads_path} -mmin +120 -delete))
     end
+  end
 
   def initialize(path_with_namespace, project)
     @path_with_namespace = path_with_namespace

spec/models/repository_spec.rb

@@ -910,9 +910,32 @@ describe Repository, models: true do
     end
   end
 
+  describe '.clean_old_archives' do
+    let(:path) { Gitlab.config.gitlab.repository_downloads_path }
+
+    context 'when the downloads directory does not exist' do
+      it 'does not remove any archives' do
+        expect(File).to receive(:directory?).with(path).and_return(false)
+
+        expect(Gitlab::Popen).not_to receive(:popen)
+
+        described_class.clean_old_archives
+      end
+    end
+
+    context 'when the downloads directory exists' do
+      it 'removes old archives' do
+        expect(File).to receive(:directory?).with(path).and_return(true)
+
+        expect(Gitlab::Popen).to receive(:popen)
+
+        described_class.clean_old_archives
+      end
+    end
+  end
+
   def create_remote_branch(remote_name, branch_name, target)
     rugged = repository.rugged
     rugged.references.create("refs/remotes/#{remote_name}/#{branch_name}", target)
   end
-
 end