Merge branch 'feature-2.6.4' of http://git.quantgroup.cn/DevOps/commons into feature-2.6.4

enoch-agent-spring-boot-starter/src/main/java/cn/quantgroup/tech/enoch/agent/report/impl/AgentReportServiceImpl.java

@@ -2,26 +2,25 @@ package cn.quantgroup.tech.enoch.agent.report.impl;
 
 import cn.quantgroup.tech.enoch.agent.configuration.EnochAgentProperties;
 import cn.quantgroup.tech.enoch.agent.report.IAgentReportService;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.google.gson.Gson;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.actuate.endpoint.MetricReaderPublicMetrics;
-import org.springframework.boot.actuate.endpoint.MetricsEndpoint;
-import org.springframework.boot.actuate.endpoint.mvc.EnvironmentMvcEndpoint;
-import org.springframework.boot.actuate.endpoint.mvc.HealthMvcEndpoint;
+import org.springframework.boot.actuate.env.EnvironmentEndpoint;
 import org.springframework.boot.actuate.health.Health;
+import org.springframework.boot.actuate.health.HealthComponent;
+import org.springframework.boot.actuate.health.HealthEndpoint;
+import org.springframework.boot.actuate.metrics.MetricsEndpoint;
 import org.springframework.kafka.core.KafkaTemplate;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.PostConstruct;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ArrayBlockingQueue;
+import java.util.stream.Collectors;
 
 /**
  * @author: amen
@@ -33,7 +32,7 @@ public class AgentReportServiceImpl implements IAgentReportService {
 
 
     @Autowired
-    private HealthMvcEndpoint healthMvcEndpoint;
+    private HealthEndpoint healthMvcEndpoint;
 
     @Autowired
     private MetricsEndpoint metricsEndpoint;
@@ -45,10 +44,10 @@ public class AgentReportServiceImpl implements IAgentReportService {
     private EnochAgentProperties enochAgentProperties;
 
     @Autowired
-    private EnvironmentMvcEndpoint environmentMvcEndpoint;
+    private EnvironmentEndpoint environmentEndpoint;
 
     @Autowired
-    private MetricReaderPublicMetrics metricReaderPublicMetrics;
+    private Gson gson;
 
 
     private final ArrayBlockingQueue<Map<String, Object>> arrayBlockingQueue = new ArrayBlockingQueue<>(600);
@@ -71,16 +70,20 @@ public class AgentReportServiceImpl implements IAgentReportService {
         pushPackage.put("appName", applicationInfo.getAppName());
         pushPackage.put("endPoints", slice);
         //todo 若发kafka失败，添加本地持久化操作，待下次提交时，一同push
-        kafkaTemplate.send(enochAgentProperties.getKafkaTopic(), JSON.toJSONString(pushPackage, SerializerFeature.DisableCircularReferenceDetect));
+
+        kafkaTemplate.send(enochAgentProperties.getKafkaTopic(), gson.toJson(pushPackage));
     }
 
     @Override
     public void collect() {
         HashMap<String, Object> endPoints = new HashMap<>(16);
-        Health health = healthMvcEndpoint.getDelegate().invoke();
+
+        HealthComponent health =healthMvcEndpoint.health();
+        Map<String, List<MetricsEndpoint.Sample>> metricCollect = metricsEndpoint.listNames().getNames().stream().collect(Collectors.toMap(i -> i, j -> metricsEndpoint.metric(j, null).getMeasurements()));
+
         Health.status(health.getStatus()).build();
         endPoints.put("health", health);
-        endPoints.put("metrics", metricsEndpoint.invoke());
+        endPoints.put("metrics", metricCollect);
         endPoints.put("timestamp", System.currentTimeMillis());
         try {
             arrayBlockingQueue.put(endPoints);
@@ -90,19 +93,13 @@ public class AgentReportServiceImpl implements IAgentReportService {
     }
 
     private ApplicationInfo initApplicationInfo() {
-        Map<String, String> appName = (HashMap) environmentMvcEndpoint.value("spring.application.name");
-        Map<String, String> ip = (HashMap) environmentMvcEndpoint.value("spring.cloud.client.ipAddress");
-        applicationInfo.setAppName(appName.get("spring.application.name"));
-        applicationInfo.setIp(ip.get("spring.cloud.client.ipAddress"));
+        String appName = (String) environmentEndpoint.environmentEntry("spring.application.name").getProperty().getValue();
+        String ip =(String) environmentEndpoint.environmentEntry("spring.cloud.client.ipAddress").getProperty().getValue();
+        applicationInfo.setAppName(appName);
+        applicationInfo.setIp(ip);
         return applicationInfo;
     }
 
-    @PostConstruct
-    public void init(){
-        //注释掉不需要收集器
-        metricsEndpoint.unregisterPublicMetrics(metricReaderPublicMetrics);
-    }
-
     @Data
     public static class ApplicationInfo {
         private String ip;