diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index ad0b2138d18..0709e319059 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -14e3f3aac332a6f0080b00afabff50b11c4778eb +23975a577f6d405769e87726ba642ca7e3761230 diff --git a/config/metrics/counts_28d/20210715094458_releases_with_milestones.yml b/config/metrics/counts_28d/20210715094458_releases_with_milestones.yml index cee6762a197..3c0481c594f 100644 --- a/config/metrics/counts_28d/20210715094458_releases_with_milestones.yml +++ b/config/metrics/counts_28d/20210715094458_releases_with_milestones.yml @@ -12,7 +12,7 @@ introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71287' time_frame: 28d data_source: database instrumentation_class: 'CountUsersAssociatingMilestonesToReleasesMetric' -data_category: Optional +data_category: optional distribution: - ce - ee diff --git a/config/metrics/counts_28d/20210816143831_i_code_review_total_suggestions_added_monthly.yml b/config/metrics/counts_28d/20210816143831_i_code_review_total_suggestions_added_monthly.yml index 1f4e20c1fd0..85ae914e9da 100644 --- a/config/metrics/counts_28d/20210816143831_i_code_review_total_suggestions_added_monthly.yml +++ b/config/metrics/counts_28d/20210816143831_i_code_review_total_suggestions_added_monthly.yml @@ -14,7 +14,7 @@ instrumentation_class: RedisHLLMetric options: events: - i_code_review_total_suggestions_added -data_category: Optional +data_category: optional performance_indicator_type: [] distribution: - ce diff --git a/config/metrics/counts_28d/20210816144453_i_code_review_total_suggestions_applied_monthly.yml b/config/metrics/counts_28d/20210816144453_i_code_review_total_suggestions_applied_monthly.yml index 62011a10bcb..be0bdec5dd8 100644 --- a/config/metrics/counts_28d/20210816144453_i_code_review_total_suggestions_applied_monthly.yml +++ b/config/metrics/counts_28d/20210816144453_i_code_review_total_suggestions_applied_monthly.yml @@ -14,7 +14,7 @@ instrumentation_class: RedisHLLMetric options: events: - i_code_review_total_suggestions_applied -data_category: Optional +data_category: optional performance_indicator_type: [] distribution: - ce diff --git a/config/metrics/counts_28d/20220504150641_count_notes_in_ipynb_diff_commit_monthly.yml b/config/metrics/counts_28d/20220504150641_count_notes_in_ipynb_diff_commit_monthly.yml index 5e4ea495da2..ed04464d77e 100644 --- a/config/metrics/counts_28d/20220504150641_count_notes_in_ipynb_diff_commit_monthly.yml +++ b/config/metrics/counts_28d/20220504150641_count_notes_in_ipynb_diff_commit_monthly.yml @@ -14,7 +14,7 @@ instrumentation_class: RedisHLLMetric options: events: - i_code_review_create_note_in_ipynb_diff_commit -data_category: Optional +data_category: optional performance_indicator_type: [] distribution: - ce diff --git a/config/metrics/counts_28d/20220504150641_count_notes_in_ipynb_diff_monthly.yml b/config/metrics/counts_28d/20220504150641_count_notes_in_ipynb_diff_monthly.yml index c8efa998c6d..87124c56a20 100644 --- a/config/metrics/counts_28d/20220504150641_count_notes_in_ipynb_diff_monthly.yml +++ b/config/metrics/counts_28d/20220504150641_count_notes_in_ipynb_diff_monthly.yml @@ -14,7 +14,7 @@ instrumentation_class: RedisHLLMetric options: events: - i_code_review_create_note_in_ipynb_diff -data_category: Optional +data_category: optional performance_indicator_type: [] distribution: - ce diff --git a/config/metrics/counts_28d/20220504150641_count_notes_in_ipynb_diff_mr_monthly.yml b/config/metrics/counts_28d/20220504150641_count_notes_in_ipynb_diff_mr_monthly.yml index e04f66dfd28..ab9b0ac53ee 100644 --- a/config/metrics/counts_28d/20220504150641_count_notes_in_ipynb_diff_mr_monthly.yml +++ b/config/metrics/counts_28d/20220504150641_count_notes_in_ipynb_diff_mr_monthly.yml @@ -14,7 +14,7 @@ instrumentation_class: RedisHLLMetric options: events: - i_code_review_create_note_in_ipynb_diff_mr -data_category: Optional +data_category: optional performance_indicator_type: [] distribution: - ce diff --git a/config/metrics/counts_28d/20220504150641_count_users_with_notes_in_ipynb_diff_commit_monthly.yml b/config/metrics/counts_28d/20220504150641_count_users_with_notes_in_ipynb_diff_commit_monthly.yml index 7f3853ea6a8..69dddc054b6 100644 --- a/config/metrics/counts_28d/20220504150641_count_users_with_notes_in_ipynb_diff_commit_monthly.yml +++ b/config/metrics/counts_28d/20220504150641_count_users_with_notes_in_ipynb_diff_commit_monthly.yml @@ -14,7 +14,7 @@ instrumentation_class: RedisHLLMetric options: events: - i_code_review_user_create_note_in_ipynb_diff_commit -data_category: Optional +data_category: optional performance_indicator_type: [] distribution: - ce diff --git a/config/metrics/counts_28d/20220504150641_count_users_with_notes_in_ipynb_diff_monthly.yml b/config/metrics/counts_28d/20220504150641_count_users_with_notes_in_ipynb_diff_monthly.yml index ddec7d8b47e..bf3731928e4 100644 --- a/config/metrics/counts_28d/20220504150641_count_users_with_notes_in_ipynb_diff_monthly.yml +++ b/config/metrics/counts_28d/20220504150641_count_users_with_notes_in_ipynb_diff_monthly.yml @@ -14,7 +14,7 @@ instrumentation_class: RedisHLLMetric options: events: - i_code_review_user_create_note_in_ipynb_diff -data_category: Optional +data_category: optional performance_indicator_type: [] distribution: - ce diff --git a/config/metrics/counts_28d/20220504150641_count_users_with_notes_in_ipynb_diff_mr_monthly.yml b/config/metrics/counts_28d/20220504150641_count_users_with_notes_in_ipynb_diff_mr_monthly.yml index 22a91b115b3..16ccd975057 100644 --- a/config/metrics/counts_28d/20220504150641_count_users_with_notes_in_ipynb_diff_mr_monthly.yml +++ b/config/metrics/counts_28d/20220504150641_count_users_with_notes_in_ipynb_diff_mr_monthly.yml @@ -14,7 +14,7 @@ instrumentation_class: RedisHLLMetric options: events: - i_code_review_user_create_note_in_ipynb_diff_mr -data_category: Optional +data_category: optional performance_indicator_type: [] distribution: - ce diff --git a/config/metrics/counts_7d/20210816144119_i_code_review_total_suggestions_added_weekly.yml b/config/metrics/counts_7d/20210816144119_i_code_review_total_suggestions_added_weekly.yml index 65e49160611..f3df3d38bdb 100644 --- a/config/metrics/counts_7d/20210816144119_i_code_review_total_suggestions_added_weekly.yml +++ b/config/metrics/counts_7d/20210816144119_i_code_review_total_suggestions_added_weekly.yml @@ -14,7 +14,7 @@ instrumentation_class: RedisHLLMetric options: events: - i_code_review_total_suggestions_added -data_category: Optional +data_category: optional performance_indicator_type: [] distribution: - ce diff --git a/config/metrics/counts_7d/20210816144247_i_code_review_total_suggestions_applied_weekly.yml b/config/metrics/counts_7d/20210816144247_i_code_review_total_suggestions_applied_weekly.yml index 617586b9bb4..fabf3942e67 100644 --- a/config/metrics/counts_7d/20210816144247_i_code_review_total_suggestions_applied_weekly.yml +++ b/config/metrics/counts_7d/20210816144247_i_code_review_total_suggestions_applied_weekly.yml @@ -14,7 +14,7 @@ instrumentation_class: RedisHLLMetric options: events: - i_code_review_total_suggestions_applied -data_category: Optional +data_category: optional performance_indicator_type: [] distribution: - ce diff --git a/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_commit_weekly.yml b/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_commit_weekly.yml index 6635545781b..b232663b050 100644 --- a/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_commit_weekly.yml +++ b/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_commit_weekly.yml @@ -14,7 +14,7 @@ instrumentation_class: RedisHLLMetric options: events: - i_code_review_create_note_in_ipynb_diff_commit -data_category: Optional +data_category: optional performance_indicator_type: [] distribution: - ce diff --git a/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_mr_weekly.yml b/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_mr_weekly.yml index 661c6ab3f59..d8ae7dbb9be 100644 --- a/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_mr_weekly.yml +++ b/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_mr_weekly.yml @@ -14,7 +14,7 @@ instrumentation_class: RedisHLLMetric options: events: - i_code_review_create_note_in_ipynb_diff_mr -data_category: Optional +data_category: optional performance_indicator_type: [] distribution: - ce diff --git a/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_weekly.yml b/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_weekly.yml index 33e27d26c2f..4701616452b 100644 --- a/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_weekly.yml +++ b/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_weekly.yml @@ -14,7 +14,7 @@ instrumentation_class: RedisHLLMetric options: events: - i_code_review_create_note_in_ipynb_diff -data_category: Optional +data_category: optional performance_indicator_type: [] distribution: - ce diff --git a/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_commit_weekly.yml b/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_commit_weekly.yml index f5419fd1e8b..62a87b390bb 100644 --- a/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_commit_weekly.yml +++ b/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_commit_weekly.yml @@ -14,7 +14,7 @@ instrumentation_class: RedisHLLMetric options: events: - i_code_review_user_create_note_in_ipynb_diff_commit -data_category: Optional +data_category: optional performance_indicator_type: [] distribution: - ce diff --git a/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_mr_weekly.yml b/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_mr_weekly.yml index e510930d660..93ea3e6c8c0 100644 --- a/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_mr_weekly.yml +++ b/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_mr_weekly.yml @@ -14,7 +14,7 @@ instrumentation_class: RedisHLLMetric options: events: - i_code_review_user_create_note_in_ipynb_diff_mr -data_category: Optional +data_category: optional performance_indicator_type: [] distribution: - ce diff --git a/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_weekly.yml b/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_weekly.yml index eeca0986739..94efc8dcf48 100644 --- a/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_weekly.yml +++ b/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_weekly.yml @@ -14,7 +14,7 @@ instrumentation_class: RedisHLLMetric options: events: - i_code_review_user_create_note_in_ipynb_diff -data_category: Optional +data_category: optional performance_indicator_type: [] distribution: - ce diff --git a/config/metrics/counts_all/20210715094459_releases_with_milestones.yml b/config/metrics/counts_all/20210715094459_releases_with_milestones.yml index 29997637a79..c461516ddc6 100644 --- a/config/metrics/counts_all/20210715094459_releases_with_milestones.yml +++ b/config/metrics/counts_all/20210715094459_releases_with_milestones.yml @@ -12,7 +12,7 @@ introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71287' time_frame: all data_source: database instrumentation_class: 'CountUsersAssociatingMilestonesToReleasesMetric' -data_category: Optional +data_category: optional distribution: - ce - ee diff --git a/config/metrics/counts_all/20210730011801_projects_zentao_active.yml b/config/metrics/counts_all/20210730011801_projects_zentao_active.yml index 5000ecab3c6..6019441b8e8 100644 --- a/config/metrics/counts_all/20210730011801_projects_zentao_active.yml +++ b/config/metrics/counts_all/20210730011801_projects_zentao_active.yml @@ -10,7 +10,7 @@ milestone: "14.4" introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338178 time_frame: all data_source: database -data_category: Operational +data_category: operational distribution: - ce - ee diff --git a/config/metrics/counts_all/20210730011802_groups_zentao_active.yml b/config/metrics/counts_all/20210730011802_groups_zentao_active.yml index ee5d3a76d02..e396a349fb3 100644 --- a/config/metrics/counts_all/20210730011802_groups_zentao_active.yml +++ b/config/metrics/counts_all/20210730011802_groups_zentao_active.yml @@ -10,7 +10,7 @@ milestone: "14.4" introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338178 time_frame: all data_source: database -data_category: Operational +data_category: operational distribution: - ce - ee diff --git a/config/metrics/counts_all/20210730011804_instances_zentao_active.yml b/config/metrics/counts_all/20210730011804_instances_zentao_active.yml index 26aa53c53b1..2ed3c43a1ec 100644 --- a/config/metrics/counts_all/20210730011804_instances_zentao_active.yml +++ b/config/metrics/counts_all/20210730011804_instances_zentao_active.yml @@ -10,7 +10,7 @@ milestone: "14.4" introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338178 time_frame: all data_source: database -data_category: Operational +data_category: operational distribution: - ce - ee diff --git a/config/metrics/counts_all/20210730011805_projects_inheriting_zentao_active.yml b/config/metrics/counts_all/20210730011805_projects_inheriting_zentao_active.yml index dfc4a35c424..35bf3d5a18e 100644 --- a/config/metrics/counts_all/20210730011805_projects_inheriting_zentao_active.yml +++ b/config/metrics/counts_all/20210730011805_projects_inheriting_zentao_active.yml @@ -10,7 +10,7 @@ milestone: "14.4" introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338178 time_frame: all data_source: database -data_category: Operational +data_category: operational distribution: - ce - ee diff --git a/config/metrics/counts_all/20210730011806_groups_inheriting_zentao_active.yml b/config/metrics/counts_all/20210730011806_groups_inheriting_zentao_active.yml index 3dc070e3db1..5d9135bb0eb 100644 --- a/config/metrics/counts_all/20210730011806_groups_inheriting_zentao_active.yml +++ b/config/metrics/counts_all/20210730011806_groups_inheriting_zentao_active.yml @@ -10,7 +10,7 @@ milestone: "14.4" introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338178 time_frame: all data_source: database -data_category: Operational +data_category: operational distribution: - ce - ee diff --git a/config/metrics/schema/base.json b/config/metrics/schema/base.json index a28e694eb81..a45c34f2abc 100644 --- a/config/metrics/schema/base.json +++ b/config/metrics/schema/base.json @@ -101,10 +101,6 @@ "data_category": { "type": "string", "enum": [ - "Operational", - "Optional", - "Subscription", - "Standard", "operational", "optional", "subscription", diff --git a/config/metrics/settings/20210812202137_smtp_encrypted_secrets_enabled.yml b/config/metrics/settings/20210812202137_smtp_encrypted_secrets_enabled.yml index 6b84c234c06..7b45ff508de 100644 --- a/config/metrics/settings/20210812202137_smtp_encrypted_secrets_enabled.yml +++ b/config/metrics/settings/20210812202137_smtp_encrypted_secrets_enabled.yml @@ -10,7 +10,7 @@ milestone: "14.2" introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67802 time_frame: none data_source: system -data_category: Optional +data_category: optional instrumentation_class: SmtpEncryptedSecretsMetric distribution: - ce diff --git a/db/docs/ci_pipeline_schedule_variables.yml b/db/docs/ci_pipeline_schedule_variables.yml index 9cf48ef2fea..7bf1432f495 100644 --- a/db/docs/ci_pipeline_schedule_variables.yml +++ b/db/docs/ci_pipeline_schedule_variables.yml @@ -4,7 +4,16 @@ classes: - Ci::PipelineScheduleVariable feature_categories: - continuous_integration -description: TODO +description: Stores the variables used in pipeline schedules introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/d278da48f837292491aaf81649afef1da3a1eb09 milestone: '9.4' gitlab_schema: gitlab_ci +desired_sharding_key: + project_id: + references: projects + backfill_via: + parent: + foreign_key: pipeline_schedule_id + table: ci_pipeline_schedules + sharding_key: project_id + belongs_to: pipeline_schedule diff --git a/db/docs/external_status_checks_protected_branches.yml b/db/docs/external_status_checks_protected_branches.yml index 1310f329fc5..febd754792c 100644 --- a/db/docs/external_status_checks_protected_branches.yml +++ b/db/docs/external_status_checks_protected_branches.yml @@ -7,4 +7,13 @@ feature_categories: description: Keeps relation between protected branches and external status checks introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62186 milestone: '14.0' -gitlab_schema: gitlab_main +gitlab_schema: gitlab_main_cell +desired_sharding_key: + project_id: + references: projects + backfill_via: + parent: + foreign_key: external_status_check_id + table: external_status_checks + sharding_key: project_id + belongs_to: external_status_check diff --git a/db/docs/gitlab_subscription_histories.yml b/db/docs/gitlab_subscription_histories.yml index aa347e5b957..d6587ce25c8 100644 --- a/db/docs/gitlab_subscription_histories.yml +++ b/db/docs/gitlab_subscription_histories.yml @@ -8,3 +8,4 @@ description: History log for the gitlab_subscriptions table introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/19694 milestone: '12.6' gitlab_schema: gitlab_main_cell +sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/462598 diff --git a/db/docs/upcoming_reconciliations.yml b/db/docs/upcoming_reconciliations.yml index 75254a524c5..59eaf8934fd 100644 --- a/db/docs/upcoming_reconciliations.yml +++ b/db/docs/upcoming_reconciliations.yml @@ -8,3 +8,4 @@ description: Stores the data needed to notify a user of an upcoming reconciliati introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/63054 milestone: '14.0' gitlab_schema: gitlab_main_cell +sharding_key_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/462598 diff --git a/doc/development/database/multiple_databases.md b/doc/development/database/multiple_databases.md index a55fc2b89d2..0659015e450 100644 --- a/doc/development/database/multiple_databases.md +++ b/doc/development/database/multiple_databases.md @@ -29,7 +29,7 @@ Each table of GitLab needs to have a `gitlab_schema` assigned: | Database | Description | Notes | | -------- | ----------- | ------- | | `gitlab_main`| All tables that are being stored in the `main:` database. | Currently, this is being replaced with `gitlab_main_cell`, for the purpose of building the [Cells](../../architecture/blueprints/cells/index.md) architecture. `gitlab_main_cell` schema describes all tables that are local to a cell in a GitLab installation. For example, `projects` and `groups` | -| `gitlab_main_clusterwide` | All tables that are being stored cluster-wide in a GitLab installation, in the [Cells](../../architecture/blueprints/cells/index.md) architecture. For example, `users` and `application_settings` | | +| `gitlab_main_clusterwide` | All tables where all rows, or a subset of rows needs to be present across the cluster, in the [Cells](../../architecture/blueprints/cells/index.md) architecture. For example, `users` and `application_settings`.| For the [Cells 1.0 architecture](../../architecture/blueprints/cells/iterations/cells-1.0.md), there are no real clusterwide tables as each cell will have its own database. In effect, these tables will still be stored locally in each cell. | | `gitlab_ci` | All CI tables that are being stored in the `ci:` database (for example, `ci_pipelines`, `ci_builds`) | | | `gitlab_geo` | All Geo tables that are being stored in the `geo:` database (for example, like `project_registry`, `secondary_usage_data`) | | | `gitlab_shared` | All application tables that contain data across all decomposed databases (for example, `loose_foreign_keys_deleted_records`) for models that inherit from `Gitlab::Database::SharedModel`. | | @@ -54,7 +54,7 @@ Depending on the use case, your feature may be [cell-local or clusterwide](../.. When you choose the appropriate schema for tables, consider the following guidelines as part of the [Cells](../../architecture/blueprints/cells/index.md) architecture: - Default to `gitlab_main_cell`: We expect most tables to be assigned to the `gitlab_main_cell` schema by default. Choose this schema if the data in the table is related to `projects` or `namespaces`. -- Consult with the Tenant Scale group: If you believe that the `gitlab_main_clusterwide` schema is more suitable for a table, seek approval from the Tenant Scale group This is crucial because it has scaling implications and may require reconsideration of the schema choice. +- Consult with the Tenant Scale group: If you believe that the `gitlab_main_clusterwide` schema is more suitable for a table, seek approval from the Tenant Scale group. This is crucial because it has scaling implications and may require reconsideration of the schema choice. To understand how existing tables are classified, you can use [this dashboard](https://manojmj.gitlab.io/tenant-scale-schema-progress/). diff --git a/lib/gitlab/usage/metric_definition.rb b/lib/gitlab/usage/metric_definition.rb index 9754856d0e1..65a50391c18 100644 --- a/lib/gitlab/usage/metric_definition.rb +++ b/lib/gitlab/usage/metric_definition.rb @@ -81,10 +81,6 @@ module Gitlab end end - def category_to_lowercase - attributes[:data_category]&.downcase! - end - def available? AVAILABLE_STATUSES.include?(attributes[:status]) end @@ -147,7 +143,7 @@ module Gitlab definition = YAML.safe_load(definition) definition.deep_symbolize_keys! - self.new(path, definition).tap(&:category_to_lowercase) + self.new(path, definition) rescue StandardError => e Gitlab::ErrorTracking.track_and_raise_for_dev_exception(InvalidError.new(e.message)) end diff --git a/spec/lib/gitlab/conan_token_spec.rb b/spec/lib/gitlab/conan_token_spec.rb index c8bda0a5cf0..ab0c4ea7733 100644 --- a/spec/lib/gitlab/conan_token_spec.rb +++ b/spec/lib/gitlab/conan_token_spec.rb @@ -20,7 +20,7 @@ RSpec.describe Gitlab::ConanToken do JSONWebToken::HMACToken.new(jwt_secret).tap do |jwt| jwt['access_token'] = access_token_id jwt['user_id'] = user_id || user_id - jwt.expire_time = expire_time || jwt.issued_at + ::Gitlab::ConanToken::CONAN_TOKEN_EXPIRE_TIME + jwt.expire_time = expire_time || (jwt.issued_at + ::Gitlab::ConanToken::CONAN_TOKEN_EXPIRE_TIME) end end diff --git a/spec/lib/gitlab/database/background_migration/batched_job_spec.rb b/spec/lib/gitlab/database/background_migration/batched_job_spec.rb index e1d1674d05c..f5e21032637 100644 --- a/spec/lib/gitlab/database/background_migration/batched_job_spec.rb +++ b/spec/lib/gitlab/database/background_migration/batched_job_spec.rb @@ -435,7 +435,7 @@ RSpec.describe Gitlab::Database::BackgroundMigration::BatchedJob, type: :model d context 'when job has finished' do it 'returns ratio of duration to interval, here: 0.5' do freeze_time do - job.started_at = Time.zone.now - migration.interval / 2 + job.started_at = Time.zone.now - (migration.interval / 2) job.finished_at = Time.zone.now expect(subject).to eq(0.5) diff --git a/spec/lib/gitlab/database/batch_count_spec.rb b/spec/lib/gitlab/database/batch_count_spec.rb index 89652b81fde..3f8ee0c3e40 100644 --- a/spec/lib/gitlab/database/batch_count_spec.rb +++ b/spec/lib/gitlab/database/batch_count_spec.rb @@ -35,7 +35,7 @@ RSpec.describe Gitlab::Database::BatchCount do end it 'returns fallback if loops more than allowed' do - large_finish = max_allowed_loops * default_batch_size + 1 + large_finish = (max_allowed_loops * default_batch_size) + 1 expect(described_class.public_send(method, *args, start: 1, finish: large_finish)).to eq(fallback) end diff --git a/spec/lib/gitlab/database/consistency_checker_spec.rb b/spec/lib/gitlab/database/consistency_checker_spec.rb index be03bd00619..8da5ccbf279 100644 --- a/spec/lib/gitlab/database/consistency_checker_spec.rb +++ b/spec/lib/gitlab/database/consistency_checker_spec.rb @@ -70,7 +70,7 @@ RSpec.describe Gitlab::Database::ConsistencyChecker, feature_category: :cell do it 'returns the correct number of matches and batches checked' do expected_result = { - next_start_id: Namespace.minimum(:id) + described_class::MAX_BATCHES * described_class::BATCH_SIZE, + next_start_id: Namespace.minimum(:id) + (described_class::MAX_BATCHES * described_class::BATCH_SIZE), batches: max_batches, matches: max_batches * batch_size, mismatches: 0, @@ -110,7 +110,7 @@ RSpec.describe Gitlab::Database::ConsistencyChecker, feature_category: :cell do it 'reports the missing elements' do expected_result = { - next_start_id: Namespace.first.id + described_class::MAX_BATCHES * described_class::BATCH_SIZE, + next_start_id: Namespace.first.id + (described_class::MAX_BATCHES * described_class::BATCH_SIZE), batches: max_batches, matches: 39, mismatches: 1, @@ -137,7 +137,7 @@ RSpec.describe Gitlab::Database::ConsistencyChecker, feature_category: :cell do it 'reports the missing elements' do expected_result = { - next_start_id: Namespace.first.id + described_class::MAX_BATCHES * described_class::BATCH_SIZE, + next_start_id: Namespace.first.id + (described_class::MAX_BATCHES * described_class::BATCH_SIZE), batches: 4, matches: 39, mismatches: 1, @@ -167,7 +167,7 @@ RSpec.describe Gitlab::Database::ConsistencyChecker, feature_category: :cell do it 'reports the difference between the two tables' do expected_result = { - next_start_id: Namespace.first.id + described_class::MAX_BATCHES * described_class::BATCH_SIZE, + next_start_id: Namespace.first.id + (described_class::MAX_BATCHES * described_class::BATCH_SIZE), batches: 4, matches: 37, mismatches: 3, diff --git a/spec/lib/gitlab/graphql/tracers/metrics_tracer_spec.rb b/spec/lib/gitlab/graphql/tracers/metrics_tracer_spec.rb index 1c6b195850e..e1e13c8a1dd 100644 --- a/spec/lib/gitlab/graphql/tracers/metrics_tracer_spec.rb +++ b/spec/lib/gitlab/graphql/tracers/metrics_tracer_spec.rb @@ -29,8 +29,8 @@ RSpec.describe Gitlab::Graphql::Tracers::MetricsTracer do describe 'when used as tracer and query is executed' do where(:duration, :expected_success) do - 0.1 | true - 0.1 + ::Gitlab::EndpointAttributes::DEFAULT_URGENCY.duration | false + 0.1 | true + (0.1 + ::Gitlab::EndpointAttributes::DEFAULT_URGENCY.duration) | false end with_them do diff --git a/spec/lib/gitlab/issues/rebalancing/state_spec.rb b/spec/lib/gitlab/issues/rebalancing/state_spec.rb index a0ea5fec8ec..b87f7b0a86a 100644 --- a/spec/lib/gitlab/issues/rebalancing/state_spec.rb +++ b/spec/lib/gitlab/issues/rebalancing/state_spec.rb @@ -223,7 +223,7 @@ RSpec.describe Gitlab::Issues::Rebalancing::State, :clean_gitlab_redis_shared_st count.times do |idx| id = idx + 1 - issues << double(relative_position: position_direction * (id * 10 + position_offset), id: id) + issues << double(relative_position: position_direction * ((id * 10) + position_offset), id: id) end rebalance_caching.cache_issue_ids(issues) diff --git a/spec/lib/gitlab/kroki_spec.rb b/spec/lib/gitlab/kroki_spec.rb index 6d8e6ecbf54..ff7276e20a8 100644 --- a/spec/lib/gitlab/kroki_spec.rb +++ b/spec/lib/gitlab/kroki_spec.rb @@ -14,9 +14,9 @@ RSpec.describe Gitlab::Kroki do where(:enabled_formats, :expected_formats) do '' | default_formats - 'blockdiag' | default_formats + %w[actdiag blockdiag nwdiag packetdiag rackdiag seqdiag] - 'bpmn' | default_formats + %w[bpmn] - 'excalidraw' | default_formats + %w[excalidraw] + 'blockdiag' | (default_formats + %w[actdiag blockdiag nwdiag packetdiag rackdiag seqdiag]) + 'bpmn' | (default_formats + %w[bpmn]) + 'excalidraw' | (default_formats + %w[excalidraw]) end with_them do diff --git a/spec/lib/gitlab/memory/instrumentation_spec.rb b/spec/lib/gitlab/memory/instrumentation_spec.rb index 059bcad37e7..019dec6e3a7 100644 --- a/spec/lib/gitlab/memory/instrumentation_spec.rb +++ b/spec/lib/gitlab/memory/instrumentation_spec.rb @@ -53,7 +53,7 @@ RSpec.describe Gitlab::Memory::Instrumentation, feature_category: :cloud_connect mem_objects: be > 1000, mem_mallocs: be > 1000, mem_bytes: be > 1000_000, # 1000 items * 1000 bytes each - mem_total_bytes: eq(result[:mem_bytes] + 40 * result[:mem_objects]) + mem_total_bytes: eq(result[:mem_bytes] + (40 * result[:mem_objects])) ) end diff --git a/spec/lib/gitlab/memory/watchdog/configurator_spec.rb b/spec/lib/gitlab/memory/watchdog/configurator_spec.rb index cd9ac0d7a8d..58e92de3e2d 100644 --- a/spec/lib/gitlab/memory/watchdog/configurator_spec.rb +++ b/spec/lib/gitlab/memory/watchdog/configurator_spec.rb @@ -96,7 +96,7 @@ RSpec.describe Gitlab::Memory::Watchdog::Configurator, feature_category: :cloud_ context 'with DISABLE_PUMA_WORKER_KILLER set to true' do let(:primary_memory_bytes) { 2_097_152_000 } - let(:worker_memory_bytes) { max_mem_growth * primary_memory_bytes + 1 } + let(:worker_memory_bytes) { (max_mem_growth * primary_memory_bytes) + 1 } let(:expected_payloads) do { heap_fragmentation: { diff --git a/spec/lib/gitlab/memory/watchdog/monitor/unique_memory_growth_spec.rb b/spec/lib/gitlab/memory/watchdog/monitor/unique_memory_growth_spec.rb index 22494af4425..077738c3edc 100644 --- a/spec/lib/gitlab/memory/watchdog/monitor/unique_memory_growth_spec.rb +++ b/spec/lib/gitlab/memory/watchdog/monitor/unique_memory_growth_spec.rb @@ -39,7 +39,7 @@ RSpec.describe Gitlab::Memory::Watchdog::Monitor::UniqueMemoryGrowth do end context 'when process exceeds threshold' do - let(:worker_memory) { max_mem_growth * primary_memory + 1 } + let(:worker_memory) { (max_mem_growth * primary_memory) + 1 } let(:payload) do { message: 'memory limit exceeded', @@ -53,7 +53,7 @@ RSpec.describe Gitlab::Memory::Watchdog::Monitor::UniqueMemoryGrowth do end context 'when process does not exceed threshold' do - let(:worker_memory) { max_mem_growth * primary_memory - 1 } + let(:worker_memory) { (max_mem_growth * primary_memory) - 1 } let(:payload) { {} } include_examples 'returns Watchdog Monitor result', threshold_violated: false diff --git a/spec/lib/gitlab/project_search_results_spec.rb b/spec/lib/gitlab/project_search_results_spec.rb index 8f74963d60b..8acec878042 100644 --- a/spec/lib/gitlab/project_search_results_spec.rb +++ b/spec/lib/gitlab/project_search_results_spec.rb @@ -180,12 +180,12 @@ RSpec.describe Gitlab::ProjectSearchResults, feature_category: :global_search do end it 'limits search results based on the third page' do - expect(file_finder).to receive(:find).with(query, content_match_cutoff: count_limit + per_page * 2) + expect(file_finder).to receive(:find).with(query, content_match_cutoff: count_limit + (per_page * 2)) results.objects(blob_type, page: 3, per_page: per_page) end it 'uses the per_page value when passed' do - expect(file_finder).to receive(:find).with(query, content_match_cutoff: count_limit + 10 * 2) + expect(file_finder).to receive(:find).with(query, content_match_cutoff: count_limit + (10 * 2)) results.objects(blob_type, page: 3, per_page: 10) end end diff --git a/spec/lib/gitlab/prometheus_client_spec.rb b/spec/lib/gitlab/prometheus_client_spec.rb index 8f39a15eb45..7b84aae19b2 100644 --- a/spec/lib/gitlab/prometheus_client_spec.rb +++ b/spec/lib/gitlab/prometheus_client_spec.rb @@ -335,7 +335,7 @@ RSpec.describe Gitlab::PrometheusClient do where(:time_interval_in_seconds, :step) do 0 | 60 10.hours | 60 - 10.hours + 1 | 61 + (10.hours + 1) | 61 # frontend options 30.minutes | 60 3.hours | 60 diff --git a/spec/lib/gitlab/quick_actions/extractor_spec.rb b/spec/lib/gitlab/quick_actions/extractor_spec.rb index ef76b1e5fdf..bdb2e0e9fa9 100644 --- a/spec/lib/gitlab/quick_actions/extractor_spec.rb +++ b/spec/lib/gitlab/quick_actions/extractor_spec.rb @@ -375,7 +375,7 @@ RSpec.describe Gitlab::QuickActions::Extractor, feature_category: :team_planning end it 'fails fast for strings with many newlines' do - msg = '`' + "\n" * 100_000 + msg = '`' + ("\n" * 100_000) expect do Timeout.timeout(3.seconds) { extractor.extract_commands(msg) } diff --git a/spec/lib/gitlab/regex_spec.rb b/spec/lib/gitlab/regex_spec.rb index ce7e57490cc..8668945e089 100644 --- a/spec/lib/gitlab/regex_spec.rb +++ b/spec/lib/gitlab/regex_spec.rb @@ -85,7 +85,7 @@ RSpec.describe Gitlab::Regex, feature_category: :tooling do it { is_expected.to match('') } it { is_expected.to match('') } it { is_expected.to match('') } - it { is_expected.to match('<<|' * 1000 + '') } + it { is_expected.to match(('<<|' * 1000) + '') } end describe '.environment_name_regex' do @@ -321,7 +321,7 @@ RSpec.describe Gitlab::Regex, feature_category: :tooling do it 'has no backtracking issue' do Timeout.timeout(1) do - expect(subject).not_to match("-" * 50000 + ";") + expect(subject).not_to match(("-" * 50000) + ";") end end end @@ -371,7 +371,7 @@ RSpec.describe Gitlab::Regex, feature_category: :tooling do it 'has no ReDos issues with long strings ending with an exclamation mark' do Timeout.timeout(5) do - expect(subject).not_to match('a' * 50000 + '!') + expect(subject).not_to match(('a' * 50000) + '!') end end @@ -978,11 +978,11 @@ RSpec.describe Gitlab::Regex, feature_category: :tooling do it { is_expected.to match('abcdefABCDEF1234567890abcdefABCDEF1234567890abcdefABCDEF12345678') } it { is_expected.not_to match('a' * 63) } it { is_expected.not_to match('a' * 65) } - it { is_expected.not_to match('a' * 63 + 'g') } - it { is_expected.not_to match('a' * 63 + '{') } - it { is_expected.not_to match('a' * 63 + '%') } - it { is_expected.not_to match('a' * 63 + '*') } - it { is_expected.not_to match('a' * 63 + '#') } + it { is_expected.not_to match(('a' * 63) + 'g') } + it { is_expected.not_to match(('a' * 63) + '{') } + it { is_expected.not_to match(('a' * 63) + '%') } + it { is_expected.not_to match(('a' * 63) + '*') } + it { is_expected.not_to match(('a' * 63) + '#') } it { is_expected.not_to match('') } end diff --git a/spec/lib/gitlab/search/abuse_validators/no_abusive_term_length_validator_spec.rb b/spec/lib/gitlab/search/abuse_validators/no_abusive_term_length_validator_spec.rb index 67409d9b628..9095268fb3d 100644 --- a/spec/lib/gitlab/search/abuse_validators/no_abusive_term_length_validator_spec.rb +++ b/spec/lib/gitlab/search/abuse_validators/no_abusive_term_length_validator_spec.rb @@ -36,11 +36,11 @@ RSpec.describe Gitlab::Search::AbuseValidators::NoAbusiveTermLengthValidator do let(:double_limit) { limit * 2 } let(:terms) do [ - 'http://' + 'x' * (double_limit - 12) + '.com', - 'https://' + 'x' * (double_limit - 13) + '.com', - 'sftp://' + 'x' * (double_limit - 12) + '.com', - 'ftp://' + 'x' * (double_limit - 11) + '.com', - 'http://' + 'x' * (double_limit - 8) # no tld is OK + 'http://' + ('x' * (double_limit - 12)) + '.com', + 'https://' + ('x' * (double_limit - 13)) + '.com', + 'sftp://' + ('x' * (double_limit - 12)) + '.com', + 'ftp://' + ('x' * (double_limit - 11)) + '.com', + 'http://' + ('x' * (double_limit - 8)) # no tld is OK ] end diff --git a/spec/lib/gitlab/slash_commands/deploy_spec.rb b/spec/lib/gitlab/slash_commands/deploy_spec.rb index 94a95fb417f..c93dedbefdc 100644 --- a/spec/lib/gitlab/slash_commands/deploy_spec.rb +++ b/spec/lib/gitlab/slash_commands/deploy_spec.rb @@ -171,8 +171,8 @@ RSpec.describe Gitlab::SlashCommands::Deploy, feature_category: :team_planning d it 'has smaller than linear execution time growth with a malformed "to"' do Timeout.timeout(3.seconds) do - sample1 = duration_for { described_class.match("deploy abc t" + "o" * 1000 + "X") } - sample2 = duration_for { described_class.match("deploy abc t" + "o" * 4000 + "X") } + sample1 = duration_for { described_class.match("deploy abc t" + ("o" * 1000) + "X") } + sample2 = duration_for { described_class.match("deploy abc t" + ("o" * 4000) + "X") } expect((sample2 / sample1) < 4).to be_truthy end diff --git a/workhorse/.tool-versions b/workhorse/.tool-versions index 3960504e7c6..a02c9a2825f 100644 --- a/workhorse/.tool-versions +++ b/workhorse/.tool-versions @@ -1 +1 @@ -golang 1.22.2 +golang 1.22.3 diff --git a/workhorse/go.mod b/workhorse/go.mod index de4c2267ee0..c120f2886a4 100644 --- a/workhorse/go.mod +++ b/workhorse/go.mod @@ -7,7 +7,7 @@ toolchain go1.21.9 require ( github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.2 github.com/BurntSushi/toml v1.3.2 - github.com/alecthomas/chroma/v2 v2.13.0 + github.com/alecthomas/chroma/v2 v2.14.0 github.com/aws/aws-sdk-go v1.51.14 github.com/disintegration/imaging v1.6.2 github.com/getsentry/raven-go v0.2.0 @@ -24,12 +24,12 @@ require ( github.com/sirupsen/logrus v1.9.3 github.com/smartystreets/goconvey v1.8.1 github.com/stretchr/testify v1.9.0 - gitlab.com/gitlab-org/gitaly/v16 v16.9.2 + gitlab.com/gitlab-org/gitaly/v16 v16.11.2 gitlab.com/gitlab-org/labkit v1.21.0 gocloud.dev v0.37.0 golang.org/x/image v0.15.0 golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 - golang.org/x/net v0.22.0 + golang.org/x/net v0.23.0 golang.org/x/oauth2 v0.18.0 golang.org/x/tools v0.19.0 google.golang.org/grpc v1.64.0 @@ -56,7 +56,7 @@ require ( github.com/DataDog/datadog-go v4.4.0+incompatible // indirect github.com/DataDog/sketches-go v1.0.0 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect - github.com/beevik/ntp v1.3.0 // indirect + github.com/beevik/ntp v1.3.1 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect github.com/certifi/gocertifi v0.0.0-20210507211836-431795d63e8d // indirect @@ -96,7 +96,7 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect - github.com/prometheus/client_model v0.5.0 // indirect + github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/prometheus/prometheus v0.50.1 // indirect @@ -117,11 +117,11 @@ require ( go.opentelemetry.io/otel/metric v1.24.0 // indirect go.opentelemetry.io/otel/trace v1.24.0 // indirect go.uber.org/atomic v1.11.0 // indirect - golang.org/x/crypto v0.21.0 // indirect + golang.org/x/crypto v0.22.0 // indirect golang.org/x/exp/typeparams v0.0.0-20221208152030-732eee02a75a // indirect golang.org/x/mod v0.16.0 // indirect golang.org/x/sync v0.6.0 // indirect - golang.org/x/sys v0.18.0 // indirect + golang.org/x/sys v0.19.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.5.0 // indirect golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect diff --git a/workhorse/go.sum b/workhorse/go.sum index c02a42c81fe..66d317b1811 100644 --- a/workhorse/go.sum +++ b/workhorse/go.sum @@ -90,10 +90,10 @@ github.com/HdrHistogram/hdrhistogram-go v1.1.1/go.mod h1:yDgFjdqOqDEKOvasDdhWNXY github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= -github.com/alecthomas/assert/v2 v2.6.0 h1:o3WJwILtexrEUk3cUVal3oiQY2tfgr/FHWiz/v2n4FU= -github.com/alecthomas/assert/v2 v2.6.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k= -github.com/alecthomas/chroma/v2 v2.13.0 h1:VP72+99Fb2zEcYM0MeaWJmV+xQvz5v5cxRHd+ooU1lI= -github.com/alecthomas/chroma/v2 v2.13.0/go.mod h1:BUGjjsD+ndS6eX37YgTchSEG+Jg9Jv1GiZs9sqPqztk= +github.com/alecthomas/assert/v2 v2.7.0 h1:QtqSACNS3tF7oasA8CU6A6sXZSBDqnm7RfpLl9bZqbE= +github.com/alecthomas/assert/v2 v2.7.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k= +github.com/alecthomas/chroma/v2 v2.14.0 h1:R3+wzpnUArGcQz7fCETQBzO5n9IMNi13iIs46aU4V9E= +github.com/alecthomas/chroma/v2 v2.14.0/go.mod h1:QolEbTfmUHIMVpBqxeDnNBj2uoeI4EbYP4i6n68SG4I= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= @@ -138,8 +138,8 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.28.4 h1:Ppup1nVNAOWbBOrcoOxaxPeEnSFB github.com/aws/aws-sdk-go-v2/service/sts v1.28.4/go.mod h1:+K1rNPVyGxkRuv9NNiaZ4YhBFuyw2MMA9SlIJ1Zlpz8= github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw= github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= -github.com/beevik/ntp v1.3.0 h1:/w5VhpW5BGKS37vFm1p9oVk/t4HnnkKZAZIubHM6F7Q= -github.com/beevik/ntp v1.3.0/go.mod h1:vD6h1um4kzXpqmLTuu0cCLcC+NfvC0IC+ltmEDA8E78= +github.com/beevik/ntp v1.3.1 h1:Y/srlT8L1yQr58kyPWFPZIxRL8ttx2SRIpVYJqZIlAM= +github.com/beevik/ntp v1.3.1/go.mod h1:fT6PylBq86Tsq23ZMEe47b7QQrZfYBFPnpzt0a9kJxw= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= @@ -412,8 +412,8 @@ github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:Om github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7kmXYlnfbA6JU= github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw= -github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI= +github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos= +github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8= github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= @@ -463,7 +463,6 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/tinylib/msgp v1.1.2 h1:gWmO7n0Ys2RBEb7GPYB9Ujq8Mk5p2U08lRnmMcGy6BQ= @@ -486,8 +485,8 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg= github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -gitlab.com/gitlab-org/gitaly/v16 v16.9.2 h1:FkNYzuezmL9K+3ZzU26BL1m3/0VoWi7Mq0ahuWovTfs= -gitlab.com/gitlab-org/gitaly/v16 v16.9.2/go.mod h1:K2zAXwDEEwnm9NLxboCllREyS4Rx1yRBRxLBC0EcakA= +gitlab.com/gitlab-org/gitaly/v16 v16.11.2 h1:Kr9ogL2FMmC57+LFI33omUpYOUYtBIhbrAtKlPrBAQM= +gitlab.com/gitlab-org/gitaly/v16 v16.11.2/go.mod h1:lJizRUtXRd1SBHjNbbbL9OsGN4TiugvfRBd8bIsdWI0= gitlab.com/gitlab-org/labkit v1.21.0 h1:hLmdBDtXjD1yOmZ+uJOac3a5Tlo83QaezwhES4IYik4= gitlab.com/gitlab-org/labkit v1.21.0/go.mod h1:zeATDAaSBelPcPLbTTq8J3ZJEHyPTLVBM1q3nva+/W4= go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= @@ -529,11 +528,10 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I= golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= -golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= -golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= +golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= +golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -625,11 +623,10 @@ golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ= golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= -golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= -golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= +golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/oauth2 v0.0.0-20170912212905-13449ad91cb2/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -723,19 +720,16 @@ golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= -golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= +golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/term v0.9.0/go.mod h1:M6DEAAIenWoTxdKrOltXcmDY3rSplQUkrvaDU5FcQyo= golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -751,7 +745,6 @@ golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=