Merge branch 'master' into 22643-manual-job-page

* master: (68 commits)
  Last push event widget width for fixed layout
  Added 'admin' persona
  Docs: move article Artifactory + GL to subject-related folder
  Mention GitLab Pages when changing username
  Consolidate the docs when changing a repo path
  Add docs for automatic redirects when renaming namespaces
  move "Transfer an existing project into a group" to project docs
  Do not show Vue pagination if only one page
  Resolve "Decouple multi-file editor from file list"
  Update Ruby version to 2.3.6
  Skip projects filter on merge requests search
  Fall back to the `MergeRequestWidgetEntity`
  LDAP extern_uids are not normalized when updated via API
  organise content by subject
  Restore missing language code in datetime_utility.js
  Add support for defining explicit dependencies to QA factories
  Document mounting volumes with Docker-in-Docker
  add missing word to pawel-reduce_cardinality_of_prometheus_metrics.yml
  Use seconds where possible, and convert to milliseconds for Influxdb consumption
  update dispatcher to allow for dynamic imports until webpack plugin is updated
  ...

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/gitlab/metrics/samplers/ruby_sampler.rb b/lib/gitlab/metrics/samplers/ruby_sampler.rb
index b68800417a2..4e1ea62351f 100644
--- a/lib/gitlab/metrics/samplers/ruby_sampler.rb
+++ b/lib/gitlab/metrics/samplers/ruby_sampler.rb
@@ -52,7 +52,7 @@ module Gitlab
           metrics[:memory_usage].set(labels, System.memory_usage)
           metrics[:file_descriptors].set(labels, System.file_descriptor_count)
 
-          metrics[:sampler_duration].observe(labels.merge(worker_label), (System.monotonic_time - start_time) / 1000.0)
+          metrics[:sampler_duration].observe(labels.merge(worker_label), System.monotonic_time - start_time)
         ensure
           GC::Profiler.clear
         end