Issue #272: Ensure that indexes are grouped together.

classes/script_metadata.php

@@ -145,24 +145,15 @@ function ($i) {
     }
 
     /**
-     * Gets the name of the script.
+     * Gets the name of the script that is being run for the request.
      *
      * @return string the request path for this profile.
      */
-    public static function get_request(): string {
-        global $SCRIPT, $ME, $CFG;
-
-        if (!isset($ME)) {
-            // If set, it will trim off the leading '/' to normalise web & cli requests.
-            $request = isset($SCRIPT) ? ltrim($SCRIPT, '/') : self::REQUEST_UNKNOWN;
-            return $request;
-        }
-
-        $request = (new \moodle_url($ME))->out_omit_querystring();
-        $request = str_replace($CFG->wwwroot, '', $request);
-        $request = ltrim($request, '/');
-        return $request;
+    public static function get_request_script_name(): string {
+        global $SCRIPT;
 
+        // If set, it will trim off the leading '/' to normalise web & cli requests.
+        $request = isset($SCRIPT) ? ltrim($SCRIPT, '/') : self::REQUEST_UNKNOWN;
         return $request;
     }
 

classes/web_processor.php

@@ -45,7 +45,7 @@ public function init(manager $manager) {
         // Record and set initial memory usage at this point.
         $memoryusage = memory_get_usage();
 
-        $request = script_metadata::get_request();
+        $request = script_metadata::get_request_script_name();
         $starttime = (int) $manager->get_starttime();
         $this->sampleset = new sample_set($request, $starttime);