Merge pull request #61 from InteractionDesignFoundation/laravel-5.7

Fix queue transaction listeners to work with Laravel/Lumen 5.3+
In-Touch · Feb 6, 2019 · 18673d9 · 18673d9
2 parents d8d29b8 + 40d63de
commit 18673d9
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 45 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 | Laravel Version | Package Tag | Supported |
 |-----------------|-------------|-----------|
-| 5.4.x | 2.2.x | yes |
+| 5.x.x | 2.2.x | yes |
 | 5.2.x | 2.1.x | yes |
 | 5.1.x | 2.0.x | yes |
 | 5.0.x | 2.0.x | no |

diff --git a/src/Intouch/LaravelNewrelic/LumenNewrelicServiceProvider.php b/src/Intouch/LaravelNewrelic/LumenNewrelicServiceProvider.php
@@ -3,6 +3,7 @@
 namespace Intouch\LaravelNewrelic;
 
 use Illuminate\Queue\Events\JobProcessed;
+use Illuminate\Queue\Events\JobProcessing;
 use Illuminate\Support\ServiceProvider;
 use Intouch\Newrelic\Newrelic;
 
@@ -23,7 +24,7 @@ function ( $app ) {
 			}
 		);
 
-		app('queue')->before(function (JobProcessed $event) {
+		app('queue')->before(function (JobProcessing $event) {
 			app('newrelic')->backgroundJob( true );
 			app('newrelic')->startTransaction( ini_get('newrelic.appname') );
 			if (app('config')->get( 'newrelic.auto_name_jobs' )) {
@@ -41,24 +42,18 @@ function ( $app ) {
 	*
 	* @return string
 	*/
-	public function getJobName(JobProcessed $event)
+	public function getJobName(JobProcessing $event)
 	{
-		return str_replace(
-			[
-				'{connection}',
-				'{class}',
-				'{data}',
-				'{args}',
-				'{input}',
-			],
-			[
-				$event->connectionName,
-				get_class($event->job),
-				json_encode($event->data),
-				implode(', ', array_keys($event->data)),
-				implode(', ', array_values($event->data)),
-			],
-			$this->app['config']->get( 'newrelic.job_name_provider' )
-		);
+        return str_replace(
+            [
+                '{connection}',
+                '{class}',
+            ],
+            [
+                $event->connectionName,
+                $event->job->resolveName(),
+            ],
+            $this->app['config']->get( 'newrelic.job_name_provider' )
+        );
 	}
 }
diff --git a/src/Intouch/LaravelNewrelic/NewrelicServiceProvider.php b/src/Intouch/LaravelNewrelic/NewrelicServiceProvider.php
@@ -17,6 +17,7 @@
 namespace Intouch\LaravelNewrelic;
 
 use Illuminate\Queue\Events\JobProcessed;
+use Illuminate\Queue\Events\JobProcessing;
 use Illuminate\Routing\Events\RouteMatched;
 use Illuminate\Support\ServiceProvider;
 use Intouch\Newrelic\Newrelic;
@@ -92,7 +93,7 @@ protected function registerQueueTransactions()
 	{
 		$app = $this->app;
 
-		$app['queue']->before(function (JobProcessed $event) use ( $app ) {
+		$app['queue']->before(function (JobProcessing $event) use ( $app ) {
 			$app['newrelic']->backgroundJob( true );
 			$app['newrelic']->startTransaction( ini_get('newrelic.appname') );
 			if ($app['config']->get( 'newrelic.auto_name_jobs' )) {
@@ -114,18 +115,18 @@ public function getTransactionName()
 	{
 		return str_replace(
 			[
-			    '{controller}',
-			    '{method}',
-			    '{route}',
-			    '{path}',
-			    '{uri}',
+				'{controller}',
+				'{method}',
+				'{route}',
+				'{path}',
+				'{uri}',
 			],
 			[
-			    $this->getController(),
-			    $this->getMethod(),
-			    $this->getRoute(),
-			    $this->getPath(),
-			    $this->getUri(),
+				$this->getController(),
+				$this->getMethod(),
+				$this->getRoute(),
+				$this->getPath(),
+				$this->getUri(),
 			],
 			$this->app['config']->get( 'newrelic.name_provider' )
 		);
@@ -134,24 +135,19 @@ public function getTransactionName()
 	/**
 	 * Build the job name
 	 *
+	 * @param JobProcessing $event
 	 * @return string
 	 */
-	public function getJobName(JobProcessed $event)
+	public function getJobName(JobProcessing $event)
 	{
 		return str_replace(
 			[
-			    '{connection}',
-			    '{class}',
-			    '{data}',
-			    '{args}',
-			    '{input}',
+				'{connection}',
+				'{class}',
 			],
 			[
-			    $event->connectionName,
-			    get_class($event->job),
-			    json_encode($event->data),
-			    implode(', ', array_keys($event->data)),
-			    implode(', ', array_values($event->data)),
+				$event->connectionName,
+				$event->job->resolveName(),
 			],
 			$this->app['config']->get( 'newrelic.job_name_provider' )
 		);

diff --git a/src/config/config.php b/src/config/config.php
@@ -48,9 +48,6 @@
 	 *      a pattern you define yourself, available tokens:
 	 *          {connection} = The name of the queue connection
 	 *          {class} = The name of the job class
-	 *          {data} = JSON string with all data passed to the job
-	 *          {args} = List of variable names passed to the job
-	 *          {input} = List of values passed to the job
 	 *      anything that is not a matched token will remain a string literal
 	 *      example:
 	 *          Given a job named App\MyJob, with data {"subject":"hello","to":"world"},