3 files changed, 10 insertions, 9 deletions
diff --git a/spec/lib/gitlab/metrics/samplers/influx_sampler_spec.rb b/spec/lib/gitlab/metrics/samplers/influx_sampler_spec.rb
index f66451c5188..81954fcf8c5 100644
--- a/spec/lib/gitlab/metrics/samplers/influx_sampler_spec.rb
+++ b/spec/lib/gitlab/metrics/samplers/influx_sampler_spec.rb
@@ -3,10 +3,6 @@ require 'spec_helper'
 describe Gitlab::Metrics::Samplers::InfluxSampler do
   let(:sampler) { described_class.new(5) }
 
-  after do
-    Allocations.stop if Gitlab::Metrics.mri?
-  end
-
   describe '#start' do
     it 'runs once and gathers a sample at a given interval' do
       expect(sampler).to receive(:sleep).with(a_kind_of(Numeric)).twice
diff --git a/spec/lib/gitlab/metrics/samplers/ruby_sampler_spec.rb b/spec/lib/gitlab/metrics/samplers/ruby_sampler_spec.rb
index 54781dd52fc..091645ee86f 100644
--- a/spec/lib/gitlab/metrics/samplers/ruby_sampler_spec.rb
+++ b/spec/lib/gitlab/metrics/samplers/ruby_sampler_spec.rb
@@ -8,10 +8,6 @@ describe Gitlab::Metrics::Samplers::RubySampler do
     allow(Gitlab::Metrics::NullMetric).to receive(:instance).and_return(null_metric)
   end
 
-  after do
-    Allocations.stop if Gitlab::Metrics.mri?
-  end
-
   describe '#sample' do
     it 'samples various statistics' do
       expect(Gitlab::Metrics::System).to receive(:memory_usage)
diff --git a/spec/lib/gitlab/metrics/web_transaction_spec.rb b/spec/lib/gitlab/metrics/web_transaction_spec.rb
index 6eb0600f49e..0b3b23e930f 100644
--- a/spec/lib/gitlab/metrics/web_transaction_spec.rb
+++ b/spec/lib/gitlab/metrics/web_transaction_spec.rb
@@ -194,7 +194,7 @@ describe Gitlab::Metrics::WebTransaction do
         expect(transaction.action).to eq('TestController#show')
       end
 
-      context 'when the response content type is not :html' do
+      context 'when the request content type is not :html' do
         let(:request) { double(:request, format: double(:format, ref: :json)) }
 
         it 'appends the mime type to the transaction action' do
@@ -202,6 +202,15 @@ describe Gitlab::Metrics::WebTransaction do
           expect(transaction.action).to eq('TestController#show.json')
         end
       end
+
+      context 'when the request content type is not' do
+        let(:request) { double(:request, format: double(:format, ref: 'http://example.com')) }
+
+        it 'does not append the MIME type to the transaction action' do
+          expect(transaction.labels).to eq({ controller: 'TestController', action: 'show' })
+          expect(transaction.action).to eq('TestController#show')
+        end
+      end
     end
 
     it 'returns no labels when no route information is present in env' do