新增链路ID

NOTICE.txt

@@ -11,7 +11,7 @@ Foundation (https://www.apache.org/),including, but not limit to:
   - Apache Maven
   - Apache log4j
 
-This product includes the several frameworks developed by
+This product includes the several frameworks developped by 
 unidal.org (https://github.com/unidal/),including:
   - maven-plugins (https://github.com/unidal/maven-plugins)
   - frameworks (https://github.com/unidal/frameworks)

README.md

@@ -109,7 +109,3 @@ git clone --depth=1 https://github.com/dianping/cat.git
 我们需要知道你对Cat的一些看法以及建议：
 
 - [**Issues**](https://github.com/dianping/cat/issues)
-
-### Starred 趋势
-
-[![Star History Chart](https://api.star-history.com/svg?repos=dianping/cat&type=Date)](https://star-history.com/#dianping/cat&Date)

cat-alarm/pom.xml

@@ -3,8 +3,8 @@
          xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>com.dianping.cat</groupId>
-    <artifactId>parent</artifactId>
-    <version>4.0-RC1</version>
+    <artifactId>cat-parent</artifactId>
+    <version>3.1.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cat-alarm</artifactId>

cat-alarm/src/main/java/com/dianping/cat/alarm/service/AlertService.java

@@ -18,20 +18,19 @@
  */
 package com.dianping.cat.alarm.service;
 
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.unidal.dal.jdbc.DalException;
-import org.unidal.dal.jdbc.DalNotFoundException;
-import org.unidal.lookup.annotation.Inject;
-import org.unidal.lookup.annotation.Named;
-
 import com.dianping.cat.Cat;
 import com.dianping.cat.alarm.Alert;
 import com.dianping.cat.alarm.AlertDao;
 import com.dianping.cat.alarm.spi.AlertEntity;
 import com.dianping.cat.alarm.spi.sender.SendMessageEntity;
+import org.unidal.dal.jdbc.DalException;
+import org.unidal.dal.jdbc.DalNotFoundException;
+import org.unidal.lookup.annotation.Inject;
+import org.unidal.lookup.annotation.Named;
+
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
 
 @Named
 public class AlertService {

cat-alarm/src/main/java/com/dianping/cat/alarm/spi/AlertManager.java

@@ -96,8 +96,8 @@ public boolean addAlert(AlertEntity entity) {
 
 	@Override
 	public void initialize() throws InitializationException {
-		Threads.forGroup("Cat").start(new SendExecutor());
-		Threads.forGroup("Cat").start(new RecoveryAnnouncer());
+		Threads.forGroup("cat").start(new SendExecutor());
+		Threads.forGroup("cat").start(new RecoveryAnnouncer());
 	}
 
 	public boolean isSuspend(String alertKey, int suspendMinute) {
@@ -226,7 +226,7 @@ private class RecoveryAnnouncer implements Task {
 
 		@Override
 		public String getName() {
-			return getClass().getSimpleName();
+			return "recovery-announcer";
 		}
 
 		private int queryRecoverMinute(AlertEntity alert) {
@@ -286,7 +286,7 @@ public void shutdown() {
 	private class SendExecutor implements Task {
 		@Override
 		public String getName() {
-			return getClass().getSimpleName();
+			return "send-executor";
 		}
 
 		@Override

cat-alarm/src/main/java/com/dianping/cat/alarm/spi/config/SenderConfigManager.java

@@ -18,14 +18,6 @@
  */
 package com.dianping.cat.alarm.spi.config;
 
-import java.util.List;
-
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
-import org.unidal.dal.jdbc.DalNotFoundException;
-import org.unidal.lookup.annotation.Inject;
-import org.unidal.lookup.annotation.Named;
-
 import com.dianping.cat.Cat;
 import com.dianping.cat.alarm.sender.entity.Par;
 import com.dianping.cat.alarm.sender.entity.Sender;
@@ -35,6 +27,14 @@
 import com.dianping.cat.core.config.Config;
 import com.dianping.cat.core.config.ConfigDao;
 import com.dianping.cat.core.config.ConfigEntity;
+import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
+import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
+import org.codehaus.plexus.util.StringUtils;
+import org.unidal.dal.jdbc.DalNotFoundException;
+import org.unidal.lookup.annotation.Inject;
+import org.unidal.lookup.annotation.Named;
+
+import java.util.List;
 
 @Named
 public class SenderConfigManager implements Initializable {
@@ -85,12 +85,6 @@ public void initialize() throws InitializationException {
 		}
 	}
 
-	public boolean insert(Sender sender) {
-		m_senderConfig.getSenders().put(sender.getId(), sender);
-
-		return storeConfig();
-	}
-
 	public boolean insert(String xml) {
 		try {
 			m_senderConfig = DefaultSaxParser.parse(xml);
@@ -102,21 +96,20 @@ public boolean insert(String xml) {
 		}
 	}
 
-	private final String join(String[] array, String separator) {
-		StringBuilder sb = new StringBuilder(1024);
-		boolean first = true;
+	public boolean insert(Sender sender) {
+		m_senderConfig.getSenders().put(sender.getId(), sender);
+
+		return storeConfig();
+	}
 
-		for (String item : array) {
-			if (first) {
-				first = false;
-			} else {
-				sb.append(separator);
-			}
+	public boolean remove(String id) {
+		m_senderConfig.removeSender(id);
 
-			sb.append(item);
-		}
+		return storeConfig();
+	}
 
-		return sb.toString();
+	public Sender querySender(String id) {
+		return m_senderConfig.getSenders().get(id);
 	}
 
 	public String queryParString(Sender sender) {
@@ -127,17 +120,7 @@ public String queryParString(Sender sender) {
 		for (Par par : pars) {
 			s[i++] = par.getId();
 		}
-		return join(s, "&");
-	}
-
-	public Sender querySender(String id) {
-		return m_senderConfig.getSenders().get(id);
-	}
-
-	public boolean remove(String id) {
-		m_senderConfig.removeSender(id);
-
-		return storeConfig();
+		return StringUtils.join(s, "&");
 	}
 
 	private boolean storeConfig() {

cat-alarm/src/main/java/com/dianping/cat/alarm/spi/rule/RuleType.java

@@ -464,6 +464,8 @@ public String getId() {
 	},
 
 	UserDefine {
+		private final String USER_DEFINED_FOLDER = Cat.getCatHome() + "user_defined_class/";
+
 		private static final String USER_DEFINED_CLASS_NAME = "UserDefinedRule.java";
 
 		private Map<String, MonitorRule> m_rules = new HashMap<String, MonitorRule>();
@@ -499,7 +501,7 @@ public Pair<Boolean, String> executeRule(double[] values, double[] baselines, St
 		}
 
 		private Pair<File, File> generateClassFile(String rawValue) throws IOException {
-			File userDefinedFolder = new File(Cat.getCatHome(), "user_defined_class");
+			File userDefinedFolder = new File(USER_DEFINED_FOLDER);
 			if (!userDefinedFolder.exists() || userDefinedFolder.isFile()) {
 				userDefinedFolder.mkdirs();
 			}

cat-alarm/src/main/resources/META-INF/plexus/components.xml

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <plexus>
 	<components>
 		<component>