Merge branch 'mwaw/rename_metrics_aggregation_operators' into 'master'

Rename metrics aggregation operators

See merge request gitlab-org/gitlab!47520

doc/development/product_analytics/usage_ping.md

@@ -735,7 +735,8 @@ In order to add data for aggregated metrics into Usage Ping payload you should a
 
 - name: unique name under which aggregate metric will be added to Usage Ping payload
 - operator: operator that defines how aggregated metric data will be counted. Available operators are:
-  - `ANY`: removes duplicates and counts all entries that triggered any of listed events
+  - `OR`: removes duplicates and counts all entries that triggered any of listed events
+  - `AND`: removes duplicates and counts all elements that were observed triggering all of following events
 - events: list of events names (from [`known_events.yml`](#known-events-in-usage-data-payload)) to aggregate into metric. All events in this list must have the same `redis_slot` and `aggregation` attributes.
 - feature_flag: name of [development feature flag](../feature_flags/development.md#development-type) that will be checked before
 metrics aggregation is performed. Corresponding feature flag should have `default_enabled` attribute set to `false`. 
@@ -744,11 +745,11 @@ metrics aggregation is performed. Corresponding feature flag should have `defaul
 Example aggregated metric entries:
 
 ```yaml
-- name: example_aggregated_metric
-  operator: ANY
-  events: ['i_search_advanced', 'i_search_paid']
-- name: example_aggregated_metric_with_feautre_flag
-  operator: ANY
+- name: product_analytics_test_metrics_union
+  operator: OR
+  events: ['i_search_total', 'i_search_advanced', 'i_search_paid']
+- name: product_analytics_test_metrics_intersection_with_feautre_flag
+  operator: AND
   events: ['i_search_total', 'i_search_advanced', 'i_search_paid']
   feature_flag: example_aggregated_metric
 ```
@@ -766,7 +767,8 @@ Aggregated metrics will be added under `aggregated_metrics` key in both `counts_
     :project_snippets => 407,
     :promoted_issues => 719,
     :aggregated_metrics => {
-      :example_aggregated_metric => 7
+      :product_analytics_test_metrics_union => 7,
+      :product_analytics_test_metrics_intersection_with_feautre_flag => 2
     },
     :snippets => 2513
   }

lib/gitlab/usage_data_counters/aggregated_metrics/common.yml

 #- name: unique name of aggregated metric
 #  operator: aggregation operator. Valid values are:
-#             - "ANY": counts unique elements that were observed triggering any of following events
-#             - "ALL": counts unique elements that were observed triggering all of following events
+#             - "OR": counts unique elements that were observed triggering any of following events
+#             - "AND": counts unique elements that were observed triggering all of following events
 #  events: list of events names to aggregate into metric. All events in this list must have the same 'redis_slot' and 'aggregation' attributes
 #           see from lib/gitlab/usage_data_counters/known_events/ for the list of valid events.
 #  feature_flag: name of development feature flag that will be checked before metrics aggregation is performed.
 #                Corresponding feature flag should have `default_enabled` attribute set to `false`.
 #                This attribute is OPTIONAL and can be omitted, when `feature_flag` is missing no feature flag will be checked.
 ---
-- name: product_analytics_test_aggregated_metrics
-  operator: ANY
+- name: product_analytics_test_metrics_union
+  operator: OR
   events: ['i_search_total', 'i_search_advanced', 'i_search_paid']
   feature_flag: product_analytics_aggregated_metrics
-- name: product_analytics_test_combined_events
-  operator: ALL
+- name: product_analytics_test_metrics_intersection
+  operator: AND
   events: ['i_search_total', 'i_search_advanced', 'i_search_paid']
-  feature_flag: product_analytics_aggregated_metrics

lib/gitlab/usage_data_counters/hll_redis_counter.rb

@@ -18,8 +18,8 @@ module Gitlab
 
       KNOWN_EVENTS_PATH = File.expand_path('known_events/*.yml', __dir__)
       ALLOWED_AGGREGATIONS = %i(daily weekly).freeze
-      UNION_OF_AGGREGATED_METRICS = 'ANY'
-      INTERSECTION_OF_AGGREGATED_METRICS = 'ALL'
+      UNION_OF_AGGREGATED_METRICS = 'OR'
+      INTERSECTION_OF_AGGREGATED_METRICS = 'AND'
       ALLOWED_METRICS_AGGREGATIONS = [UNION_OF_AGGREGATED_METRICS, INTERSECTION_OF_AGGREGATED_METRICS].freeze
       AGGREGATED_METRICS_PATH = File.expand_path('aggregated_metrics/*.yml', __dir__)
 

spec/lib/gitlab/usage_data_counters/hll_redis_counter_spec.rb

@@ -400,13 +400,13 @@ RSpec.describe Gitlab::UsageDataCounters::HLLRedisCounter, :clean_gitlab_redis_s
           allow(described_class).to receive(:aggregated_metrics).and_return(aggregated_metrics)
         end
 
-        context 'with ALL operator' do
+        context 'with AND operator' do
           let(:aggregated_metrics) do
             [
-              { name: 'gmau_1', events: %w[event1_slot event2_slot], operator: "ALL" },
-              { name: 'gmau_2', events: %w[event1_slot event2_slot event3_slot], operator: "ALL" },
-              { name: 'gmau_3', events: %w[event1_slot event2_slot event3_slot event5_slot], operator: "ALL" },
-              { name: 'gmau_4', events: %w[event4], operator: "ALL" }
+              { name: 'gmau_1', events: %w[event1_slot event2_slot], operator: "AND" },
+              { name: 'gmau_2', events: %w[event1_slot event2_slot event3_slot], operator: "AND" },
+              { name: 'gmau_3', events: %w[event1_slot event2_slot event3_slot event5_slot], operator: "AND" },
+              { name: 'gmau_4', events: %w[event4], operator: "AND" }
             ].map(&:with_indifferent_access)
           end
 
@@ -422,12 +422,12 @@ RSpec.describe Gitlab::UsageDataCounters::HLLRedisCounter, :clean_gitlab_redis_s
           end
         end
 
-        context 'with ANY operator' do
+        context 'with OR operator' do
           let(:aggregated_metrics) do
             [
-              { name: 'gmau_1', events: %w[event3_slot event5_slot], operator: "ANY" },
-              { name: 'gmau_2', events: %w[event1_slot event2_slot event3_slot event5_slot], operator: "ANY" },
-              { name: 'gmau_3', events: %w[event4], operator: "ANY" }
+              { name: 'gmau_1', events: %w[event3_slot event5_slot], operator: "OR" },
+              { name: 'gmau_2', events: %w[event1_slot event2_slot event3_slot event5_slot], operator: "OR" },
+              { name: 'gmau_3', events: %w[event4], operator: "OR" }
             ].map(&:with_indifferent_access)
           end
 
@@ -448,11 +448,11 @@ RSpec.describe Gitlab::UsageDataCounters::HLLRedisCounter, :clean_gitlab_redis_s
           let(:aggregated_metrics) do
             [
               # represents stable aggregated metrics that has been fully released
-              { name: 'gmau_without_ff', events: %w[event3_slot event5_slot], operator: "ANY" },
+              { name: 'gmau_without_ff', events: %w[event3_slot event5_slot], operator: "OR" },
               # represents new aggregated metric that is under performance testing on gitlab.com
-              { name: 'gmau_enabled', events: %w[event4], operator: "ALL", feature_flag: enabled_feature_flag },
+              { name: 'gmau_enabled', events: %w[event4], operator: "AND", feature_flag: enabled_feature_flag },
               # represents aggregated metric that is under development and shouldn't be yet collected even on gitlab.com
-              { name: 'gmau_disabled', events: %w[event4], operator: "ALL", feature_flag: disabled_feature_flag }
+              { name: 'gmau_disabled', events: %w[event4], operator: "AND", feature_flag: disabled_feature_flag }
             ].map(&:with_indifferent_access)
           end
 
@@ -520,7 +520,7 @@ RSpec.describe Gitlab::UsageDataCounters::HLLRedisCounter, :clean_gitlab_redis_s
       context 'Redis calls' do
         let(:aggregated_metrics) do
           [
-            { name: 'gmau_3', events: %w[event1_slot event2_slot event3_slot event5_slot], operator: "ALL" }
+            { name: 'gmau_3', events: %w[event1_slot event2_slot event3_slot event5_slot], operator: "AND" }
           ].map(&:with_indifferent_access)
         end