Add more tests

Author: itssimon

src/test/java/io/apitally/common/RequestLoggerTest.java

@@ -11,6 +11,7 @@
 import io.apitally.common.dto.LogRecord;
 import io.apitally.common.dto.Request;
 import io.apitally.common.dto.Response;
+import io.apitally.common.dto.SpanData;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Base64;
@@ -34,6 +35,7 @@ void setUp() {
         requestLoggingConfig.setResponseHeadersIncluded(true);
         requestLoggingConfig.setResponseBodyIncluded(true);
         requestLoggingConfig.setLogCaptureEnabled(true);
+        requestLoggingConfig.setTracingEnabled(true);
         requestLogger = new RequestLogger(requestLoggingConfig);
     }
 
@@ -72,7 +74,29 @@ void testEndToEnd() {
                         "test.Logger",
                         "INFO",
                         "Test log message"));
-        requestLogger.logRequest(request, response, exception, logs, null, null);
+        List<SpanData> spans = new ArrayList<>();
+        spans.add(
+                new SpanData(
+                        "a1b2c3d4e5f6a7b8",
+                        null,
+                        "root",
+                        "INTERNAL",
+                        1000000L,
+                        2000000L,
+                        null,
+                        null));
+        spans.add(
+                new SpanData(
+                        "b2c3d4e5f6a7b8c9",
+                        "a1b2c3d4e5f6a7b8",
+                        "child",
+                        "INTERNAL",
+                        1100000L,
+                        1900000L,
+                        "OK",
+                        null));
+        String traceId = "a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6";
+        requestLogger.logRequest(request, response, exception, logs, spans, traceId);
 
         JsonNode[] items = getLoggedItems(requestLogger);
         assertEquals(1, items.length);
@@ -114,6 +138,14 @@ void testEndToEnd() {
         assertEquals("INFO", logsNode.get(0).get("level").asText());
         assertEquals("Test log message", logsNode.get(0).get("message").asText());
 
+        assertEquals("a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6", jsonNode.get("trace_id").asText());
+        JsonNode spansNode = jsonNode.get("spans");
+        assertTrue(spansNode.isArray());
+        assertEquals(2, spansNode.size());
+        assertEquals("root", spansNode.get(0).get("name").asText());
+        assertEquals("child", spansNode.get(1).get("name").asText());
+        assertEquals("a1b2c3d4e5f6a7b8", spansNode.get(1).get("parent_span_id").asText());
+
         requestLogger.clear();
 
         items = getLoggedItems(requestLogger);

src/test/java/io/apitally/spring/ApitallyFilterTest.java

@@ -52,8 +52,13 @@ static class TestConfig {
         @Bean
         public ApitallyClient apitallyClient(ApitallyProperties properties) {
             LogAppender.register();
-            return new ApitallyClient(
-                    properties.getClientId(), properties.getEnv(), properties.getRequestLogging());
+            ApitallyClient client =
+                    new ApitallyClient(
+                            properties.getClientId(),
+                            properties.getEnv(),
+                            properties.getRequestLogging());
+            ApitallySpanCollector.getInstance().setDelegate(client.spanCollector);
+            return client;
         }
 
         @Bean
@@ -289,6 +294,7 @@ void testRequestLogger() {
         apitallyClient.requestLogger.getConfig().setRequestBodyIncluded(true);
         apitallyClient.requestLogger.getConfig().setResponseBodyIncluded(true);
         apitallyClient.requestLogger.getConfig().setLogCaptureEnabled(true);
+        apitallyClient.requestLogger.getConfig().setTracingEnabled(true);
         apitallyClient.requestLogger.clear();
 
         ResponseEntity<String> response = restTemplate.getForEntity("/items", String.class);
@@ -321,6 +327,14 @@ void testRequestLogger() {
         assertTrue(firstItem.get("logs").size() > 0);
         assertTrue(firstItem.get("logs").get(0).get("message").asText().contains("Getting items"));
 
+        // Verify spans were captured
+        assertTrue(firstItem.has("spans"));
+        assertTrue(firstItem.get("spans").isArray());
+        assertTrue(firstItem.get("spans").size() >= 2); // root span + child span
+        assertTrue(
+                java.util.stream.StreamSupport.stream(firstItem.get("spans").spliterator(), false)
+                        .anyMatch(span -> span.get("name").asText().equals("fetchItems")));
+
         // Verify POST request logging with request body
         JsonNode secondItem = items[1];
         assertEquals("POST", secondItem.get("request").get("method").asText());

src/test/java/io/apitally/spring/app/TestController.java

@@ -38,11 +38,18 @@ public List<TestItem> getItems(
             HttpServletRequest request,
             @RequestParam(required = false) @Size(min = 2, max = 10) String name) {
         logger.info("Getting items with filter: {}", name != null ? name : "none");
+
         ApitallyConsumer consumer = new ApitallyConsumer("tester", "Tester", "Test Group");
         request.setAttribute("apitallyConsumer", consumer);
+
+        Tracer tracer = GlobalOpenTelemetry.getTracer("test");
+        Span childSpan = tracer.spanBuilder("fetchItems").startSpan();
+        childSpan.setAttribute("filter", name != null ? name : "none");
         List<TestItem> items = new ArrayList<TestItem>();
         items.add(new TestItem(1, "bob"));
         items.add(new TestItem(2, "alice"));
+        childSpan.end();
+
         logger.debug("Returning {} items", items.size());
         return items;
     }
@@ -53,11 +60,6 @@ public void addItem(@Valid @RequestBody TestItem newItem) {}
 
     @GetMapping("/items/{id}")
     public TestItem getItem(@PathVariable @Min(1) Integer id) {
-        Tracer tracer = GlobalOpenTelemetry.getTracer("test");
-        Span childSpan = tracer.spanBuilder("fetchItemFromDatabase").startSpan();
-        childSpan.setAttribute("item.id", id);
-        childSpan.end();
-
         TestItem item = new TestItem(id, "bob");
         return item;
     }