diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-13 06:06:53 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-13 06:06:53 +0300 |
commit | c0b9c14ebd1524a1e2334e656f997ec680a18966 (patch) | |
tree | 4437aea2c4239279131a56adca1679f636683d29 /tooling | |
parent | 98638cd5e43611aac2193a5c2f80f72374040430 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'tooling')
-rw-r--r-- | tooling/danger/analytics_instrumentation.rb (renamed from tooling/danger/product_intelligence.rb) | 20 | ||||
-rw-r--r-- | tooling/danger/project_helper.rb | 28 |
2 files changed, 24 insertions, 24 deletions
diff --git a/tooling/danger/product_intelligence.rb b/tooling/danger/analytics_instrumentation.rb index 00dc31b9bb9..ce5ee55e3ee 100644 --- a/tooling/danger/product_intelligence.rb +++ b/tooling/danger/analytics_instrumentation.rb @@ -3,13 +3,13 @@ module Tooling module Danger - module ProductIntelligence + module AnalyticsInstrumentation METRIC_DIRS = %w[lib/gitlab/usage/metrics/instrumentations ee/lib/gitlab/usage/metrics/instrumentations].freeze - APPROVED_LABEL = 'product intelligence::approved' - REVIEW_LABEL = 'product intelligence::review pending' + APPROVED_LABEL = 'analytics instrumentation::approved' + REVIEW_LABEL = 'analytics instrumentation::review pending' CHANGED_FILES_MESSAGE = <<~MSG - For the following files, a review from the [Data team and Product Intelligence team](https://gitlab.com/groups/gitlab-org/analytics-section/product-intelligence/engineers/-/group_members?with_inherited_permissions=exclude) is recommended - Please check the ~"product intelligence" [Service Ping guide](https://docs.gitlab.com/ee/development/service_ping/) or the [Snowplow guide](https://docs.gitlab.com/ee/development/snowplow/). + For the following files, a review from the [Data team and Analytics Instrumentation team](https://gitlab.com/groups/gitlab-org/analytics-section/product-intelligence/engineers/-/group_members?with_inherited_permissions=exclude) is recommended + Please check the ~"analytics instrumentation" [Service Ping guide](https://docs.gitlab.com/ee/development/service_ping/) or the [Snowplow guide](https://docs.gitlab.com/ee/development/snowplow/). For MR review guidelines, see the [Service Ping review guidelines](https://docs.gitlab.com/ee/development/service_ping/review_guidelines.html) or the [Snowplow review guidelines](https://docs.gitlab.com/ee/development/snowplow/review_guidelines.html). @@ -18,7 +18,7 @@ module Tooling MSG CHANGED_SCOPE_MESSAGE = <<~MSG - The following metrics could be affected by the modified scopes and require ~"product intelligence" review: + The following metrics could be affected by the modified scopes and require ~"analytics instrumentation" review: MSG @@ -33,13 +33,13 @@ module Tooling ].freeze def check! - product_intelligence_paths_to_review = helper.changes.by_category(:product_intelligence).files + analytics_instrumentation_paths_to_review = helper.changes.by_category(:analytics_instrumentation).files labels_to_add = missing_labels - return if product_intelligence_paths_to_review.empty? || skip_review? + return if analytics_instrumentation_paths_to_review.empty? || skip_review? - warn format(CHANGED_FILES_MESSAGE, changed_files: helper.markdown_list(product_intelligence_paths_to_review)) unless has_approved_label? + warn format(CHANGED_FILES_MESSAGE, changed_files: helper.markdown_list(analytics_instrumentation_paths_to_review)) unless has_approved_label? helper.labels_to_add.concat(labels_to_add) unless labels_to_add.empty? end @@ -110,7 +110,7 @@ module Tooling return [] unless helper.ci? labels = [] - labels << 'product intelligence' unless helper.mr_has_labels?('product intelligence') + labels << 'analytics instrumentation' unless helper.mr_has_labels?('analytics instrumentation') labels << REVIEW_LABEL unless has_workflow_labels? labels diff --git a/tooling/danger/project_helper.rb b/tooling/danger/project_helper.rb index d9581929896..5b5b998e3ea 100644 --- a/tooling/danger/project_helper.rb +++ b/tooling/danger/project_helper.rb @@ -26,11 +26,11 @@ module Tooling %r{\Adoc/api/graphql/reference/} => [:docs, :backend], %r{\Adoc/api/openapi/.*\.yaml\z} => [:docs, :backend], - [%r{usage_data\.rb}, %r{^(\+|-).*\s+(count|distinct_count|estimate_batch_distinct_count)\(.*\)(.*)$}] => [:database, :backend, :product_intelligence], + [%r{usage_data\.rb}, %r{^(\+|-).*\s+(count|distinct_count|estimate_batch_distinct_count)\(.*\)(.*)$}] => [:database, :backend, :analytics_instrumentation], %r{\A((ee|jh)/)?config/feature_flags/} => :feature_flag, - %r{doc/api/usage_data.md} => [:product_intelligence], + %r{doc/api/usage_data.md} => [:analytics_instrumentation], %r{\Adoc/.*(\.(md|png|gif|jpg|yml))\z} => :docs, %r{\A(CONTRIBUTING|LICENSE|MAINTENANCE|PHILOSOPHY|PROCESS|README)(\.md)?\z} => :docs, @@ -65,8 +65,8 @@ module Tooling app/assets/javascripts/tracking/.*\.js | spec/frontend/tracking/.*\.js | spec/frontend/tracking_spec\.js - )\z}x => [:frontend, :product_intelligence], - [%r{\.(vue|js)\z}, %r{trackRedis}] => [:frontend, :product_intelligence], + )\z}x => [:frontend, :analytics_instrumentation], + [%r{\.(vue|js)\z}, %r{trackRedis}] => [:frontend, :analytics_instrumentation], %r{\A((ee|jh)/)?app/assets/} => :frontend, %r{\A((ee|jh)/)?app/views/.*\.svg} => :frontend, %r{\A((ee|jh)/)?app/views/} => [:frontend, :backend], @@ -132,11 +132,11 @@ module Tooling %r{\A((ee|jh)/)?spec/support/shared_contexts/features/} => :test, %r{\A((ee|jh)/)?spec/support/helpers/features/} => :test, - %r{\A((spec/)?lib/generators/gitlab/usage_metric_)} => [:product_intelligence], - %r{\A((ee|jh)/)?lib/gitlab/usage_data_counters/.*\.yml\z} => [:product_intelligence], - %r{\A((ee|jh)/)?config/(events|metrics)/((.*\.yml)|(schema\.json))\z} => [:product_intelligence], - %r{\A((ee|jh)/)?lib/gitlab/usage_data(_counters)?(/|\.rb)} => [:backend, :product_intelligence], - %r{\A((ee|jh)/)?(spec/)?lib/gitlab/usage(/|\.rb)} => [:backend, :product_intelligence], + %r{\A((spec/)?lib/generators/gitlab/usage_metric_)} => [:analytics_instrumentation], + %r{\A((ee|jh)/)?lib/gitlab/usage_data_counters/.*\.yml\z} => [:analytics_instrumentation], + %r{\A((ee|jh)/)?config/(events|metrics)/((.*\.yml)|(schema\.json))\z} => [:analytics_instrumentation], + %r{\A((ee|jh)/)?lib/gitlab/usage_data(_counters)?(/|\.rb)} => [:backend, :analytics_instrumentation], + %r{\A((ee|jh)/)?(spec/)?lib/gitlab/usage(/|\.rb)} => [:backend, :analytics_instrumentation], %r{\A( lib/gitlab/tracking\.rb | spec/lib/gitlab/tracking_spec\.rb | @@ -146,11 +146,11 @@ module Tooling (spec/)?lib/generators/gitlab/usage_metric_definition/redis_hll_generator(_spec)?\.rb | lib/generators/rails/usage_metric_definition_generator\.rb | spec/lib/generators/usage_metric_definition_generator_spec\.rb | - generator_templates/usage_metric_definition/metric_definition\.yml)\z}x => [:backend, :product_intelligence], - %r{gitlab/usage_data(_spec)?\.rb} => [:product_intelligence], - [%r{\.haml\z}, %r{data: \{ track}] => [:product_intelligence], - [%r{\.(rb|haml)\z}, %r{Gitlab::Tracking\.(event|enabled\?|options)$}] => [:product_intelligence], - [%r{\.(vue|js)\z}, %r{(Tracking.event|/\btrack\(/|data-track-action)}] => [:product_intelligence], + generator_templates/usage_metric_definition/metric_definition\.yml)\z}x => [:backend, :analytics_instrumentation], + %r{gitlab/usage_data(_spec)?\.rb} => [:analytics_instrumentation], + [%r{\.haml\z}, %r{data: \{ track}] => [:analytics_instrumentation], + [%r{\.(rb|haml)\z}, %r{Gitlab::Tracking\.(event|enabled\?|options)$}] => [:analytics_instrumentation], + [%r{\.(vue|js)\z}, %r{(Tracking.event|/\btrack\(/|data-track-action)}] => [:analytics_instrumentation], %r{\A((ee|jh)/)?app/(?!assets|views)[^/]+} => :backend, %r{\A((ee|jh)/)?(bin|config|generator_templates|lib|rubocop)/} => :backend, |