Merge branch 'test-usage-ping-in-timeout-case' into 'master'

Verify that usage ping works when all counts time out

See merge request gitlab-org/gitlab-ee!7926

ee/lib/ee/gitlab/usage_data.rb

@@ -83,7 +83,7 @@ module EE
           sast: :sast_jobs
         }
 
-        results = count(::Ci::Build.where(name: types.keys).group(:name))
+        results = count(::Ci::Build.where(name: types.keys).group(:name), fallback: Hash.new(-1))
         results.each_with_object({}) { |(key, value), response| response[types[key.to_sym]] = value  }
       end
       # rubocop: enable CodeReuse/ActiveRecord

spec/lib/gitlab/usage_data_spec.rb

@@ -128,6 +128,13 @@ describe Gitlab::UsageData do
       expect(count_data[:clusters_applications_prometheus]).to eq(1)
       expect(count_data[:clusters_applications_runner]).to eq(1)
     end
+
+    it 'works when queries time out' do
+      allow_any_instance_of(ActiveRecord::Relation)
+        .to receive(:count).and_raise(ActiveRecord::StatementInvalid.new(''))
+
+      expect { subject }.not_to raise_error
+    end
   end
 
   describe '#features_usage_data_ce' do