SF-4325 - updating to use APMLog by default for trace info - fallback on existing methods.

Author: darinhoward

.gitignore

@@ -2,4 +2,6 @@
 .project
 .settings
 target
-coverage.ec
+coverage.ec
+.idea
+*.iml

pom.xml

@@ -62,7 +62,7 @@
 		<dependency>
 		  	<groupId>com.stackify</groupId>
   			<artifactId>stackify-api-java</artifactId>
-  			<version>2.1.6</version>
+  			<version>2.1.8-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Runtime dependencies -->

src/main/java/com/stackify/log/log4j12/LoggingEventAdapter.java

@@ -20,6 +20,7 @@
 import java.util.Iterator;
 import java.util.Map;
 
+import com.stackify.api.common.log.APMLogData;
 import org.apache.log4j.Level;
 import org.apache.log4j.spi.LocationInfo;
 import org.apache.log4j.spi.LoggingEvent;
@@ -119,14 +120,14 @@ public StackifyError getStackifyError(final LoggingEvent event, final Throwable
 
 			builder.error(Throwables.toErrorItem(getMessage(event), className, methodName, lineNumber));
 		}
-		
-		String user = ServletLogContext.getUser();
-		
+
+		String user = APMLogData.isLinked() ? APMLogData.getUser() : ServletLogContext.getUser();
+
 		if (user != null) {
 			builder.userName(user);
 		}
-		
-		WebRequestDetail webRequest = ServletLogContext.getWebRequest();
+
+		WebRequestDetail webRequest = APMLogData.isLinked() ? APMLogData.getWebRequest() : ServletLogContext.getWebRequest();
 
 		if (webRequest != null) {
 			builder.webRequestDetail(webRequest);
@@ -162,7 +163,7 @@ public LogMsg getLogMsg(final LoggingEvent event, final StackifyError error) {
 		builder.epochMs(event.getTimeStamp());
 		builder.level(event.getLevel().toString().toLowerCase());
 
-		String transactionId = ServletLogContext.getTransactionId();
+		String transactionId = APMLogData.isLinked() ? APMLogData.getTransactionId() : ServletLogContext.getTransactionId();
 
 		if (transactionId != null) {
 			builder.transId(transactionId);