1 files changed, 15 insertions, 18 deletions
diff --git a/app/controllers/graphql_controller.rb b/app/controllers/graphql_controller.rb
index 3d3b7f31dfd..5c0c2b4adf2 100644
--- a/app/controllers/graphql_controller.rb
+++ b/app/controllers/graphql_controller.rb
@@ -14,6 +14,7 @@ class GraphqlController < ApplicationController
 
   # The query string of a standard IntrospectionQuery, used to compare incoming requests for caching
   CACHED_INTROSPECTION_QUERY_STRING = CachedIntrospectionQuery.query_string
+  INTROSPECTION_QUERY_OPERATION_NAME = 'IntrospectionQuery'
 
   # If a user is using their session to access GraphQL, we need to have session
   # storage, since the admin-mode check is session wide.
@@ -58,7 +59,7 @@ class GraphqlController < ApplicationController
   urgency :low, [:execute]
 
   def execute
-    result = if Feature.enabled?(:cache_introspection_query) && params[:operationName] == 'IntrospectionQuery'
+    result = if Feature.enabled?(:cache_introspection_query) && introspection_query?
                execute_introspection_query
              else
                multiplex? ? execute_multiplex : execute_query
@@ -276,9 +277,6 @@ class GraphqlController < ApplicationController
 
   def execute_introspection_query
     if introspection_query_can_use_cache?
-      Gitlab::AppLogger.info(message: "IntrospectionQueryCache hit")
-      log_introspection_query_cache_details(true)
-
       # Context for caching: https://gitlab.com/gitlab-org/gitlab/-/issues/409448
       Rails.cache.fetch(
         introspection_query_cache_key,
@@ -286,17 +284,12 @@ class GraphqlController < ApplicationController
           execute_query.to_json
         end
     else
-      Gitlab::AppLogger.info(message: "IntrospectionQueryCache miss")
-      log_introspection_query_cache_details(false)
-
       execute_query
     end
   end
 
   def introspection_query_can_use_cache?
-    graphql_query = GraphQL::Query.new(GitlabSchema, query: query, variables: build_variables(params[:variables]))
-
-    CACHED_INTROSPECTION_QUERY_STRING == graphql_query.query_string.squish
+    CACHED_INTROSPECTION_QUERY_STRING == graphql_query_object.query_string.squish
   end
 
   def introspection_query_cache_key
@@ -306,13 +299,17 @@ class GraphqlController < ApplicationController
     ['introspection-query-cache', Gitlab.revision, context[:remove_deprecated]]
   end
 
-  def log_introspection_query_cache_details(can_use_introspection_query_cache)
-    Gitlab::AppLogger.info(
-      message: "IntrospectionQueryCache",
-      can_use_introspection_query_cache: can_use_introspection_query_cache.to_s,
-      query: query,
-      variables: build_variables(params[:variables]).to_s,
-      introspection_query_cache_key: introspection_query_cache_key.to_s
-    )
+  def introspection_query?
+    if params.key?(:operationName)
+      params[:operationName] == INTROSPECTION_QUERY_OPERATION_NAME
+    else
+      # If we don't provide operationName param, we infer it from the query
+      graphql_query_object.selected_operation_name == INTROSPECTION_QUERY_OPERATION_NAME
+    end
+  end
+
+  def graphql_query_object
+    @graphql_query_object ||= GraphQL::Query.new(GitlabSchema, query: query,
+      variables: build_variables(params[:variables]))
   end
 end