Include operational data when usage ping enabled

ee/app/services/ee/service_ping/permit_data_categories_service.rb

@@ -16,11 +16,11 @@ module EE
         return [] unless product_intelligence_enabled?
 
         optional_enabled = ::Gitlab::CurrentSettings.usage_ping_enabled?
-        operational_enabled = ::License.current.usage_ping?
+        customer_service_enabled = ::License.current.usage_ping?
 
         [STANDARD_CATEGORY, SUBSCRIPTION_CATEGORY].tap do |categories|
-          categories << OPTIONAL_CATEGORY if optional_enabled
-          categories << OPERATIONAL_CATEGORY if operational_enabled
+          categories << OPERATIONAL_CATEGORY << OPTIONAL_CATEGORY if optional_enabled
+          categories << OPERATIONAL_CATEGORY if customer_service_enabled
         end.to_set
       end
 

ee/spec/services/ee/service_ping/build_payload_service_spec.rb

@@ -42,11 +42,7 @@ RSpec.describe ServicePing::BuildPayloadService do
           end
 
           it_behaves_like 'service ping payload with all expected metrics' do
-            let(:expected_metrics) { standard_metrics + subscription_metrics + optional_metrics }
-          end
-
-          it_behaves_like 'service ping payload without restricted metrics' do
-            let(:restricted_metrics) { operational_metrics }
+            let(:expected_metrics) { standard_metrics + subscription_metrics + optional_metrics + operational_metrics }
           end
         end
       end

ee/spec/services/ee/service_ping/permit_data_categories_service_spec.rb

@@ -62,7 +62,7 @@ RSpec.describe ServicePing::PermitDataCategoriesService do
           end
 
           it 'returns all categories' do
-            expect(permitted_categories).to match_array(%w[Standard Subscription Optional])
+            expect(permitted_categories).to match_array(%w[Standard Subscription Operational Optional])
           end
         end
       end