From 2a14a402e3b628ef4f2ea65d92d42f2d998beea7 Mon Sep 17 00:00:00 2001 From: "chen.ma" Date: Tue, 7 Dec 2021 23:15:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=A8=E6=80=81=E7=BA=BF?= =?UTF-8?q?=E7=A8=8B=E6=B1=A0=E8=BF=90=E8=A1=8C=E6=97=B6=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E6=96=B9=E5=BC=8F.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/hippo4j/starter/monitor/HttpMvcSender.java | 5 ++++- .../cn/hippo4j/starter/monitor/ReportingEventExecutor.java | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/monitor/HttpMvcSender.java b/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/monitor/HttpMvcSender.java index 0396d4db..c2f6b068 100644 --- a/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/monitor/HttpMvcSender.java +++ b/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/monitor/HttpMvcSender.java @@ -1,6 +1,7 @@ package cn.hippo4j.starter.monitor; import cn.hippo4j.common.monitor.Message; +import cn.hippo4j.common.monitor.MessageWrapper; import cn.hippo4j.starter.remote.HttpAgent; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -22,7 +23,9 @@ public class HttpMvcSender implements MessageSender { @Override public void send(Message message) { try { - httpAgent.httpPost(MONITOR_PATH, message); + MessageWrapper messageWrapper = new MessageWrapper(message); + messageWrapper.setMessageType(message.getMessageType()); + httpAgent.httpPost(MONITOR_PATH, messageWrapper); } catch (Throwable ex) { log.error("Failed to push dynamic thread pool runtime data.", ex); } diff --git a/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/monitor/ReportingEventExecutor.java b/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/monitor/ReportingEventExecutor.java index 498e7fd6..44a1b992 100644 --- a/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/monitor/ReportingEventExecutor.java +++ b/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/monitor/ReportingEventExecutor.java @@ -75,8 +75,8 @@ public class ReportingEventExecutor extends AbstractThreadPoolRuntime implements @Override public void run(String... args) { - // 延迟 10秒后每 5秒调用一次. scheduleAtFixedRate 间隔周期是前后两次任务的开始时间计算的, 不考虑执行任务本身的耗时 - collectVesselExecutor.scheduleAtFixedRate(() -> runTimeGatherTask(), 10, 5, TimeUnit.SECONDS); + // 延迟 10秒后每 5秒调用一次. scheduleWithFixedDelay 每次执行时间为上一次任务结束时, 向后推一个时间间隔 + collectVesselExecutor.scheduleWithFixedDelay(() -> runTimeGatherTask(), 10, 5, TimeUnit.SECONDS); ThreadUtil.newThread(this, "reporting-task", Boolean.TRUE).start(); log.info("Dynamic thread pool :: [{}]. The dynamic thread pool starts data collection and reporting. ", getThreadPoolNum()); @@ -108,7 +108,7 @@ public class ReportingEventExecutor extends AbstractThreadPoolRuntime implements runtimeMessages.add(runtimeMessage); } - message.setMessageTypeEnum(MessageTypeEnum.RUNTIME); + message.setMessageType(MessageTypeEnum.RUNTIME); message.setMessages(runtimeMessages); return message;