refactor(home): add resourceKeys in supercache

traas-stack · Apr 8, 2024 · 969ad0a · 969ad0a
1 parent 125304c
commit 969ad0a
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 16 deletions.
diff --git a/server/apm/apm-server/apm-core/src/main/java/io/holoinsight/server/apm/core/ApmConfig.java b/server/apm/apm-server/apm-core/src/main/java/io/holoinsight/server/apm/core/ApmConfig.java
@@ -31,5 +31,6 @@ protected void refresh(Binder binder) {
   @Data
   public static class Materialize {
     private Set<String> blacklist = new HashSet<>();
+    private Boolean traceWriteClose = Boolean.FALSE;
   }
 }
diff --git a/...ce/src/main/java/io/holoinsight/server/apm/server/service/impl/ApmMetricMaterializer.java b/...ce/src/main/java/io/holoinsight/server/apm/server/service/impl/ApmMetricMaterializer.java
@@ -7,7 +7,6 @@
 import io.holoinsight.server.apm.common.model.query.Duration;
 import io.holoinsight.server.apm.common.model.query.MetricValues;
 import io.holoinsight.server.apm.engine.postcal.MetricsManager;
-import io.holoinsight.server.apm.engine.storage.MetricStorage;
 import io.holoinsight.server.apm.server.service.MetricService;
 import io.holoinsight.server.common.dao.entity.TenantOps;
 import io.holoinsight.server.common.dao.mapper.TenantOpsMapper;
@@ -18,10 +17,13 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.*;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
@@ -32,6 +34,7 @@
 
 @Component
 @Slf4j
+@Deprecated
 public class ApmMetricMaterializer {
 
   @Autowired
@@ -66,13 +69,13 @@ public class ApmMetricMaterializer {
       new ThreadPoolExecutor(4, 4, 60, TimeUnit.SECONDS, new LinkedBlockingQueue<>(4096),
           new BasicThreadFactory.Builder().namingPattern("apm-materialize-executor-%d").build());
 
-  @PostConstruct
-  public void start() {
-    long now = System.currentTimeMillis();
-    long nextPeriod = now / INTERVAL * INTERVAL + INTERVAL;
-    long wait = nextPeriod - now + DELAY;
-    SCHEDULER.scheduleAtFixedRate(this::materialize, wait, INTERVAL, TimeUnit.MILLISECONDS);
-  }
+  // @PostConstruct
+  // public void start() {
+  // long now = System.currentTimeMillis();
+  // long nextPeriod = now / INTERVAL * INTERVAL + INTERVAL;
+  // long wait = nextPeriod - now + DELAY;
+  // SCHEDULER.scheduleAtFixedRate(this::materialize, wait, INTERVAL, TimeUnit.MILLISECONDS);
+  // }
 
   private void materialize() {
     long now = System.currentTimeMillis();

diff --git a/.../common-service/src/main/java/io/holoinsight/server/common/ctl/ProductCtlServiceImpl.java b/.../common-service/src/main/java/io/holoinsight/server/common/ctl/ProductCtlServiceImpl.java
@@ -101,8 +101,7 @@ public String buildResourceVal(List<String> resourceKeys, Map<String, String> ta
 
   @Override
   public boolean productClosed(MonitorProductCode productCode, Map<String, String> tags) {
-    List<String> resourceKeys = superCacheService.getSc().getListValue("global_config",
-        "resource_keys", Collections.singletonList("tenant"));
+    List<String> resourceKeys = superCacheService.getSc().resourceKeys;
     if (!switchOn || productCode == null || resourceKeys == null || tags == null
         || productClosed == null) {
       return false;
@@ -119,8 +118,7 @@ public boolean productClosed(MonitorProductCode productCode, Map<String, String>
   public Map<String, Set<String>> productCtl(MonitorProductCode code, Map<String, String> tags,
       String action) throws Exception {
     Map<String, Set<String>> result = new HashMap<>();
-    List<String> resourceKeys = superCacheService.getSc().getListValue("global_config",
-        "resource_keys", Collections.singletonList("tenant"));
+    List<String> resourceKeys = superCacheService.getSc().resourceKeys;
     if (CollectionUtils.isEmpty(resourceKeys)) {
       throw new RuntimeException("resource keys not found for code : " + code.getCode());
     }
@@ -144,8 +142,7 @@ public Map<String, Set<String>> productCtl(MonitorProductCode code, Map<String,
   @Override
   public Map<String, Boolean> productStatus(Map<String, String> tags) throws Exception {
     Map<String, Boolean> closed = new HashMap<>();
-    List<String> resourceKeys = superCacheService.getSc().getListValue("global_config",
-        "resource_keys", Collections.singletonList("tenant"));
+    List<String> resourceKeys = superCacheService.getSc().resourceKeys;
     for (MonitorProductCode code : MonitorProductCode.values()) {
       if (CollectionUtils.isEmpty(resourceKeys)) {
         closed.put(code.getCode(), false);

diff --git a/.../common/common-service/src/main/java/io/holoinsight/server/common/service/SuperCache.java b/.../common/common-service/src/main/java/io/holoinsight/server/common/service/SuperCache.java
@@ -10,6 +10,7 @@
 import io.holoinsight.server.query.grpc.QueryProto.QueryRequest;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -25,6 +26,9 @@ public class SuperCache {
 
   public Map<String /* metric table */, MetricInfo> metricInfoMap;
 
+  public List<String> resourceKeys;
+  public List<String> freePrefixes;
+
   public String getStringValue(String type, String k) {
 
     Map<String, MetaDataDictValue> kMap = this.metaDataDictValueMap.get(type);
@@ -56,4 +60,20 @@ public List<String> getListValue(String type, String k, List<String> defaultValu
     }
     return J.fromJson(meta.getDictValue(), new TypeToken<List<String>>() {}.getType());
   }
+
+  public Boolean getBooleanValue(String type, String k) {
+
+    Map<String, MetaDataDictValue> kMap = this.metaDataDictValueMap.get(type);
+
+    if (null == kMap) {
+      return Boolean.FALSE;
+    }
+
+    MetaDataDictValue meta = kMap.get(k);
+
+    if (null == meta || StringUtils.isBlank(meta.getDictValue())) {
+      return Boolean.FALSE;
+    }
+    return Boolean.parseBoolean(meta.getDictValue());
+  }
 }
diff --git a/.../common-service/src/main/java/io/holoinsight/server/common/service/SuperCacheService.java b/.../common-service/src/main/java/io/holoinsight/server/common/service/SuperCacheService.java
@@ -15,6 +15,7 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -50,6 +51,10 @@ public void load() throws Exception {
     ProdLog.info("[SuperCache][expressionMetricList] size: " + sc.expressionMetricList.size());
 
     queryMetricInfoByPage(sc);
+    sc.resourceKeys =
+        sc.getListValue("global_config", "resource_keys", Collections.singletonList("tenant"));
+    sc.freePrefixes =
+        sc.getListValue("global_config", "free_metric_prefix", Collections.emptyList());
     this.sc = sc;
     ProdLog.info("[SuperCache] load end");
   }