catchpoint · jefflembeck · Jan 18, 2022 · Jan 14, 2022
diff --git a/www/breakdown.inc b/www/breakdown.inc
@@ -5,11 +5,6 @@
 require_once('object_detail.inc');
 require_once('contentColors.inc');
 
-if(extension_loaded('newrelic')) {
-    newrelic_add_custom_tracer('getBreakdown');
-    newrelic_add_custom_tracer('getBreakdownCombined');
-}
-
 define('BREAKDOWN_CACHE_VERSION', 4);
 
 /**

diff --git a/www/common.inc b/www/common.inc
@@ -163,8 +163,6 @@ if (isset($_REQUEST['embed'])) {
     define('BARE_UI', true);
     define('NAV_NO_SHARE', true);
     $noanalytics = true;
-    if (extension_loaded('newrelic'))
-      @newrelic_disable_autorum();
 }
 $is_ssl = isSslConnection();
 $GLOBALS['cdnPath'] = '';
@@ -272,9 +270,6 @@ $median_metric = GetSetting('medianMetric') ? GetSetting('medianMetric') : 'load
 $testLabel = '';
 $page_title = 'WebPageTest Test';
 if (strlen($id)) {
-    if(extension_loaded('newrelic')) {
-        newrelic_add_custom_parameter ('testID', $id);
-    }  
     if (isset($_REQUEST['rkey']) && @strlen($_REQUEST['rkey'])) {
         // We are serving a relay request, so munge the id accordingly.
         $id = trim(htmlspecialchars($_REQUEST['rkey'])) . ".$id";

diff --git a/www/common_lib.inc b/www/common_lib.inc
@@ -5,10 +5,6 @@
 require_once(__DIR__ . '/archive.inc');
 require_once(__DIR__ . '/util.inc');
 
-if(extension_loaded('newrelic')) {
-  newrelic_add_custom_tracer('RestoreTest');
-}
-
 define('VIDEO_CODE_VERSION', 20);
 
 require_once(__DIR__ . '/logging.inc');

diff --git a/www/devtools.inc.php b/www/devtools.inc.php
@@ -5,17 +5,6 @@
 $DevToolsCacheVersion = '1.7';
 require_once __DIR__ . '/include/TestPaths.php';
 
-if(extension_loaded('newrelic')) { 
-    newrelic_add_custom_tracer('GetTimeline');
-    newrelic_add_custom_tracer('GetDevToolsRequests');
-    newrelic_add_custom_tracer('GetDevToolsEventsForStep');
-    newrelic_add_custom_tracer('DevToolsGetConsoleLog');
-    newrelic_add_custom_tracer('DevToolsGetCPUSlicesForStep');
-    newrelic_add_custom_tracer('GetDevToolsCPUTime');
-    newrelic_add_custom_tracer('ParseDevToolsEvents');
-    newrelic_add_custom_tracer('DevToolsMatchEvent');
-}
-
 /**
 * Load the timeline data for the given test run (from a timeline file or a raw dev tools dump)
 * 

diff --git a/www/ec2/ec2.inc.php b/www/ec2/ec2.inc.php
@@ -5,18 +5,6 @@
 require_once('./common_lib.inc');
 require_once('./lib/aws/aws-autoloader.php');
 
-if(extension_loaded('newrelic')) {
-    newrelic_add_custom_tracer('EC2_StartInstanceIfNeeded');
-    newrelic_add_custom_tracer('EC2_StartInstance');
-    newrelic_add_custom_tracer('EC2_TerminateIdleInstances');
-    newrelic_add_custom_tracer('EC2_GetRunningInstances');
-    newrelic_add_custom_tracer('EC2_SendInstancesOffline');
-    newrelic_add_custom_tracer('EC2_StartNeededInstances');
-    newrelic_add_custom_tracer('EC2_TerminateInstance');
-    newrelic_add_custom_tracer('EC2_LaunchInstance');
-}
-
-
 /**
 * Tests are pending for the given location, start instances as necessary
 * 

diff --git a/www/footer.inc b/www/footer.inc
@@ -51,9 +51,5 @@
         include('./settings/customfooter.inc.php');
     }
     ?>
-    <?php
-    if(!isset($noanalytics) && extension_loaded('newrelic'))
-        echo @newrelic_get_browser_timing_footer();
-    ?>
 
     <div id="experiment-timing" style="color: #77A;"></div>
diff --git a/www/head.inc b/www/head.inc
@@ -46,8 +46,6 @@ if( strlen($page_description) )
 }
 </style>
 <?php 
-    if(!isset($noanalytics) && extension_loaded('newrelic'))
-        echo @newrelic_get_browser_timing_header();
     if (file_exists('./settings/server/customhead.inc.php')) {
         include('./settings/server/customhead.inc.php');
     } elseif (file_exists('./settings/common/customhead.inc.php')) {

diff --git a/www/object_detail.inc b/www/object_detail.inc
@@ -5,14 +5,6 @@
 require_once __DIR__ . '/devtools.inc.php';
 require_once __DIR__ . '/include/UrlGenerator.php';
 
-if(extension_loaded('newrelic')) {
-    newrelic_add_custom_tracer('LoadRequests');
-    newrelic_add_custom_tracer('FixUpRequestTimes');
-    newrelic_add_custom_tracer('AddHeaders');
-    newrelic_add_custom_tracer('AddResponseBodyFlags');
-    newrelic_add_custom_tracer('BuildRequestDependencies');
-}
-
 /**
 * Load the object data file.
 */

diff --git a/www/runtest.php b/www/runtest.php
@@ -2,13 +2,6 @@
 // Copyright 2020 Catchpoint Systems Inc.
 // Use of this source code is governed by the Polyform Shield 1.0.0 license that can be
 // found in the LICENSE.md file.
-    if(extension_loaded('newrelic')) {
-        newrelic_add_custom_tracer('CheckUrl');
-        newrelic_add_custom_tracer('CheckIp');
-        newrelic_add_custom_tracer('WptHookValidateTest');
-        newrelic_add_custom_tracer('GetRedirect');
-        newrelic_add_custom_tracer('ReportAnalytics');
-    }
 
     // deal with magic quotes being enabled
     if (get_magic_quotes_gpc()) {

diff --git a/www/templates/layouts/footer.inc b/www/templates/layouts/footer.inc
@@ -50,9 +50,5 @@ if( !strcasecmp('Test Result', $tab) && (!isset($nosubheader) || !@$nosubheader)
         require(__DIR__ . '/../../settings/customfooter.inc.php');
     }
     ?>
-    <?php
-    if(!isset($noanalytics) && extension_loaded('newrelic'))
-        echo @newrelic_get_browser_timing_footer();
-    ?>
 
     <div id="experiment-timing" style="color: #77A;"></div>
diff --git a/www/templates/layouts/head.inc b/www/templates/layouts/head.inc
@@ -46,8 +46,6 @@ if( strlen($page_description) )
 }
 </style>
 <?php
-    if(!isset($noanalytics) && extension_loaded('newrelic'))
-        echo @newrelic_get_browser_timing_header();
     if (file_exists(__DIR__ . '/../../settings/server/customhead.inc.php')) {
         include(__DIR__ . '/../../settings/server/customhead.inc.php');
     } elseif (file_exists(__DIR__ . '/../../settings/common/customhead.inc.php')) {

diff --git a/www/testStatus.inc b/www/testStatus.inc
@@ -4,9 +4,6 @@
 // found in the LICENSE.md file.
 require_once(__DIR__ . '/common_lib.inc');
 require_once(__DIR__ . '/page_data.inc');
-if(extension_loaded('newrelic')) {
-    newrelic_add_custom_tracer('GetRelayStatus');
-}
 
 $testQueue = array();
 $testInfoJson = null;

diff --git a/www/testlog.php b/www/testlog.php
@@ -51,13 +51,6 @@
 if (isset($filterstr) && $supportsGrep)
   $filterstr = trim(escapeshellarg(str_replace(array('"', "'", '\\'), '', trim($filterstr))), "'\"");
 
-if(extension_loaded('newrelic')) {
-  newrelic_add_custom_parameter('filter', $filter);
-  newrelic_add_custom_parameter('days', $days);
-  newrelic_add_custom_parameter('all', $all);
-  newrelic_add_custom_parameter('nolimit', $nolimit);
-}
-
 $includeip      = false;
 $includePrivate = false;
 if ($admin) {

diff --git a/www/thumbnail.php b/www/thumbnail.php
@@ -2,15 +2,6 @@
 // Copyright 2020 Catchpoint Systems Inc.
 // Use of this source code is governed by the Polyform Shield 1.0.0 license that can be
 // found in the LICENSE.md file.
-if(extension_loaded('newrelic')) {
-    newrelic_add_custom_tracer('tbnDrawWaterfall');
-    newrelic_add_custom_tracer('tbnDrawChecklist');
-    newrelic_add_custom_tracer('tbnLoadImage');
-    newrelic_add_custom_tracer('GenerateThumbnail');
-    newrelic_add_custom_tracer('SendImage');
-    newrelic_add_custom_tracer('getRequests');
-    newrelic_add_custom_tracer('loadPageRunData');
-}
 
 if(array_key_exists("HTTP_IF_MODIFIED_SINCE",$_SERVER) && strlen(trim($_SERVER['HTTP_IF_MODIFIED_SINCE'])))
 {

diff --git a/www/updateFeeds.php b/www/updateFeeds.php
@@ -2,9 +2,6 @@
 // Copyright 2020 Catchpoint Systems Inc.
 // Use of this source code is governed by the Polyform Shield 1.0.0 license that can be
 // found in the LICENSE.md file.
-if(extension_loaded('newrelic')) {
-    newrelic_add_custom_tracer('UpdateFeeds');
-}
 
 /**
 * Update the feeds

diff --git a/www/video/visualProgress.inc.php b/www/video/visualProgress.inc.php
@@ -3,10 +3,6 @@
 // Use of this source code is governed by the Polyform Shield 1.0.0 license that can be
 // found in the LICENSE.md file.
 
-if(extension_loaded('newrelic')) {
-    newrelic_add_custom_tracer('GetVisualProgress');
-    newrelic_add_custom_tracer('GetImageHistogram');
-}
 require_once(__DIR__ . '/../devtools.inc.php');
 
 /**

diff --git a/www/work/getwork.php b/www/work/getwork.php
@@ -2,21 +2,6 @@
 // Copyright 2020 Catchpoint Systems Inc.
 // Use of this source code is governed by the Polyform Shield 1.0.0 license that can be
 // found in the LICENSE.md file.
-if(extension_loaded('newrelic')) { 
-  newrelic_add_custom_tracer('GetUpdate');
-  newrelic_add_custom_tracer('GetJob');
-  newrelic_add_custom_tracer('GetTestJob');
-  newrelic_add_custom_tracer('CheckCron');
-  newrelic_add_custom_tracer('GetTesters');
-  newrelic_add_custom_tracer('LockLocation');
-  newrelic_add_custom_tracer('GetLocationInfo');
-  newrelic_add_custom_tracer('LockTest');
-  newrelic_add_custom_tracer('UpdateTester');
-  newrelic_add_custom_tracer('GetTesterIndex');
-  newrelic_add_custom_tracer('StartTest');
-  newrelic_add_custom_tracer('TestToJSON');
-  newrelic_add_custom_tracer('logTestMsg');
-}
 
 chdir('..');
 include 'common.inc';

diff --git a/www/work/postprocess.php b/www/work/postprocess.php
@@ -20,13 +20,6 @@
 if (function_exists('fastcgi_finish_request'))
   fastcgi_finish_request();
 
-if(extension_loaded('newrelic')) {
-  newrelic_add_custom_tracer('ArchiveTest');
-  newrelic_add_custom_tracer('loadAllPageData');
-  newrelic_add_custom_tracer('SendBeacon');
-  newrelic_add_custom_tracer('SendCallback');
-}
-
 if (array_key_exists('test', $_REQUEST)) {
   $id = $_REQUEST['test'];
   if (ValidateTestId($id)) {

diff --git a/www/work/workdone.php b/www/work/workdone.php
@@ -2,25 +2,6 @@
 // Copyright 2020 Catchpoint Systems Inc.
 // Use of this source code is governed by the Polyform Shield 1.0.0 license that can be
 // found in the LICENSE.md file.
-if(extension_loaded('newrelic')) {
-  newrelic_add_custom_tracer('ProcessRun');
-  newrelic_add_custom_tracer('loadAllPageData');
-  newrelic_add_custom_tracer('getRequestsForStep');
-  newrelic_add_custom_tracer('LockTest');
-  newrelic_add_custom_tracer('UpdateTester');
-  newrelic_add_custom_tracer('GetVisualProgressForStep');
-  newrelic_add_custom_tracer('GetDevToolsCPUTimeForStep');
-  newrelic_add_custom_tracer('GetDevToolsRequestsForStep');
-  newrelic_add_custom_tracer('loadUserTimingData');
-  newrelic_add_custom_tracer('GetVisualProgress');
-  newrelic_add_custom_tracer('DevToolsGetConsoleLog');
-  newrelic_add_custom_tracer('SecureDir');
-  newrelic_add_custom_tracer('loadPageRunData');
-  newrelic_add_custom_tracer('loadPageStepData');
-  newrelic_add_custom_tracer('ParseUserTiming');
-  newrelic_add_custom_tracer('CalculateTimeToInteractive');
-
-}
 
 chdir('..');
 //$debug = true;
@@ -70,10 +51,6 @@
 ob_flush();
 flush();
 
-if(extension_loaded('newrelic')) {
-  newrelic_add_custom_parameter('test', $id);
-}
-
 $workdone_start = microtime(true);
 
 //logmsg(json_encode($_REQUEST), './work/workdone.log', true);

diff --git a/www/xmlResult.php b/www/xmlResult.php
@@ -2,15 +2,6 @@
 // Copyright 2020 Catchpoint Systems Inc.
 // Use of this source code is governed by the Polyform Shield 1.0.0 license that can be
 // found in the LICENSE.md file.
-if(extension_loaded('newrelic')) { 
-  newrelic_add_custom_tracer('GetTestStatus');
-  newrelic_add_custom_tracer('calculatePageStats');
-  newrelic_add_custom_tracer('xmlDomains');
-  newrelic_add_custom_tracer('xmlBreakdown');
-  newrelic_add_custom_tracer('xmlRequests');
-  newrelic_add_custom_tracer('GetVisualProgress');
-  newrelic_add_custom_tracer('ArchiveApi');
-}
 
 $msStart = microtime(true);