Alert if `calls_gitaly` declaration missing

- Move `calls_gitaly_check` to public
- Add instrumentation for flagging missing CallsGitaly declarations
- Wrap resolver proc in before-and-after Gitaly counts to get the net
Gitaly call count for the resolver.

2 files changed, 13 insertions, 10 deletions

diff --git a/app/graphql/gitlab_schema.rb b/app/graphql/gitlab_schema.rb
index 5615909c4ec..152ebb930e2 100644
--- a/app/graphql/gitlab_schema.rb
+++ b/app/graphql/gitlab_schema.rb
@@ -13,6 +13,7 @@ class GitlabSchema < GraphQL::Schema
   use BatchLoader::GraphQL
   use Gitlab::Graphql::Authorize
   use Gitlab::Graphql::Present
+  use Gitlab::Graphql::CallsGitaly
   use Gitlab::Graphql::Connections
   use Gitlab::Graphql::GenericTracing
 
diff --git a/app/graphql/types/base_field.rb b/app/graphql/types/base_field.rb
index 95db116d6f9..64bc7e6474f 100644
--- a/app/graphql/types/base_field.rb
+++ b/app/graphql/types/base_field.rb
@@ -21,6 +21,18 @@ module Types
       complexity
     end
 
+    def calls_gitaly_check(calls)
+      return if @calls_gitaly
+
+      # Will inform you if :calls_gitaly should be true or false based on the number of Gitaly calls
+      # involved with the request.
+      if calls > 0
+        raise "Gitaly is called for field '#{name}' - please add `calls_gitaly: true` to the field declaration"
+      end
+    rescue => e
+      Gitlab::Sentry.track_exception(e)
+    end
+
     private
 
     def field_complexity(resolver_class)
@@ -54,15 +66,5 @@ module Types
         complexity.to_i
       end
     end
-
-    def calls_gitaly_check
-      # Will inform you if :calls_gitaly should be true or false based on the number of Gitaly calls
-      # involved with the request.
-      if @calls_gitaly && Gitlab::GitalyClient.get_request_count == 0
-        raise "Gitaly is called for field '#{name}' - please add `calls_gitaly: true` to the field declaration"
-      end
-    rescue => e
-      Gitlab::Sentry.track_exception(e)
-    end
   end
 end