Changes to grafana usage data based on CR

Use find_each instead of each_batch. Simplify specs.
Cleanup and consistency changes. Query only for issues
with a grafana integration enabled

app/models/issue.rb

@@ -62,6 +62,7 @@ class Issue < ApplicationRecord
   scope :order_relative_position_asc, -> { reorder(::Gitlab::Database.nulls_last_order('relative_position', 'ASC')) }
 
   scope :preload_associated_models, -> { preload(:labels, project: :namespace) }
+  scope :with_project_grafana_integration, -> { includes(project: :grafana_integration).where(projects: { grafana_integrations: { enabled: true } } ) }
   scope :with_api_entity_associations, -> { preload(:timelogs, :assignees, :author, :notes, :labels, project: [:route, { namespace: :route }] ) }
 
   scope :public_only, -> { where(confidential: false) }

lib/gitlab/grafana_embed_usage_data.rb

@@ -4,26 +4,17 @@ module Gitlab
   class GrafanaEmbedUsageData
     class << self
       def issue_count
-        get_embed_count
-      end
-
-      private
-
-      def get_embed_count
-        Issue.class_eval { include EachBatch } unless Issue < EachBatch
-
         count = 0
 
-        Issue.eager_load(project: :grafana_integration).each_batch do |issue_batch|
-          embed_count_per_batch = issue_batch.map do |issue|
-            has_grafana_url?(issue)
-          end.count(&:itself)
-          count += embed_count_per_batch
+        Issue.with_project_grafana_integration.find_each do |issue|
+          count += has_grafana_url?(issue) ? 1 : 0
         end
 
         count
       end
 
+      private
+
       def has_grafana_url?(issue)
         html = Banzai.render(issue.description, project: issue.project)
         result = Banzai::Filter::InlineGrafanaMetricsFilter.new(

spec/lib/gitlab/grafana_embed_usage_data_spec.rb

@@ -13,53 +13,43 @@ describe Gitlab::GrafanaEmbedUsageData do
     let(:description_with_unintegrated_embed) { "Some comment\n\nhttps://grafana.exp.com/d/xvAk4q0Wk/go-processes?orgId=1&from=1573238522762&to=1573240322762&var-job=prometheus&var-interval=10m&panelId=1&fullscreen" }
 
     shared_examples "zero count" do
-      context "without grafana embeds" do
-        it "does not count the issue" do
-          expect(subject).to eq(0)
-        end
+      it "does not count the issue" do
+        expect(subject).to eq(0)
       end
     end
 
-    context 'with grafana integrated project' do
+    context 'with project grafana integration enabled' do
       before do
         create(:grafana_integration, project: project)
       end
 
-      it 'counts multiple issues with grafana links' do
-        create(:issue, project: project, description: description_with_embed)
-        create(:issue, project: project, description: description_with_embed)
-        create(:issue, project: project)
-
-        expect(subject).to eq(2)
-      end
-
-      context 'issue description has no grafana link' do
+      context 'with valid and invalid embeds' do
         before do
+          create(:issue, project: project, description: description_with_embed)
+          create(:issue, project: project, description: description_with_embed)
+          create(:issue, project: project, description: description_with_unintegrated_embed)
+          create(:issue, project: project, description: nil)
+          create(:issue, project: project, description: '')
           create(:issue, project: project)
         end
 
-        it_behaves_like('zero count')
-      end
-
-      context 'issue description is nil' do
-        before do
-          create(:issue, project: project, description: nil)
+        it 'counts only the issues with embeds' do
+          expect(subject).to eq(2)
         end
-
-        it_behaves_like('zero count')
       end
+    end
 
-      context 'issue description is empty' do
-        before do
-          create(:issue, project: project, description: '')
-        end
-        it_behaves_like('zero count')
+    context 'with project grafana integration disabled' do
+      before do
+        create(:grafana_integration, project: project, enabled: false)
       end
 
-      context 'issue description has grafana link for un-integrated grafana instance' do
+      context 'with one issue having a grafana link in the description and one without' do
         before do
-          create(:issue, project: project, description: description_with_unintegrated_embed)
+          create(:issue, project: project, description: description_with_embed)
+          create(:issue, project: project)
         end
+
         it_behaves_like('zero count')
       end
     end
@@ -73,22 +63,6 @@ describe Gitlab::GrafanaEmbedUsageData do
 
         it_behaves_like('zero count')
       end
-
-      context 'with issue description nil' do
-        before do
-          create(:issue, project: project, description: nil)
-        end
-
-        it_behaves_like('zero count')
-      end
-
-      context 'with issue description empty' do
-        before do
-          create(:issue, project: project, description: '')
-        end
-
-        it_behaves_like('zero count')
-      end
     end
   end
 end

spec/lib/gitlab/usage_data_spec.rb

@@ -53,7 +53,7 @@ describe Gitlab::UsageData do
       create(:grafana_integration, project: projects[1], enabled: true)
       create(:grafana_integration, project: projects[2], enabled: false)
 
-      allow(Gitlab::GrafanaEmbedUsageData).to receive(:issue_count) { 2 }
+      allow(Gitlab::GrafanaEmbedUsageData).to receive(:issue_count).and_return(2)
 
       ProjectFeature.first.update_attribute('repository_access_level', 0)
     end