gitlab_quality-test_tooling 1.25.0 → 1.26.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d9ffa0b968a30865f566b0e0605f0f1f3e86ada066e5d9f556cf5fc841158a2
-  data.tar.gz: 86ff9419e5023c229f7e0dfbb98d9afae4370f62e98e0742a0050d314839d9a3
+  metadata.gz: e3ee730d9233005716cead9875a8a94b79db857b68ef7dcc16715e8f1ac3f281
+  data.tar.gz: 74d20185fa73cb46cdc998786267d79946c5f96e29966b4c5d57eac40b26c14e
 SHA512:
-  metadata.gz: c1a1d48ad6f07f3861d2c20cac6c24623b709664b80f796b42972238e0c378c22a97f9374bb29546c5f9a3012d22b523d84b3e178d413040fe4d8e40a14e3827
-  data.tar.gz: 6ec38fbbba05b00c978a3f0a48994217257aca572ec8081b1764d950c47175e91bd0cdc3dbd944c730c184ea76e856bd0e46691c7323f16c5acc0b7fe1d5cab1
+  metadata.gz: 7909fce13b1b085bef53aa1843029cda34199bd11757ec50a3175a933b3e2805d432a489e9fe157926c14c7f6819466b6a45970cd8b0d62f483df0b0ea422856
+  data.tar.gz: 2e28b30086187f268911b15c359bd5635958c6061dfddc0213e3176e686cbf27fdc96c5fd72594a608cd0ebf21ac3870ac9f0330a148a5112e252cb97d32a8fc

data/Gemfile.lock

@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    gitlab_quality-test_tooling (1.25.0)
-      activesupport (>= 6.1, < 7.2)
+    gitlab_quality-test_tooling (1.26.1)
+      activesupport (~> 7.1)
       amatch (~> 0.4.1)
       gitlab (~> 4.19)
       http (~> 5.0)
+      influxdb-client (~> 3.1)
       nokogiri (~> 1.10)
       parallel (>= 1, < 2)
       rainbow (>= 3, < 4)
@@ -35,7 +36,7 @@ GEM
     backport (1.2.0)
     base64 (0.2.0)
     benchmark (0.3.0)
-    bigdecimal (3.1.6)
+    bigdecimal (3.1.8)
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
     byebug (11.1.3)
@@ -128,7 +129,7 @@ GEM
     httparty (0.21.0)
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.14.4)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     influxdb-client (3.1.0)
     jaro_winkler (1.5.6)
@@ -148,7 +149,7 @@ GEM
     method_source (1.0.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
-    minitest (5.22.2)
+    minitest (5.23.0)
     mize (0.4.1)
       protocol (~> 2.0)
     multi_xml (0.6.0)
@@ -313,13 +314,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (>= 6.1, < 7.2)
   climate_control (~> 1.2)
   gitlab-dangerfiles (~> 3.8)
   gitlab-styles (~> 10.0)
   gitlab_quality-test_tooling!
   guard-rspec (~> 4.7)
-  influxdb-client (~> 3.1)
   lefthook (~> 1.3)
   pry-byebug (= 3.10.1)
   rake (~> 13.0)
@@ -331,4 +330,4 @@ DEPENDENCIES
   webmock (= 3.7.0)
 
 BUNDLED WITH
-   2.5.4
+   2.5.6

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

@@ -33,10 +33,11 @@ module GitlabQuality
           input_files:,
           base_issue_labels: nil,
           dry_run: false,
+          related_issues_file: nil,
           project: nil,
           max_diff_ratio: DEFAULT_MAX_DIFF_RATIO_FOR_DETECTION,
           **_kwargs)
-          super(token: token, input_files: input_files, project: project, dry_run: dry_run)
+          super(token: token, input_files: input_files, related_issues_file: related_issues_file, project: project, dry_run: dry_run)
 
           @base_issue_labels = Set.new(base_issue_labels)
           @max_diff_ratio = max_diff_ratio.to_f

data/lib/gitlab_quality/test_tooling/test_metrics_exporter/config.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require "singleton"
+
+module GitlabQuality
+  module TestTooling
+    module TestMetricsExporter
+      class Config
+        include Singleton
+
+        class << self
+          def configuration
+            Config.instance
+          end
+
+          def configure
+            yield(configuration)
+          end
+        end
+
+        attr_accessor :influxdb_url,
+          :influxdb_token,
+          :influxdb_bucket,
+          :run_type
+
+        attr_writer :custom_keys_tags,
+          :custom_keys_fields,
+          :test_metric_file_name
+
+        def custom_keys_tags
+          @custom_keys_tags || []
+        end
+
+        def custom_keys_fields
+          @custom_keys_fields || []
+        end
+
+        def test_metric_file_name
+          @test_metric_file_name || "test_metrics.json"
+        end
+      end
+    end
+  end
+end

data/lib/gitlab_quality/test_tooling/test_metrics_exporter/formatter.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module GitlabQuality
+  module TestTooling
+    module TestMetricsExporter
+      class Formatter < RSpec::Core::Formatters::BaseFormatter
+        RSpec::Core::Formatters.register(self, :stop)
+
+        def stop(notification)
+          setup_test_metrics_exporter(notification.examples)
+
+          log_test_metrics.push_test_metrics(
+            custom_keys_tags: config.custom_keys_tags,
+            custom_keys_fields: config.custom_keys_fields
+          )
+
+          log_test_metrics.save_test_metrics(
+            file_name: config.test_metric_file_name,
+            custom_keys_tags: config.custom_keys_tags,
+            custom_keys_fields: config.custom_keys_fields
+          )
+        end
+
+        private
+
+        attr_reader :log_test_metrics
+
+        def config
+          Config.configuration
+        end
+
+        def setup_test_metrics_exporter(examples)
+          @log_test_metrics = LogTestMetrics.new(
+            examples: examples,
+            influxdb_url: config.influxdb_url,
+            influxdb_token: config.influxdb_token,
+            influxdb_bucket: config.influxdb_bucket,
+            run_type: config.run_type
+          )
+        end
+      end
+    end
+  end
+end

data/lib/gitlab_quality/test_tooling/{concerns → test_metrics_exporter}/influxdb_tools.rb

@@ -2,7 +2,7 @@
 
 module GitlabQuality
   module TestTooling
-    module Concerns
+    module TestMetricsExporter
       module InfluxdbTools
         # InfluxDb client
         #

data/lib/gitlab_quality/test_tooling/{test_metric → test_metrics_exporter}/log_test_metrics.rb

@@ -1,13 +1,11 @@
 # frozen_string_literal: true
 
-require 'json'
-
 module GitlabQuality
   module TestTooling
-    module TestMetric
+    module TestMetricsExporter
       class LogTestMetrics
-        include Concerns::TestMetrics
-        include Concerns::InfluxdbTools
+        include TestMetrics
+        include InfluxdbTools
 
         CUSTOM_METRICS_KEY = :custom_test_metrics
 
@@ -39,7 +37,9 @@ module GitlabQuality
         # @param [Array<String>] custom_keys_tags
         # @param [Array<String>] custom_keys_fields
         # @return [nil]
-        def save_test_metrics(file_name, custom_keys_tags: nil, custom_keys_fields: nil)
+        def save_test_metrics(file_name:, custom_keys_tags: nil, custom_keys_fields: nil)
+          return Runtime::Logger.warn("No file_name provided, not saving test metrics") if file_name.nil?
+
           @test_metrics ||= examples.filter_map { |example| parse_test_results(example, custom_keys_tags, custom_keys_fields) }
           file = "tmp/#{file_name}"
 

data/lib/gitlab_quality/test_tooling/{concerns → test_metrics_exporter}/test_metrics.rb

@@ -2,7 +2,7 @@
 
 module GitlabQuality
   module TestTooling
-    module Concerns
+    module TestMetricsExporter
       module TestMetrics
         # Single common timestamp for all exported example metrics to keep data points consistently grouped
         #
@@ -30,7 +30,7 @@ module GitlabQuality
             job_name: job_name,
             merge_request: merge_request,
             run_type: run_type,
-            stage: example.metadata[:product_stage] || example.metadata[:product_category],
+            feature_category: example.metadata[:feature_category],
             product_group: example.metadata[:product_group],
             exception_class: example.execution_result.exception&.class&.to_s,
             **custom_metrics(example.metadata, custom_keys)

data/lib/gitlab_quality/test_tooling/version.rb

@@ -2,6 +2,6 @@
 
 module GitlabQuality
   module TestTooling
-    VERSION = "1.25.0"
+    VERSION = "1.26.1"
   end
 end

metadata

@@ -1,35 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_quality-test_tooling
 version: !ruby/object:Gem::Version
-  version: 1.25.0
+  version: 1.26.1
 platform: ruby
 authors:
 - GitLab Quality
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-14 00:00:00.000000000 Z
+date: 2024-05-22 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '6.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '6.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: climate_control
   requirement: !ruby/object:Gem::Requirement
@@ -86,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.7'
-- !ruby/object:Gem::Dependency
-  name: influxdb-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: lefthook
   requirement: !ruby/object:Gem::Requirement
@@ -230,22 +196,16 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '6.1'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '6.1'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: amatch
   requirement: !ruby/object:Gem::Requirement
@@ -288,6 +248,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: influxdb-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -438,8 +412,6 @@ files:
 - lefthook.yml
 - lib/gitlab_quality/test_tooling.rb
 - lib/gitlab_quality/test_tooling/concerns/find_set_dri.rb
-- lib/gitlab_quality/test_tooling/concerns/influxdb_tools.rb
-- lib/gitlab_quality/test_tooling/concerns/test_metrics.rb
 - lib/gitlab_quality/test_tooling/failed_jobs_table.rb
 - lib/gitlab_quality/test_tooling/gitlab_client/branches_client.rb
 - lib/gitlab_quality/test_tooling/gitlab_client/branches_dry_client.rb
@@ -497,8 +469,12 @@ files:
 - lib/gitlab_quality/test_tooling/test_meta/processor/meta_processor.rb
 - lib/gitlab_quality/test_tooling/test_meta/test_meta_updater.rb
 - lib/gitlab_quality/test_tooling/test_metric/json_test_metric.rb
-- lib/gitlab_quality/test_tooling/test_metric/log_test_metrics.rb
 - lib/gitlab_quality/test_tooling/test_metrics/json_test_metric_collection.rb
+- lib/gitlab_quality/test_tooling/test_metrics_exporter/config.rb
+- lib/gitlab_quality/test_tooling/test_metrics_exporter/formatter.rb
+- lib/gitlab_quality/test_tooling/test_metrics_exporter/influxdb_tools.rb
+- lib/gitlab_quality/test_tooling/test_metrics_exporter/log_test_metrics.rb
+- lib/gitlab_quality/test_tooling/test_metrics_exporter/test_metrics.rb
 - lib/gitlab_quality/test_tooling/test_result/base_test_result.rb
 - lib/gitlab_quality/test_tooling/test_result/j_unit_test_result.rb
 - lib/gitlab_quality/test_tooling/test_result/json_test_result.rb