Skip to content
This repository was archived by the owner on Jun 11, 2024. It is now read-only.

Commit

Permalink
Added support for agent 1.8.0 and Mule 3.9.3
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelhyatt authored and michaelhyatt committed Aug 7, 2019
1 parent 5140ad3 commit 2037064
Show file tree
Hide file tree
Showing 11 changed files with 61 additions and 57 deletions.
6 changes: 3 additions & 3 deletions apm-mule3-agent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>co.elastic.apm</groupId>
<artifactId>apm-mule3-agent</artifactId>
<version>1.7.0</version>
<version>1.8.0</version>
<packaging>${packaging}</packaging>
<name>Mule apm-mule3-agent Application</name>

Expand All @@ -30,10 +30,10 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<mule.version>3.9.0</mule.version>
<mule.version>3.9.3</mule.version>
<mule.tools.version>1.2</mule.tools.version>

<elastic-apm.version>1.7.0</elastic-apm.version>
<elastic-apm.version>1.8.0</elastic-apm.version>
<version.byte-buddy>1.9.11</version.byte-buddy>

<maven.compiler.source>1.8</maven.compiler.source>
Expand Down
6 changes: 4 additions & 2 deletions apm-mule3-agent/src/test/java/co/elastic/apm/mule/functional/ApikitFunctionalTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import org.mule.api.MuleEvent;
import org.mule.api.MuleMessage;
import org.mule.api.transport.PropertyScope;
import org.mule.module.http.internal.ParameterMap;

import co.elastic.apm.agent.impl.error.ErrorCapture;
import co.elastic.apm.agent.impl.transaction.Span;
Expand All @@ -23,6 +24,7 @@ public class ApikitFunctionalTests extends AbstractApmFunctionalTestCase {
public void testAPIKitFlow() throws Exception {

MuleMessage message = getTestMuleMessage();
message.setProperty("http.uri.params", new ParameterMap(), PropertyScope.INBOUND);
message.setProperty("http.listener.path", "/api/*", PropertyScope.INBOUND);
message.setProperty("http.method", "GET", PropertyScope.INBOUND);
message.setProperty("host", "localhost", PropertyScope.INBOUND);
Expand All @@ -35,8 +37,8 @@ public void testAPIKitFlow() throws Exception {
Mockito.verify(reporter, Mockito.times(0)).report(Mockito.any(ErrorCapture.class));

assertTrue(response.getMessage().getPayload().toString().contains("Hello world"));
assertEquals("api-kit-test-main", tx.getName().toString());
assertEquals("Set Payload", spans.get(0).getName().toString());
assertEquals("api-kit-test-main", tx.getNameAsString());
assertEquals("Set Payload", spans.get(0).getNameAsString());

}

Expand Down
4 changes: 2 additions & 2 deletions apm-mule3-agent/src/test/java/co/elastic/apm/mule/functional/ExceptionFunctionalTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ public void testSimpleException() throws Exception {
Mockito.verify(reporter, Mockito.times(1)).report(Mockito.any(Transaction.class));
Mockito.verify(reporter, Mockito.times(1)).report(Mockito.any(ErrorCapture.class));

assertEquals("exception1Flow", tx.getName().toString());
assertEquals("exception1Flow", tx.getNameAsString());

assertEquals("HTTP", spans.get(0).getName().toString());
assertEquals("HTTP", spans.get(0).getNameAsString());
String expected = "Error sending HTTP request";
assertEquals(expected, errors.get(0).getException().getMessage().subSequence(0, expected.length()));

Expand Down
34 changes: 17 additions & 17 deletions apm-mule3-agent/src/test/java/co/elastic/apm/mule/functional/FlowFunctionalTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ public void simpleFlowSendsOneTransaction() throws Exception {
Mockito.verify(reporter, Mockito.times(1)).report(Mockito.any(Transaction.class));
Mockito.verify(reporter, Mockito.times(0)).report(Mockito.any(ErrorCapture.class));

assertEquals("test1Flow", tx.getName().toString());
assertEquals("Logger", spans.get(0).getName().toString());
assertEquals("test1Flow", tx.getNameAsString());
assertEquals("Logger", spans.get(0).getNameAsString());
}

@Test
Expand All @@ -41,14 +41,14 @@ public void parallelFlowSendsOneTransaction() throws Exception {
Mockito.verify(reporter, Mockito.times(1)).report(Mockito.any(Transaction.class));
Mockito.verify(reporter, Mockito.times(0)).report(Mockito.any(ErrorCapture.class));

assertEquals("parallelFlow", tx.getName().toString());
assertEquals("Logger1", spans.get(0).getName().toString());
assertEquals("Logger", spans.get(1).getName().toString());
assertEquals("Logger", spans.get(2).getName().toString());
assertEquals("Logger", spans.get(3).getName().toString());
assertEquals("Logger", spans.get(4).getName().toString());
assertEquals("Scatter-Gather", spans.get(5).getName().toString());
assertEquals("Logger4", spans.get(6).getName().toString());
assertEquals("parallelFlow", tx.getNameAsString());
assertEquals("Logger1", spans.get(0).getNameAsString());
assertEquals("Logger", spans.get(1).getNameAsString());
assertEquals("Logger", spans.get(2).getNameAsString());
assertEquals("Logger", spans.get(3).getNameAsString());
assertEquals("Logger", spans.get(4).getNameAsString());
assertEquals("Scatter-Gather", spans.get(5).getNameAsString());
assertEquals("Logger4", spans.get(6).getNameAsString());

}

Expand All @@ -69,15 +69,15 @@ public void simpleFlowSendsOneTransactionWithProperty() throws Exception {
Mockito.verify(reporter, Mockito.times(1)).report(Mockito.any(Transaction.class));
Mockito.verify(reporter, Mockito.times(0)).report(Mockito.any(ErrorCapture.class));

assertEquals("test1Flow", tx.getName().toString());
assertEquals("test1Flow", tx.getNameAsString());

// Logged property
assertEquals("testValue", tx.getContext().getLabel("in:testProp"));

// Filtered out property
assertNull(tx.getContext().getLabel("in:not_testProp"));

assertEquals("Logger", spans.get(0).getName().toString());
assertEquals("Logger", spans.get(0).getNameAsString());
}

@Test
Expand All @@ -92,15 +92,15 @@ public void testFlowWith4steps() throws Exception {
Mockito.verify(reporter, Mockito.times(1)).report(Mockito.any(Transaction.class));
Mockito.verify(reporter, Mockito.times(0)).report(Mockito.any(ErrorCapture.class));

assertEquals("test2Flow", tx.getName().toString());
assertEquals("test2Flow", tx.getNameAsString());

assertEquals("Logger", spans.get(0).getName().toString());
assertEquals("Logger", spans.get(0).getNameAsString());
assertEquals("logger", spans.get(0).getType().toString());
assertEquals("Groovy", spans.get(1).getName().toString());
assertEquals("Groovy", spans.get(1).getNameAsString());
assertEquals("scripting:component", spans.get(1).getType().toString());
assertEquals("VM", spans.get(2).getName().toString());
assertEquals("VM", spans.get(2).getNameAsString());
assertEquals("vm:outbound-endpoint", spans.get(2).getType().toString());
assertEquals("Property", spans.get(3).getName().toString());
assertEquals("Property", spans.get(3).getNameAsString());
assertEquals("set-property", spans.get(3).getType().toString());

assertEquals("201", tx.getContext().getLabel("out:http.response"));
Expand Down
10 changes: 5 additions & 5 deletions apm-mule3-agent/src/test/java/co/elastic/apm/mule/functional/FlowvarFunctionalTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ public void simpleFlowTestsOneFlowvar() throws Exception {
Mockito.verify(reporter, Mockito.times(1)).report(Mockito.any(Transaction.class));
Mockito.verify(reporter, Mockito.times(0)).report(Mockito.any(ErrorCapture.class));

assertEquals("testflowvar1Flow", tx.getName().toString());
assertEquals("testflowvar1Flow", tx.getNameAsString());

assertEquals("Variable", spans.get(0).getName().toString());
assertEquals("Variable", spans.get(1).getName().toString());
assertEquals("Variable", spans.get(2).getName().toString());
assertEquals("Logger", spans.get(3).getName().toString());
assertEquals("Variable", spans.get(0).getNameAsString());
assertEquals("Variable", spans.get(1).getNameAsString());
assertEquals("Variable", spans.get(2).getNameAsString());
assertEquals("Logger", spans.get(3).getNameAsString());

assertEquals("123", spans.get(3).getContext().getLabel("flowVar:var1"));
assertEquals("456", spans.get(3).getContext().getLabel("flowVar:var2"));
Expand Down
2 changes: 2 additions & 0 deletions apm-mule3-agent/src/test/resources/api-kit-test.raml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#%RAML 1.0
title: Hello world # required title

baseUri: http://localhost:8999/

/helloworld: # optional resource
get: # HTTP method declaration
responses: # declare a response
Expand Down
4 changes: 2 additions & 2 deletions apm-mule3.8-agent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>co.elastic.apm</groupId>
<artifactId>apm-mule3.8-agent</artifactId>
<version>1.7.0</version>
<version>1.8.0</version>
<packaging>${packaging}</packaging>
<name>Mule apm-mule3-agent Application built for Mule 3.8</name>

Expand Down Expand Up @@ -33,7 +33,7 @@
<mule.version>3.8.5</mule.version>
<mule.tools.version>1.2</mule.tools.version>

<elastic-apm.version>1.7.0</elastic-apm.version>
<elastic-apm.version>1.8.0</elastic-apm.version>
<version.byte-buddy>1.9.11</version.byte-buddy>

<maven.compiler.source>1.8</maven.compiler.source>
Expand Down
4 changes: 2 additions & 2 deletions apm-mule3.8-agent/src/test/java/co/elastic/apm/mule/functional/ApikitFunctionalTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ public void testAPIKitFlow() throws Exception {
Mockito.verify(reporter, Mockito.times(0)).report(Mockito.any(ErrorCapture.class));

assertTrue(response.getMessage().getPayload().toString().contains("Hello world"));
assertEquals("api-kit-test-main", tx.getName().toString());
assertEquals("Set Payload", spans.get(0).getName().toString());
assertEquals("api-kit-test-main", tx.getNameAsString());
assertEquals("Set Payload", spans.get(0).getNameAsString());

}

Expand Down
4 changes: 2 additions & 2 deletions apm-mule3.8-agent/src/test/java/co/elastic/apm/mule/functional/ExceptionFunctionalTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ public void testSimpleException() throws Exception {
Mockito.verify(reporter, Mockito.times(1)).report(Mockito.any(Transaction.class));
Mockito.verify(reporter, Mockito.times(1)).report(Mockito.any(ErrorCapture.class));

assertEquals("exception1Flow", tx.getName().toString());
assertEquals("exception1Flow", tx.getNameAsString());

assertEquals("HTTP", spans.get(0).getName().toString());
assertEquals("HTTP", spans.get(0).getNameAsString());
String expected = "Error sending HTTP request";
assertEquals(expected, errors.get(0).getException().getMessage().subSequence(0, expected.length()));

Expand Down
34 changes: 17 additions & 17 deletions apm-mule3.8-agent/src/test/java/co/elastic/apm/mule/functional/FlowFunctionalTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ public void simpleFlowSendsOneTransaction() throws Exception {
Mockito.verify(reporter, Mockito.times(1)).report(Mockito.any(Transaction.class));
Mockito.verify(reporter, Mockito.times(0)).report(Mockito.any(ErrorCapture.class));

assertEquals("test1Flow", tx.getName().toString());
assertEquals("Logger", spans.get(0).getName().toString());
assertEquals("test1Flow", tx.getNameAsString());
assertEquals("Logger", spans.get(0).getNameAsString());
}

@Test
Expand All @@ -41,14 +41,14 @@ public void parallelFlowSendsOneTransaction() throws Exception {
Mockito.verify(reporter, Mockito.times(1)).report(Mockito.any(Transaction.class));
Mockito.verify(reporter, Mockito.times(0)).report(Mockito.any(ErrorCapture.class));

assertEquals("parallelFlow", tx.getName().toString());
assertEquals("Logger1", spans.get(0).getName().toString());
assertEquals("Logger", spans.get(1).getName().toString());
assertEquals("Logger", spans.get(2).getName().toString());
assertEquals("Logger", spans.get(3).getName().toString());
assertEquals("Logger", spans.get(4).getName().toString());
assertEquals("Scatter-Gather", spans.get(5).getName().toString());
assertEquals("Logger4", spans.get(6).getName().toString());
assertEquals("parallelFlow", tx.getNameAsString());
assertEquals("Logger1", spans.get(0).getNameAsString());
assertEquals("Logger", spans.get(1).getNameAsString());
assertEquals("Logger", spans.get(2).getNameAsString());
assertEquals("Logger", spans.get(3).getNameAsString());
assertEquals("Logger", spans.get(4).getNameAsString());
assertEquals("Scatter-Gather", spans.get(5).getNameAsString());
assertEquals("Logger4", spans.get(6).getNameAsString());

}

Expand All @@ -69,15 +69,15 @@ public void simpleFlowSendsOneTransactionWithProperty() throws Exception {
Mockito.verify(reporter, Mockito.times(1)).report(Mockito.any(Transaction.class));
Mockito.verify(reporter, Mockito.times(0)).report(Mockito.any(ErrorCapture.class));

assertEquals("test1Flow", tx.getName().toString());
assertEquals("test1Flow", tx.getNameAsString());

// Logged property
assertEquals("testValue", tx.getContext().getLabel("in:testProp"));

// Filtered out property
assertNull(tx.getContext().getLabel("in:not_testProp"));

assertEquals("Logger", spans.get(0).getName().toString());
assertEquals("Logger", spans.get(0).getNameAsString());
}

@Test
Expand All @@ -92,15 +92,15 @@ public void testFlowWith4steps() throws Exception {
Mockito.verify(reporter, Mockito.times(1)).report(Mockito.any(Transaction.class));
Mockito.verify(reporter, Mockito.times(0)).report(Mockito.any(ErrorCapture.class));

assertEquals("test2Flow", tx.getName().toString());
assertEquals("test2Flow", tx.getNameAsString());

assertEquals("Logger", spans.get(0).getName().toString());
assertEquals("Logger", spans.get(0).getNameAsString());
assertEquals("logger", spans.get(0).getType().toString());
assertEquals("Groovy", spans.get(1).getName().toString());
assertEquals("Groovy", spans.get(1).getNameAsString());
assertEquals("scripting:component", spans.get(1).getType().toString());
assertEquals("VM", spans.get(2).getName().toString());
assertEquals("VM", spans.get(2).getNameAsString());
assertEquals("vm:outbound-endpoint", spans.get(2).getType().toString());
assertEquals("Property", spans.get(3).getName().toString());
assertEquals("Property", spans.get(3).getNameAsString());
assertEquals("set-property", spans.get(3).getType().toString());

assertEquals("201", tx.getContext().getLabel("out:http.response"));
Expand Down
10 changes: 5 additions & 5 deletions apm-mule3.8-agent/src/test/java/co/elastic/apm/mule/functional/FlowvarFunctionalTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ public void simpleFlowTestsOneFlowvar() throws Exception {
Mockito.verify(reporter, Mockito.times(1)).report(Mockito.any(Transaction.class));
Mockito.verify(reporter, Mockito.times(0)).report(Mockito.any(ErrorCapture.class));

assertEquals("testflowvar1Flow", tx.getName().toString());
assertEquals("testflowvar1Flow", tx.getNameAsString());

assertEquals("Variable", spans.get(0).getName().toString());
assertEquals("Variable", spans.get(1).getName().toString());
assertEquals("Variable", spans.get(2).getName().toString());
assertEquals("Logger", spans.get(3).getName().toString());
assertEquals("Variable", spans.get(0).getNameAsString());
assertEquals("Variable", spans.get(1).getNameAsString());
assertEquals("Variable", spans.get(2).getNameAsString());
assertEquals("Logger", spans.get(3).getNameAsString());

assertEquals("123", spans.get(3).getContext().getLabel("flowVar:var1"));
assertEquals("456", spans.get(3).getContext().getLabel("flowVar:var2"));
Expand Down

0 comments on commit 2037064

Please sign in to comment.