[INLONG-11360][Audit] Optimize HTTPServer to exit gracefully

apache · Oct 16, 2024 · 41134dc · 41134dc
1 parent d551eef
commit 41134dc
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 0 deletions.
diff --git a/inlong-audit/audit-common/src/main/java/org/apache/inlong/audit/metric/AbstractMetric.java b/inlong-audit/audit-common/src/main/java/org/apache/inlong/audit/metric/AbstractMetric.java
@@ -20,4 +20,5 @@
 public interface AbstractMetric {
 
     public void report();
+    public void stop();
 }
diff --git a/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/metric/MetricsManager.java b/inlong-audit/audit-proxy/src/main/java/org/apache/inlong/audit/metric/MetricsManager.java
@@ -94,5 +94,6 @@ public void addSendFailed(long count) {
     }
     public void shutdown() {
         timer.shutdown();
+        metric.stop();
     }
 }
diff --git a/...-proxy/src/main/java/org/apache/inlong/audit/metric/prometheus/ProxyPrometheusMetric.java b/...-proxy/src/main/java/org/apache/inlong/audit/metric/prometheus/ProxyPrometheusMetric.java
@@ -80,4 +80,9 @@ private MetricFamilySamples.Sample createSample(MetricDimension key, double valu
     public void report() {
         LOGGER.info("Report proxy prometheus metric: {} ", metricItem.toString());
     }
+
+    @Override
+    public void stop() {
+        server.close();
+    }
 }
diff --git a/...-audit/audit-store/src/main/java/org/apache/inlong/audit/store/metric/MetricsManager.java b/...-audit/audit-store/src/main/java/org/apache/inlong/audit/store/metric/MetricsManager.java
@@ -90,5 +90,6 @@ public void addSendFailed(long count, long duration) {
 
     public void shutdown() {
         timer.shutdown();
+        metric.stop();
     }
 }
diff --git a/.../src/main/java/org/apache/inlong/audit/store/metric/prometheus/StorePrometheusMetric.java b/.../src/main/java/org/apache/inlong/audit/store/metric/prometheus/StorePrometheusMetric.java
@@ -82,4 +82,10 @@ private MetricFamilySamples.Sample createSample(MetricDimension key, double valu
     public void report() {
         LOGGER.info("Report store prometheus metric: {} ", metricItem.toString());
     }
+
+    @Override
+    public void stop() {
+        server.close();
+    }
+
 }
diff --git a/...dit-store/src/main/java/org/apache/inlong/audit/store/service/AuditMsgConsumerServer.java b/...dit-store/src/main/java/org/apache/inlong/audit/store/service/AuditMsgConsumerServer.java
@@ -47,6 +47,8 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.PreDestroy;
+
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
@@ -180,4 +182,9 @@ private List<MQInfo> getMQConfig(String host, String clusterTag) {
         }
         return null;
     }
+
+    @PreDestroy
+    public void shutdown() {
+        MetricsManager.getInstance().shutdown();
+    }
 }