Merge remote-tracking branch 'origin/master'

Author: edengal

timbermill-java/timbermill-api/src/main/java/com/datorama/oss/timbermill/EventLogger.java

@@ -205,7 +205,7 @@ public void close() {
 	<T> Callable<T> wrapCallable(Callable<T> callable) {
 		final String currentTaskId = getCurrentTaskId();
 		return () -> {
-			try(Scope scope = new Scope(currentTaskId)) {
+			try(Scope scope = threadInstance.get().new Scope(currentTaskId)) {
 				return scope.apply(callable);
 			}
 		};
@@ -214,7 +214,7 @@ <T> Callable<T> wrapCallable(Callable<T> callable) {
 	<T, R> Function<T, R> wrapFunction(Function<T, R> function) {
 		final String currentTaskId = getCurrentTaskId();
 		return (in) -> {
-			try(Scope scope = new Scope(currentTaskId)) {
+			try(Scope scope = threadInstance.get().new Scope(currentTaskId)) {
 				return scope.apply(function, in);
 			}
 		};

timbermill-java/timbermill-api/src/test/java/com/datorama/oss/timbermill/EventLoggerTest.java

@@ -2,6 +2,7 @@
 
 import java.util.List;
 import java.util.concurrent.Callable;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 
@@ -68,14 +69,14 @@ public void testSimpleEventLogger() {
 	public void testWrapCallable() throws Exception {
 		String parentTaskId = el.startEvent(QUERY, EMPTY_LOG_PARAMS);
 		Callable<String> wrappedCallable = el.wrapCallable(() -> {
-			return el.getCurrentTaskId();
+			return EventLogger.get().getCurrentTaskId();
 		});
 
 		String childTaskId = el.startEvent(QUERY, EMPTY_LOG_PARAMS);
 
 		String callableVisibleTaskId = wrappedCallable.call();
 
-		assertEquals(callableVisibleTaskId, parentTaskId);
+		assertEquals(parentTaskId, callableVisibleTaskId);
 	}
 
 	@Test
@@ -92,18 +93,45 @@ public void testWrapCallableOnEmptyStack() throws Exception {
 		assertNull(callableVisibleTaskId);
 	}
 
+	@Test
+	public void testWrapCallableThreaded() throws Exception {
+		String parentTaskId = el.startEvent(QUERY, EMPTY_LOG_PARAMS);
+		Callable<String> wrappedCallable = el.wrapCallable(() -> {
+			return EventLogger.get().getCurrentTaskId();
+		});
+
+		String childTaskId = el.startEvent(QUERY, EMPTY_LOG_PARAMS);
+
+		CompletableFuture<String> future = new CompletableFuture<String>();
+
+		new Thread() {
+			@Override
+			public void run() {
+				try {
+					future.complete(wrappedCallable.call());
+				} catch (Exception ex) {
+					future.completeExceptionally(ex);
+				}
+			}
+		}.start();
+
+		String futureVisibleTaskId = future.get();
+
+		assertEquals(parentTaskId, futureVisibleTaskId);
+	}
+
 	@Test
 	public void testWrapFunction() throws Exception {
 		String parentTaskId = el.startEvent(QUERY, EMPTY_LOG_PARAMS);
 		Function<Integer, String> wrappedFunction = el.<Integer, String>wrapFunction(ignored -> {
-			return el.getCurrentTaskId();
+			return EventLogger.get().getCurrentTaskId();
 		});
 
 		String childTaskId = el.startEvent(QUERY, EMPTY_LOG_PARAMS);
 
 		String callableVisibleTaskId = wrappedFunction.apply(42);
 
-		assertEquals(callableVisibleTaskId, parentTaskId);
+		assertEquals(parentTaskId, callableVisibleTaskId);
 	}
 
 	@Test