Add latest changes from gitlab-org/gitlab@master

3 files changed, 35 insertions, 4 deletions

diff --git a/spec/lib/gitlab/graphql/tracers/logger_tracer_spec.rb b/spec/lib/gitlab/graphql/tracers/logger_tracer_spec.rb
index d83ac4dabc5..5bc077a963e 100644
--- a/spec/lib/gitlab/graphql/tracers/logger_tracer_spec.rb
+++ b/spec/lib/gitlab/graphql/tracers/logger_tracer_spec.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
-require "fast_spec_helper"
-require "support/graphql/fake_query_type"
+require "spec_helper"
 
 RSpec.describe Gitlab::Graphql::Tracers::LoggerTracer do
   let(:dummy_schema) do
@@ -49,4 +48,15 @@ RSpec.describe Gitlab::Graphql::Tracers::LoggerTracer do
 
     dummy_schema.execute(query_string, variables: variables)
   end
+
+  it 'logs exceptions for breaking queries' do
+    query_string = "query fooOperation { breakingField }"
+
+    expect(::Gitlab::GraphqlLogger).to receive(:info).with(a_hash_including({
+      'exception.message' => 'This field is supposed to break',
+      'exception.class' => 'RuntimeError'
+    }))
+
+    expect { dummy_schema.execute(query_string) }.to raise_error(/This field is supposed to break/)
+  end
 end
diff --git a/spec/lib/gitlab/graphql/tracers/metrics_tracer_spec.rb b/spec/lib/gitlab/graphql/tracers/metrics_tracer_spec.rb
index ff6a76aa319..168f5aa529e 100644
--- a/spec/lib/gitlab/graphql/tracers/metrics_tracer_spec.rb
+++ b/spec/lib/gitlab/graphql/tracers/metrics_tracer_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'fast_spec_helper'
+require 'spec_helper'
 require 'rspec-parameterized'
 require "support/graphql/fake_query_type"
 
@@ -36,7 +36,7 @@ RSpec.describe Gitlab::Graphql::Tracers::MetricsTracer do
     end
 
     with_them do
-      it 'increments sli' do
+      it 'increments apdex sli' do
         # Trigger initialization
         fake_schema
 
@@ -56,5 +56,13 @@ RSpec.describe Gitlab::Graphql::Tracers::MetricsTracer do
         fake_schema.execute("query lorem { helloWorld }")
       end
     end
+
+    it "does not record apdex for failing queries" do
+      query_string = "query fooOperation { breakingField }"
+
+      expect(Gitlab::Metrics::RailsSlis.graphql_query_apdex).not_to receive(:increment)
+
+      expect { fake_schema.execute(query_string) }.to raise_error(/This field is supposed to break/)
+    end
   end
 end
diff --git a/spec/lib/gitlab/graphql/tracers/timer_tracer_spec.rb b/spec/lib/gitlab/graphql/tracers/timer_tracer_spec.rb
index 7f837e28772..986120dcd95 100644
--- a/spec/lib/gitlab/graphql/tracers/timer_tracer_spec.rb
+++ b/spec/lib/gitlab/graphql/tracers/timer_tracer_spec.rb
@@ -20,6 +20,7 @@ RSpec.describe Gitlab::Graphql::Tracers::TimerTracer do
 
   before do
     current_time = 0
+    allow(tracer_spy).to receive(:trace)
     allow(Gitlab::Metrics::System).to receive(:monotonic_time) do
       current_time += expected_duration
     end
@@ -30,6 +31,18 @@ RSpec.describe Gitlab::Graphql::Tracers::TimerTracer do
 
     dummy_schema.execute(query_string)
 
+    expect_to_have_traced(tracer_spy, expected_duration, query_string)
+  end
+
+  it "adds a duration_s even if the query failed" do
+    query_string = "query fooOperation { breakingField }"
+
+    expect { dummy_schema.execute(query_string) }.to raise_error(/This field is supposed to break/)
+
+    expect_to_have_traced(tracer_spy, expected_duration, query_string)
+  end
+
+  def expect_to_have_traced(tracer_spy, expected_duration, query_string)
     # "parse" and "execute_query" are just arbitrary trace events
     expect(tracer_spy).to have_received(:trace).with("parse", {
       duration_s: expected_duration,