Pedro Pombeiro
--- a/ee/config/feature_flags/development/issues_completed_analytics_feature_flag.yml
+++ b/ee/config/feature_flags/development/issues_completed_analytics_feature_flag.yml
 milestone: '16.3'
 type: development
 group: group::optimize
-default_enabled: false
+default_enabled: true
--- a/lib/gitlab/cleanup/orphan_job_artifact_final_objects/job_artifact_object.rb 0 → 100644
+++ b/lib/gitlab/cleanup/orphan_job_artifact_final_objects/job_artifact_object.rb 0 → 100644
+          @fog_file = fog_file
+          @path = fog_file.key
+          @size = fog_file.content_length
+          @bucket_prefix = bucket_prefix
+        end
+
+        def in_final_location?
+          path.include?('/@final/')
+        end
+
+        def orphan?
+          !job_artifact_record_exists? && !pending_direct_upload?
+        end
+
+        def delete
+          fog_file.destroy
--- a/lib/gitlab/cleanup/orphan_job_artifact_final_objects_cleaner.rb 0 → 100644
+++ b/lib/gitlab/cleanup/orphan_job_artifact_final_objects_cleaner.rb 0 → 100644
+      LAST_PAGE_MARKER_REDIS_KEY = 'orphan-job-artifact-objects-cleanup-last-page-marker'
+
+      def initialize(provider: nil, dry_run: true, force_restart: false, logger: Gitlab::AppLogger)
+        @paginator = determine_paginator!(provider)
+        @dry_run = dry_run
+        @force_restart = force_restart
+        @logger = logger
+      end
+
+      def run!
+        log_info('Looking for orphan job artifact objects under the `@final` directories')
+
+        each_final_object do |object|
+          next unless object.orphan?
+
+          object.delete unless dry_run
--- a/spec/finders/ci/runner_managers_finder_spec.rb
+++ b/spec/finders/ci/runner_managers_finder_spec.rb
+
+      it { is_expected.to be_empty }
+    end
+  end
+
+  context 'without any arguments' do
    let(:params) { {} }

-    let_it_be(:runner_manager) { create(:ci_runner_machine, runner: runner) }
+    let_it_be(:runner_manager1) { create(:ci_runner_machine, runner: runner) }
+    let_it_be(:runner_manager2) { create(:ci_runner_machine, runner: runner) }

-    it 'returns all runner managers' do
-      expect(runner_managers).to contain_exactly(runner_manager)
+    it 'returns all runner managers in id_desc order' do
+      expect(runner_managers).to eq([runner_manager2, runner_manager1])
-      expect(runner_managers).to eq([runner_manager2, runner_manager1])
+      expect(runner_managers).to match_array([runner_manager2, runner_manager1])