Merge branch 'mwaw/switch_to_default_enabled_yml_in_aggergted_metrics_ff' into 'master'

Use default_enabled: :yaml in aggregated metrics

See merge request gitlab-org/gitlab!53831

lib/gitlab/usage/metrics/aggregates/aggregate.rb

@@ -44,7 +44,7 @@ module Gitlab
 
           def aggregated_metrics_data(start_date:, end_date:)
             aggregated_metrics.each_with_object({}) do |aggregation, data|
-              next if aggregation[:feature_flag] && Feature.disabled?(aggregation[:feature_flag], default_enabled: false, type: :development)
+              next if aggregation[:feature_flag] && Feature.disabled?(aggregation[:feature_flag], default_enabled: :yaml, type: :development)
 
               case aggregation[:source]
               when REDIS_SOURCE

spec/lib/gitlab/usage/metrics/aggregates/aggregate_spec.rb

@@ -142,6 +142,7 @@ RSpec.describe Gitlab::Usage::Metrics::Aggregates::Aggregate, :clean_gitlab_redi
 
           it 'does not calculate data for aggregates with ff turned off' do
             skip_feature_flags_yaml_validation
+            skip_default_enabled_yaml_check
             stub_feature_flags(enabled_feature_flag => true, disabled_feature_flag => false)
             allow(sources::RedisHll).to receive(:calculate_metrics_union).and_return(6)