fix: add source parameter to LogSearchRequest/LogEntry calls in ClickHouseLogStoreIT
All constructor calls updated to include the new source field added in the log forwarding v2 changes. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -49,11 +49,11 @@ class ClickHouseLogStoreIT {
|
|||||||
|
|
||||||
private LogEntry entry(Instant ts, String level, String logger, String message,
|
private LogEntry entry(Instant ts, String level, String logger, String message,
|
||||||
String thread, String stackTrace, Map<String, String> mdc) {
|
String thread, String stackTrace, Map<String, String> mdc) {
|
||||||
return new LogEntry(ts, level, logger, message, thread, stackTrace, mdc);
|
return new LogEntry(ts, level, logger, message, thread, stackTrace, mdc, "app");
|
||||||
}
|
}
|
||||||
|
|
||||||
private LogSearchRequest req(String application) {
|
private LogSearchRequest req(String application) {
|
||||||
return new LogSearchRequest(null, null, application, null, null, null, null, null, null, null, 100, "desc");
|
return new LogSearchRequest(null, null, application, null, null, null, null, null, null, null, null, 100, "desc");
|
||||||
}
|
}
|
||||||
|
|
||||||
// ── Tests ─────────────────────────────────────────────────────────────
|
// ── Tests ─────────────────────────────────────────────────────────────
|
||||||
@@ -99,7 +99,7 @@ class ClickHouseLogStoreIT {
|
|||||||
));
|
));
|
||||||
|
|
||||||
LogSearchResponse result = store.search(new LogSearchRequest(
|
LogSearchResponse result = store.search(new LogSearchRequest(
|
||||||
null, List.of("ERROR"), "my-app", null, null, null, null, null, null, null, 100, "desc"));
|
null, List.of("ERROR"), "my-app", null, null, null, null, null, null, null, null, 100, "desc"));
|
||||||
|
|
||||||
assertThat(result.data()).hasSize(1);
|
assertThat(result.data()).hasSize(1);
|
||||||
assertThat(result.data().get(0).level()).isEqualTo("ERROR");
|
assertThat(result.data().get(0).level()).isEqualTo("ERROR");
|
||||||
@@ -116,7 +116,7 @@ class ClickHouseLogStoreIT {
|
|||||||
));
|
));
|
||||||
|
|
||||||
LogSearchResponse result = store.search(new LogSearchRequest(
|
LogSearchResponse result = store.search(new LogSearchRequest(
|
||||||
null, List.of("WARN", "ERROR"), "my-app", null, null, null, null, null, null, null, 100, "desc"));
|
null, List.of("WARN", "ERROR"), "my-app", null, null, null, null, null, null, null, null, 100, "desc"));
|
||||||
|
|
||||||
assertThat(result.data()).hasSize(2);
|
assertThat(result.data()).hasSize(2);
|
||||||
}
|
}
|
||||||
@@ -130,7 +130,7 @@ class ClickHouseLogStoreIT {
|
|||||||
));
|
));
|
||||||
|
|
||||||
LogSearchResponse result = store.search(new LogSearchRequest(
|
LogSearchResponse result = store.search(new LogSearchRequest(
|
||||||
"order #12345", null, "my-app", null, null, null, null, null, null, null, 100, "desc"));
|
"order #12345", null, "my-app", null, null, null, null, null, null, null, null, 100, "desc"));
|
||||||
|
|
||||||
assertThat(result.data()).hasSize(1);
|
assertThat(result.data()).hasSize(1);
|
||||||
assertThat(result.data().get(0).message()).contains("order #12345");
|
assertThat(result.data().get(0).message()).contains("order #12345");
|
||||||
@@ -147,7 +147,7 @@ class ClickHouseLogStoreIT {
|
|||||||
));
|
));
|
||||||
|
|
||||||
LogSearchResponse result = store.search(new LogSearchRequest(
|
LogSearchResponse result = store.search(new LogSearchRequest(
|
||||||
null, null, "my-app", null, "exchange-abc", null, null, null, null, null, 100, "desc"));
|
null, null, "my-app", null, "exchange-abc", null, null, null, null, null, null, 100, "desc"));
|
||||||
|
|
||||||
assertThat(result.data()).hasSize(1);
|
assertThat(result.data()).hasSize(1);
|
||||||
assertThat(result.data().get(0).message()).isEqualTo("msg with exchange");
|
assertThat(result.data().get(0).message()).isEqualTo("msg with exchange");
|
||||||
@@ -170,7 +170,7 @@ class ClickHouseLogStoreIT {
|
|||||||
Instant to = Instant.parse("2026-03-31T13:00:00Z");
|
Instant to = Instant.parse("2026-03-31T13:00:00Z");
|
||||||
|
|
||||||
LogSearchResponse result = store.search(new LogSearchRequest(
|
LogSearchResponse result = store.search(new LogSearchRequest(
|
||||||
null, null, "my-app", null, null, null, null, from, to, null, 100, "desc"));
|
null, null, "my-app", null, null, null, null, null, from, to, null, 100, "desc"));
|
||||||
|
|
||||||
assertThat(result.data()).hasSize(1);
|
assertThat(result.data()).hasSize(1);
|
||||||
assertThat(result.data().get(0).message()).isEqualTo("noon");
|
assertThat(result.data().get(0).message()).isEqualTo("noon");
|
||||||
@@ -188,7 +188,7 @@ class ClickHouseLogStoreIT {
|
|||||||
|
|
||||||
// No application filter — should return both
|
// No application filter — should return both
|
||||||
LogSearchResponse result = store.search(new LogSearchRequest(
|
LogSearchResponse result = store.search(new LogSearchRequest(
|
||||||
null, null, null, null, null, null, null, null, null, null, 100, "desc"));
|
null, null, null, null, null, null, null, null, null, null, null, 100, "desc"));
|
||||||
|
|
||||||
assertThat(result.data()).hasSize(2);
|
assertThat(result.data()).hasSize(2);
|
||||||
}
|
}
|
||||||
@@ -202,7 +202,7 @@ class ClickHouseLogStoreIT {
|
|||||||
));
|
));
|
||||||
|
|
||||||
LogSearchResponse result = store.search(new LogSearchRequest(
|
LogSearchResponse result = store.search(new LogSearchRequest(
|
||||||
null, null, "my-app", null, null, "OrderProcessor", null, null, null, null, 100, "desc"));
|
null, null, "my-app", null, null, "OrderProcessor", null, null, null, null, null, 100, "desc"));
|
||||||
|
|
||||||
assertThat(result.data()).hasSize(1);
|
assertThat(result.data()).hasSize(1);
|
||||||
assertThat(result.data().get(0).loggerName()).contains("OrderProcessor");
|
assertThat(result.data().get(0).loggerName()).contains("OrderProcessor");
|
||||||
@@ -221,7 +221,7 @@ class ClickHouseLogStoreIT {
|
|||||||
|
|
||||||
// Page 1: limit 2
|
// Page 1: limit 2
|
||||||
LogSearchResponse page1 = store.search(new LogSearchRequest(
|
LogSearchResponse page1 = store.search(new LogSearchRequest(
|
||||||
null, null, "my-app", null, null, null, null, null, null, null, 2, "desc"));
|
null, null, "my-app", null, null, null, null, null, null, null, null, 2, "desc"));
|
||||||
|
|
||||||
assertThat(page1.data()).hasSize(2);
|
assertThat(page1.data()).hasSize(2);
|
||||||
assertThat(page1.hasMore()).isTrue();
|
assertThat(page1.hasMore()).isTrue();
|
||||||
@@ -230,7 +230,7 @@ class ClickHouseLogStoreIT {
|
|||||||
|
|
||||||
// Page 2: use cursor
|
// Page 2: use cursor
|
||||||
LogSearchResponse page2 = store.search(new LogSearchRequest(
|
LogSearchResponse page2 = store.search(new LogSearchRequest(
|
||||||
null, null, "my-app", null, null, null, null, null, null, page1.nextCursor(), 2, "desc"));
|
null, null, "my-app", null, null, null, null, null, null, null, page1.nextCursor(), 2, "desc"));
|
||||||
|
|
||||||
assertThat(page2.data()).hasSize(2);
|
assertThat(page2.data()).hasSize(2);
|
||||||
assertThat(page2.hasMore()).isTrue();
|
assertThat(page2.hasMore()).isTrue();
|
||||||
@@ -238,7 +238,7 @@ class ClickHouseLogStoreIT {
|
|||||||
|
|
||||||
// Page 3: last page
|
// Page 3: last page
|
||||||
LogSearchResponse page3 = store.search(new LogSearchRequest(
|
LogSearchResponse page3 = store.search(new LogSearchRequest(
|
||||||
null, null, "my-app", null, null, null, null, null, null, page2.nextCursor(), 2, "desc"));
|
null, null, "my-app", null, null, null, null, null, null, null, page2.nextCursor(), 2, "desc"));
|
||||||
|
|
||||||
assertThat(page3.data()).hasSize(1);
|
assertThat(page3.data()).hasSize(1);
|
||||||
assertThat(page3.hasMore()).isFalse();
|
assertThat(page3.hasMore()).isFalse();
|
||||||
@@ -257,7 +257,7 @@ class ClickHouseLogStoreIT {
|
|||||||
|
|
||||||
// Filter for ERROR only, but counts should include all levels
|
// Filter for ERROR only, but counts should include all levels
|
||||||
LogSearchResponse result = store.search(new LogSearchRequest(
|
LogSearchResponse result = store.search(new LogSearchRequest(
|
||||||
null, List.of("ERROR"), "my-app", null, null, null, null, null, null, null, 100, "desc"));
|
null, List.of("ERROR"), "my-app", null, null, null, null, null, null, null, null, 100, "desc"));
|
||||||
|
|
||||||
assertThat(result.data()).hasSize(1);
|
assertThat(result.data()).hasSize(1);
|
||||||
assertThat(result.levelCounts()).containsEntry("INFO", 2L);
|
assertThat(result.levelCounts()).containsEntry("INFO", 2L);
|
||||||
@@ -275,7 +275,7 @@ class ClickHouseLogStoreIT {
|
|||||||
));
|
));
|
||||||
|
|
||||||
LogSearchResponse result = store.search(new LogSearchRequest(
|
LogSearchResponse result = store.search(new LogSearchRequest(
|
||||||
null, null, "my-app", null, null, null, null, null, null, null, 100, "asc"));
|
null, null, "my-app", null, null, null, null, null, null, null, null, 100, "asc"));
|
||||||
|
|
||||||
assertThat(result.data()).hasSize(3);
|
assertThat(result.data()).hasSize(3);
|
||||||
assertThat(result.data().get(0).message()).isEqualTo("msg-1");
|
assertThat(result.data().get(0).message()).isEqualTo("msg-1");
|
||||||
|
|||||||
Reference in New Issue
Block a user