Merge pull request #944 from humanmade/backport-940-to-v21-branch

[Backport v21-branch] Remove job level cavalcade metrics

inc/cavalcade_runner_to_cloudwatch/namespace.php

@@ -59,7 +59,7 @@ function on_job_completed( Worker $worker, Job $job ) {
 }
 
 /**
- * Called when a job completed or failed via Cavalcade, and sends a Dureaction metric to CloudWatch.
+ * Called when a job completed or failed via Cavalcade, and sends a Duration metric to CloudWatch.
  *
  * @param Worker $worker The Cavalcade runner process.
  * @param Job $job The current Cavalcade cron job.
@@ -74,20 +74,6 @@ function on_end_job( Worker $worker, Job $job, string $status ) {
 
 	// Batch all the metrics together to avoid many API calls.
 	$data = [];
-	$data[] = [
-		'MetricName' => $status_metric,
-		'Dimensions' => [
-			[
-				'Name' => 'Application',
-				'Value' => HM_ENV,
-			],
-			[
-				'Name' => 'Job',
-				'Value' => $job->hook,
-			],
-		],
-		'Value' => 1,
-	];
 	$data[] = [
 		'MetricName' => $status_metric,
 		'Dimensions' => [
@@ -103,20 +89,6 @@ function on_end_job( Worker $worker, Job $job, string $status ) {
 		'Value' => 1,
 	];
 
-	$data[] = [
-		'MetricName' => 'Invocations',
-		'Dimensions' => [
-			[
-				'Name' => 'Application',
-				'Value' => HM_ENV,
-			],
-			[
-				'Name' => 'Job',
-				'Value' => $job->hook,
-			],
-		],
-		'Value' => 1,
-	];
 	$data[] = [
 		'MetricName' => 'Invocations',
 		'Dimensions' => [
@@ -131,35 +103,6 @@ function on_end_job( Worker $worker, Job $job, string $status ) {
 		'MetricName' => 'Invocations',
 		'Value' => 1,
 	];
-	$data[] = [
-		'MetricName' => 'Duration',
-		'Dimensions' => [
-			[
-				'Name' => 'Application',
-				'Value' => HM_ENV,
-			],
-			[
-				'Name' => 'Job',
-				'Value' => $job->hook,
-			],
-		],
-		'Value' => $duration,
-	];
-	$data[] = [
-		'MetricName' => 'Duration',
-		'Unit' => 'Seconds',
-		'Dimensions' => [
-			[
-				'Name' => 'Application',
-				'Value' => HM_ENV,
-			],
-			[
-				'Name' => 'Job',
-				'Value' => $job->hook,
-			],
-		],
-		'Value' => $duration,
-	];
 	$data[] = [
 		'MetricName' => 'Duration',
 		'Unit' => 'Seconds',