diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-12 15:14:10 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-12 15:14:10 +0300 |
commit | da646aac6c559584f63d1fc06132d7351abcfac6 (patch) | |
tree | e6e17878b47c081dcd7e161e9bfc3bacd535c8a6 /lib/gitlab/ci/pipeline | |
parent | 612dd7d31ab927dd79968a6be7cb36599291bace (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/ci/pipeline')
-rw-r--r-- | lib/gitlab/ci/pipeline/logger.rb | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/lib/gitlab/ci/pipeline/logger.rb b/lib/gitlab/ci/pipeline/logger.rb index 50c8ec6b96a..fbba12c11a9 100644 --- a/lib/gitlab/ci/pipeline/logger.rb +++ b/lib/gitlab/ci/pipeline/logger.rb @@ -38,8 +38,6 @@ module Gitlab end def instrument_with_sql(operation, &block) - return instrument(operation, &block) unless sql_logging_enabled? - op_start_db_counters = current_db_counter_payload result = instrument(operation, &block) @@ -131,12 +129,6 @@ module Gitlab def current_db_counter_payload ::Gitlab::Metrics::Subscribers::ActiveRecord.db_counter_payload end - - def sql_logging_enabled? - strong_memoize(:sql_logging_enabled) do - ::Feature.enabled?(:ci_pipeline_logger_sql_count, project, default_enabled: :yaml) - end - end end end end |