Merge pull request #33 from michaelhyatt/MDC_support

Updated the domain listeners to track flow completion events
michaelhyatt · Jul 8, 2020 · 0c202e6 · 0c202e6
2 parents eb191ee + 734396f
commit 0c202e6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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;
 				}
 			}
 		});