summaryrefslogtreecommitdiff
path: root/lib/gitlab
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2018-06-20 16:33:22 +0000
committerStan Hu <stanhu@gmail.com>2018-06-20 16:33:22 +0000
commitc9eb56d511eeda596741045ab1964bfba0e6186e (patch)
treea692b873fac674b35fbfed92fcee30b16a8115d8 /lib/gitlab
parent40a66cb550cf7b5e1b0a6e3816b91026ba2dd6ca (diff)
parentd527b468025922c04ba03edffb7ef33300ec9bb6 (diff)
downloadgitlab-ce-c9eb56d511eeda596741045ab1964bfba0e6186e.tar.gz
Merge branch 'remove-allocations-gem' into 'master'
Remove remaining traces of the Allocations Gem See merge request gitlab-org/gitlab-ce!20029
Diffstat (limited to 'lib/gitlab')
-rw-r--r--lib/gitlab/metrics/samplers/influx_sampler.rb6
-rw-r--r--lib/gitlab/metrics/samplers/ruby_sampler.rb10
2 files changed, 0 insertions, 16 deletions
diff --git a/lib/gitlab/metrics/samplers/influx_sampler.rb b/lib/gitlab/metrics/samplers/influx_sampler.rb
index 5a0f7f28fc8..ad97632e4eb 100644
--- a/lib/gitlab/metrics/samplers/influx_sampler.rb
+++ b/lib/gitlab/metrics/samplers/influx_sampler.rb
@@ -16,12 +16,6 @@ module Gitlab
@last_minor_gc = Delta.new(GC.stat[:minor_gc_count])
@last_major_gc = Delta.new(GC.stat[:major_gc_count])
-
- if Gitlab::Metrics.mri?
- require 'allocations'
-
- Allocations.start
- end
end
def sample
diff --git a/lib/gitlab/metrics/samplers/ruby_sampler.rb b/lib/gitlab/metrics/samplers/ruby_sampler.rb
index 4e1ea62351f..a39b3bc158c 100644
--- a/lib/gitlab/metrics/samplers/ruby_sampler.rb
+++ b/lib/gitlab/metrics/samplers/ruby_sampler.rb
@@ -20,16 +20,6 @@ module Gitlab
{}
end
- def initialize(interval)
- super(interval)
-
- if Metrics.mri?
- require 'allocations'
-
- Allocations.start
- end
- end
-
def init_metrics
metrics = {}
metrics[:sampler_duration] = Metrics.histogram(with_prefix(:sampler_duration, :seconds), 'Sampler time', { worker: nil })