Merge branch 'da-pod-logs-usage-ping' into 'master'

Send only pod logs usage total on the usage data

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

ee/lib/ee/gitlab/usage_data.rb

@@ -120,21 +120,22 @@ module EE
           usage_data = super
 
           usage_data[:counts] = usage_data[:counts].merge({
+            dependency_list_usages_total: ::Gitlab::UsageCounters::DependencyList.usage_totals[:total],
             epics: count(::Epic),
             feature_flags: count(Operations::FeatureFlag),
             geo_nodes: count(::GeoNode),
+            incident_issues: count(::Issue.authored(::User.alert_bot)),
             ldap_group_links: count(::LdapGroupLink),
             ldap_keys: count(::LDAPKey),
             ldap_users: count(::User.ldap),
-            projects_reporting_ci_cd_back_to_github: count(::GithubService.without_defaults.active),
+            operations_dashboard: operations_dashboard_usage,
+            pod_logs_usages_total: ::Gitlab::UsageCounters::PodLogs.usage_totals[:total],
+            projects_enforcing_code_owner_approval: count(::Project.without_deleted.non_archived.requiring_code_owner_approval),
             projects_mirrored_with_pipelines_enabled: projects_mirrored_with_pipelines_enabled,
-            projects_with_prometheus_alerts: count(PrometheusAlert.distinct_projects),
+            projects_reporting_ci_cd_back_to_github: count(::GithubService.without_defaults.active),
             projects_with_packages: count(::Packages::Package.select('distinct project_id')),
-            projects_with_tracing_enabled: count(ProjectTracingSetting),
-            projects_enforcing_code_owner_approval: count(::Project.without_deleted.non_archived.requiring_code_owner_approval),
-            operations_dashboard: operations_dashboard_usage,
-            dependency_list_usages_total: ::Gitlab::UsageCounters::DependencyList.usage_totals[:total],
-            incident_issues: count(::Issue.authored(::User.alert_bot))
+            projects_with_prometheus_alerts: count(PrometheusAlert.distinct_projects),
+            projects_with_tracing_enabled: count(ProjectTracingSetting)
           }).merge(service_desk_counts).merge(security_products_usage)
 
           # MySql does not support recursive queries so we can't retrieve epics relationship depth
@@ -145,13 +146,6 @@ module EE
           usage_data
         end
 
-        override :usage_counters
-        def usage_counters
-          super.merge({
-            pod_logs_usages: ::Gitlab::UsageCounters::PodLogs.usage_totals
-          })
-        end
-
         override :jira_usage
         def jira_usage
           super.merge(

ee/spec/lib/gitlab/usage_data_spec.rb

@@ -54,7 +54,6 @@ describe Gitlab::UsageData do
         license_id
         elasticsearch_enabled
         geo_enabled
-        pod_logs_usages
       ))
     end
 
@@ -65,27 +64,28 @@ describe Gitlab::UsageData do
       expect(count_data[:projects]).to eq(3)
 
       expect(count_data.keys).to include(*%i(
-        projects_mirrored_with_pipelines_enabled
+        container_scanning_jobs
+        dast_jobs
+        dependency_list_usages_total
+        dependency_scanning_jobs
         epics
+        feature_flags
         geo_nodes
+        incident_issues
         ldap_group_links
         ldap_keys
         ldap_users
-        projects_reporting_ci_cd_back_to_github
-        container_scanning_jobs
-        dast_jobs
-        dependency_scanning_jobs
         license_management_jobs
-        sast_jobs
-        projects_with_prometheus_alerts
-        projects_with_packages
-        projects_with_tracing_enabled
+        operations_dashboard
+        pod_logs_usages_total
         projects_jira_dvcs_cloud_active
         projects_jira_dvcs_server_active
-        feature_flags
-        operations_dashboard
-        dependency_list_usages_total
-        incident_issues
+        projects_mirrored_with_pipelines_enabled
+        projects_reporting_ci_cd_back_to_github
+        projects_with_packages
+        projects_with_prometheus_alerts
+        projects_with_tracing_enabled
+        sast_jobs
       ))
 
       expect(count_data[:projects_with_prometheus_alerts]).to eq(2)