Merge pull request #74 from datorama/api-fix

edengal · web-flow · commit 749726d9ff21 · 2021-03-10T19:51:16.000+02:00
api fix
diff --git a/timbermill-java/timbermill-api/pom.xml b/timbermill-java/timbermill-api/pom.xml
@@ -16,7 +16,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.source-target.version>1.8</java.source-target.version>
-        <timbermill.version>2.4.0</timbermill.version>
+        <timbermill.version>2.4.1</timbermill.version>
         <slf4jVersion>1.7.28</slf4jVersion>
     </properties>
 
diff --git a/timbermill-java/timbermill-api/src/main/java/com/datorama/oss/timbermill/EventLogger.java b/timbermill-java/timbermill-api/src/main/java/com/datorama/oss/timbermill/EventLogger.java
@@ -94,6 +94,15 @@ String startEvent(String taskId, String name, String parentTaskId, LogParams log
 		}
 	}
 
+	void successEvent(String taskId) {
+		if (!taskIdStack.isEmpty()) {
+			String latestTaskId = taskIdStack.peek();
+			if (latestTaskId != null && latestTaskId.equals(taskId)) {
+				successEvent();
+			}
+		}
+	}
+
 	String successEvent() {
 		return successEvent(null, LogParams.create());
 	}
@@ -111,6 +120,15 @@ String successEvent(String ongoingTaskId, LogParams logParams) {
 		}
 	}
 
+	void endWithError(String taskId, Throwable t) {
+		if (!taskIdStack.isEmpty()) {
+			String latestTaskId = taskIdStack.peek();
+			if (latestTaskId != null && latestTaskId.equals(taskId)) {
+				endWithError(t);
+			}
+		}
+	}
+
 	String endWithError(Throwable t) {
 		return endWithError(t, null, null);
 	}
diff --git a/timbermill-java/timbermill-api/src/main/java/com/datorama/oss/timbermill/TimberLogger.java b/timbermill-java/timbermill-api/src/main/java/com/datorama/oss/timbermill/TimberLogger.java
@@ -136,6 +136,10 @@ public static String success(LogParams logParams) {
 		return EventLogger.get().successEvent(null, logParams);
 	}
 
+	public static void success(String taskId) {
+		EventLogger.get().successEvent(taskId);
+	}
+
 	public static String error() {
 		return error(LogParams.create());
 	}
@@ -152,6 +156,10 @@ public static String error(Throwable t, LogParams logParams) {
 		return EventLogger.get().endWithError(t, null, logParams);
 	}
 
+	public static void error(String taskId, Throwable t) {
+		EventLogger.get().endWithError(taskId, t);
+	}
+
 	public static String spot(String name) {
 		return spot(name, null);
 	}
diff --git a/timbermill-java/timbermill-client/pom.xml b/timbermill-java/timbermill-client/pom.xml
@@ -15,7 +15,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.source-target.version>1.8</java.source-target.version>
-        <timbermill.version>2.4.0</timbermill.version>
+        <timbermill.version>2.4.1</timbermill.version>
         <aspectj.version>1.9.6</aspectj.version>
         <org.springframework.version>5.3.4</org.springframework.version>
     </properties>
diff --git a/timbermill-java/timbermill-client/src/main/java/com/datorama/oss/timbermill/annotation/TimberLogAspect.java b/timbermill-java/timbermill-client/src/main/java/com/datorama/oss/timbermill/annotation/TimberLogAspect.java
@@ -18,13 +18,13 @@ public Object timberLog(ProceedingJoinPoint pjp, TimberLogTask timberLogAnnotati
         if (timberLogAnnotation.logParameters()) {
             logParams = getLogParamsForMethodParams(pjp, logParams);
         }
-        TimberLogger.start(timberLogAnnotation.name(), logParams);
+        String taskId = TimberLogger.start(timberLogAnnotation.name(), logParams);
         try {
             Object obj = pjp.proceed();
-            TimberLogger.success();
+            TimberLogger.success(taskId);
             return obj;
         } catch (Exception e){
-            TimberLogger.error(e);
+            TimberLogger.error(taskId, e);
             throw e;
         }
     }
diff --git a/timbermill-java/timbermill-local/pom.xml b/timbermill-java/timbermill-local/pom.xml
@@ -14,7 +14,7 @@
 
     <properties>
         <java.source-target.version>1.8</java.source-target.version>
-        <timbermill.version>2.4.0</timbermill.version>
+        <timbermill.version>2.4.1</timbermill.version>
         <kamon.bundle.version>2.0.4</kamon.bundle.version>
     </properties>
 
@@ -83,7 +83,7 @@
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-java-sdk-core</artifactId>
-            <version>1.11.714</version>
+            <version>1.11.965</version>
         </dependency>
         <dependency>
             <groupId>org.xerial</groupId>
diff --git a/timbermill-java/timbermill-local/src/main/java/com/datorama/oss/timbermill/AWSRequestSigningApacheInterceptor.java b/timbermill-java/timbermill-local/src/main/java/com/datorama/oss/timbermill/AWSRequestSigningApacheInterceptor.java
@@ -1,5 +1,6 @@
 package com.datorama.oss.timbermill;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -60,7 +61,9 @@ public void process(final HttpRequest request, final HttpContext context) throws
 		if (request instanceof HttpEntityEnclosingRequest) {
 			HttpEntityEnclosingRequest httpEntityEnclosingRequest =
 					(HttpEntityEnclosingRequest) request;
-			if (httpEntityEnclosingRequest.getEntity() != null) {
+			if (httpEntityEnclosingRequest.getEntity() == null) {
+				signableRequest.setContent(new ByteArrayInputStream(new byte[0]));
+			} else {
 				signableRequest.setContent(httpEntityEnclosingRequest.getEntity().getContent());
 			}
 		}
diff --git a/timbermill-java/timbermill-server/pom.xml b/timbermill-java/timbermill-server/pom.xml
@@ -16,7 +16,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.source-target.version>1.8</java.source-target.version>
-        <timbermill.version>2.4.0</timbermill.version>
+        <timbermill.version>2.4.1</timbermill.version>
         <slf4jVersion>1.7.28</slf4jVersion>
     </properties>
 
diff --git a/timbermill-java/timbermill-server/src/test/java/com/datorama/oss/timbermill/TimberLogLocalTest.java b/timbermill-java/timbermill-server/src/test/java/com/datorama/oss/timbermill/TimberLogLocalTest.java
@@ -1,6 +1,5 @@
 package com.datorama.oss.timbermill;
 
-import com.datorama.oss.timbermill.unit.LogParams;
 import org.apache.commons.lang3.StringUtils;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -39,6 +38,11 @@ public void testSimpleTaskWithParams(){
         super.testSimpleTaskWithParams();
     }
 
+    @Test
+    public void testEndWithingAnnotation(){
+        super.testEndWithingAnnotation();
+    }
+
     @Test
     public void testSwitchCasePlugin() {
         super.testSwitchCasePlugin();
diff --git a/timbermill-java/timbermill-server/src/test/java/com/datorama/oss/timbermill/TimberLogServerTest.java b/timbermill-java/timbermill-server/src/test/java/com/datorama/oss/timbermill/TimberLogServerTest.java
@@ -40,6 +40,11 @@ public void testSimpleTaskWithParams(){
         super.testSimpleTaskWithParams();
     }
 
+    @Test
+    public void testEndWithingAnnotation(){
+        super.testEndWithingAnnotation();
+    }
+
     @Test
     public void testSwitchCasePlugin() {
         super.testSwitchCasePlugin();
diff --git a/timbermill-java/timbermill-server/src/test/java/com/datorama/oss/timbermill/TimberLogTest.java b/timbermill-java/timbermill-server/src/test/java/com/datorama/oss/timbermill/TimberLogTest.java
@@ -6,10 +6,12 @@
 import com.datorama.oss.timbermill.unit.LogParams;
 import com.datorama.oss.timbermill.unit.Task;
 import com.datorama.oss.timbermill.unit.TaskStatus;
+import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.awaitility.Awaitility;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Callable;
@@ -169,6 +171,43 @@ protected void testSimpleTaskWithParams(){
 		assertEquals(str2, strings.get(str2));
 	}
 
+	protected void testEndWithingAnnotation(){
+		List<String> taskIds = simpleTask1();
+
+		String taskId3 = taskIds.get(0);
+		String taskId2 = taskIds.get(1);
+		String taskId1 = taskIds.get(2);
+
+		waitForTask(taskId1, TaskStatus.SUCCESS, client);
+		waitForTask(taskId2, TaskStatus.ERROR, client);
+		waitForTask(taskId3, TaskStatus.SUCCESS, client);
+
+	}
+
+	@TimberLogTask(name = EVENT  + "1")
+	private ArrayList<String> simpleTask1() {
+		String currentTaskId = TimberLogger.getCurrentTaskId();
+		ArrayList<String> ids = simpleTask2();
+		TimberLogger.success();
+		ids.add(currentTaskId);
+		return ids;
+	}
+
+	@TimberLogTask(name = EVENT + "2")
+	private ArrayList<String> simpleTask2() {
+		String currentTaskId = TimberLogger.getCurrentTaskId();
+		String taskId3 = simpleTask3();
+		TimberLogger.error();
+		return Lists.newArrayList(taskId3, currentTaskId);
+	}
+
+	@TimberLogTask(name = EVENT + "3")
+	private String simpleTask3() {
+		String currentTaskId = TimberLogger.getCurrentTaskId();
+		TimberLogger.success();
+		return currentTaskId;
+	}
+
 	@TimberLogTask(name = EVENT, logParameters = true)
 	private String simpleTaskWithParams(String str, String str2) {
 		return TimberLogger.getCurrentTaskId();

Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,15 @@ String startEvent(String taskId, String name, String parentTaskId, LogParams log`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`
	`97`	`+ void successEvent(String taskId) {`
	`98`	`+ if (!taskIdStack.isEmpty()) {`
	`99`	`+ String latestTaskId = taskIdStack.peek();`
	`100`	`+ if (latestTaskId != null && latestTaskId.equals(taskId)) {`
	`101`	`+ successEvent();`
	`102`	`+ }`
	`103`	`+ }`
	`104`	`+ }`
	`105`	`+`
`97`	`106`	`String successEvent() {`
`98`	`107`	`return successEvent(null, LogParams.create());`
`99`	`108`	`}`
`@@ -111,6 +120,15 @@ String successEvent(String ongoingTaskId, LogParams logParams) {`
`111`	`120`	`}`
`112`	`121`	`}`
`113`	`122`
	`123`	`+ void endWithError(String taskId, Throwable t) {`
	`124`	`+ if (!taskIdStack.isEmpty()) {`
	`125`	`+ String latestTaskId = taskIdStack.peek();`
	`126`	`+ if (latestTaskId != null && latestTaskId.equals(taskId)) {`
	`127`	`+ endWithError(t);`
	`128`	`+ }`
	`129`	`+ }`
	`130`	`+ }`
	`131`	`+`
`114`	`132`	`String endWithError(Throwable t) {`
`115`	`133`	`return endWithError(t, null, null);`
`116`	`134`	`}`
Original file line number	Diff line number	Diff line change
`@@ -136,6 +136,10 @@ public static String success(LogParams logParams) {`
`136`	`136`	`return EventLogger.get().successEvent(null, logParams);`
`137`	`137`	`}`
`138`	`138`
	`139`	`+ public static void success(String taskId) {`
	`140`	`+ EventLogger.get().successEvent(taskId);`
	`141`	`+ }`
	`142`	`+`
`139`	`143`	`public static String error() {`
`140`	`144`	`return error(LogParams.create());`
`141`	`145`	`}`
`@@ -152,6 +156,10 @@ public static String error(Throwable t, LogParams logParams) {`
`152`	`156`	`return EventLogger.get().endWithError(t, null, logParams);`
`153`	`157`	`}`
`154`	`158`
	`159`	`+ public static void error(String taskId, Throwable t) {`
	`160`	`+ EventLogger.get().endWithError(taskId, t);`
	`161`	`+ }`
	`162`	`+`
`155`	`163`	`public static String spot(String name) {`
`156`	`164`	`return spot(name, null);`
`157`	`165`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,13 +18,13 @@ public Object timberLog(ProceedingJoinPoint pjp, TimberLogTask timberLogAnnotati`
`18`	`18`	`if (timberLogAnnotation.logParameters()) {`
`19`	`19`	`logParams = getLogParamsForMethodParams(pjp, logParams);`
`20`	`20`	`}`
`21`		`- TimberLogger.start(timberLogAnnotation.name(), logParams);`
	`21`	`+ String taskId = TimberLogger.start(timberLogAnnotation.name(), logParams);`
`22`	`22`	`try {`
`23`	`23`	`Object obj = pjp.proceed();`
`24`		`- TimberLogger.success();`
	`24`	`+ TimberLogger.success(taskId);`
`25`	`25`	`return obj;`
`26`	`26`	`} catch (Exception e){`
`27`		`- TimberLogger.error(e);`
	`27`	`+ TimberLogger.error(taskId, e);`
`28`	`28`	`throw e;`
`29`	`29`	`}`
`30`	`30`	`}`