From 7fd55ea8ba92830ddad59dd3fe3d9a0516254946 Mon Sep 17 00:00:00 2001 From: hsiegeln <37154749+hsiegeln@users.noreply.github.com> Date: Wed, 25 Mar 2026 13:11:11 +0100 Subject: [PATCH] fix: remove core LogIndexService to fix CI snapshot resolution LogIndexService in server-core imported LogEntry from cameleer3-common, but the SNAPSHOT on the registry may not have it yet when the server CI runs. Moved the dependency to server-app where both the controller and OpenSearch implementation live. Co-Authored-By: Claude Opus 4.6 (1M context) --- .../server/app/controller/LogIngestionController.java | 10 +++++----- .../server/app/search/OpenSearchLogIndex.java | 4 +--- .../cameleer3/server/core/logging/LogIndexService.java | 10 ---------- 3 files changed, 6 insertions(+), 18 deletions(-) delete mode 100644 cameleer3-server-core/src/main/java/com/cameleer3/server/core/logging/LogIndexService.java diff --git a/cameleer3-server-app/src/main/java/com/cameleer3/server/app/controller/LogIngestionController.java b/cameleer3-server-app/src/main/java/com/cameleer3/server/app/controller/LogIngestionController.java index 0ff278cc..480ac951 100644 --- a/cameleer3-server-app/src/main/java/com/cameleer3/server/app/controller/LogIngestionController.java +++ b/cameleer3-server-app/src/main/java/com/cameleer3/server/app/controller/LogIngestionController.java @@ -1,9 +1,9 @@ package com.cameleer3.server.app.controller; import com.cameleer3.common.model.LogBatch; +import com.cameleer3.server.app.search.OpenSearchLogIndex; import com.cameleer3.server.core.agent.AgentInfo; import com.cameleer3.server.core.agent.AgentRegistryService; -import com.cameleer3.server.core.logging.LogIndexService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.tags.Tag; @@ -24,12 +24,12 @@ public class LogIngestionController { private static final Logger log = LoggerFactory.getLogger(LogIngestionController.class); - private final LogIndexService logIndexService; + private final OpenSearchLogIndex logIndex; private final AgentRegistryService registryService; - public LogIngestionController(LogIndexService logIndexService, + public LogIngestionController(OpenSearchLogIndex logIndex, AgentRegistryService registryService) { - this.logIndexService = logIndexService; + this.logIndex = logIndex; this.registryService = registryService; } @@ -43,7 +43,7 @@ public class LogIngestionController { if (batch.getEntries() != null && !batch.getEntries().isEmpty()) { log.debug("Received {} log entries from agent={}, app={}", batch.getEntries().size(), agentId, application); - logIndexService.indexBatch(agentId, application, batch.getEntries()); + logIndex.indexBatch(agentId, application, batch.getEntries()); } return ResponseEntity.accepted().build(); diff --git a/cameleer3-server-app/src/main/java/com/cameleer3/server/app/search/OpenSearchLogIndex.java b/cameleer3-server-app/src/main/java/com/cameleer3/server/app/search/OpenSearchLogIndex.java index 4177d14d..ea81544c 100644 --- a/cameleer3-server-app/src/main/java/com/cameleer3/server/app/search/OpenSearchLogIndex.java +++ b/cameleer3-server-app/src/main/java/com/cameleer3/server/app/search/OpenSearchLogIndex.java @@ -1,7 +1,6 @@ package com.cameleer3.server.app.search; import com.cameleer3.common.model.LogEntry; -import com.cameleer3.server.core.logging.LogIndexService; import jakarta.annotation.PostConstruct; import org.opensearch.client.opensearch.OpenSearchClient; import org.opensearch.client.opensearch._types.mapping.Property; @@ -23,7 +22,7 @@ import java.util.List; import java.util.Map; @Repository -public class OpenSearchLogIndex implements LogIndexService { +public class OpenSearchLogIndex { private static final Logger log = LoggerFactory.getLogger(OpenSearchLogIndex.class); private static final DateTimeFormatter DAY_FMT = DateTimeFormatter.ofPattern("yyyy-MM-dd") @@ -92,7 +91,6 @@ public class OpenSearchLogIndex implements LogIndexService { } } - @Override public void indexBatch(String agentId, String application, List entries) { if (entries == null || entries.isEmpty()) { return; diff --git a/cameleer3-server-core/src/main/java/com/cameleer3/server/core/logging/LogIndexService.java b/cameleer3-server-core/src/main/java/com/cameleer3/server/core/logging/LogIndexService.java deleted file mode 100644 index 8e689bbb..00000000 --- a/cameleer3-server-core/src/main/java/com/cameleer3/server/core/logging/LogIndexService.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.cameleer3.server.core.logging; - -import com.cameleer3.common.model.LogEntry; - -import java.util.List; - -public interface LogIndexService { - - void indexBatch(String agentId, String application, List entries); -}