gitlab_quality-test_tooling 1.15.0 → 1.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8364acd36abab9ce89c0846c346b893ca041a6a740ced7dc5c784da5990ea74c
-  data.tar.gz: 9468d8b559aeec587f9c3722e4f6e9d539d790828f9ecc7f815cc39ca22f2657
+  metadata.gz: 948fbcd939a7800a4538113fddc717642c4d9fed7dab6d650cd9052c1832f19b
+  data.tar.gz: fbc4cee23cbcd3f7631ac6a03d41f2b8e287590777fef813289013d982efc4f7
 SHA512:
-  metadata.gz: 4d287ca74d5fe7bc1bd9acd25541eb6f150f717f95f9e8c0bdf7a53ac139f3dab5186565ec74f2f7279e50dd47268d22121eb94ba2e3955cc5f6de33e7a952c0
-  data.tar.gz: e2954fea3d65bdce6e72f26a201965f45cc3aab583a34af9835f4d42f71540ad21582f4f8a96a12cd377a949644ab458ea213febfb2e6e90fbdc25c1867ddb72
+  metadata.gz: 34c8a65eaf48e4ef9800df34a66f0086d3915252444091631fbd76273731008f70be149e3c92d5954644e55839d8a314eb3442411e3a389061e460d66c9d1ea2
+  data.tar.gz: 29f34824d1c5bba8dbe979a10c0e93a8c4c06e7b0b174b96b0150c19e3d6f71bb0fa9a8ef285a2d650af407547084a5e1a7bb2925817dce5d200b6755e864d4c

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    gitlab_quality-test_tooling (1.15.0)
-      activesupport (>= 6.1, < 7.1)
+    gitlab_quality-test_tooling (1.18.0)
+      activesupport (>= 6.1, < 7.2)
       amatch (~> 0.4.1)
       gitlab (~> 4.19)
       http (~> 5.0)
@@ -16,10 +16,15 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.8)
+    activesupport (7.1.3.2)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
     addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
@@ -28,7 +33,9 @@ GEM
       tins (~> 1.0)
     ast (2.4.2)
     backport (1.2.0)
+    base64 (0.2.0)
     benchmark (0.3.0)
+    bigdecimal (3.1.6)
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
     byebug (11.1.3)
@@ -41,6 +48,7 @@ GEM
     coderay (1.1.3)
     colored2 (3.1.2)
     concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
     cork (0.3.0)
       colored2 (~> 3.1)
     crack (0.4.5)
@@ -65,6 +73,7 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.0)
     domain_name (0.6.20240107)
+    drb (2.2.1)
     e2mmap (0.1.0)
     faraday (2.9.0)
       faraday-net_http (>= 2.0, < 3.2)
@@ -119,7 +128,7 @@ GEM
     httparty (0.21.0)
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.14.1)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.6)
     json (2.7.1)
@@ -138,10 +147,11 @@ GEM
     method_source (1.0.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
-    minitest (5.21.2)
+    minitest (5.22.2)
     mize (0.4.1)
       protocol (~> 2.0)
     multi_xml (0.6.0)
+    mutex_m (0.2.0)
     nap (1.1.0)
     nenv (0.3.0)
     net-http (0.4.1)
@@ -318,4 +328,4 @@ DEPENDENCIES
   webmock (= 3.7.0)
 
 BUNDLED WITH
-   2.4.2
+   2.5.4

data/exe/flaky-test-issues

@@ -19,10 +19,6 @@ options = OptionParser.new do |opts|
     params[:project] = project
   end
 
-  opts.on('-m', '--merge_request_iid MERGE_REQUEST_IID', String, 'An integer merge request IID') do |merge_request_iid|
-    params[:merge_request_iid] = merge_request_iid
-  end
-
   opts.on('--base-issue-labels BASE_ISSUE_LABELS', String,
     'Comma-separated labels (without tilde) to add to new flaky test issues') do |base_issue_labels|
     params[:base_issue_labels] = base_issue_labels.split(',')
@@ -32,6 +28,10 @@ options = OptionParser.new do |opts|
     params[:token] = token
   end
 
+  opts.on('-r', '--related-issues-file RELATED_ISSUES_FILE', String, 'The file path for the related issues') do |related_issues_file|
+    params[:related_issues_file] = related_issues_file
+  end
+
   opts.on('--dry-run', "Perform a dry-run (don't create issues)") do
     params[:dry_run] = true
   end

data/exe/generate-test-session

@@ -31,6 +31,10 @@ options = OptionParser.new do |opts|
     params[:issue_url_file] = issue_url_file
   end
 
+  opts.on('--pipeline-stages STAGES', STRING, 'Comma-separated list of pipeline stages to include in test session issue') do |pipeline_stages|
+    params[:pipeline_stages] = pipeline_stages.split(',')
+  end
+
   opts.on('--confidential', "Makes test session issue confidential") do
     params[:confidential] = true
   end

data/lefthook.yml

@@ -13,3 +13,16 @@ pre-push:
     rubocop:
       run: bundle exec rubocop
       glob: '*.rb'
+
+    # Changelog git trailer for the first commit of the branch
+    changelog-on-first-commit:
+      run: |
+        first_commit_message=$(git log --format=%B -n 1 $(git log main..HEAD --pretty=format:"%h" | tail -1))
+        if ! echo ${first_commit_message} | grep "Changelog:"; then
+          echo Could not find a Changelog: git trailer on the first commit for this branch.
+          echo
+          echo Please add a trailer by amending the git commit message.
+          echo
+          echo See https://docs.gitlab.com/ee/development/changelog.html#overview for more info.
+          exit 1
+        fi

data/lib/gitlab_quality/test_tooling/gitlab_client/gitlab_client.rb

@@ -15,7 +15,7 @@ module GitlabQuality
           @retry_backoff = 0
         end
 
-        def handle_gitlab_client_exceptions # rubocop:disable Metrics/AbcSize
+        def handle_gitlab_client_exceptions
           yield
         rescue Gitlab::Error::NotFound
           # This error could be raised in assert_user_permission!
@@ -27,12 +27,20 @@ module GitlabQuality
 
           raise if @retry_backoff > RETRY_BACK_OFF_DELAY * MAX_RETRY_ATTEMPTS
 
-          warn_exception(e)
+          warn("#{e.class.name} #{e.message}")
           warn("Sleeping for #{@retry_backoff} seconds before retrying...")
           sleep @retry_backoff
 
           retry
         rescue StandardError => e
+          post_exception_to_slack(e) if Runtime::Env.ci_commit_ref_name == Runtime::Env.default_branch
+
+          raise e
+        end
+
+        def post_exception_to_slack(error)
+          return unless ENV['CI_SLACK_WEBHOOK_URL']
+
           pipeline = Runtime::Env.pipeline_from_project_name
           channel = case pipeline
                     when "canary"
@@ -42,9 +50,6 @@ module GitlabQuality
                     else
                       "qa-#{pipeline}"
                     end
-          error_msg = warn_exception(e)
-
-          return unless Runtime::Env.ci_commit_ref_name == Runtime::Env.default_branch
 
           slack_options = {
             slack_webhook_url: ENV.fetch('CI_SLACK_WEBHOOK_URL', nil),
@@ -54,7 +59,7 @@ module GitlabQuality
             message: <<~MSG
               An unexpected error occurred while reporting test results in issues.
               The error occurred in job: #{Runtime::Env.ci_job_url}
-              `#{error_msg}`
+              `#{error.class.name} #{error.message}`
             MSG
           }
           puts "Posting Slack message to channel: #{channel}"
@@ -79,12 +84,6 @@ module GitlabQuality
             private_token: token
           )
         end
-
-        def warn_exception(error)
-          error_msg = "#{error.class.name} #{error.message}"
-          warn(error_msg)
-          error_msg
-        end
       end
     end
   end

data/lib/gitlab_quality/test_tooling/gitlab_client/issues_client.rb

@@ -48,6 +48,12 @@ module GitlabQuality
           end
         end
 
+        def find_issue_notes(iid:)
+          handle_gitlab_client_exceptions do
+            client.issue_notes(project, iid, order_by: 'created_at', sort: 'asc').auto_paginate
+          end
+        end
+
         def find_issue_discussions(iid:)
           handle_gitlab_client_exceptions do
             client.issue_discussions(project, iid, order_by: 'created_at', sort: 'asc').auto_paginate
@@ -75,12 +81,6 @@ module GitlabQuality
           end
         end
 
-        def find_issue_notes(iid:)
-          handle_gitlab_client_exceptions do
-            client.issue_notes(project, iid, order_by: 'created_at', sort: 'asc')&.auto_paginate
-          end
-        end
-
         def create_issue_note(iid:, note:)
           handle_gitlab_client_exceptions do
             client.create_issue_note(project, iid, note)

data/lib/gitlab_quality/test_tooling/report/concerns/issue_reports.rb

@@ -1,13 +1,16 @@
 # frozen_string_literal: true
 
+require 'active_support/core_ext/object/blank'
+
 module GitlabQuality
   module TestTooling
     module Report
       module Concerns
         module IssueReports
-          JOB_URL_REGEX                = %r{(?<job_url>https://(?<host>[\w.]+)/(?<project_path>[\w\-./]+)/-/jobs/\d+)}
+          JOB_URL_REGEX = %r{(?<job_url>https://(?<host>[\w.]+)/(?<project_path>[\w\-./]+)/-/jobs/\d+)}
           FAILED_JOB_DESCRIPTION_REGEX = /First happened in #{JOB_URL_REGEX}\./m
-          REPORT_ITEM_REGEX            = /^1\. \d{4}-\d{2}-\d{2}: #{JOB_URL_REGEX} \((?<pipeline_url>.+)\)$/
+          REPORT_ITEM_REGEX = /^1\. \d{4}-\d{2}-\d{2}: #{JOB_URL_REGEX} \((?<pipeline_url>\S+)\)/
+          LATEST_REPORTS_TO_SHOW = 10
 
           def initial_reports_section(test)
             <<~REPORTS
@@ -17,22 +20,21 @@ module GitlabQuality
             REPORTS
           end
 
-          def add_report_to_issue_description(issue, test)
-            issue_description = issue.description
-
-            # We include the number of reports in the header, for visibility.
-            new_issue_description =
-              if issue_description.include?('### Reports')
-                # We count the number of existing reports.
-                reports_count = issue_description
-                  .scan(REPORT_ITEM_REGEX)
-                  .size.to_i + 1
-                issue_description.sub(/^### Reports.*$/, "### Reports (#{reports_count})")
-              else # For issue with the legacy format, we add the Reports section
-                update_legacy_issue_description(issue_description)
-              end
+          def increment_reports(
+            current_reports_content:,
+            test:,
+            reports_section_header: '### Reports',
+            item_extra_content: nil,
+            reports_extra_content: nil)
+            preserved_content = current_reports_content.split(reports_section_header).first&.strip
+            reports = report_lines(current_reports_content) + [report_list_item(test, item_extra_content: item_extra_content)]
 
-            [new_issue_description, report_list_item(test)].join("\n")
+            [
+              preserved_content,
+              "#{reports_section_header} (#{reports.size})",
+              reports_list(reports),
+              reports_extra_content
+            ].reject(&:blank?).compact.join("\n\n")
           end
 
           def failed_issue_job_url(issue)
@@ -49,8 +51,28 @@ module GitlabQuality
 
           private
 
-          def report_list_item(test)
-            "1. #{Time.new.utc.strftime('%F')}: #{test.ci_job_url} (#{ENV.fetch('CI_PIPELINE_URL', 'pipeline url is missing')})"
+          def report_lines(content)
+            content.lines.grep(REPORT_ITEM_REGEX).map(&:strip)
+          end
+
+          def reports_list(reports)
+            sorted_reports = reports.sort.reverse
+
+            if sorted_reports.size > LATEST_REPORTS_TO_SHOW
+              [
+                "Last 10 reports:",
+                sorted_reports[...LATEST_REPORTS_TO_SHOW].join("\n"),
+                "<details><summary>See #{sorted_reports.size - LATEST_REPORTS_TO_SHOW} more reports</summary>",
+                sorted_reports[LATEST_REPORTS_TO_SHOW..].join("\n"),
+                "</details>"
+              ].join("\n\n")
+            else
+              sorted_reports.join("\n")
+            end
+          end
+
+          def report_list_item(test, item_extra_content: nil)
+            "1. #{Time.new.utc.strftime('%F')}: #{test.ci_job_url} (#{ENV.fetch('CI_PIPELINE_URL', 'pipeline url is missing')}) #{item_extra_content}".strip
           end
 
           def job_urls_from_description(issue_description, regex)
@@ -60,15 +82,6 @@ module GitlabQuality
             end
           end
 
-          def update_legacy_issue_description(issue_description)
-            test_captures = issue_description.scan(JOB_URL_REGEX)
-            reports_count = test_captures.size.to_i + 1
-
-            updated_description = "#{issue_description}\n\n### Reports (#{reports_count})\n"
-            updated_description = [updated_description, *test_captures_to_report_items(test_captures)].join("\n") unless test_captures.empty?
-            updated_description
-          end
-
           def test_captures_to_report_items(test_captures)
             test_captures.map do |ci_job_url, _, _|
               report_list_item(GitlabQuality::TestTooling::TestResult::JsonTestResult.new(

data/lib/gitlab_quality/test_tooling/report/concerns/utils.rb

@@ -16,7 +16,7 @@ module GitlabQuality
           end
 
           def new_issue_title(test)
-            "#{partial_file_path(test.file)} | #{search_safe(test.name)}".strip
+            "[Test] #{partial_file_path(test.file)} | #{search_safe(test.name)}".strip
           end
 
           def partial_file_path(path)

data/lib/gitlab_quality/test_tooling/report/flaky_test_issue.rb

@@ -13,11 +13,19 @@ module GitlabQuality
       #   - Find issue by test hash
       #   - Reopen issue if it already exists, but is closed
       class FlakyTestIssue < ReportAsIssue
+        include Concerns::GroupAndCategoryLabels
         include Concerns::IssueReports
 
-        NEW_ISSUE_LABELS      = Set.new(['type::maintenance', 'priority::3', 'severity::3', 'failure::flaky-test']).freeze
-        FOUND_IN_MR_LABEL     = 'found:in MR'
-        FOUND_IN_MASTER_LABEL = 'found:master'
+        IDENTITY_LABELS       = ['test', 'failure::flaky-test', 'automation:bot-authored'].freeze
+        NEW_ISSUE_LABELS      = Set.new(['type::maintenance', 'priority::3', 'severity::3', *IDENTITY_LABELS]).freeze
+        SEARCH_LABELS         = ['test'].freeze
+        FOUND_IN_MR_LABEL     = '~"found:in MR"'
+        FOUND_IN_MASTER_LABEL = '~"found:master"'
+        REPORT_SECTION_HEADER = '### Flakiness reports'
+        REPORTS_DOCUMENTATION = <<~DOC
+          Flaky tests were detected, please refer to the [Flaky tests documentation](https://docs.gitlab.com/ee/development/testing_guide/flaky_tests.html)
+          to learn more about how to reproduce them.
+        DOC
 
         def initialize(
           token:,
@@ -25,18 +33,16 @@ module GitlabQuality
           base_issue_labels: nil,
           confidential: false,
           dry_run: false,
-          merge_request_iid: nil,
           project: nil,
           **_kwargs)
           super(token: token, input_files: input_files, project: project, confidential: confidential, dry_run: dry_run)
 
           @base_issue_labels = Set.new(base_issue_labels)
-          @merge_request_iid = merge_request_iid
         end
 
         private
 
-        attr_reader :base_issue_labels, :merge_request_iid
+        attr_reader :base_issue_labels
 
         def run!
           puts "Reporting flaky tests in `#{files.join(',')}` as issues in project `#{project}` via the API at `#{Runtime::Env.gitlab_api_base}`."
@@ -44,62 +50,91 @@ module GitlabQuality
           TestResults::Builder.new(files).test_results_per_file do |test_results|
             puts "=> Reporting #{test_results.count} tests in #{test_results.path}"
 
-            test_results.each do |test|
-              next if test.status != 'passed' # We only want failed tests that passed in the end
-
-              create_flaky_issue(test)
-            end
+            process_test_results(test_results)
           end
         end
 
-        def new_issue_title(test)
-          "Flaky test in #{super}"
-        end
+        def process_test_results(test_results)
+          test_results.each do |test|
+            next unless test_is_applicable?(test)
 
-        def new_issue_labels(_test)
-          found_label =
-            if !merge_request_iid || merge_request_iid.empty?
-              FOUND_IN_MASTER_LABEL
-            else
-              FOUND_IN_MR_LABEL
-            end
+            puts " => Reporting flakiness for test '#{test.name}'..."
 
-          NEW_ISSUE_LABELS + base_issue_labels + [found_label]
+            issues = find_issues_by_hash(test_hash(test), state: 'opened', labels: SEARCH_LABELS)
+            issues << create_issue(test) if issues.empty?
+
+            update_reports(issues, test)
+            collect_issues(test, issues)
+          end
         end
 
-        def new_issue_description(test)
-          super + [
-            "Flaky tests were detected, please refer to the [Flaky tests documentation](https://docs.gitlab.com/ee/development/testing_guide/flaky_tests.html) " \
-            "to learn more about how to reproduce them.",
-            initial_reports_section(test)
-          ].compact.join("\n\n")
+        def test_is_applicable?(test)
+          test.status == 'passed' # We only want failed tests that passed in the end
         end
 
-        def create_flaky_issue(test)
-          puts "   => Finding existing issues for flaky test '#{test.name}' (run time: #{test.run_time} seconds)..."
+        def up_to_date_labels(test:, issue: nil, new_labels: Set.new)
+          (base_issue_labels + super).to_a
+        end
 
-          issues = find_issues_by_hash(test_hash(test))
+        def update_reports(issues, test)
           issues.each do |issue|
-            puts "   => Existing issue link #{issue.web_url}."
+            puts "   => Adding the flaky test to the existing issue: #{issue.web_url}"
+            add_report_to_issue(issue: issue, test: test, related_issues: (issues - [issue]))
+          end
+        end
 
-            puts "   => Adding the flaky test to the existing issue..."
-            add_report_to_issue(issue, test)
+        def add_report_to_issue(issue:, test:, related_issues:)
+          reports_note = existing_reports_note(issue: issue)
+          note_body = [
+            report_body(reports_note: reports_note, test: test),
+            identity_labels_quick_action,
+            relate_issues_quick_actions(related_issues)
+          ].join("\n")
+
+          if reports_note
+            gitlab.edit_issue_note(
+              issue_iid: issue.iid,
+              note_id: reports_note.id,
+              note: note_body
+            )
+          else
+            gitlab.create_issue_note(iid: issue.iid, note: note_body)
+          end
+        end
 
-            if issue.state == 'closed'
-              puts "   => Issue is closed. Reopening it."
-              reopen_issue(issue)
-            end
+        def existing_reports_note(issue:)
+          gitlab.find_issue_notes(iid: issue.iid).find do |note|
+            note.body.start_with?(REPORT_SECTION_HEADER)
           end
+        end
 
-          create_issue(test) unless issues.any?
+        def report_body(reports_note:, test:)
+          increment_reports(
+            current_reports_content: reports_note&.body.to_s,
+            test: test,
+            reports_section_header: REPORT_SECTION_HEADER,
+            item_extra_content: found_label,
+            reports_extra_content: REPORTS_DOCUMENTATION
+          )
+        end
+
+        def found_label
+          if ENV.key?('CI_MERGE_REQUEST_IID')
+            FOUND_IN_MR_LABEL
+          else
+            FOUND_IN_MASTER_LABEL
+          end
         end
 
-        def add_report_to_issue(issue, test)
-          gitlab.edit_issue(iid: issue.iid, options: { description: add_report_to_issue_description(issue, test) })
+        def identity_labels_quick_action
+          labels_list = IDENTITY_LABELS.map { |label| %(~"#{label}") }.join(' ')
+          %(/label #{labels_list})
         end
 
-        def reopen_issue(issue)
-          gitlab.edit_issue(iid: issue.iid, options: { state_event: 'reopen' })
+        def relate_issues_quick_actions(issues)
+          issues.map do |issue|
+            "/relate #{issue.web_url}"
+          end.join("\n")
         end
       end
     end

data/lib/gitlab_quality/test_tooling/report/generate_test_session.rb

@@ -7,15 +7,16 @@ module GitlabQuality
   module TestTooling
     module Report
       class GenerateTestSession < ReportAsIssue
-        def initialize(ci_project_token:, **kwargs)
+        def initialize(ci_project_token:, pipeline_stages: nil, **kwargs)
           super
           @ci_project_token = ci_project_token
+          @pipeline_stages = Set.new(pipeline_stages)
           @issue_type = 'issue'
         end
 
         private
 
-        attr_reader :ci_project_token
+        attr_reader :ci_project_token, :pipeline_stages
 
         # rubocop:disable Metrics/AbcSize
         def run!
@@ -27,6 +28,8 @@ module GitlabQuality
             TestResults::JsonTestResults.new(path).to_a
           end
 
+          tests = tests.select { |test| pipeline_stages.include? test.report["stage"] } unless pipeline_stages.empty?
+
           issue = gitlab.create_issue(
             title: "#{Time.now.strftime('%Y-%m-%d')} Test session report | #{Runtime::Env.qa_run_type}",
             description: generate_description(tests),
@@ -205,12 +208,9 @@ module GitlabQuality
 
         def generate_test_text(testcase, tests_with_same_testcase, passed)
           text = tests_with_same_testcase.map(&:name).uniq.join(', ')
-          encoded_text = ERB::Util.url_encode(text)
 
           if testcase && !passed
-            # Workaround for reducing system notes on testcase issues
-            # The first regex extracts the link to the issues list page from a link to a single issue show page by removing the issue id.
-            "[#{text}](#{testcase.match(%r{[\s\S]+/[^/\d]+})}?state=opened&search=#{encoded_text})"
+            "[#{text}](#{testcase})"
           else
             text
           end

data/lib/gitlab_quality/test_tooling/report/knapsack_report_issue.rb

@@ -99,7 +99,6 @@ module GitlabQuality
         end
 
         def update_issue(issue:, spec_run_time:)
-          state_event = issue.state == 'closed' ? 'reopen' : nil
           updated_description = <<~MARKDOWN.chomp
           #{issue.description}
 
@@ -110,8 +109,6 @@ module GitlabQuality
             description: updated_description
           }
 
-          issue_attrs[:state_event] = state_event if state_event
-
           gitlab.edit_issue(iid: issue.iid, options: issue_attrs)
           puts "  => Added a report in #{issue.web_url}!"
         end

data/lib/gitlab_quality/test_tooling/report/relate_failure_issue.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
 require 'nokogiri'
-require 'active_support/core_ext/enumerable'
 require 'rubygems/text'
-require 'active_support/core_ext/integer/time'
 require 'amatch'
 
 module GitlabQuality
@@ -190,8 +188,8 @@ module GitlabQuality
         end
 
         def failure_issues(test)
-          find_issues_for_test(
-            test,
+          find_issues_by_hash(
+            test_hash(test),
             state: 'opened',
             labels: base_issue_labels + Set.new(%w[test]),
             not_labels: exclude_labels_for_search
@@ -339,7 +337,7 @@ module GitlabQuality
         def new_issue_due_date(test)
           return unless test.product_group?
 
-          Date.today + 1.month
+          Date.today.next_month
         end
 
         def update_reports(issue, test)
@@ -347,7 +345,7 @@ module GitlabQuality
           state_event = issue.state == 'closed' ? 'reopen' : nil
 
           issue_attrs = {
-            description: add_report_to_issue_description(issue, test),
+            description: increment_reports(current_reports_content: issue.description, test: test),
             labels: up_to_date_labels(test: test, issue: issue)
           }
           issue_attrs[:state_event] = state_event if state_event
@@ -356,10 +354,6 @@ module GitlabQuality
           puts "  => Added a report in '#{issue.title}': #{issue.web_url}!"
         end
 
-        def new_issue_title(test)
-          "Failure in #{super}"
-        end
-
         def screenshot_section(test)
           return unless test.screenshot?
 

data/lib/gitlab_quality/test_tooling/report/report_as_issue.rb

@@ -60,7 +60,6 @@ module GitlabQuality
           | Description | `#{test.name}` |
           | Test level | #{test.level} |
           | Hash | `#{test_hash(test)}` |
-          | Duration | #{test.run_time} seconds |
           | Expected duration | < #{test.max_duration_for_test} seconds |
           #{"| Test case | #{test.testcase} |" if test.testcase}
           DESCRIPTION
@@ -142,8 +141,10 @@ module GitlabQuality
           labels
         end
 
-        def find_issues_by_hash(test_hash)
-          search_options = { search: test_hash }
+        def find_issues_by_hash(test_hash, labels: Set.new, not_labels: Set.new, state: nil)
+          search_options = { search: test_hash, labels: labels.to_a, not: { labels: not_labels.to_a } }
+          search_options[:state] = state if state
+          search_options[:in] = 'description'
           gitlab.find_issues(options: search_options)
         end
 

data/lib/gitlab_quality/test_tooling/report/slow_test_issue.rb

@@ -10,16 +10,21 @@ module GitlabQuality
       # - Find issue by title (with test description or test file)
       # - Add test metadata, duration to the issue with group and category labels
       class SlowTestIssue < ReportAsIssue
-        include TestTooling::Concerns::FindSetDri
         include Concerns::GroupAndCategoryLabels
+        include Concerns::IssueReports
 
-        NEW_ISSUE_LABELS = Set.new(['test', 'type::maintenance', 'maintenance::performance', 'priority::3', 'severity::3', 'rspec profiling', 'rspec:slow test']).freeze
-        SEARCH_LABELS = %w[test maintenance::performance].freeze
+        IDENTITY_LABELS       = ['test', 'rspec:slow test', 'rspec profiling', 'automation:bot-authored'].freeze
+        NEW_ISSUE_LABELS      = Set.new(['test', 'type::maintenance', 'maintenance::performance', 'priority::3', 'severity::3']).freeze
+        SEARCH_LABELS         = ['test'].freeze
+        FOUND_IN_MR_LABEL     = '~"found:in MR"'
+        FOUND_IN_MASTER_LABEL = '~"found:master"'
+        REPORT_SECTION_HEADER = '### Slowness reports'
+        REPORTS_DOCUMENTATION = <<~DOC
+          Slow tests were detected, please see the [test speed best practices guide](https://docs.gitlab.com/ee/development/testing_guide/best_practices.html#test-speed)
+          to improve them. More context available about this issue in the [top slow tests guide](https://docs.gitlab.com/ee/development/testing_guide/best_practices.html#top-slow-tests).
 
-        JOB_URL_REGEX = %r{(?<job_url>https://(?<host>[\w.]+)/(?<project_path>[\w\-./]+)/-/jobs/\d+)}
-        REPORT_ITEM_REGEX = /^1\. \d{4}-\d{2}-\d{2}: #{JOB_URL_REGEX} \((?<pipeline_url>.+)\)$/
-
-        MultipleIssuesFound = Class.new(StandardError)
+          Add `allowed_to_be_slow: true` to the RSpec test if this is a legit slow test and close the issue.
+        DOC
 
         private
 
@@ -29,99 +34,87 @@ module GitlabQuality
           TestResults::Builder.new(files).test_results_per_file do |test_results|
             puts "=> Reporting #{test_results.count} tests in #{test_results.path}"
 
-            test_results.each do |test|
-              create_slow_issue(test) if test.slow_test?
-            end
+            process_test_results(test_results)
           end
         end
 
-        def new_issue_title(test)
-          "Slow test in #{super}"
-        end
+        def process_test_results(test_results)
+          test_results.each do |test|
+            next unless test.slow_test?
 
-        def new_issue_description(test)
-          super +
-            <<~DESCRIPTION.chomp
-              Slow tests were detected, please see the [test speed best practices guide](https://docs.gitlab.com/ee/development/testing_guide/best_practices.html#test-speed)
-              to improve them. More context available about this issue in the [top slow tests guide](https://docs.gitlab.com/ee/development/testing_guide/best_practices.html#top-slow-tests).
+            puts " => Reporting slowness for test '#{test.name}'..."
 
-              Add `allowed_to_be_slow: true` to the RSpec test if this is a legit slow test and close the issue.
+            issues = find_issues_by_hash(test_hash(test), state: 'opened', labels: SEARCH_LABELS)
+            issues << create_issue(test) if issues.empty?
 
-              #{reports_section(test)}
-            DESCRIPTION
+            update_reports(issues, test)
+            collect_issues(test, issues)
+          end
         end
 
-        def reports_section(test)
-          <<~REPORTS
-          ### Reports (1)
-
-          #{report_list_item(test)}
-          REPORTS
+        def test_is_applicable?(test)
+          test.slow_test?
         end
 
-        def report_list_item(test)
-          "1. #{Time.new.utc.strftime('%F')}: #{test.ci_job_url} (#{ENV.fetch('CI_PIPELINE_URL', 'pipeline url is missing')})"
+        def update_reports(issues, test)
+          issues.each do |issue|
+            puts "   => Adding the slow test to the existing issue: #{issue.web_url}"
+            add_report_to_issue(issue: issue, test: test, related_issues: (issues - [issue]))
+          end
         end
 
-        def slow_test_issues(test)
-          find_issues_for_test(
-            test,
-            state: 'opened',
-            labels: SEARCH_LABELS
-          )
+        def add_report_to_issue(issue:, test:, related_issues:)
+          reports_note = existing_reports_note(issue: issue)
+          note_body = [
+            report_body(reports_note: reports_note, test: test),
+            identity_labels_quick_action,
+            relate_issues_quick_actions(related_issues)
+          ].join("\n")
+
+          if reports_note
+            gitlab.edit_issue_note(
+              issue_iid: issue.iid,
+              note_id: reports_note.id,
+              note: note_body
+            )
+          else
+            gitlab.create_issue_note(iid: issue.iid, note: note_body)
+          end
         end
 
-        def create_slow_issue(test)
-          puts "   => Finding existing issues for slow test '#{test.name}' (run time: #{test.run_time} seconds)..."
+        def existing_reports_note(issue:)
+          gitlab.find_issue_notes(iid: issue.iid).find do |note|
+            note.body.start_with?(REPORT_SECTION_HEADER)
+          end
+        end
 
-          issues = slow_test_issues(test)
+        def report_body(reports_note:, test:)
+          increment_reports(
+            current_reports_content: reports_note&.body.to_s,
+            test: test,
+            reports_section_header: REPORT_SECTION_HEADER,
+            item_extra_content: "(#{test.run_time} seconds) #{found_label}",
+            reports_extra_content: REPORTS_DOCUMENTATION
+          )
+        end
 
-          if issues.blank?
-            issues << create_issue(test)
+        def found_label
+          if ENV.key?('CI_MERGE_REQUEST_IID')
+            FOUND_IN_MR_LABEL
           else
-            issues.each do |issue|
-              puts "   => Existing issue link #{issue['web_url']}"
-
-              update_reports(issue, test)
-            end
+            FOUND_IN_MASTER_LABEL
           end
-
-          collect_issues(test, issues)
-        rescue MultipleIssuesFound => e
-          warn(e.message)
         end
 
-        def update_reports(issue, test)
-          # We reopen closed issues to not lose any history
-          state_event = issue.state == 'closed' ? 'reopen' : nil
-
-          issue_attrs = {
-            description: up_to_date_issue_description(issue.description, test)
-          }
-
-          issue_attrs[:state_event] = state_event if state_event
-
-          gitlab.edit_issue(iid: issue.iid, options: issue_attrs)
-          puts "  => Added a report in '#{issue.title}': #{issue.web_url}!"
+        def identity_labels_quick_action
+          labels_list = IDENTITY_LABELS.map { |label| %(~"#{label}") }.join(' ')
+          %(/label #{labels_list})
         end
 
-        def up_to_date_issue_description(issue_description, test)
-          new_issue_description =
-            if issue_description.include?('### Reports')
-              # We count the number of existing reports.
-              reports_count = issue_description
-                .scan(REPORT_ITEM_REGEX)
-                .size.to_i + 1
-              issue_description.sub(/^### Reports.*$/, "### Reports (#{reports_count})")
-            else # For issue with the legacy format, we add the Reports section
-              reports_count = issue_description
-                .scan(JOB_URL_REGEX)
-                .size.to_i + 1
-
-              "#{issue_description}\n\n### Reports (#{reports_count})"
-            end
-
-          "#{new_issue_description}\n#{report_list_item(test)}"
+        def relate_issues_quick_actions(issues)
+          issues.map do |issue|
+            "/relate #{issue.web_url}"
+          end.join("\n")
         end
       end
     end

data/lib/gitlab_quality/test_tooling/runtime/logger.rb

@@ -38,7 +38,7 @@ module GitlabQuality
               console_log = console_logger(source: source, level: Env.log_level)
               file_log = file_logger(source: source, path: log_path)
 
-              console_log.extend(ActiveSupport::Logger.broadcast(file_log))
+              ActiveSupport::BroadcastLogger.new(console_log, file_log, file_log)
             end
           end
 

data/lib/gitlab_quality/test_tooling/test_meta/processor/add_to_blocking_processor.rb

@@ -16,10 +16,11 @@ module GitlabQuality
               @context = context
               @existing_mrs = nil
               @file_path = spec["file_path"]
+              testcase = spec["testcase"]
               devops_stage = spec["stage"]
               product_group = spec["product_group"]
               @example_name = spec["name"]
-              @mr_title = format("%{prefix} %{example_name}", prefix: '[PROMOTE TO BLOCKING]', example_name: example_name)
+              @mr_title = format("%{prefix} %{example_name}", prefix: '[PROMOTE TO BLOCKING]', example_name: example_name).truncate(72, omission: '')
 
               @file_contents = context.get_file_contents(file_path)
 
@@ -48,8 +49,13 @@ module GitlabQuality
 
                   This test was identified in the reliable e2e test report: #{context.report_issue}
 
+                  [Testcase link](#{testcase})
+
+                  [Spec metrics link](#{context.single_spec_metrics_link(example_name)})
+
                   /label ~"Quality" ~"QA" ~"type::maintenance"
                   /label ~"devops::#{devops_stage}"
+                  #{context.label_from_product_group(product_group)}
 
                   <div align="center">
                   (This MR was automatically generated by [`gitlab_quality-test_tooling`](https://gitlab.com/gitlab-org/ruby/gems/gitlab_quality-test_tooling) at #{Time.now.utc})
@@ -120,8 +126,8 @@ module GitlabQuality
               end
 
               context.update_matched_line(matched_lines.last, file_contents.dup) do |line|
-                if line.include?(',')
-                  line[line.index(',')] = format(BLOCKING_METADATA, suffix: ',')
+                if line.sub(DESCRIPTION_REGEX, '').include?(',')
+                  line[line.index(',', end_of_description_index(line))] = format(BLOCKING_METADATA, suffix: ',')
                 else
                   line[line.rindex(' ')] = format(BLOCKING_METADATA, suffix: ' ')
                 end

data/lib/gitlab_quality/test_tooling/test_meta/processor/add_to_quarantine_processor.rb

@@ -26,11 +26,13 @@ module GitlabQuality
               @context = context
               @existing_mrs = nil
               @file_path = spec["file_path"]
+              testcase = spec["testcase"]
               devops_stage = spec["stage"]
+              product_group = spec["product_group"]
               @failure_issue_url = spec["failure_issue"]
               @example_name = spec["name"]
               @issue_id = failure_issue_url.split('/').last # split url segment, last segment of path is the issue id
-              @mr_title = format("%{prefix} %{example_name}", prefix: '[QUARANTINE]', example_name: example_name)
+              @mr_title = format("%{prefix} %{example_name}", prefix: '[QUARANTINE]', example_name: example_name).truncate(72, omission: '')
               @failure_issue = context.fetch_issue(iid: issue_id)
 
               @file_contents = context.get_file_contents(file_path)
@@ -57,6 +59,10 @@ module GitlabQuality
 
                   This test was identified in the reliable e2e test report: #{context.report_issue}
 
+                  [Testcase link](#{testcase})
+
+                  [Spec metrics link](#{context.single_spec_metrics_link(example_name)})
+
                   ### E2E Test Failure issue(s)
 
                   #{failure_issue_url}
@@ -81,6 +87,7 @@ module GitlabQuality
                   `qa/specs/features/browser_ui/3_create/web_ide/add_file_template_spec.rb`.
                   -->
                   /label ~"devops::#{devops_stage}"
+                  #{context.label_from_product_group(product_group)}
 
                   <div align="center">
                   (This MR was automatically generated by [`gitlab_quality-test_tooling`](https://gitlab.com/gitlab-org/ruby/gems/gitlab_quality-test_tooling) at #{Time.now.utc})
@@ -153,7 +160,7 @@ module GitlabQuality
               context.update_matched_line(matched_lines.last, file_contents.dup) do |line|
                 indentation = context.indentation(line)
 
-                if line.include?(',') && line.split.last != 'do'
+                if line.sub(DESCRIPTION_REGEX, '').include?(',') && line.split.last != 'do'
                   line[line.rindex(',')] = format(QUARANTINE_METADATA.rstrip, issue_url: failure_issue_url, indentation: indentation, suffix: ',', quarantine_type: quarantine_type)
                 else
                   line[line.rindex(' ')] = format(QUARANTINE_METADATA.rstrip, issue_url: failure_issue_url, indentation: indentation, suffix: ' ', quarantine_type: quarantine_type)
@@ -170,8 +177,6 @@ module GitlabQuality
               case context.issue_scoped_label(failure_issue, 'failure')&.split('::')&.last
               when 'new', 'investigating'
                 ':investigating'
-              when 'external-dependency'
-                ':external_dependency'
               when 'broken-test'
                 ':broken'
               when 'bug'

data/lib/gitlab_quality/test_tooling/test_meta/processor/meta_processor.rb

@@ -8,6 +8,8 @@ module GitlabQuality
       module Processor
         class MetaProcessor
           class << self
+            DESCRIPTION_REGEX = /('.*?')|(".*?")/
+
             def execute
               raise 'method not implemented'
             end
@@ -24,6 +26,16 @@ module GitlabQuality
             def existing_mrs
               @existing_mrs ||= context.existing_merge_requests(title: mr_title)
             end
+
+            # Returns the index of the end of test description
+            #
+            # @param [String] line The line containing the test description
+            # @return [Integer]
+            def end_of_description_index(line)
+              description_length = line.match(DESCRIPTION_REGEX)[0].length
+              description_start_index = line.index(DESCRIPTION_REGEX)
+              description_start_index + description_length
+            end
           end
         end
       end

data/lib/gitlab_quality/test_tooling/test_meta/test_meta_updater.rb

@@ -252,6 +252,25 @@ module GitlabQuality
           processed_records[file_path] && processed_records[file_path] == changed_line_no
         end
 
+        # Infers product group label from the provided product group
+        #
+        # @param [String] product_group product group
+        # @return [String]
+        def label_from_product_group(product_group)
+          label = labels_inference.infer_labels_from_product_group(product_group).to_a.first
+
+          label ? %(/label ~"#{label}") : ''
+        end
+
+        # Returns the link to the Grafana dashboard for single spec metrics
+        #
+        # @param [String] example_name the full example name
+        # @return [String]
+        def single_spec_metrics_link(example_name)
+          base_url = "https://dashboards.quality.gitlab.net/d/cW0UMgv7k/single-spec-metrics?orgId=1&var-run_type=All&var-name="
+          base_url + CGI.escape(example_name)
+        end
+
         private
 
         attr_reader :token, :specs_file, :dry_run, :processor
@@ -281,6 +300,13 @@ module GitlabQuality
             project: project
           )
         end
+
+        # Returns a cached instance of GitlabQuality::TestTooling::LabelsInference
+        #
+        #  @return [GitlabQuality::TestTooling::LabelsInference]
+        def labels_inference
+          @labels_inference ||= GitlabQuality::TestTooling::LabelsInference.new
+        end
       end
     end
   end

data/lib/gitlab_quality/test_tooling/version.rb

@@ -2,6 +2,6 @@
 
 module GitlabQuality
   module TestTooling
-    VERSION = "1.15.0"
+    VERSION = "1.18.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_quality-test_tooling
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.18.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-08 00:00:00.000000000 Z
+date: 2024-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -201,7 +201,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -211,7 +211,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: amatch
   requirement: !ruby/object:Gem::Requirement