Merge pull request #25 from michaelhyatt/update_1.15.0

Updated to Elastic APM agent to v1.15.0
Updated to ByteBuddy 1.10.8
Updated README instructions
Downgraded 3.8 clients to support Mule EE 3.8.0 to support later Mule 3.8 versions

README.md

@@ -27,13 +27,13 @@ Go to the [Releases](https://github.com/michaelhyatt/elastic-apm-mule3-agent/rel
 Mule 3.9:
 ```
 mvn install:install-file -Dfile=<path-to-file> -DgroupId=co.elastic.apm \
-    -DartifactId=apm-mule3-agent -Dversion=1.8.0 -Dpackaging=jar
+    -DartifactId=apm-mule3-agent -Dversion=1.15.0 -Dpackaging=jar
 ```
 
 Mule 3.8:
 ```
 mvn install:install-file -Dfile=<path-to-file> -DgroupId=co.elastic.apm \
-    -DartifactId=apm-mule3.8-agent -Dversion=1.8.0 -Dpackaging=jar
+    -DartifactId=apm-mule3.8-agent -Dversion=1.15.0 -Dpackaging=jar
 ```
 
 ### Or, get the code and build it from scratch
@@ -46,7 +46,7 @@ Mule 3.9:
 <dependency>
     <groupId>co.elastic.apm</groupId>
     <artifactId>apm-mule3-agent</artifactId>
-    <version>1.8.0</version>
+    <version>1.15.0</version>
 </dependency>
 ```
 
@@ -55,7 +55,7 @@ Mule 3.8:
 <dependency>
     <groupId>co.elastic.apm</groupId>
     <artifactId>apm-mule3.8-agent</artifactId>
-    <version>1.8.0</version>
+    <version>1.15.0</version>
 </dependency>
 ```
 

apm-mule3-agent/pom.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>co.elastic.apm</groupId>
 	<artifactId>apm-mule3-agent</artifactId>
-	<version>1.8.0</version>
+	<version>1.15.0</version>
 	<packaging>${packaging}</packaging>
 	<name>Mule apm-mule3-agent Application</name>
 
@@ -33,8 +34,8 @@
 		<mule.version>3.9.0</mule.version>
 		<mule.tools.version>1.2</mule.tools.version>
 
-		<elastic-apm.version>1.8.0</elastic-apm.version>
-		<version.byte-buddy>1.9.11</version.byte-buddy>
+		<elastic-apm.version>1.15.0</elastic-apm.version>
+		<version.byte-buddy>1.10.8</version.byte-buddy>
 
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
@@ -171,6 +172,12 @@
 			<version>${mule.version}</version>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.mule.modules</groupId>
+			<artifactId>mule-module-json</artifactId>
+			<version>${mule.version}</version>
+			<scope>provided</scope>
+		</dependency>
 
 		<!-- for testing -->
 		<dependency>
@@ -223,7 +230,7 @@
 		<repository>
 			<id>Central</id>
 			<name>Central</name>
-			<url>http://repo1.maven.org/maven2/</url>
+			<url>https://repo1.maven.org/maven2/</url>
 			<layout>default</layout>
 		</repository>
 		<repository>

apm-mule3.8-agent/pom.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>co.elastic.apm</groupId>
 	<artifactId>apm-mule3.8-agent</artifactId>
-	<version>1.8.0</version>
+	<version>1.15.0</version>
 	<packaging>${packaging}</packaging>
 	<name>Mule apm-mule3-agent Application built for Mule 3.8</name>
 
@@ -30,11 +31,11 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-		<mule.version>3.8.5</mule.version>
+		<mule.version>3.8.1</mule.version>
 		<mule.tools.version>1.2</mule.tools.version>
 
-		<elastic-apm.version>1.8.0</elastic-apm.version>
-		<version.byte-buddy>1.9.11</version.byte-buddy>
+		<elastic-apm.version>1.15.0</elastic-apm.version>
+		<version.byte-buddy>1.10.8</version.byte-buddy>
 
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
@@ -216,14 +217,23 @@
 			<version>${mule.version}</version>
 			<scope>provided</scope>
 		</dependency>
+
+
+		<!-- 3.8.1 is missing this, but 3.8.5 has it -->
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>3.6</version>
+		</dependency>
+
 	</dependencies>
 
 
 	<repositories>
 		<repository>
 			<id>Central</id>
 			<name>Central</name>
-			<url>http://repo1.maven.org/maven2/</url>
+			<url>https://repo1.maven.org/maven2/</url>
 			<layout>default</layout>
 		</repository>
 		<repository>

example-app/component1/.classpath

@@ -6,22 +6,12 @@
   <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
   <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="var" path="M2_REPO/co/elastic/apm/apm-agent-api/1.7.0/apm-agent-api-1.7.0.jar" sourcepath="M2_REPO/co/elastic/apm/apm-agent-api/1.7.0/apm-agent-api-1.7.0-sources.jar">
-    <attributes>
-      <attribute value="jar:file:/Users/axolotl/.m2/repository/co/elastic/apm/apm-agent-api/1.7.0/apm-agent-api-1.7.0-javadoc.jar!/" name="javadoc_location"/>
-    </attributes>
-  </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/co/elastic/apm/apm-agent-attach/1.7.0/apm-agent-attach-1.7.0.jar" sourcepath="M2_REPO/co/elastic/apm/apm-agent-attach/1.7.0/apm-agent-attach-1.7.0-sources.jar">
-    <attributes>
-      <attribute value="jar:file:/Users/axolotl/.m2/repository/co/elastic/apm/apm-agent-attach/1.7.0/apm-agent-attach-1.7.0-javadoc.jar!/" name="javadoc_location"/>
-    </attributes>
-  </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/co/elastic/apm/apm-mule3-agent/1.7.0/apm-mule3-agent-1.7.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/co/elastic/apm/elastic-apm-agent/1.7.0/elastic-apm-agent-1.7.0.jar" sourcepath="M2_REPO/co/elastic/apm/elastic-apm-agent/1.7.0/elastic-apm-agent-1.7.0-sources.jar">
-    <attributes>
-      <attribute value="jar:file:/Users/axolotl/.m2/repository/co/elastic/apm/elastic-apm-agent/1.7.0/elastic-apm-agent-1.7.0-javadoc.jar!/" name="javadoc_location"/>
-    </attributes>
-  </classpathentry>
+  <classpathentry kind="var" path="M2_REPO/co/elastic/apm/apm-agent-api/1.15.0/apm-agent-api-1.15.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/co/elastic/apm/apm-agent-attach/1.15.0/apm-agent-attach-1.15.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/co/elastic/apm/apm-mule3-agent/1.15.0/apm-mule3-agent-1.15.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/co/elastic/apm/elastic-apm-agent/1.15.0/elastic-apm-agent-1.15.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/net/java/dev/jna/jna/5.3.1/jna-5.3.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/net/java/dev/jna/jna-platform/5.3.1/jna-platform-5.3.1.jar"/>
   <classpathentry kind="con" path="MULE_RUNTIME"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 </classpath>

example-app/component1/pom.xml

@@ -16,7 +16,7 @@
 		<mule.version>3.9.0</mule.version>
 		<mule.tools.version>1.7</mule.tools.version>
 
-		<apm-mule3-agent.version>1.7.0</apm-mule3-agent.version>
+		<apm-mule3-agent.version>1.15.0</apm-mule3-agent.version>
 
 		<maven.test.skip>true</maven.test.skip>
 	</properties>

example-app/component2/.classpath

@@ -6,22 +6,12 @@
   <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
   <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="var" path="M2_REPO/co/elastic/apm/apm-agent-api/1.7.0/apm-agent-api-1.7.0.jar" sourcepath="M2_REPO/co/elastic/apm/apm-agent-api/1.7.0/apm-agent-api-1.7.0-sources.jar">
-    <attributes>
-      <attribute value="jar:file:/Users/axolotl/.m2/repository/co/elastic/apm/apm-agent-api/1.7.0/apm-agent-api-1.7.0-javadoc.jar!/" name="javadoc_location"/>
-    </attributes>
-  </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/co/elastic/apm/apm-agent-attach/1.7.0/apm-agent-attach-1.7.0.jar" sourcepath="M2_REPO/co/elastic/apm/apm-agent-attach/1.7.0/apm-agent-attach-1.7.0-sources.jar">
-    <attributes>
-      <attribute value="jar:file:/Users/axolotl/.m2/repository/co/elastic/apm/apm-agent-attach/1.7.0/apm-agent-attach-1.7.0-javadoc.jar!/" name="javadoc_location"/>
-    </attributes>
-  </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/co/elastic/apm/apm-mule3-agent/1.7.0/apm-mule3-agent-1.7.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/co/elastic/apm/elastic-apm-agent/1.7.0/elastic-apm-agent-1.7.0.jar" sourcepath="M2_REPO/co/elastic/apm/elastic-apm-agent/1.7.0/elastic-apm-agent-1.7.0-sources.jar">
-    <attributes>
-      <attribute value="jar:file:/Users/axolotl/.m2/repository/co/elastic/apm/elastic-apm-agent/1.7.0/elastic-apm-agent-1.7.0-javadoc.jar!/" name="javadoc_location"/>
-    </attributes>
-  </classpathentry>
+  <classpathentry kind="var" path="M2_REPO/co/elastic/apm/apm-agent-api/1.15.0/apm-agent-api-1.15.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/co/elastic/apm/apm-agent-attach/1.15.0/apm-agent-attach-1.15.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/co/elastic/apm/apm-mule3-agent/1.15.0/apm-mule3-agent-1.15.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/co/elastic/apm/elastic-apm-agent/1.15.0/elastic-apm-agent-1.15.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/net/java/dev/jna/jna/5.3.1/jna-5.3.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/net/java/dev/jna/jna-platform/5.3.1/jna-platform-5.3.1.jar"/>
   <classpathentry kind="con" path="MULE_RUNTIME"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 </classpath>

example-app/component2/pom.xml

@@ -16,7 +16,7 @@
 		<mule.version>3.9.0</mule.version>
 		<mule.tools.version>1.7</mule.tools.version>
 
-		<apm-mule3-agent.version>1.7.0</apm-mule3-agent.version>
+		<apm-mule3-agent.version>1.15.0</apm-mule3-agent.version>
 
 		<maven.test.skip>true</maven.test.skip>
 	</properties>

example-domain-app/test-domain/.classpath

@@ -2,22 +2,12 @@
   <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
   <classpathentry kind="src" path="src/main/domain" excluding="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="var" path="M2_REPO/co/elastic/apm/apm-agent-api/1.7.0/apm-agent-api-1.7.0.jar" sourcepath="M2_REPO/co/elastic/apm/apm-agent-api/1.7.0/apm-agent-api-1.7.0-sources.jar">
-    <attributes>
-      <attribute value="jar:file:/Users/axolotl/.m2/repository/co/elastic/apm/apm-agent-api/1.7.0/apm-agent-api-1.7.0-javadoc.jar!/" name="javadoc_location"/>
-    </attributes>
-  </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/co/elastic/apm/apm-agent-attach/1.7.0/apm-agent-attach-1.7.0.jar" sourcepath="M2_REPO/co/elastic/apm/apm-agent-attach/1.7.0/apm-agent-attach-1.7.0-sources.jar">
-    <attributes>
-      <attribute value="jar:file:/Users/axolotl/.m2/repository/co/elastic/apm/apm-agent-attach/1.7.0/apm-agent-attach-1.7.0-javadoc.jar!/" name="javadoc_location"/>
-    </attributes>
-  </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/co/elastic/apm/apm-mule3-agent/1.7.0/apm-mule3-agent-1.7.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/co/elastic/apm/elastic-apm-agent/1.7.0/elastic-apm-agent-1.7.0.jar" sourcepath="M2_REPO/co/elastic/apm/elastic-apm-agent/1.7.0/elastic-apm-agent-1.7.0-sources.jar">
-    <attributes>
-      <attribute value="jar:file:/Users/axolotl/.m2/repository/co/elastic/apm/elastic-apm-agent/1.7.0/elastic-apm-agent-1.7.0-javadoc.jar!/" name="javadoc_location"/>
-    </attributes>
-  </classpathentry>
+  <classpathentry kind="var" path="M2_REPO/co/elastic/apm/apm-agent-api/1.15.0/apm-agent-api-1.15.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/co/elastic/apm/apm-agent-attach/1.15.0/apm-agent-attach-1.15.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/co/elastic/apm/apm-mule3-agent/1.15.0/apm-mule3-agent-1.15.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/co/elastic/apm/elastic-apm-agent/1.15.0/elastic-apm-agent-1.15.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/net/java/dev/jna/jna/5.3.1/jna-5.3.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/net/java/dev/jna/jna-platform/5.3.1/jna-platform-5.3.1.jar"/>
   <classpathentry kind="con" path="MULE_RUNTIME"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 </classpath>

example-domain-app/test-domain/pom.xml

@@ -28,7 +28,7 @@
 		<dependency>
 			<groupId>co.elastic.apm</groupId>
 			<artifactId>apm-mule3-agent</artifactId>
-			<version>1.7.0</version>
+			<version>1.15.0</version>
 		</dependency>
 	</dependencies>
 

example-domain-app/test-domain1/.classpath

@@ -1,33 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry excluding="**/*.java" kind="src" path="src/main/api"/>
-	<classpathentry excluding="**/*.java" kind="src" path="src/main/app"/>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
-	<classpathentry kind="var" path="M2_REPO/co/elastic/apm/apm-agent-api/1.3.0/apm-agent-api-1.3.0.jar" sourcepath="M2_REPO/co/elastic/apm/apm-agent-api/1.3.0/apm-agent-api-1.3.0-sources.jar">
-		<attributes>
-			<attribute name="org.mule.tooling.scope" value="test"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="M2_REPO/co/elastic/apm/apm-mule3-agent/1.3.0/apm-mule3-agent-1.3.0.jar">
-		<attributes>
-			<attribute name="org.mule.tooling.scope" value="test"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="M2_REPO/net/bytebuddy/byte-buddy-agent/1.8.14/byte-buddy-agent-1.8.14.jar" sourcepath="M2_REPO/net/bytebuddy/byte-buddy-agent/1.8.14/byte-buddy-agent-1.8.14-sources.jar">
-		<attributes>
-			<attribute name="org.mule.tooling.scope" value="test"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="M2_REPO/co/elastic/apm/elastic-apm-agent/1.3.0/elastic-apm-agent-1.3.0.jar" sourcepath="M2_REPO/co/elastic/apm/elastic-apm-agent/1.3.0/elastic-apm-agent-1.3.0-sources.jar">
-		<attributes>
-			<attribute name="org.mule.tooling.scope" value="test"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="MULE_RUNTIME"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="src" path="/test-domain"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+  <classpathentry kind="src" path="src/main/api" excluding="**/*.java"/>
+  <classpathentry kind="src" path="src/main/app" excluding="**/*.java"/>
+  <classpathentry kind="src" path="src/main/java"/>
+  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
+  <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
+  <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="MULE_RUNTIME"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+</classpath>

example-domain-app/test-domain1/.project

@@ -1,29 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>test-domain1</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.mule.tooling.core.muleBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.mule.tooling.maven.mavenBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.mule.tooling.maven.mavenNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.mule.tooling.core.muleNature</nature>
-	</natures>
-</projectDescription>
+  <name>test-domain1</name>
+  <comment/>
+  <projects/>
+  <buildSpec>
+    <buildCommand>
+      <name>org.eclipse.jdt.core.javabuilder</name>
+    </buildCommand>
+    <buildCommand>
+      <name>org.mule.tooling.core.muleBuilder</name>
+    </buildCommand>
+    <buildCommand>
+      <name>org.mule.tooling.maven.mavenBuilder</name>
+    </buildCommand>
+  </buildSpec>
+  <natures>
+    <nature>org.mule.tooling.maven.mavenNature</nature>
+    <nature>org.eclipse.jdt.core.javanature</nature>
+    <nature>org.mule.tooling.core.muleNature</nature>
+  </natures>
+</projectDescription>

example-domain-app/test-domain1/pom.xml

@@ -137,7 +137,7 @@
           <repository>
             <id>Central</id>
             <name>Central</name>
-            <url>http://repo1.maven.org/maven2/</url>
+            <url>https://repo1.maven.org/maven2/</url>
             <layout>default</layout>
         </repository>
         <repository>