Merge branch 'mwaw/metric_names_suggestions_include_constraints_on_joined_relations' into 'master'

Include constraints on joined relations [RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!57704

lib/gitlab/usage/metrics/names_suggestions/generator.rb

@@ -6,6 +6,7 @@ module Gitlab
       module NamesSuggestions
         class Generator < ::Gitlab::UsageData
           FREE_TEXT_METRIC_NAME = "<please fill metric name>"
+          CONSTRAINTS_PROMPT_TEMPLATE = "<adjective describing: '%{constraints}'>"
 
           class << self
             def generate(key_path)
@@ -76,15 +77,20 @@ module Gitlab
               #   count_environment_id_from_clusters_with_deployments
               actual_source = parse_source(relation, arel_column)
 
-              if constraints.include?(actual_source)
-                parts << "<adjective describing: '#{constraints}'>"
-              end
+              append_constraints_prompt(actual_source, [constraints], parts)
 
               parts << actual_source
-              parts += process_joined_relations(actual_source, arel, relation)
+              parts += process_joined_relations(actual_source, arel, relation, constraints)
               parts.compact.join('_')
             end
 
+            def append_constraints_prompt(target, constraints, parts)
+              applicable_constraints = constraints.select { |constraint| constraint.include?(target) }
+              return unless applicable_constraints.any?
+
+              parts << CONSTRAINTS_PROMPT_TEMPLATE % { constraints: applicable_constraints.join(' AND ') }
+            end
+
             def parse_constraints(relation:, arel:)
               connection = relation.connection
               ::Gitlab::Usage::Metrics::NamesSuggestions::RelationParsers::Constraints
@@ -94,7 +100,7 @@ module Gitlab
             end
 
             # TODO: joins with `USING` keyword
-            def process_joined_relations(actual_source, arel, relation)
+            def process_joined_relations(actual_source, arel, relation, where_constraints)
               joins = parse_joins(connection: relation.connection, arel: arel)
               return [] unless joins.any?
 
@@ -109,7 +115,7 @@ module Gitlab
                             build_relations_tree(joins + [{ source: relation.table_name }], actual_source, source_key: :target, target_key: :source)
                           end
 
-              collect_join_parts(relations[actual_source])
+              collect_join_parts(relations: relations[actual_source], joins: joins, wheres: where_constraints)
             end
 
             def parse_joins(connection:, arel:)
@@ -128,7 +134,11 @@ module Gitlab
                 join_cond_regex = /(#{source_regex}\s+=\s+#{target_regex})|(#{target_regex}\s+=\s+#{source_regex})/i
                 matched = join_cond_regex.match(join[:constraints])
 
-                join[:target] = matched[:target] if matched
+                if matched
+                  join[:target] = matched[:target]
+                  join[:constraints].gsub!(/#{join_cond_regex}(\s+(and|or))*/i, '')
+                end
+
                 join
               end
             end
@@ -147,13 +157,15 @@ module Gitlab
               tree
             end
 
-            def collect_join_parts(joined_relations, parts = [], conjunctions = %w[with having including].cycle)
+            def collect_join_parts(relations:, joins:, wheres:, parts: [], conjunctions: %w[with having including].cycle)
               conjunction = conjunctions.next
-              joined_relations.each do |subtree|
+              relations.each do |subtree|
                 subtree.each do |parent, children|
                   parts << "<#{conjunction}>"
+                  join_constraints = joins.find { |join| join[:source] == parent }&.dig(:constraints)
+                  append_constraints_prompt(parent, [wheres, join_constraints].compact, parts)
                   parts << parent
-                  collect_join_parts(children, parts, conjunctions)
+                  collect_join_parts(relations: children, joins: joins, wheres: wheres, parts: parts, conjunctions: conjunctions)
                 end
               end
               parts

spec/lib/gitlab/usage/metrics/names_suggestions/generator_spec.rb

@@ -44,7 +44,10 @@ RSpec.describe Gitlab::Usage::Metrics::NamesSuggestions::Generator do
           #   ::Deployment.arel_table[:environment_id]
           # )
           let(:key_path) { 'counts.ingress_modsecurity_logging' }
-          let(:name_suggestion) { /count_distinct_environment_id_from_<adjective describing\: '\(clusters_applications_ingress\.modsecurity_enabled = TRUE AND clusters_applications_ingress\.modsecurity_mode = \d+ AND clusters.enabled = TRUE AND deployments.status = \d+\)'>_deployments_<with>_clusters_<having>_clusters_applications_ingress/ }
+          let(:name_suggestion) do
+            constrains = /'\(clusters_applications_ingress\.modsecurity_enabled = TRUE AND clusters_applications_ingress\.modsecurity_mode = \d+ AND clusters.enabled = TRUE AND deployments.status = \d+\)'/
+            /count_distinct_environment_id_from_<adjective describing\: #{constrains}>_deployments_<with>_<adjective describing\: #{constrains}>_clusters_<having>_<adjective describing\: #{constrains}>_clusters_applications_ingress/
+          end
         end
       end