fix/logger and events handler improvements, wrong api endpoint provided

Author: piotr-szewczyk

.idea/workspace.xml

@@ -40,7 +40,7 @@ public void catchException(Throwable throwable, String message, EventCallback<Tr
         }
 
         try {
-            DefaultRequest<TraceoIncident> request = new DefaultRequest<>("/incident", payload);
+            DefaultRequest<TraceoIncident> request = new DefaultRequest<>("/api/capture/incident", payload);
             options.getHttpClient().execute(request);
         } catch (Throwable e) {
             LOGGER.error("Failed to send exception.", e);
@@ -79,10 +79,10 @@ private static List<TraceoTrace> getTraceList(Throwable throwable) {
 
             String[] splitFilename = stackTraceElement.getFileName().split("\\.");
             if (splitFilename.length > 1) {
-                trace.setFilename(splitFilename[0]);
                 trace.setExtension(splitFilename[1]);
             }
 
+            trace.setFilename(stackTraceElement.getFileName());
             trace.setLineNo(stackTraceElement.getLineNumber());
             trace.setAbsPath(stackTraceElement.getClassName());
 

traceo-sdk-core/src/main/java/com/traceo/sdk/handlers/IncidentHandler.java

@@ -89,10 +89,10 @@ public Future<HttpResponse> execute(IRequest<?> request) {
                 public void completed(HttpResponse httpResponse) {
                     int statusCode = httpResponse.getStatusLine().getStatusCode();
 
-                    if (statusCode != 200) {
-                        LOGGER.error("Failed to send request. Received status code: {}", statusCode);
-                    } else {
+                    if (statusCode >= 200 && statusCode <= 300) {
                         LOGGER.log("Request has been send successfully.");
+                    } else {
+                        LOGGER.error("Failed to send request. Received status code: {}", statusCode);
                     }
 
                     latch.countDown();

traceo-sdk-core/src/main/java/com/traceo/sdk/http/HttpAsyncClient.java

@@ -41,7 +41,13 @@ public void process(TraceoLogLevel level, String message, Object... args) {
             className = logger.getName();
         }
 
-        TraceoLog log = new TraceoLog(message, level, className, argsToResources(args));
+        StringBuilder logMsg = new StringBuilder(String.format("[%s] %s", className, message));
+
+        for (Object arg : args) {
+            logMsg.append(" ").append(arg.toString());
+        }
+
+        TraceoLog log = new TraceoLog(logMsg.toString(), level, className, argsToResources(args));
         logsPool.add(log);
 
         if (logsPool.size() >= MAX_LOGS_IN_POOL) {
@@ -73,7 +79,7 @@ public void send() {
         }
 
         try {
-            DefaultRequest<List<TraceoLog>> request = new DefaultRequest<>("/logs", logsPool);
+            DefaultRequest<List<TraceoLog>> request = new DefaultRequest<>("/api/capture/log", logsPool);
             Future<HttpResponse> response = (Future<HttpResponse>) clientOptions.getHttpClient().execute(request);
             int statusCode = response.get().getStatusLine().getStatusCode();
             if (statusCode == 200) {

traceo-sdk-core/src/main/java/com/traceo/sdk/logging/client/LogsHandler.java

@@ -12,7 +12,7 @@
  */
 public class TraceoLogger implements Ilogger {
 
-    private static final String BASE_LOGGER_NAME = "TraceoLogger";
+    private static final String BASE_LOGGER_NAME = "com.traceo.sdk.logging.client.TraceoLogger";
 
     private static ClientOptions clientOptions = new ClientOptions();
 

traceo-sdk-core/src/main/java/com/traceo/sdk/logging/client/TraceoLogger.java

@@ -6,7 +6,7 @@
 public class TimestampUtils {
 
     public static long getCurrentUnixTimestamp() {
-        return System.currentTimeMillis() / 1000;
+        return System.currentTimeMillis();
     }
 
     public static String getCurrentTimestamp() {

traceo-sdk-core/src/main/java/com/traceo/sdk/utils/TimestampUtils.java

@@ -3,6 +3,8 @@
 import com.traceo.sdk.client.TraceoClient;
 import com.traceo.sdk.client.TraceoClientBuilder;
 import com.traceo.sdk.client.TraceoClientConfiguration;
+import com.traceo.sdk.logging.client.TraceoLogger;
+import com.traceo.sdk.utils.TimestampUtils;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -12,8 +14,8 @@ public class IncidentHandlerTest {
     public void setUp() {
         TraceoClientConfiguration configs = TraceoClientBuilder
                 .standard()
-                .withApiKey("xxx")
-                .withHost("https://webhook.site/488164a0-5467-4621-9212-2974cc3eebc7/")
+                .withApiKey("tr_408917b2-42fb-43d9-8602-861879c1a273")
+                .withHost("http://localhost:3000")
                 .withDebug(true)
                 .withCatchUncaughtException(true)
                 .build();
@@ -24,11 +26,17 @@ public void setUp() {
     @Test
     public void testCaptureException() throws ClassNotFoundException {
         try {
-//            throw new NullPointerException("Bardzo fajny exception");
-            double value = 1 / 0;
-            System.out.println(value);
-        } catch (NullPointerException exception) {
-//            TraceoClient.catchException("CO TO KURWA MA BYĆ", exception);
+            throw new ArrayIndexOutOfBoundsException();
+        } catch (ArrayIndexOutOfBoundsException exception) {
+            TraceoClient.catchException("CO TO KURWA MA BYĆ", exception);
+        }
+    }
+
+    @Test
+    public void testLogger() {
+        TraceoLogger traceoLogger = TraceoClient.getLogger(HttpClientTest.class.getName());
+        for (int i=0; i< 50; i++) {
+            traceoLogger.log("xxxxxxxxxxxxxx", "arg1", "arg2", "arg3");
         }
     }
 }