Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-07-20 15:26:25 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-07-20 15:26:25 +0300
commita09983ae35713f5a2bbb100981116d31ce99826e (patch)
tree2ee2af7bd104d57086db360a7e6d8c9d5d43667a /lib/gitlab/lograge/custom_options.rb
parent18c5ab32b738c0b6ecb4d0df3994000482f34bd8 (diff)
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'lib/gitlab/lograge/custom_options.rb')
-rw-r--r--lib/gitlab/lograge/custom_options.rb12
1 files changed, 0 insertions, 12 deletions
diff --git a/lib/gitlab/lograge/custom_options.rb b/lib/gitlab/lograge/custom_options.rb
index 17a36c292c0..e6dd87a8bec 100644
--- a/lib/gitlab/lograge/custom_options.rb
+++ b/lib/gitlab/lograge/custom_options.rb
@@ -20,8 +20,6 @@ module Gitlab
username: event.payload[:username],
ua: event.payload[:ua]
}
- add_db_counters!(payload)
-
payload.merge!(event.payload[:metadata]) if event.payload[:metadata]
::Gitlab::InstrumentationHelper.add_instrumentation_data(payload)
@@ -46,16 +44,6 @@ module Gitlab
payload
end
-
- def self.add_db_counters!(payload)
- current_transaction = Gitlab::Metrics::Transaction.current
- if current_transaction
- payload[:db_count] = current_transaction.get(:db_count, :counter).to_i
- payload[:db_write_count] = current_transaction.get(:db_write_count, :counter).to_i
- payload[:db_cached_count] = current_transaction.get(:db_cached_count, :counter).to_i
- end
- end
- private_class_method :add_db_counters!
end
end
end