From 734396f4b67b740d2d1c5f9811eeea7ed4deaadd Mon Sep 17 00:00:00 2001
From: user1 <user1@localhost>
Date: Wed, 8 Jul 2020 14:57:10 +1000
Subject: [PATCH] Updated the domain listeners to track flow completion events

---
 apm-mule3-agent/pom.xml                                      | 2 +-
 .../apm/mule/listeners/DomainApplicationListener.java        | 5 +----
 apm-mule3.8-agent/pom.xml                                    | 2 +-
 .../apm/mule/listeners/DomainApplicationListener.java        | 5 +----
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/apm-mule3-agent/pom.xml b/apm-mule3-agent/pom.xml
index bbc4e7c..0c574d3 100644
--- a/apm-mule3-agent/pom.xml
+++ b/apm-mule3-agent/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>co.elastic.apm</groupId>
 	<artifactId>apm-mule3-agent</artifactId>
-	<version>1.15.1</version>
+	<version>1.15.2</version>
 	<packaging>${packaging}</packaging>
 	<name>Mule apm-mule3-agent Application</name>
 
diff --git a/apm-mule3-agent/src/main/java/co/elastic/apm/mule/listeners/DomainApplicationListener.java b/apm-mule3-agent/src/main/java/co/elastic/apm/mule/listeners/DomainApplicationListener.java
index 38ff487..902d3b4 100644
--- a/apm-mule3-agent/src/main/java/co/elastic/apm/mule/listeners/DomainApplicationListener.java
+++ b/apm-mule3-agent/src/main/java/co/elastic/apm/mule/listeners/DomainApplicationListener.java
@@ -64,13 +64,10 @@ public void onNotification(PipelineMessageNotification notification) {
 					transactionUtils.startTransactionIfNone(notification);
 					break;
 
+				case PipelineMessageNotification.PROCESS_COMPLETE:
 				case PipelineMessageNotification.PROCESS_END:
 					transactionUtils.endTransactionIfNeeded(notification);
 					break;
-
-				case PipelineMessageNotification.PROCESS_COMPLETE:
-					// Ignored, as it is skipped when flow exception is thrown
-					break;
 				}
 			}
 		});
diff --git a/apm-mule3.8-agent/pom.xml b/apm-mule3.8-agent/pom.xml
index c9ad15e..cb4a3ff 100644
--- a/apm-mule3.8-agent/pom.xml
+++ b/apm-mule3.8-agent/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>co.elastic.apm</groupId>
 	<artifactId>apm-mule3.8-agent</artifactId>
-	<version>1.15.1</version>
+	<version>1.15.2</version>
 	<packaging>${packaging}</packaging>
 	<name>Mule apm-mule3-agent Application built for Mule 3.8</name>
 
diff --git a/apm-mule3.8-agent/src/main/java/co/elastic/apm/mule/listeners/DomainApplicationListener.java b/apm-mule3.8-agent/src/main/java/co/elastic/apm/mule/listeners/DomainApplicationListener.java
index 3a272df..ad08da9 100644
--- a/apm-mule3.8-agent/src/main/java/co/elastic/apm/mule/listeners/DomainApplicationListener.java
+++ b/apm-mule3.8-agent/src/main/java/co/elastic/apm/mule/listeners/DomainApplicationListener.java
@@ -64,13 +64,10 @@ public void onNotification(PipelineMessageNotification notification) {
 					transactionUtils.startTransactionIfNone(notification);
 					break;
 
+				case PipelineMessageNotification.PROCESS_COMPLETE:					
 				case PipelineMessageNotification.PROCESS_END:
 					transactionUtils.endTransactionIfNeeded(notification);
 					break;
-
-				case PipelineMessageNotification.PROCESS_COMPLETE:
-					// Ignored, as it is skipped when flow exception is thrown
-					break;
 				}
 			}
 		});