kezhenxu94 commented on code in PR #9822:
URL: https://github.com/apache/skywalking/pull/9822#discussion_r1005435247
##########
oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/prometheus/rule/Rules.java:
##########
@@ -40,36 +49,76 @@
public class Rules {
private static final Logger LOG = LoggerFactory.getLogger(Rule.class);
- public static List<Rule> loadRules(final String path) throws
ModuleStartException {
+ public static List<Rule> loadRules(final String path) throws IOException {
return loadRules(path, Collections.emptyList());
}
- public static List<Rule> loadRules(final String path, List<String>
enabledRules) throws ModuleStartException {
- File[] rules;
- try {
- rules = ResourceUtils.getPathFiles(path);
- } catch (FileNotFoundException e) {
- throw new ModuleStartException("Load fetcher rules failed", e);
- }
- return Arrays.stream(rules)
- .filter(File::isFile)
- .map(f -> {
- try (Reader r = new FileReader(f)) {
- String fileName = f.getName();
- int dotIndex = fileName.lastIndexOf('.');
- fileName = (dotIndex == -1) ? fileName :
fileName.substring(0, dotIndex);
- if (!enabledRules.contains(fileName)) {
- return null;
+ public static List<Rule> loadRules(final String path, List<String>
enabledRules) throws IOException {
+
+ final Path root = ResourceUtils.getPath(path);
+
+ Map<String, Boolean> formedEnabledRules = enabledRules
+ .stream()
+ .map(rule -> {
+ rule = rule.trim();
+ if (rule.startsWith("/")) {
+ rule = rule.substring(1);
+ }
+ if (!rule.endsWith(".yaml") && !rule.endsWith(".yml")) {
+ return rule + "{.yaml,.yml}";
}
- Rule rule = new Yaml().loadAs(r, Rule.class);
- rule.setName(fileName);
return rule;
- } catch (IOException e) {
- LOG.debug("Reading file {} failed", f, e);
- }
+ })
+ .collect(Collectors.toMap(rule -> rule, $ -> false));
+ List<Rule> rules;
+ try (Stream<Path> stream = Files.walk(root)) {
+ rules = stream
+ .filter(it -> formedEnabledRules.keySet().stream()
+ .anyMatch(rule -> {
+ boolean matches =
FileSystems.getDefault().getPathMatcher("glob:" + rule)
+ .matches(root.relativize(it));
+ if (matches) {
+ formedEnabledRules.put(rule, true);
+ }
+ return matches;
+ }))
+ .map(pathPointer -> {
+ Path relativize = root.relativize(pathPointer);
+ String relativizePath = relativize.toString();
+ relativizePath = relativizePath.substring(0,
relativizePath.lastIndexOf("."));
+ return getRulesFromFile(relativizePath, pathPointer);
+ })
+ .filter(Objects::nonNull)
+ .collect(Collectors.toList()) ;
+ }
+
+ if (formedEnabledRules.containsValue(false)) {
+ List<String> rulesNotFound = formedEnabledRules.keySet().stream()
+ .filter(rule -> !formedEnabledRules.get(rule))
+ .collect(Collectors.toList());
+ throw new UnexpectedException("Some configuration files of enabled
rules are not found, enabled rules: " + rulesNotFound);
+ }
+ return rules;
+ }
+
+ private static Rule getRulesFromFile(String ruleName, Path path) {
+ File file = path.toFile();
+ if (!file.isFile()) {
+ return null;
+ }
+ try (Reader r = new FileReader(file)) {
+ String fileName = file.getName();
+ if (fileName.startsWith(".")) {
return null;
- })
- .filter(Objects::nonNull)
- .collect(Collectors.toList());
+ }
Review Comment:
Not sure why we need to skip hidden files, but if you insist, please use
this
```java
if (!file.isFile() || file.isHidden()) {
return null;
}
```
##########
oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/prometheus/rule/Rules.java:
##########
@@ -40,36 +49,76 @@
public class Rules {
private static final Logger LOG = LoggerFactory.getLogger(Rule.class);
- public static List<Rule> loadRules(final String path) throws
ModuleStartException {
+ public static List<Rule> loadRules(final String path) throws IOException {
return loadRules(path, Collections.emptyList());
}
- public static List<Rule> loadRules(final String path, List<String>
enabledRules) throws ModuleStartException {
- File[] rules;
- try {
- rules = ResourceUtils.getPathFiles(path);
- } catch (FileNotFoundException e) {
- throw new ModuleStartException("Load fetcher rules failed", e);
- }
- return Arrays.stream(rules)
- .filter(File::isFile)
- .map(f -> {
- try (Reader r = new FileReader(f)) {
- String fileName = f.getName();
- int dotIndex = fileName.lastIndexOf('.');
- fileName = (dotIndex == -1) ? fileName :
fileName.substring(0, dotIndex);
- if (!enabledRules.contains(fileName)) {
- return null;
+ public static List<Rule> loadRules(final String path, List<String>
enabledRules) throws IOException {
+
+ final Path root = ResourceUtils.getPath(path);
+
+ Map<String, Boolean> formedEnabledRules = enabledRules
+ .stream()
+ .map(rule -> {
+ rule = rule.trim();
+ if (rule.startsWith("/")) {
+ rule = rule.substring(1);
+ }
+ if (!rule.endsWith(".yaml") && !rule.endsWith(".yml")) {
+ return rule + "{.yaml,.yml}";
}
- Rule rule = new Yaml().loadAs(r, Rule.class);
- rule.setName(fileName);
return rule;
- } catch (IOException e) {
- LOG.debug("Reading file {} failed", f, e);
- }
+ })
+ .collect(Collectors.toMap(rule -> rule, $ -> false));
+ List<Rule> rules;
+ try (Stream<Path> stream = Files.walk(root)) {
+ rules = stream
+ .filter(it -> formedEnabledRules.keySet().stream()
+ .anyMatch(rule -> {
+ boolean matches =
FileSystems.getDefault().getPathMatcher("glob:" + rule)
+ .matches(root.relativize(it));
+ if (matches) {
+ formedEnabledRules.put(rule, true);
+ }
+ return matches;
+ }))
+ .map(pathPointer -> {
Review Comment:
Why `pathPointer`? What does `pointer` mean?
##########
oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/prometheus/rule/Rules.java:
##########
@@ -40,36 +49,76 @@
public class Rules {
private static final Logger LOG = LoggerFactory.getLogger(Rule.class);
- public static List<Rule> loadRules(final String path) throws
ModuleStartException {
+ public static List<Rule> loadRules(final String path) throws IOException {
return loadRules(path, Collections.emptyList());
}
- public static List<Rule> loadRules(final String path, List<String>
enabledRules) throws ModuleStartException {
- File[] rules;
- try {
- rules = ResourceUtils.getPathFiles(path);
- } catch (FileNotFoundException e) {
- throw new ModuleStartException("Load fetcher rules failed", e);
- }
- return Arrays.stream(rules)
- .filter(File::isFile)
- .map(f -> {
- try (Reader r = new FileReader(f)) {
- String fileName = f.getName();
- int dotIndex = fileName.lastIndexOf('.');
- fileName = (dotIndex == -1) ? fileName :
fileName.substring(0, dotIndex);
- if (!enabledRules.contains(fileName)) {
- return null;
+ public static List<Rule> loadRules(final String path, List<String>
enabledRules) throws IOException {
+
+ final Path root = ResourceUtils.getPath(path);
+
+ Map<String, Boolean> formedEnabledRules = enabledRules
+ .stream()
+ .map(rule -> {
+ rule = rule.trim();
+ if (rule.startsWith("/")) {
+ rule = rule.substring(1);
+ }
+ if (!rule.endsWith(".yaml") && !rule.endsWith(".yml")) {
+ return rule + "{.yaml,.yml}";
}
- Rule rule = new Yaml().loadAs(r, Rule.class);
- rule.setName(fileName);
return rule;
- } catch (IOException e) {
- LOG.debug("Reading file {} failed", f, e);
- }
+ })
+ .collect(Collectors.toMap(rule -> rule, $ -> false));
+ List<Rule> rules;
+ try (Stream<Path> stream = Files.walk(root)) {
+ rules = stream
+ .filter(it -> formedEnabledRules.keySet().stream()
+ .anyMatch(rule -> {
+ boolean matches =
FileSystems.getDefault().getPathMatcher("glob:" + rule)
+ .matches(root.relativize(it));
+ if (matches) {
+ formedEnabledRules.put(rule, true);
+ }
+ return matches;
+ }))
+ .map(pathPointer -> {
+ Path relativize = root.relativize(pathPointer);
+ String relativizePath = relativize.toString();
+ relativizePath = relativizePath.substring(0,
relativizePath.lastIndexOf("."));
+ return getRulesFromFile(relativizePath, pathPointer);
+ })
+ .filter(Objects::nonNull)
+ .collect(Collectors.toList()) ;
+ }
+
+ if (formedEnabledRules.containsValue(false)) {
+ List<String> rulesNotFound = formedEnabledRules.keySet().stream()
+ .filter(rule -> !formedEnabledRules.get(rule))
+ .collect(Collectors.toList());
+ throw new UnexpectedException("Some configuration files of enabled
rules are not found, enabled rules: " + rulesNotFound);
+ }
+ return rules;
+ }
+
+ private static Rule getRulesFromFile(String ruleName, Path path) {
+ File file = path.toFile();
+ if (!file.isFile()) {
+ return null;
+ }
+ try (Reader r = new FileReader(file)) {
+ String fileName = file.getName();
+ if (fileName.startsWith(".")) {
return null;
- })
- .filter(Objects::nonNull)
- .collect(Collectors.toList());
+ }
+ Rule rule = new Yaml().loadAs(r, Rule.class);
+ if (rule == null) {
+ return null;
+ }
+ rule.setName(ruleName);
Review Comment:
@yswdqz can you confirm whether rule.name is used anywhere? I locally search
and find nowhere use rule.name. If you can confirm rule.name is never used, we
may consider remove it
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
