Skip to content

Commit 3909015

Browse files
xuehuitian45xuehuitian45
authored
fix: unify logger to slf4j (#81)
1 parent d602169 commit 3909015

File tree

75 files changed

+875
-899
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+875
-899
lines changed

‎agents/agentscope/src/main/java/io/agentscope/runtime/engine/agents/agentscope/tools/ToolkitInit.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,16 @@
2727
import io.agentscope.runtime.sandbox.manager.model.container.SandboxType;
2828
import io.agentscope.runtime.sandbox.tools.MCPTool;
2929
import io.agentscope.runtime.sandbox.tools.McpConfigConverter;
30+
import org.slf4j.Logger;
31+
import org.slf4j.LoggerFactory;
3032

3133
import java.util.ArrayList;
3234
import java.util.List;
3335
import java.util.Map;
3436
import java.util.Set;
35-
import java.util.logging.Logger;
3637

3738
public class ToolkitInit {
38-
private static final Logger logger = Logger.getLogger(ToolkitInit.class.getName());
39+
private static final Logger logger = LoggerFactory.getLogger(ToolkitInit.class);
3940

4041
public static List<AgentTool> getAllTools(Sandbox sandbox) {
4142
return List.of(
@@ -421,10 +422,10 @@ private static List<AgentTool> buildMcpAgentTools(McpConfigConverter converter)
421422
agentTools.add(new AsMCPTool(mcpTool));
422423
}
423424

424-
logger.info(String.format("Created %d MCP tools", agentTools.size()));
425+
logger.info("Created {} MCP tools", agentTools.size());
425426
return agentTools;
426427
} catch (Exception e) {
427-
logger.severe("Failed to create MCP tools: " + e.getMessage());
428+
logger.error("Failed to create MCP tools: {}", e.getMessage());
428429
throw new RuntimeException("Failed to create MCP tools", e);
429430
}
430431
}

‎core/src/main/java/io/agentscope/runtime/engine/services/memory/persistence/memory/service/Mem0MemoryService.java‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import java.util.Optional;
2626
import java.util.Set;
2727
import java.util.concurrent.CompletableFuture;
28-
import java.util.logging.Logger;
2928

3029
import com.fasterxml.jackson.databind.JsonNode;
3130
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -45,6 +44,8 @@
4544
import org.apache.hc.core5.http.ContentType;
4645
import org.apache.hc.core5.http.io.entity.EntityUtils;
4746
import org.apache.hc.core5.http.io.entity.StringEntity;
47+
import org.slf4j.Logger;
48+
import org.slf4j.LoggerFactory;
4849

4950
/**
5051
* Mem0-based implementation of memory service
@@ -53,7 +54,7 @@
5354
*/
5455
public class Mem0MemoryService implements MemoryService {
5556

56-
private static final Logger logger = Logger.getLogger(Mem0MemoryService.class.getName());
57+
private static final Logger logger = LoggerFactory.getLogger(Mem0MemoryService.class);
5758
private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
5859
private static final String MEM0_API_BASE_URL = "https://api.mem0.ai";
5960
private static final String API_VERSION_V1 = "v1";
@@ -104,7 +105,7 @@ public CompletableFuture<Void> stop() {
104105
}
105106
logger.info("Mem0 memory service stopped");
106107
} catch (Exception e) {
107-
logger.severe("Failed to close HTTP client: " + e.getMessage());
108+
logger.error("Failed to close HTTP client: {}", e.getMessage());
108109
}
109110
});
110111
}
@@ -134,7 +135,7 @@ public CompletableFuture<Boolean> health() {
134135
return response.getCode() == 200;
135136
}
136137
} catch (Exception e) {
137-
logger.severe("Mem0 memory service health check failed: " + e.getMessage());
138+
logger.error("Mem0 memory service health check failed: {}", e.getMessage());
138139
return false;
139140
}
140141
});
@@ -180,14 +181,14 @@ public CompletableFuture<Void> addMemory(String userId, List<Message> messages,
180181
try (CloseableHttpResponse response = httpClient.execute(request)) {
181182
int statusCode = response.getCode();
182183
if (statusCode >= 200 && statusCode < 300) {
183-
logger.fine("Added " + messages.size() + " messages to Mem0 for user: " + userId);
184+
logger.info("Added {} messages to Mem0 for user: {}", messages.size(), userId);
184185
} else {
185186
String responseBody = EntityUtils.toString(response.getEntity());
186-
logger.warning("Failed to add memory: " + statusCode + " - " + responseBody);
187+
logger.warn("Failed to add memory: {} - {}", statusCode, responseBody);
187188
}
188189
}
189190
} catch (Exception e) {
190-
logger.severe("Failed to add memory: " + e.getMessage());
191+
logger.error("Failed to add memory: {}", e.getMessage());
191192
throw new RuntimeException("Failed to add memory", e);
192193
}
193194
});
@@ -272,12 +273,12 @@ public CompletableFuture<List<Message>> searchMemory(String userId, List<Message
272273
if (response.getCode() == 200) {
273274
return parseSearchResponse(responseBody);
274275
} else {
275-
logger.warning("Failed to search memory: " + response.getCode() + " - " + responseBody);
276+
logger.warn("Failed to search memory: {} - {}", response.getCode(), responseBody);
276277
return Collections.emptyList();
277278
}
278279
}
279280
} catch (Exception e) {
280-
logger.severe("Failed to search memory: " + e.getMessage());
281+
logger.error("Failed to search memory: {}", e.getMessage());
281282
return Collections.emptyList();
282283
}
283284
});
@@ -341,12 +342,12 @@ public CompletableFuture<List<Message>> listMemory(String userId, Optional<Map<S
341342

342343
return allMessages;
343344
} else {
344-
logger.warning("Failed to list memory: " + response.getCode() + " - " + responseBody);
345+
logger.warn("Failed to list memory: {} - {}", response.getCode(), responseBody);
345346
return Collections.emptyList();
346347
}
347348
}
348349
} catch (Exception e) {
349-
logger.severe("Failed to list memory: " + e.getMessage());
350+
logger.error("Failed to list memory: {}", e.getMessage());
350351
return Collections.emptyList();
351352
}
352353
});
@@ -411,18 +412,18 @@ public CompletableFuture<Void> deleteMemory(String userId, Optional<String> sess
411412

412413
try (CloseableHttpResponse deleteResponse = httpClient.execute(deleteRequest)) {
413414
if (deleteResponse.getCode() >= 200 && deleteResponse.getCode() < 300) {
414-
logger.fine("Deleted memory: " + memoryId);
415+
logger.info("Deleted memory: {}", memoryId);
415416
} else {
416417
String responseBody = EntityUtils.toString(deleteResponse.getEntity());
417-
logger.warning("Failed to delete memory " + memoryId + ": " + deleteResponse.getCode() + " - " + responseBody);
418+
logger.warn("Failed to delete memory {}: {} - {}", memoryId, deleteResponse.getCode(), responseBody);
418419
}
419420
}
420421
}
421422

422423
String sessionInfo = sessionId.map(s -> ", session: " + s).orElse("");
423-
logger.fine("Deleted " + memoryIds.size() + " memories for user: " + userId + sessionInfo);
424+
logger.info("Deleted {} memories for user: {}{}", memoryIds.size(), userId, sessionInfo);
424425
} catch (Exception e) {
425-
logger.severe("Failed to delete memory: " + e.getMessage());
426+
logger.error("Failed to delete memory: {}", e.getMessage());
426427
throw new RuntimeException("Failed to delete memory", e);
427428
}
428429
});
@@ -462,12 +463,12 @@ public CompletableFuture<List<String>> getAllUsers() {
462463
}
463464
return new ArrayList<>(userIds);
464465
} else {
465-
logger.warning("Failed to get all users: " + response.getCode() + " - " + responseBody);
466+
logger.warn("Failed to get all users: {} - {}", response.getCode(), responseBody);
466467
return Collections.emptyList();
467468
}
468469
}
469470
} catch (Exception e) {
470-
logger.severe("Failed to get all users: " + e.getMessage());
471+
logger.error("Failed to get all users: {}", e.getMessage());
471472
return Collections.emptyList();
472473
}
473474
});
@@ -544,7 +545,7 @@ private List<Message> parseSearchResponse(String responseBody) {
544545
}
545546
return messages;
546547
} catch (Exception e) {
547-
logger.severe("Failed to parse search response: " + e.getMessage());
548+
logger.error("Failed to parse search response: {}", e.getMessage());
548549
return Collections.emptyList();
549550
}
550551
}
@@ -569,7 +570,7 @@ private List<Message> parseListResponse(String responseBody) {
569570
}
570571
return messages;
571572
} catch (Exception e) {
572-
logger.severe("Failed to parse list response: " + e.getMessage());
573+
logger.error("Failed to parse list response: {}", e.getMessage());
573574
return Collections.emptyList();
574575
}
575576
}

‎core/src/main/java/io/agentscope/runtime/engine/services/memory/persistence/memory/service/RedisMemoryService.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
*/
1616
package io.agentscope.runtime.engine.services.memory.persistence.memory.service;
1717

18+
import org.slf4j.Logger;
19+
import org.slf4j.LoggerFactory;
1820
import org.springframework.data.redis.core.HashOperations;
1921
import org.springframework.data.redis.core.RedisTemplate;
2022

@@ -27,7 +29,6 @@
2729
import java.util.Optional;
2830
import java.util.Set;
2931
import java.util.concurrent.CompletableFuture;
30-
import java.util.logging.Logger;
3132
import java.util.stream.Collectors;
3233

3334
import com.fasterxml.jackson.core.JsonProcessingException;
@@ -41,7 +42,7 @@
4142
* Redis-based memory service implementation
4243
*/
4344
public class RedisMemoryService implements MemoryService {
44-
Logger logger = Logger.getLogger(RedisMemoryService.class.getName());
45+
private static final Logger logger = LoggerFactory.getLogger(MemoryService.class);
4546

4647
private final RedisTemplate<String, String> redisTemplate;
4748
private final ObjectMapper objectMapper;
@@ -128,7 +129,7 @@ public CompletableFuture<List<Message>> searchMemory(String userId, List<Message
128129
Set<String> keywords = Arrays.stream(query.toLowerCase().split("\\s+"))
129130
.collect(Collectors.toSet());
130131

131-
logger.info("keywords: "+keywords);
132+
logger.info("keywords: {}", keywords);
132133

133134
HashOperations<String, String, String> hashOps = redisTemplate.opsForHash();
134135
Map<String, String> allFields = hashOps.entries(key);

‎core/src/main/java/io/agentscope/runtime/engine/services/memory/persistence/memory/service/SimpleEmbeddingService.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,21 @@
2323
import java.util.Map;
2424
import java.util.Set;
2525
import java.util.concurrent.CompletableFuture;
26-
import java.util.logging.Logger;
2726
import java.util.stream.Collectors;
2827

2928
import io.agentscope.runtime.engine.services.memory.service.EmbeddingService;
3029
import org.apache.commons.math3.linear.ArrayRealVector;
3130
import org.apache.commons.math3.linear.RealVector;
31+
import org.slf4j.Logger;
32+
import org.slf4j.LoggerFactory;
3233

3334
/**
3435
* Simple text embedding service implementation
3536
* Uses TF-IDF and term frequency statistics as vector representation
3637
*/
3738
public class SimpleEmbeddingService implements EmbeddingService {
3839

39-
Logger logger = Logger.getLogger(SimpleEmbeddingService.class.getName());
40+
private static final Logger logger = LoggerFactory.getLogger(SimpleEmbeddingService.class);
4041
private static final int EMBEDDING_DIMENSION = 300; // Fixed dimension
4142

4243
private final Map<String, Integer> vocabulary = new HashMap<>();
@@ -68,7 +69,7 @@ public CompletableFuture<List<Double>> embedText(String text) {
6869
return embedding;
6970

7071
} catch (Exception e) {
71-
logger.severe("Failed to generate text embedding" + e.getMessage());
72+
logger.error("Failed to generate text embedding{}", e.getMessage());
7273
return createZeroVector();
7374
}
7475
});
@@ -95,7 +96,7 @@ public double cosineSimilarity(List<Double> vector1, List<Double> vector2) {
9596
return dotProduct / (norm1 * norm2);
9697

9798
} catch (Exception e) {
98-
logger.severe("Failed to compute cosine similarity" + e.getMessage());
99+
logger.error("Failed to compute cosine similarity{}", e.getMessage());
99100
return 0.0;
100101
}
101102
}
@@ -113,7 +114,7 @@ public double euclideanDistance(List<Double> vector1, List<Double> vector2) {
113114
return v1.getDistance(v2);
114115

115116
} catch (Exception e) {
116-
logger.severe("Failed to compute Euclidean distance" + e.getMessage());
117+
logger.error("Failed to compute Euclidean distance{}", e.getMessage());
117118
return Double.MAX_VALUE;
118119
}
119120
}

‎core/src/main/java/io/agentscope/runtime/engine/services/memory/persistence/memory/service/TableStoreMemoryService.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import java.util.Set;
2626
import java.util.UUID;
2727
import java.util.concurrent.CompletableFuture;
28-
import java.util.logging.Logger;
2928
import java.util.stream.Collectors;
3029

3130
import com.alicloud.openservices.tablestore.SyncClient;
@@ -42,14 +41,16 @@
4241
import io.agentscope.runtime.engine.schemas.Message;
4342
import io.agentscope.runtime.engine.schemas.TextContent;
4443
import io.agentscope.runtime.engine.services.memory.service.MemoryService;
44+
import org.slf4j.Logger;
45+
import org.slf4j.LoggerFactory;
4546

4647
/**
4748
* TableStore-based implementation of memory service
4849
* Uses Aliyun TableStore KnowledgeStore for persistent storage with search capabilities
4950
*/
5051
public class TableStoreMemoryService implements MemoryService {
5152

52-
private static final Logger logger = Logger.getLogger(TableStoreMemoryService.class.getName());
53+
private static final Logger logger = LoggerFactory.getLogger(MemoryService.class);
5354
private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
5455

5556
private static final String DEFAULT_SESSION_ID = "default";
@@ -96,7 +97,7 @@ public CompletableFuture<Void> start() {
9697
.build();
9798

9899
knowledgeStore.initTable();
99-
logger.info("TableStore memory service started with table: " + tableName);
100+
logger.info("TableStore memory service started with table: {}", tableName);
100101
});
101102
}
102103

@@ -114,7 +115,7 @@ public CompletableFuture<Void> stop() {
114115
public CompletableFuture<Boolean> health() {
115116
return CompletableFuture.supplyAsync(() -> {
116117
if (knowledgeStore == null) {
117-
logger.warning("TableStore memory service is not started");
118+
logger.warn("TableStore memory service is not started");
118119
return false;
119120
}
120121

@@ -126,7 +127,7 @@ public CompletableFuture<Boolean> health() {
126127
knowledgeStore.searchDocuments(request);
127128
return true;
128129
} catch (Exception e) {
129-
logger.severe("TableStore memory service health check failed: " + e.getMessage());
130+
logger.error("TableStore memory service health check failed: {}", e.getMessage());
130131
return false;
131132
}
132133
});
@@ -146,7 +147,7 @@ public CompletableFuture<Void> addMemory(String userId, List<Message> messages,
146147
knowledgeStore.putDocument(document);
147148
}
148149

149-
logger.fine("Added " + messages.size() + " messages to TableStore for user: " + userId);
150+
logger.info("Added {} messages to TableStore for user: {}", messages.size(), userId);
150151
});
151152
}
152153

@@ -258,8 +259,7 @@ public CompletableFuture<Void> deleteMemory(String userId, Optional<String> sess
258259
knowledgeStore.deleteDocument(hit.getDocument().getDocumentId());
259260
}
260261

261-
logger.fine("Deleted memory for user: " + userId +
262-
(sessionId.isPresent() ? ", session: " + sessionId.get() : ""));
262+
logger.info("Deleted memory for user: {}{}", userId, sessionId.isPresent() ? ", session: " + sessionId.get() : "");
263263
});
264264
}
265265

@@ -311,7 +311,7 @@ private Document convertMessageToDocument(Message message, String userId, String
311311
metadata.put("message_metadata", metadataJson);
312312
}
313313
} catch (Exception e) {
314-
logger.severe("Failed to serialize message content: " + e.getMessage());
314+
logger.error("Failed to serialize message content: {}", e.getMessage());
315315
}
316316

317317
document.setMetadata(metadata);
@@ -353,7 +353,7 @@ private Message convertDocumentToMessage(Document document) {
353353
message.setMetadata(messageMetadata);
354354
}
355355
} catch (Exception e) {
356-
logger.severe("Failed to deserialize message content: " + e.getMessage());
356+
logger.error("Failed to deserialize message content: {}", e.getMessage());
357357
}
358358

359359
return message;

‎core/src/main/java/io/agentscope/runtime/engine/services/memory/persistence/session/InMemorySessionHistoryService.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,20 @@
2323
import java.util.UUID;
2424
import java.util.concurrent.CompletableFuture;
2525
import java.util.concurrent.ConcurrentHashMap;
26-
import java.util.logging.Logger;
2726
import java.util.stream.Collectors;
2827

2928
import io.agentscope.runtime.engine.schemas.Message;
3029
import io.agentscope.runtime.engine.schemas.Session;
3130
import io.agentscope.runtime.engine.services.memory.service.SessionHistoryService;
31+
import org.slf4j.Logger;
32+
import org.slf4j.LoggerFactory;
3233

3334
/**
3435
* In-memory implementation of session history service
3536
* Stores all session data in dictionary, suitable for development, testing and scenarios that don't require persistence
3637
*/
3738
public class InMemorySessionHistoryService implements SessionHistoryService {
38-
public static Logger logger = Logger.getLogger(InMemorySessionHistoryService.class.getName());
39+
private static final Logger logger = LoggerFactory.getLogger(InMemorySessionHistoryService.class);
3940

4041
private final Map<String, Map<String, Session>> sessions = new ConcurrentHashMap<>();
4142

@@ -122,8 +123,7 @@ public CompletableFuture<Void> appendMessage(Session session, List<Message> mess
122123
if (existingSession != null) {
123124
existingSession.getMessages().addAll(messages);
124125
} else {
125-
logger.severe("Warning: Session " + session.getId() +
126-
" not found in storage for append_message.");
126+
logger.error("Warning: Session {} not found in storage for append_message.", session.getId());
127127
}
128128
}
129129
});

0 commit comments

Comments
 (0)