dev: cpu usage presenter, utils

Author: ghkdqhrbals

bm-agent/src/main/java/org/benchmarker/bmagent/controller/AgentApiController.java

@@ -78,7 +78,6 @@ public ResponseEntity<Map<Long, SchedulerStatus>> getSchedulersStatus() {
 
     @GetMapping("/status")
     public AgentInfo getStatus() throws UnknownHostException {
-        log.info("Check current status");
         InetAddress localHost = InetAddress.getLocalHost();
         String serverAddress = localHost.getHostAddress();
         String scheme = "http"; // Assuming it's always HTTP when accessed locally
@@ -87,16 +86,14 @@ public AgentInfo getStatus() throws UnknownHostException {
         Set<Long> longs = scheduledTaskService.getStatus().keySet();
 
         String agentServerUrl = scheme + "://" + serverAddress + ":" + serverPort;
-        AgentInfo info = AgentInfo.builder()
+        return AgentInfo.builder()
             .templateId(longs)
             .cpuUsage(agentStatusManager.getCpuUsage())
             .memoryUsage(agentStatusManager.getMemoryUsage())
             .startedAt(agentStatusManager.getStartedAt())
             .serverUrl(agentServerUrl)
             .status(agentStatusManager.getStatus().get())
             .build();
-        log.info(info.toString());
-        return info;
     }
 }
 

bm-agent/src/main/java/org/benchmarker/bmagent/pref/HttpSender.java

@@ -115,12 +115,11 @@ public void sendRequests(SseEmitter sseEmitter, TemplateInfo templateInfo)
         log.info("Now send multiple HTTP request to target server");
         log.info(templateInfo.toString());
 
+        long startTime = System.currentTimeMillis(); // 시작 시간 기록
+        long endTime = startTime + duration.toMillis();
         // Future setup
         futures = IntStream.range(0, templateInfo.getVuser())
             .mapToObj(i -> CompletableFuture.runAsync(() -> {
-                long startTime = System.currentTimeMillis(); // 시작 시간 기록
-                long endTime = startTime + duration.toMillis();
-
                 for (int j = 0; j < templateInfo.getMaxRequest(); j++) {
                     // 테스트 시간 종료
                     if (System.currentTimeMillis() > endTime){

bm-agent/src/main/java/org/benchmarker/bmagent/status/AgentStatusManager.java

@@ -147,7 +147,7 @@ public Optional<AgentStatus> getAndUpdateStatusIfReady(AgentStatus status) {
     public void updateStats() {
         // Update CPU usage
         OperatingSystemMXBean osBean = (OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean();
-        cpuUsage = osBean.getSystemCpuLoad();
+        cpuUsage = osBean.getCpuLoad();
 
         // Update memory usage
         MemoryMXBean memoryBean = ManagementFactory.getMemoryMXBean();

bm-controller/src/main/java/org/benchmarker/bmcontroller/preftest/controller/PerftestController.java

@@ -68,7 +68,6 @@ public ResponseEntity send(@PathVariable("group_id") String groupId,
         if (action.equals("stop")) {
             serverUrl = agentServerManager.getAgentMapped().get(Long.valueOf(templateId));
             agentServerManager.removeTemplateRunnerAgent(Long.valueOf(templateId));
-
             log.info("stop to " + serverUrl);
         }else{
             if (perftestService.isRunning(groupId, templateId)){
@@ -99,7 +98,6 @@ public ResponseEntity send(@PathVariable("group_id") String groupId,
             })
             .subscribe(event -> {
                     CommonTestResult commonTestResult = event.data();
-
                     // 결과 저장
                     log.info("Start save Result");
                     CommonTestResult saveReturnResult = testResultService.resultSaveAndReturn(commonTestResult)
@@ -108,6 +106,7 @@ public ResponseEntity send(@PathVariable("group_id") String groupId,
                     log.info("End save Result");
                 },
                 error -> {
+                    perftestService.removeRunning(groupId,templateId);
                     log.error("Error receiving SSE: {}", error.getMessage());
                 });
 

bm-controller/src/main/java/org/benchmarker/bmcontroller/template/common/TemplateUtils.java

@@ -7,10 +7,12 @@
 public class TemplateUtils {
 
     public static LocalDateTime convertStringToLocalDateTime(String dateTimeString) {
-
-        LocalDate datePart = LocalDate.parse(dateTimeString.split("T")[0]);
-        LocalTime timePart = LocalTime.parse(dateTimeString.split("T")[1].substring(0, 8));
-
-        return LocalDateTime.of(datePart, timePart);
+        try{
+            LocalDate datePart = LocalDate.parse(dateTimeString.split("T")[0]);
+            LocalTime timePart = LocalTime.parse(dateTimeString.split("T")[1].substring(0, 8));
+            return LocalDateTime.of(datePart, timePart);
+        }catch (Exception e){
+            return null;
+        }
     }
 }

bm-controller/src/main/java/org/benchmarker/bmcontroller/template/model/TestResult.java

@@ -3,6 +3,7 @@
 import jakarta.persistence.*;
 import lombok.*;
 import lombok.extern.slf4j.Slf4j;
+import org.benchmarker.bmagent.AgentStatus;
 import org.benchmarker.bmcontroller.common.model.BaseTime;
 import org.benchmarker.bmcontroller.template.controller.dto.TestResultResponseDto;
 
@@ -52,6 +53,9 @@ public class TestResult extends BaseTime {
     @OneToMany(mappedBy = "testResult", fetch = FetchType.EAGER)
     private List<TestStatus> testStatuses;
 
+    @Enumerated(EnumType.STRING)
+    private AgentStatus agentStatus;
+
     public TestResultResponseDto convertToResponseDto() {
         return TestResultResponseDto.builder()
                 .testId(this.id)

bm-controller/src/main/java/org/benchmarker/bmcontroller/template/service/TestResultService.java

@@ -1,6 +1,12 @@
 package org.benchmarker.bmcontroller.template.service;
 
+import static org.benchmarker.bmcontroller.template.common.TemplateUtils.convertStringToLocalDateTime;
+
 import jakarta.transaction.Transactional;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.benchmarker.bmcommon.dto.CommonTestResult;
@@ -20,13 +26,6 @@
 import org.benchmarker.bmcontroller.user.repository.UserGroupRepository;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
-import static org.benchmarker.bmcontroller.template.common.TemplateUtils.convertStringToLocalDateTime;
-
 @Slf4j
 @Service
 @RequiredArgsConstructor
@@ -62,6 +61,7 @@ public Optional<CommonTestResult> resultSaveAndReturn(CommonTestResult commonTes
                 .totalError(commonTestResult.getTotalErrors())
                 .tpsAvg(commonTestResult.getTpsAverage())
                 .mttbfbAvg(commonTestResult.getMttfbAverage())
+                .agentStatus(commonTestResult.getTestStatus())
                 .build();
 
         TestResult saveTestResult = testResultRepository.save(testResult);

bm-controller/src/main/resources/templates/fragments/agentStatus.html

@@ -21,8 +21,10 @@
       stompClient.subscribe('/topic/server', (result) => {
         const agentInfoList = JSON.parse(result.body); // Parse the received JSON string
         const container = document.getElementById('agentInfoContainer');
+
         container.innerHTML = '';
         agentInfoList.forEach((agent, index) => {
+          const cpuUsagePercent = Math.floor(agent.cpuUsage * 100);
           // show info
           const agentInfoDiv = document.createElement('div');
           agentInfoDiv.id = 'agentInfoDiv';
@@ -46,7 +48,6 @@
           agentInfoParagraph.style.fontSize = '10px'; // 폰트 크기 설정
           agentInfoParagraph.style.fontWeight = 'bold'; // 폰트 굵기 설정
 
-
           // Set styles for status circles
           const circle = document.createElement('div');
           circle.style.width = '10px';
@@ -71,7 +72,22 @@
           agentInfoDiv.appendChild(agentInfoParagraph);
           agentInfoDiv.appendChild(circle);
 
-          container.appendChild(agentInfoDiv);
+          const cpuUsageParagraph = document.createElement('p');
+          cpuUsageParagraph.textContent = `CPU Usage: ${(agent.cpuUsage * 100).toFixed(2)}%`;
+          cpuUsageParagraph.style.margin = '0px';
+          cpuUsageParagraph.style.padding = '0px';
+          cpuUsageParagraph.style.fontSize = '10px'; // 폰트 크기 설정
+          cpuUsageParagraph.style.color = '#3a3a3a'; // 텍스트 색상 설정
+          cpuUsageParagraph.style.alignSelf = 'center';
+
+          const infoWrapper = document.createElement('div');
+          infoWrapper.style.display = 'flex';
+          infoWrapper.style.flexDirection = 'column';
+
+          infoWrapper.appendChild(agentInfoDiv);
+          infoWrapper.appendChild(cpuUsageParagraph);
+
+          container.appendChild(infoWrapper);
         });
 
       });