diff --git a/apm-mule3-agent/pom.xml b/apm-mule3-agent/pom.xml index 20025ef..416955d 100644 --- a/apm-mule3-agent/pom.xml +++ b/apm-mule3-agent/pom.xml @@ -4,7 +4,7 @@ 4.0.0 co.elastic.apm apm-mule3-agent - 1.7.0 + 1.8.0 ${packaging} Mule apm-mule3-agent Application @@ -30,10 +30,10 @@ UTF-8 UTF-8 - 3.9.0 + 3.9.3 1.2 - 1.7.0 + 1.8.0 1.9.11 1.8 diff --git a/apm-mule3-agent/src/test/java/co/elastic/apm/mule/functional/ApikitFunctionalTests.java b/apm-mule3-agent/src/test/java/co/elastic/apm/mule/functional/ApikitFunctionalTests.java index bea183e..cbdbd30 100644 --- a/apm-mule3-agent/src/test/java/co/elastic/apm/mule/functional/ApikitFunctionalTests.java +++ b/apm-mule3-agent/src/test/java/co/elastic/apm/mule/functional/ApikitFunctionalTests.java @@ -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; @@ -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); @@ -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()); } diff --git a/apm-mule3-agent/src/test/java/co/elastic/apm/mule/functional/ExceptionFunctionalTests.java b/apm-mule3-agent/src/test/java/co/elastic/apm/mule/functional/ExceptionFunctionalTests.java index 76c05ba..eb48626 100644 --- a/apm-mule3-agent/src/test/java/co/elastic/apm/mule/functional/ExceptionFunctionalTests.java +++ b/apm-mule3-agent/src/test/java/co/elastic/apm/mule/functional/ExceptionFunctionalTests.java @@ -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())); diff --git a/apm-mule3-agent/src/test/java/co/elastic/apm/mule/functional/FlowFunctionalTests.java b/apm-mule3-agent/src/test/java/co/elastic/apm/mule/functional/FlowFunctionalTests.java index 7162b00..b32eedc 100644 --- a/apm-mule3-agent/src/test/java/co/elastic/apm/mule/functional/FlowFunctionalTests.java +++ b/apm-mule3-agent/src/test/java/co/elastic/apm/mule/functional/FlowFunctionalTests.java @@ -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 @@ -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()); } @@ -69,7 +69,7 @@ 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")); @@ -77,7 +77,7 @@ public void simpleFlowSendsOneTransactionWithProperty() throws Exception { // Filtered out property assertNull(tx.getContext().getLabel("in:not_testProp")); - assertEquals("Logger", spans.get(0).getName().toString()); + assertEquals("Logger", spans.get(0).getNameAsString()); } @Test @@ -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")); diff --git a/apm-mule3-agent/src/test/java/co/elastic/apm/mule/functional/FlowvarFunctionalTests.java b/apm-mule3-agent/src/test/java/co/elastic/apm/mule/functional/FlowvarFunctionalTests.java index df63f0f..f1fad68 100644 --- a/apm-mule3-agent/src/test/java/co/elastic/apm/mule/functional/FlowvarFunctionalTests.java +++ b/apm-mule3-agent/src/test/java/co/elastic/apm/mule/functional/FlowvarFunctionalTests.java @@ -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")); diff --git a/apm-mule3-agent/src/test/resources/api-kit-test.raml b/apm-mule3-agent/src/test/resources/api-kit-test.raml index b005b6f..6147d40 100644 --- a/apm-mule3-agent/src/test/resources/api-kit-test.raml +++ b/apm-mule3-agent/src/test/resources/api-kit-test.raml @@ -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 diff --git a/apm-mule3.8-agent/pom.xml b/apm-mule3.8-agent/pom.xml index f0a9539..f95fdb1 100644 --- a/apm-mule3.8-agent/pom.xml +++ b/apm-mule3.8-agent/pom.xml @@ -4,7 +4,7 @@ 4.0.0 co.elastic.apm apm-mule3.8-agent - 1.7.0 + 1.8.0 ${packaging} Mule apm-mule3-agent Application built for Mule 3.8 @@ -33,7 +33,7 @@ 3.8.5 1.2 - 1.7.0 + 1.8.0 1.9.11 1.8 diff --git a/apm-mule3.8-agent/src/test/java/co/elastic/apm/mule/functional/ApikitFunctionalTests.java b/apm-mule3.8-agent/src/test/java/co/elastic/apm/mule/functional/ApikitFunctionalTests.java index bea183e..8ac332b 100644 --- a/apm-mule3.8-agent/src/test/java/co/elastic/apm/mule/functional/ApikitFunctionalTests.java +++ b/apm-mule3.8-agent/src/test/java/co/elastic/apm/mule/functional/ApikitFunctionalTests.java @@ -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()); } diff --git a/apm-mule3.8-agent/src/test/java/co/elastic/apm/mule/functional/ExceptionFunctionalTests.java b/apm-mule3.8-agent/src/test/java/co/elastic/apm/mule/functional/ExceptionFunctionalTests.java index 76c05ba..eb48626 100644 --- a/apm-mule3.8-agent/src/test/java/co/elastic/apm/mule/functional/ExceptionFunctionalTests.java +++ b/apm-mule3.8-agent/src/test/java/co/elastic/apm/mule/functional/ExceptionFunctionalTests.java @@ -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())); diff --git a/apm-mule3.8-agent/src/test/java/co/elastic/apm/mule/functional/FlowFunctionalTests.java b/apm-mule3.8-agent/src/test/java/co/elastic/apm/mule/functional/FlowFunctionalTests.java index 7162b00..b32eedc 100644 --- a/apm-mule3.8-agent/src/test/java/co/elastic/apm/mule/functional/FlowFunctionalTests.java +++ b/apm-mule3.8-agent/src/test/java/co/elastic/apm/mule/functional/FlowFunctionalTests.java @@ -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 @@ -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()); } @@ -69,7 +69,7 @@ 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")); @@ -77,7 +77,7 @@ public void simpleFlowSendsOneTransactionWithProperty() throws Exception { // Filtered out property assertNull(tx.getContext().getLabel("in:not_testProp")); - assertEquals("Logger", spans.get(0).getName().toString()); + assertEquals("Logger", spans.get(0).getNameAsString()); } @Test @@ -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")); diff --git a/apm-mule3.8-agent/src/test/java/co/elastic/apm/mule/functional/FlowvarFunctionalTests.java b/apm-mule3.8-agent/src/test/java/co/elastic/apm/mule/functional/FlowvarFunctionalTests.java index df63f0f..f1fad68 100644 --- a/apm-mule3.8-agent/src/test/java/co/elastic/apm/mule/functional/FlowvarFunctionalTests.java +++ b/apm-mule3.8-agent/src/test/java/co/elastic/apm/mule/functional/FlowvarFunctionalTests.java @@ -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"));