PR comments

server/app/controllers/concerns/analytics.rb

@@ -5,9 +5,9 @@ def get_trace_mode(request)
     return unless Rails.env.production?
 
     query_types = %w[search-genes search-drugs]
-    if request.headers['dgidb-client-name'] == 'dgidb-frontend' && query_types.include?(request.headers['dgidb-query-type'])
-      :frontend_analytics
-    elsif request.headers['RAW_POST_DATA'] && !request.headers['RAW_POST_DATA'].include?('IntrospectionQuery')
+    if request.headers['dgidb-client-name'] == 'dgidb-frontend'
+      :frontend_analytics if query_types.include?(request.headers['dgidb-query-type'])
+    else
       :api_analytics
     end
   end

server/app/controllers/graphql_controller.rb

@@ -8,8 +8,11 @@ def execute
     variables = prepare_variables(params[:variables])
     query = params[:query]
     operation_name = params[:operationName]
-    trace_mode = Analytics.get_trace_mode(request)
-    result = DgidbSchema.execute(query, variables: variables, context: { trace_mode: }, operation_name: operation_name)
+    context = {
+      trace_mode: Analytics.get_trace_mode(request),
+      request_ip: request.remote_ip
+    }
+    result = DgidbSchema.execute(query, variables: variables, context:, operation_name: operation_name)
     render json: result
   rescue StandardError => e
     raise e unless Rails.env.development?

server/app/lib/api_analytics_tracer.rb

@@ -1,6 +1,10 @@
 module ApiAnalyticsTracer
   API_LOGGER = Logger.new(File.join(Rails.root, 'log', 'api-queries.log'))
   def analyze_query(query: )
+    query_type = query.selected_operation.selections&.first&.name
+
+    return unless query_type == '__schema'
+
     params = {
       user_ip: query.context[:request_ip],
       query: query.query_string.squish,