METRIC_FILE_NAME_CMP = new MetricFileNameComparator();
private final DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
/**
* 排除时差干扰
*/
private long timeSecondBase;
- private final StringBuilder sb = new StringBuilder(32);
private String baseDir;
private String baseFileName;
/**
@@ -86,7 +92,9 @@ public class MetricWriter {
if (singleFileSize <= 0 || totalFileCount <= 0) {
throw new IllegalArgumentException();
}
- RecordLog.info("[MetricWriter] Creating new MetricWriter, singleFileSize=" + singleFileSize + ", totalFileCount=" + totalFileCount);
+ RecordLog.info(
+ "[MetricWriter] Creating new MetricWriter, singleFileSize=" + singleFileSize + ", totalFileCount="
+ + totalFileCount);
this.baseDir = METRIC_BASE_DIR;
File dir = new File(baseDir);
if (!dir.exists()) {
@@ -193,7 +201,7 @@ public class MetricWriter {
list.add(file.getAbsolutePath());
}
}
- Collections.sort(list, METRIC_FILENAME_CMP);
+ Collections.sort(list, METRIC_FILE_NAME_CMP);
if (list.isEmpty()) {
return baseDir + baseFileName + "." + dateStr;
}
@@ -209,30 +217,38 @@ public class MetricWriter {
/**
* A comparator for metric file name. Metric file name is like:
*
- * aliswitch-8728-metrics.log.2018-03-06
- * aliswitch-8728-metrics.log.2018-03-07
- * aliswitch-8728-metrics.log.2018-03-07.10
- * aliswitch-8728-metrics.log.2018-03-06.100
+ * metrics.log.2018-03-06
+ * metrics.log.2018-03-07
+ * metrics.log.2018-03-07.10
+ * metrics.log.2018-03-06.100
*
*
* File name with the early date is smaller, if date is same, the one with the small file number is smaller.
* Note that if the name is an absolute path, only the fileName({@link File#getName()}) part will be considered.
* So the above file names should be sorted as:
*
- * aliswitch-8728-metrics.log.2018-03-06
- * aliswitch-8728-metrics.log.2018-03-06.100
- * aliswitch-8728-metrics.log.2018-03-07
- * aliswitch-8728-metrics.log.2018-03-07.10
+ * metrics.log.2018-03-06
+ * metrics.log.2018-03-06.100
+ * metrics.log.2018-03-07
+ * metrics.log.2018-03-07.10
+ *
*
*
*/
private static final class MetricFileNameComparator implements Comparator {
+ private final String pid = "pid";
+
@Override
public int compare(String o1, String o2) {
String name1 = new File(o1).getName();
String name2 = new File(o2).getName();
String dateStr1 = name1.split("\\.")[2];
String dateStr2 = name2.split("\\.")[2];
+ // in case of file name contains pid, skip it
+ if (dateStr1.startsWith(pid)) {
+ dateStr1 = name1.split("\\.")[3];
+ dateStr2 = name2.split("\\.")[3];
+ }
// compare date first
int t = dateStr1.compareTo(dateStr2);
@@ -273,7 +289,7 @@ public class MetricWriter {
list.add(file.getAbsolutePath());
}
}
- Collections.sort(list, MetricWriter.METRIC_FILENAME_CMP);
+ Collections.sort(list, MetricWriter.METRIC_FILE_NAME_CMP);
return list;
}
@@ -323,9 +339,12 @@ public class MetricWriter {
}
/**
- * Form metric file name use the specific appName and pid. Not that only
+ * Form metric file name use the specific appName and pid. Note that only
* form the file name, not include path.
*
+ * Note: {@link MetricFileNameComparator}'s implementation relays on the metric file name,
+ * we should be careful when changing the metric file name.
+ *
* @param appName
* @param pid
* @return metric file name.
@@ -334,7 +353,17 @@ public class MetricWriter {
if (appName == null) {
appName = "";
}
- return appName + "-" + pid + METRIC_FILE_SUFFIX;
+ // dot is special char that should be replaced.
+ final String dot = ".";
+ final String separator = "-";
+ if (appName.contains(dot)) {
+ appName = appName.replace(dot, separator);
+ }
+ String name = appName + separator + METRIC_FILE;
+ if (LogBase.isLogNameUsePid()) {
+ name += ".pid" + pid;
+ }
+ return name;
}
/**
diff --git a/sentinel-core/src/test/java/com/alibaba/csp/sentinel/RecordLogTest.java b/sentinel-core/src/test/java/com/alibaba/csp/sentinel/RecordLogTest.java
index 9652f217..e2e4bd99 100755
--- a/sentinel-core/src/test/java/com/alibaba/csp/sentinel/RecordLogTest.java
+++ b/sentinel-core/src/test/java/com/alibaba/csp/sentinel/RecordLogTest.java
@@ -19,6 +19,7 @@ import java.io.File;
import com.alibaba.csp.sentinel.log.LogBase;
import com.alibaba.csp.sentinel.log.RecordLog;
+import com.alibaba.csp.sentinel.util.PidUtil;
import org.junit.Test;
@@ -61,4 +62,30 @@ public class RecordLogTest {
assertTrue(RecordLog.getLogBaseDir().startsWith(System.getProperty("user.home")));
}
+ public void testLogNameNotUsePid() {
+ String userHome = System.getProperty("user.home");
+ String newLogBase = userHome + File.separator + "tmpLogDir" + System.currentTimeMillis();
+ System.setProperty(LogBase.LOG_DIR, newLogBase);
+ RecordLog.info("testLogNameNotUsePid");
+ File[] files = new File(newLogBase).listFiles();
+ assertTrue(files != null && files.length > 0);
+ for (File f : files) {
+ assertTrue(!f.getName().contains("pid" + PidUtil.getPid()));
+ }
+ }
+
+ public void testLogNameUsePid() {
+ String userHome = System.getProperty("user.home");
+ String newLogBase = userHome + File.separator + "tmpLogDir" + System.currentTimeMillis();
+ System.setProperty(LogBase.LOG_DIR, newLogBase);
+ System.setProperty(LogBase.LOG_NAME_USE_PID, "true");
+
+ RecordLog.info("testLogNameUsePid");
+ File[] files = new File(newLogBase).listFiles();
+ assertTrue(files != null && files.length > 0);
+ for (File f : files) {
+ assertTrue(f.getName().contains("pid" + PidUtil.getPid()));
+ }
+ }
+
}
\ No newline at end of file
diff --git a/sentinel-core/src/test/java/com/alibaba/csp/sentinel/node/metric/MetricWriterTest.java b/sentinel-core/src/test/java/com/alibaba/csp/sentinel/node/metric/MetricWriterTest.java
new file mode 100644
index 00000000..548a106a
--- /dev/null
+++ b/sentinel-core/src/test/java/com/alibaba/csp/sentinel/node/metric/MetricWriterTest.java
@@ -0,0 +1,54 @@
+package com.alibaba.csp.sentinel.node.metric;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class MetricWriterTest {
+ @Test
+ public void testFileNameCmp() {
+ String[] arr = new String[] {
+ "metrics.log.2018-03-06",
+ "metrics.log.2018-03-07",
+ "metrics.log.2018-03-07.51",
+ "metrics.log.2018-03-07.10",
+ "metrics.log.2018-03-06.100"
+ };
+ String[] key = new String[] {
+ "metrics.log.2018-03-06",
+ "metrics.log.2018-03-06.100",
+ "metrics.log.2018-03-07",
+ "metrics.log.2018-03-07.10",
+ "metrics.log.2018-03-07.51"
+ };
+ ArrayList list = new ArrayList(Arrays.asList(arr));
+ Collections.sort(list, MetricWriter.METRIC_FILE_NAME_CMP);
+ assertEquals(Arrays.asList(key), list);
+ }
+
+ @Test
+ public void testFileNamePidCmp() {
+ String[] arr = new String[] {
+ "metrics.log.pid1234.2018-03-06",
+ "metrics.log.pid1234.2018-03-07",
+ "metrics.log.pid1234.2018-03-07.51",
+ "metrics.log.pid1234.2018-03-07.10",
+ "metrics.log.pid1234.2018-03-06.100"
+ };
+ String[] key = new String[] {
+ "metrics.log.pid1234.2018-03-06",
+ "metrics.log.pid1234.2018-03-06.100",
+ "metrics.log.pid1234.2018-03-07",
+ "metrics.log.pid1234.2018-03-07.10",
+ "metrics.log.pid1234.2018-03-07.51"
+ };
+ ArrayList list = new ArrayList(Arrays.asList(arr));
+ Collections.sort(list, MetricWriter.METRIC_FILE_NAME_CMP);
+ assertEquals(Arrays.asList(key), list);
+ }
+
+}
\ No newline at end of file