Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

improve monitor-support

Browse Source
This commit is contained in:
wenshao
2013-08-18 00:41:07 +08:00
parent f9a06e7a85
commit 26419df2fd
10 changed files with 355 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/support/monitor/MonitorClient.java
+44
View File
@@ -19,8 +19,11 @@ import static com.alibaba.druid.util.Utils.getBoolean;
import static com.alibaba.druid.util.Utils.getInteger;
import java.lang.management.ManagementFactory;
import java.net.InetAddress;
import java.net.NetworkInterface;
import java.util.ArrayList;
import java.util.Date;
import java.util.Enumeration;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -37,6 +40,8 @@ import com.alibaba.druid.support.http.stat.WebAppStat;
import com.alibaba.druid.support.http.stat.WebAppStatManager;
import com.alibaba.druid.support.http.stat.WebAppStatValue;
import com.alibaba.druid.support.http.stat.WebURIStatValue;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
import com.alibaba.druid.support.monitor.dao.MonitorDao;
import com.alibaba.druid.support.spring.stat.SpringMethodStatValue;
import com.alibaba.druid.support.spring.stat.SpringStat;
@@ -47,6 +52,8 @@ import com.alibaba.druid.wall.WallProviderStatValue;
public class MonitorClient {
private final static Log LOG = LogFactory.getLog(MonitorClient.class);
private final static long DEFAULT_TIME_BETWEEN_COLLECT = 60 * 5;
private ScheduledExecutorService scheduler;
@@ -69,6 +76,7 @@ public class MonitorClient {
private String app;
private String cluster;
private String host;
private String ip;
private int pid;
public MonitorClient(){
@@ -78,6 +86,7 @@ public class MonitorClient {
pid = Integer.parseInt(items[0]);
host = items[1];
ip = getLocalIPAddress().getHostAddress();
configFromPropety(System.getProperties());
}
@@ -170,6 +179,8 @@ public class MonitorClient {
}
public void start() {
checkInst();
if (scheduler == null) {
scheduler = new ScheduledThreadPoolExecutor(schedulerThreadSize);
}
@@ -207,6 +218,18 @@ public class MonitorClient {
this.scheduler = scheduler;
}
public void checkInst() {
try {
dao.insertAppIfNotExits(domain, app);
dao.insertClusterIfNotExits(domain, app, cluster);
dao.insertOrUpdateInstance(domain, app, cluster, host, ip, Utils.getStartTime(), pid);
} catch (Exception ex) {
LOG.error("checkInst error", ex);
}
}
@SuppressWarnings("resource")
public void collectSql() {
if ((!collectSqlEnable) && !collectSqlWallEnable) {
@@ -457,4 +480,25 @@ public class MonitorClient {
this.pid = pid;
}
public static InetAddress getLocalIPAddress() {
try {
Enumeration<?> netInterfaces = NetworkInterface.getNetworkInterfaces();
InetAddress inetAddr = null;
boolean flag = true;
while (netInterfaces.hasMoreElements() && flag) {
NetworkInterface ni = (NetworkInterface) netInterfaces.nextElement();
Enumeration<?> e2 = ni.getInetAddresses();
while (e2.hasMoreElements()) {
inetAddr = (InetAddress) e2.nextElement();
if (!inetAddr.isLoopbackAddress() && inetAddr.getHostAddress().indexOf(":") == -1) {
return inetAddr;
}
}
}
} catch (Exception e) {
LOG.error("getLocalIP error", e);
}
return null;
}
}
src/main/java/com/alibaba/druid/support/monitor/dao/MonitorDao.java
+9
View File
@@ -15,6 +15,8 @@
*/
package com.alibaba.druid.support.monitor.dao;
import java.sql.SQLException;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -39,4 +41,11 @@ public interface MonitorDao {
void saveWebApp(MonitorContext ctx, List<WebAppStatValue> uriList);
List<JdbcSqlStatValue> loadSqlList(Map<String, Object> filters);
void insertAppIfNotExits(String domain, String app) throws SQLException;
void insertClusterIfNotExits(String domain, String app, String cluster) throws SQLException;
void insertOrUpdateInstance(String domain, String app, String cluster, String host, String ip, Date startTime,
long pid) throws SQLException;
}
src/main/java/com/alibaba/druid/support/monitor/dao/MonitorDaoJdbcImpl.java
+260 -45
View File
@@ -45,6 +45,8 @@ import com.alibaba.druid.support.monitor.annotation.AggregateType;
import com.alibaba.druid.support.monitor.annotation.MField;
import com.alibaba.druid.support.monitor.annotation.MTable;
import com.alibaba.druid.support.monitor.entity.MonitorApp;
import com.alibaba.druid.support.monitor.entity.MonitorCluster;
import com.alibaba.druid.support.monitor.entity.MonitorInstance;
import com.alibaba.druid.support.spring.stat.SpringMethodStatValue;
import com.alibaba.druid.util.JdbcUtils;
import com.alibaba.druid.util.StringUtils;
@@ -56,20 +58,31 @@ import com.alibaba.druid.wall.WallTableStatValue;
public class MonitorDaoJdbcImpl implements MonitorDao {
private final static Log LOG = LogFactory.getLog(MonitorDaoJdbcImpl.class);
private final static Log LOG = LogFactory.getLog(MonitorDaoJdbcImpl.class);
private DataSource dataSource;
private DataSource dataSource;
private BeanInfo dataSourceStatBeanInfo = new BeanInfo(DruidDataSourceStatValue.class);
private BeanInfo sqlStatBeanInfo = new BeanInfo(JdbcSqlStatValue.class);
private BeanInfo springMethodStatBeanInfo = new BeanInfo(SpringMethodStatValue.class);
private BeanInfo webURIStatBeanInfo = new BeanInfo(WebURIStatValue.class);
private BeanInfo webAppStatBeanInfo = new BeanInfo(WebAppStatValue.class);
private BeanInfo dataSourceStatBeanInfo = new BeanInfo(
DruidDataSourceStatValue.class);
private BeanInfo sqlStatBeanInfo = new BeanInfo(
JdbcSqlStatValue.class);
private BeanInfo springMethodStatBeanInfo = new BeanInfo(
SpringMethodStatValue.class);
private BeanInfo webURIStatBeanInfo = new BeanInfo(
WebURIStatValue.class);
private BeanInfo webAppStatBeanInfo = new BeanInfo(
WebAppStatValue.class);
private BeanInfo wallProviderStatBeanInfo = new BeanInfo(WallProviderStatValue.class);
private BeanInfo wallSqlStatBeanInfo = new BeanInfo(WallSqlStatValue.class);
private BeanInfo wallTableStatBeanInfo = new BeanInfo(WallTableStatValue.class);
private BeanInfo wallFunctionStatBeanInfo = new BeanInfo(WallFunctionStatValue.class);
private BeanInfo wallProviderStatBeanInfo = new BeanInfo(
WallProviderStatValue.class);
private BeanInfo wallSqlStatBeanInfo = new BeanInfo(
WallSqlStatValue.class);
private BeanInfo wallTableStatBeanInfo = new BeanInfo(
WallTableStatValue.class);
private BeanInfo wallFunctionStatBeanInfo = new BeanInfo(
WallFunctionStatValue.class);
private ConcurrentMap<String, ConcurrentMap<Long, String>> cacheMap = new ConcurrentHashMap<String, ConcurrentMap<Long, String>>();
public MonitorDaoJdbcImpl(){
}
@@ -81,9 +94,7 @@ public class MonitorDaoJdbcImpl implements MonitorDao {
"springmethod.sql", //
"sql.sql", //
"webapp.sql", //
"weburi.sql",
"wall.sql"
};
"weburi.sql", "wall.sql" };
for (String item : resources) {
String path = "/support/monitor/" + dbType + "/" + item;
@@ -126,15 +137,15 @@ public class MonitorDaoJdbcImpl implements MonitorDao {
public void saveWebURI(MonitorContext ctx, List<WebURIStatValue> list) {
save(webURIStatBeanInfo, ctx, list);
}
@Override
public void saveSqlWall(MonitorContext ctx, List<WallProviderStatValue> statList) {
save(wallProviderStatBeanInfo, ctx, statList);
for (WallProviderStatValue providerStat : statList) {
save(wallSqlStatBeanInfo, ctx, providerStat.getWhiteList());
save(wallSqlStatBeanInfo, ctx, providerStat.getBlackList());
save(wallTableStatBeanInfo, ctx, providerStat.getTables());
save(wallFunctionStatBeanInfo, ctx, providerStat.getFunctions());
}
@@ -402,7 +413,7 @@ public class MonitorDaoJdbcImpl implements MonitorDao {
for (Object statValue : list) {
try {
Long hash = (Long) hashField.field.get(statValue);
String value = hashField.getCacheValue(hash);
String value = cacheGet(hashField.getHashForType(), hash);
if (value == null) {
value = getConstValueFromDb(domain, app, hashField.getHashForType(), hash);
@@ -452,7 +463,7 @@ public class MonitorDaoJdbcImpl implements MonitorDao {
for (Object statValue : list) {
try {
Long hash = (Long) hashField.field.get(statValue);
if (!hashField.hashCacheContains(hash)) {
if (!cacheContains(hashField.getHashForType(), hash)) {
String value = (String) hashField.getHashFor().get(statValue);
final String sql = "insert into druid_const (domain, app, type, hash, value) values (?, ?, ?, ?, ?)";
Connection conn = null;
@@ -476,7 +487,7 @@ public class MonitorDaoJdbcImpl implements MonitorDao {
JdbcUtils.close(stmt);
JdbcUtils.close(conn);
}
hashField.hashCacheAdd(hash, value);
cachePut(hashField.getHashForType(), hash, value);
}
} catch (IllegalArgumentException e) {
throw new DruidRuntimeException("set field error" + hashField.getField(), e);
@@ -490,7 +501,7 @@ public class MonitorDaoJdbcImpl implements MonitorDao {
if (list.size() == 0) {
return;
}
for (FieldInfo hashField : beanInfo.getHashFields()) {
saveHash(hashField, ctx, list);
}
@@ -615,7 +626,7 @@ public class MonitorDaoJdbcImpl implements MonitorDao {
stmt.setString(paramIndex, value);
}
}
static void setParam(PreparedStatement stmt, int paramIndex, Boolean value) throws SQLException {
if (value == null) {
stmt.setNull(paramIndex, Types.BOOLEAN);
@@ -735,14 +746,37 @@ public class MonitorDaoJdbcImpl implements MonitorDao {
}
public boolean cacheContains(String type, Long hash) {
Map<Long, String> cache = cacheMap.get(type);
if (cache == null) {
return false;
}
return cache.containsKey(hash);
}
public String cacheGet(String type, Long hash) {
Map<Long, String> cache = cacheMap.get(type);
if (cache == null) {
return null;
}
return cache.get(hash);
}
public void cachePut(String type, Long hash, String value) {
ConcurrentMap<Long, String> cache = cacheMap.get(type);
if (cache == null) {
cacheMap.putIfAbsent(type, new ConcurrentHashMap<Long, String>(16, 0.75f, 1));
cache = cacheMap.get(type);
}
cache.putIfAbsent(hash, value);
}
public static class FieldInfo {
private final Field field;
private final String columnName;
private final Field hashFor;
private final String hashForType;
private ConcurrentMap<Long, String> hashCache = new ConcurrentHashMap<Long, String>(16, 0.75f, 1);
private final Field field;
private final String columnName;
private final Field hashFor;
private final String hashForType;
public FieldInfo(Field field, String columnName, Field hashFor, String hashForType){
this.field = field;
@@ -776,21 +810,6 @@ public class MonitorDaoJdbcImpl implements MonitorDao {
return field.getType();
}
public void hashCacheAdd(long hash, String value) {
if (hashCache.size() > 1000) {
return;
}
hashCache.put(hash, value);
}
public boolean hashCacheContains(long hash) {
return hashCache.containsKey(hash);
}
public String getCacheValue(long hash) {
return hashCache.get(hash);
}
}
public void insertAppIfNotExits(String domain, String app) throws SQLException {
@@ -806,13 +825,17 @@ public class MonitorDaoJdbcImpl implements MonitorDao {
public List<MonitorApp> listApp(String domain) throws SQLException {
List<MonitorApp> list = new ArrayList<MonitorApp>();
String sql = "select id, domain, app from druid_app where domain = ? and app = ?";
String sql = "select id, domain, app from druid_app " //
+ " where domain = ?";
Connection conn = null;
PreparedStatement stmt = null;
ResultSet rs = null;
try {
conn = dataSource.getConnection();
stmt = conn.prepareStatement(sql);
stmt.setString(1, domain);
rs = stmt.executeQuery();
if (rs.next()) {
list.add(readApp(rs));
@@ -827,13 +850,18 @@ public class MonitorDaoJdbcImpl implements MonitorDao {
}
public MonitorApp findApp(String domain, String app) throws SQLException {
String sql = "select id, domain, app from druid_app where domain = ? and app = ?";
String sql = "select id, domain, app from druid_app " //
+ " where domain = ? and app = ?";
Connection conn = null;
PreparedStatement stmt = null;
ResultSet rs = null;
try {
conn = dataSource.getConnection();
stmt = conn.prepareStatement(sql);
stmt.setString(1, domain);
stmt.setString(2, app);
rs = stmt.executeQuery();
if (rs.next()) {
return readApp(rs);
@@ -856,4 +884,191 @@ public class MonitorDaoJdbcImpl implements MonitorDao {
return app;
}
public List<MonitorCluster> listCluster(String domain, String app) throws SQLException {
List<MonitorCluster> list = new ArrayList<MonitorCluster>();
String sql = "select id, domain, app, cluster from druid_cluster " //
+ " where domain = ?";
if (app != null) {
sql += " and app = ?";
}
Connection conn = null;
PreparedStatement stmt = null;
ResultSet rs = null;
try {
conn = dataSource.getConnection();
stmt = conn.prepareStatement(sql);
stmt.setString(1, domain);
if (app != null) {
stmt.setString(2, app);
}
rs = stmt.executeQuery();
if (rs.next()) {
list.add(readCluster(rs));
}
return list;
} finally {
JdbcUtils.close(rs);
JdbcUtils.close(stmt);
JdbcUtils.close(conn);
}
}
public void insertClusterIfNotExits(String domain, String app, String cluster) throws SQLException {
MonitorCluster monitorApp = findCluster(domain, app, cluster);
if (monitorApp != null) {
return;
}
String sql = "insert druid_cluster (domain, app, cluster) values (?, ?, ?)";
JdbcUtils.execute(dataSource, sql, domain, app, cluster);
}
public MonitorCluster findCluster(String domain, String app, String cluster) throws SQLException {
String sql = "select id, domain, app, cluster from druid_cluster " //
+ " where domain = ? and app = ? and cluster = ?";
Connection conn = null;
PreparedStatement stmt = null;
ResultSet rs = null;
try {
conn = dataSource.getConnection();
stmt = conn.prepareStatement(sql);
stmt.setString(1, domain);
stmt.setString(2, app);
stmt.setString(3, cluster);
rs = stmt.executeQuery();
if (rs.next()) {
return readCluster(rs);
}
return null;
} finally {
JdbcUtils.close(rs);
JdbcUtils.close(stmt);
JdbcUtils.close(conn);
}
}
private MonitorCluster readCluster(ResultSet rs) throws SQLException {
MonitorCluster app = new MonitorCluster();
app.setId(rs.getLong(1));
app.setDomain(rs.getString(2));
app.setApp(rs.getString(3));
app.setCluster(rs.getString(4));
return app;
}
public void insertOrUpdateInstance(String domain, String app, String cluster, String host, String ip,
Date startTime, long pid) throws SQLException {
MonitorInstance monitorInst = findInst(domain, app, cluster, host);
if (monitorInst == null) {
String sql = "insert into druid_inst (domain, app, cluster, host, ip, lastActiveTime, lastPID) " //
+ " values (?, ?, ?, ?, ?, ?, ?)";
JdbcUtils.execute(dataSource, sql, domain, app, cluster, host, ip, startTime, pid);
} else {
String sql = "update druid_inst set ip = ?, lastActiveTime = ?, lastPID = ? " //
+ " where domain = ? and app = ? and cluster = ? and host = ? ";
JdbcUtils.execute(dataSource, sql, ip, startTime, pid, domain, app, cluster, host);
}
}
public MonitorInstance findInst(String domain, String app, String cluster, String host) throws SQLException {
String sql = "select id, domain, app, cluster, host, ip, lastActiveTime, lastPID from druid_inst " //
+ " where domain = ? and app = ? and cluster = ? and host = ? " //
+ " limit 1";
Connection conn = null;
PreparedStatement stmt = null;
ResultSet rs = null;
try {
conn = dataSource.getConnection();
stmt = conn.prepareStatement(sql);
stmt.setString(1, domain);
stmt.setString(2, app);
stmt.setString(3, cluster);
stmt.setString(4, host);
rs = stmt.executeQuery();
if (rs.next()) {
return readInst(rs);
}
return null;
} finally {
JdbcUtils.close(rs);
JdbcUtils.close(stmt);
JdbcUtils.close(conn);
}
}
public List<MonitorInstance> listInst(String domain, String app, String cluster) throws SQLException {
List<MonitorInstance> list = new ArrayList<MonitorInstance>();
String sql = "select id, domain, app, cluster, host, ip, lastActiveTime, lastPID from druid_inst " //
+ "where domain = ?";
if (app != null) {
sql += " and app = ?";
}
if (cluster != null) {
sql += " and cluster = ?";
}
Connection conn = null;
PreparedStatement stmt = null;
ResultSet rs = null;
try {
conn = dataSource.getConnection();
stmt = conn.prepareStatement(sql);
int paramIndex = 1;
stmt.setString(paramIndex++, domain);
if (app != null) {
stmt.setString(paramIndex++, app);
}
if (cluster != null) {
stmt.setString(paramIndex++, cluster);
}
rs = stmt.executeQuery();
if (rs.next()) {
list.add(readInst(rs));
}
return list;
} finally {
JdbcUtils.close(rs);
JdbcUtils.close(stmt);
JdbcUtils.close(conn);
}
}
private MonitorInstance readInst(ResultSet rs) throws SQLException {
MonitorInstance inst = new MonitorInstance();
inst.setId(rs.getLong(1));
inst.setDomain(rs.getString(2));
inst.setApp(rs.getString(3));
inst.setCluster(rs.getString(4));
inst.setHost(rs.getString(5));
inst.setIp(rs.getString(6));
inst.setLastActiveTime(rs.getTimestamp(7));
inst.setLastPID(rs.getLong(8));
return inst;
}
}
src/main/java/com/alibaba/druid/util/JdbcUtils.java
+2 -1
View File
@@ -631,7 +631,8 @@ public final class JdbcUtils implements JdbcConstants {
private static void setParameters(PreparedStatement stmt, List<Object> parameters) throws SQLException {
for (int i = 0, size = parameters.size(); i < size; ++i) {
stmt.setObject(i + 1, parameters.get(i));
Object param = parameters.get(i);
stmt.setObject(i + 1, param);
}
}
src/main/java/com/alibaba/druid/wall/WallProvider.java
+9
View File
@@ -40,6 +40,7 @@ import com.alibaba.druid.sql.parser.Token;
import com.alibaba.druid.sql.visitor.ExportParameterVisitor;
import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils;
import com.alibaba.druid.util.LRUCache;
import com.alibaba.druid.util.Utils;
import com.alibaba.druid.wall.spi.WallVisitorUtils;
import com.alibaba.druid.wall.violation.ErrorCode;
import com.alibaba.druid.wall.violation.IllegalSQLObjectViolation;
@@ -918,6 +919,14 @@ public abstract class WallProvider {
}
sqlStatValue.setSql(sql);
long sqlHash = sqlStat.getSqlHash();
if (sqlHash == 0) {
sqlHash = Utils.murmurhash2_64(sql);
sqlStat.setSqlHash(sqlHash);
}
sqlStatValue.setSqlHash(sqlHash);
statValue.getWhiteList().add(sqlStatValue);
}
}
src/main/java/com/alibaba/druid/wall/WallSqlStat.java
+10
View File
@@ -44,6 +44,8 @@ public class WallSqlStat {
private String sample;
private long sqlHash;
public WallSqlStat(Map<String, WallSqlTableStat> tableStats, Map<String, WallSqlFunctionStat> functionStats,
boolean syntaxError){
this(tableStats, functionStats, Collections.<Violation> emptyList(), syntaxError);
@@ -57,6 +59,14 @@ public class WallSqlStat {
this.syntaxError = syntaxError;
}
public long getSqlHash() {
return sqlHash;
}
public void setSqlHash(long sqlHash) {
this.sqlHash = sqlHash;
}
public String getSample() {
return sample;
}
src/main/java/com/alibaba/druid/wall/WallSqlStatValue.java
+14 -2
View File
@@ -25,12 +25,16 @@ import com.alibaba.druid.support.monitor.annotation.MTable;
@MTable(name = "druid_wall_sql")
public class WallSqlStatValue {
@MField(aggregate = AggregateType.None)
private String sql;
@MField(aggregate = AggregateType.None)
@MField(groupBy = true, aggregate = AggregateType.None, hashFor = "sql", hashForType = "sql")
private long sqlHash;
private String sqlSample;
@MField(groupBy = true, aggregate = AggregateType.None, hashFor = "sqlSample", hashForType = "sqlSample")
private long sqlSampleHash;
@MField(aggregate = AggregateType.Sum)
private long executeCount;
@@ -58,6 +62,14 @@ public class WallSqlStatValue {
this.sql = sql;
}
public long getSqlHash() {
return sqlHash;
}
public void setSqlHash(long sqlHash) {
this.sqlHash = sqlHash;
}
public String getSqlSample() {
return sqlSample;
}