Remove distribution from metric and event schema

config/events/schema.json

@@ -10,12 +10,6 @@
   ],
   "additionalProperties": false,
   "properties": {
-    "distributions": {
-      "type": [
-        "array",
-        "null"
-      ]
-    },
     "description": {
       "type": "string"
     },

config/metrics/schema/base.json

@@ -109,19 +109,6 @@
       "type": "string",
       "pattern": "^(([A-Z][a-z]+)+::)*(([A-Z]+[a-z]+)+)$"
     },
-    "distribution": {
-      "type": [
-        "array",
-        "null"
-      ],
-      "items": {
-        "type": "string",
-        "enum": [
-          "ee",
-          "ce"
-        ]
-      }
-    },
     "performance_indicator_type": {
       "type": "array",
       "items": {

spec/lib/gitlab/tracking/event_definition_validator_spec.rb

@@ -13,7 +13,6 @@
       value_description: 'ID of the issue',
       extra_properties: { confidential: false },
       product_group: 'group::product analytics',
-      distributions: %w[ee ce],
       tiers: %w[free premium ultimate],
       introduced_by_url: "https://gitlab.com/example/-/merge_requests/123",
       milestone: '1.6'
@@ -35,7 +34,6 @@
       :value_description    | 1
       :extra_properties     | 'smth'
       :product_group        | nil
-      :distributions        | %(be eb)
       :tiers                | %(pro)
       :product_categories     | 'bad_category'
       :product_categories     | ['bad_category']
@@ -60,7 +58,6 @@
           internal_events: true,
           product_group: 'activation',
           introduced_by_url: "https://gitlab.com/example/-/merge_requests/123",
-          distributions: %w[ce],
           milestone: "1.0",
           tiers: %w[free],
           additional_properties: {}

spec/lib/gitlab/usage/metric_definition_spec.rb

@@ -198,7 +198,6 @@ def write_metric(metric, path, content)
       :time_frame         | '29d'
       :data_source        | 'other'
       :data_source        | nil
-      :distribution       | 'test'
       :tiers              | %w[test ee]
       :repair_issue_url   | nil
       :removed_by_url     | 1
@@ -375,17 +374,6 @@ def write_metric(metric, path, content)
           end
         end
       end
-
-      # ToDo: Remove once https://gitlab.com/gitlab-org/gitlab/-/issues/469514 is closed
-      context 'when metric has no distribution' do
-        before do
-          attributes[:distribution] = nil
-        end
-
-        it 'has no validation errors' do
-          expect_no_validation_errors
-        end
-      end
     end
   end