Add latest changes from gitlab-org/gitlab@13-0-stable-ee

1 files changed, 4 insertions, 3 deletions

diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb
index 697c943b4ec..3aaed0edb87 100644
--- a/lib/gitlab/gitaly_client.rb
+++ b/lib/gitlab/gitaly_client.rb
@@ -130,7 +130,7 @@ module Gitlab
     end
 
     def self.address_metadata(storage)
-      Base64.strict_encode64(JSON.dump(storage => connection_data(storage)))
+      Base64.strict_encode64(Gitlab::Json.dump(storage => connection_data(storage)))
     end
 
     def self.connection_data(storage)
@@ -209,7 +209,8 @@ module Gitlab
     end
 
     def self.query_time
-      SafeRequestStore[:gitaly_query_time] ||= 0
+      query_time = SafeRequestStore[:gitaly_query_time] ||= 0
+      query_time.round(Gitlab::InstrumentationHelper::DURATION_PRECISION)
     end
 
     def self.query_time=(duration)
@@ -457,7 +458,7 @@ module Gitlab
 
     def self.filesystem_id_from_disk(storage)
       metadata_file = File.read(storage_metadata_file_path(storage))
-      metadata_hash = JSON.parse(metadata_file)
+      metadata_hash = Gitlab::Json.parse(metadata_file)
       metadata_hash['gitaly_filesystem_id']
     rescue Errno::ENOENT, Errno::EACCES, JSON::ParserError
       nil