WANG há 5 anos atrás
pai
commit
6fa2f24f0b

+ 6 - 32
src/main/java/cn/com/qmth/examcloud/web/actuator/ApiStatusEndpoint.java

@@ -65,10 +65,10 @@ public class ApiStatusEndpoint {
 
 		for (MeterInfo meterInfo : meterInfoList) {
 			String key = meterInfo.getKey();
-			if (!key.startsWith(MetricNames.API_EXCEPTION_METER.name())) {
+			if (!key.startsWith(MetricNames.API_ERROR_METER.name())) {
 				continue;
 			}
-			String mapping = key.substring(MetricNames.API_EXCEPTION_METER.name().length() + 1);
+			String mapping = key.substring(MetricNames.API_ERROR_METER.name().length() + 1);
 			meterInfoMap.put(mapping, meterInfo);
 		}
 
@@ -92,9 +92,6 @@ public class ApiStatusEndpoint {
 				apiStatusInfo.setDescription(apiInfo.getDescription());
 			}
 
-			apiStatusInfo.setRateUnit(timerInfo.getRateUnit());
-			apiStatusInfo.setDurationUnit(timerInfo.getDurationUnit());
-
 			apiStatusInfo.setCount(timerInfo.getCount());
 			apiStatusInfo.setMeanRate(timerInfo.getMeanRate());
 			apiStatusInfo.setOneMinuteRate(timerInfo.getOneMinuteRate());
@@ -110,38 +107,15 @@ public class ApiStatusEndpoint {
 			apiStatusInfo.setP95(timerInfo.getP95());
 			apiStatusInfo.setP98(timerInfo.getP98());
 			apiStatusInfo.setP99(timerInfo.getP99());
-			apiStatusInfo.setP999(timerInfo.getP999());
 
 			MeterInfo meterInfo = meterInfoMap.get(mapping);
 			if (null == meterInfo) {
-				apiStatusInfo.setExceptionCount(0L);
-				apiStatusInfo.setExceptionMeanRate(0);
-				apiStatusInfo.setExceptionOneMinuteRate(0);
-				apiStatusInfo.setExceptionFiveMinuteRate(0);
-				apiStatusInfo.setExceptionFifteenMinuteRate(0);
-
-				apiStatusInfo.setExceptionPercent(0);
-				apiStatusInfo.setExceptionMeanPercent(0);
-				apiStatusInfo.setExceptionOneMinutePercent(0);
-				apiStatusInfo.setExceptionFiveMinutePercent(0);
-				apiStatusInfo.setExceptionFifteenMinutePercent(0);
+				apiStatusInfo.setErrorCount(0L);
+				apiStatusInfo.setErrorPercent(0D);
 			} else {
-				apiStatusInfo.setExceptionCount(meterInfo.getCount());
-				apiStatusInfo.setExceptionMeanRate(meterInfo.getMeanRate());
-				apiStatusInfo.setExceptionOneMinuteRate(meterInfo.getOneMinuteRate());
-				apiStatusInfo.setExceptionFiveMinuteRate(meterInfo.getFiveMinuteRate());
-				apiStatusInfo.setExceptionFifteenMinuteRate(meterInfo.getFifteenMinuteRate());
-
-				apiStatusInfo.setExceptionPercent(
-						getPercent(meterInfo.getCount(), timerInfo.getCount()));
-				apiStatusInfo.setExceptionMeanPercent(
+				apiStatusInfo.setErrorCount(meterInfo.getCount());
+				apiStatusInfo.setErrorPercent(
 						getPercent(meterInfo.getMeanRate(), timerInfo.getMeanRate()));
-				apiStatusInfo.setExceptionOneMinutePercent(
-						getPercent(meterInfo.getOneMinuteRate(), timerInfo.getOneMinuteRate()));
-				apiStatusInfo.setExceptionFiveMinutePercent(
-						getPercent(meterInfo.getFiveMinuteRate(), timerInfo.getFiveMinuteRate()));
-				apiStatusInfo.setExceptionFifteenMinutePercent(getPercent(
-						meterInfo.getFifteenMinuteRate(), timerInfo.getFifteenMinuteRate()));
 			}
 
 		}

+ 10 - 120
src/main/java/cn/com/qmth/examcloud/web/actuator/ApiStatusInfo.java

@@ -16,16 +16,12 @@ public class ApiStatusInfo {
 
 	private double fifteenMinuteRate;
 
-	private String rateUnit;
-
 	private double min;
 
 	private double max;
 
 	private double mean;
 
-	private String durationUnit;
-
 	private double p50;
 
 	private double p75;
@@ -36,27 +32,9 @@ public class ApiStatusInfo {
 
 	private double p99;
 
-	private double p999;
-
-	private Long exceptionCount;
-
-	private double exceptionMeanRate;
-
-	private double exceptionOneMinuteRate;
-
-	private double exceptionFiveMinuteRate;
-
-	private double exceptionFifteenMinuteRate;
+	private Long errorCount;
 
-	private double exceptionPercent;
-
-	private double exceptionMeanPercent;
-
-	private double exceptionOneMinutePercent;
-
-	private double exceptionFiveMinutePercent;
-
-	private double exceptionFifteenMinutePercent;
+	private double errorPercent;
 
 	public String getMapping() {
 		return mapping;
@@ -114,14 +92,6 @@ public class ApiStatusInfo {
 		this.fifteenMinuteRate = fifteenMinuteRate;
 	}
 
-	public String getRateUnit() {
-		return rateUnit;
-	}
-
-	public void setRateUnit(String rateUnit) {
-		this.rateUnit = rateUnit;
-	}
-
 	public double getMin() {
 		return min;
 	}
@@ -146,14 +116,6 @@ public class ApiStatusInfo {
 		this.mean = mean;
 	}
 
-	public String getDurationUnit() {
-		return durationUnit;
-	}
-
-	public void setDurationUnit(String durationUnit) {
-		this.durationUnit = durationUnit;
-	}
-
 	public double getP50() {
 		return p50;
 	}
@@ -194,92 +156,20 @@ public class ApiStatusInfo {
 		this.p99 = p99;
 	}
 
-	public double getP999() {
-		return p999;
-	}
-
-	public void setP999(double p999) {
-		this.p999 = p999;
-	}
-
-	public Long getExceptionCount() {
-		return exceptionCount;
-	}
-
-	public void setExceptionCount(Long exceptionCount) {
-		this.exceptionCount = exceptionCount;
-	}
-
-	public double getExceptionMeanRate() {
-		return exceptionMeanRate;
-	}
-
-	public void setExceptionMeanRate(double exceptionMeanRate) {
-		this.exceptionMeanRate = exceptionMeanRate;
-	}
-
-	public double getExceptionOneMinuteRate() {
-		return exceptionOneMinuteRate;
-	}
-
-	public void setExceptionOneMinuteRate(double exceptionOneMinuteRate) {
-		this.exceptionOneMinuteRate = exceptionOneMinuteRate;
-	}
-
-	public double getExceptionFiveMinuteRate() {
-		return exceptionFiveMinuteRate;
-	}
-
-	public void setExceptionFiveMinuteRate(double exceptionFiveMinuteRate) {
-		this.exceptionFiveMinuteRate = exceptionFiveMinuteRate;
-	}
-
-	public double getExceptionFifteenMinuteRate() {
-		return exceptionFifteenMinuteRate;
-	}
-
-	public void setExceptionFifteenMinuteRate(double exceptionFifteenMinuteRate) {
-		this.exceptionFifteenMinuteRate = exceptionFifteenMinuteRate;
-	}
-
-	public double getExceptionPercent() {
-		return exceptionPercent;
-	}
-
-	public void setExceptionPercent(double exceptionPercent) {
-		this.exceptionPercent = exceptionPercent;
-	}
-
-	public double getExceptionMeanPercent() {
-		return exceptionMeanPercent;
-	}
-
-	public void setExceptionMeanPercent(double exceptionMeanPercent) {
-		this.exceptionMeanPercent = exceptionMeanPercent;
-	}
-
-	public double getExceptionOneMinutePercent() {
-		return exceptionOneMinutePercent;
-	}
-
-	public void setExceptionOneMinutePercent(double exceptionOneMinutePercent) {
-		this.exceptionOneMinutePercent = exceptionOneMinutePercent;
-	}
-
-	public double getExceptionFiveMinutePercent() {
-		return exceptionFiveMinutePercent;
+	public Long getErrorCount() {
+		return errorCount;
 	}
 
-	public void setExceptionFiveMinutePercent(double exceptionFiveMinutePercent) {
-		this.exceptionFiveMinutePercent = exceptionFiveMinutePercent;
+	public void setErrorCount(Long errorCount) {
+		this.errorCount = errorCount;
 	}
 
-	public double getExceptionFifteenMinutePercent() {
-		return exceptionFifteenMinutePercent;
+	public double getErrorPercent() {
+		return errorPercent;
 	}
 
-	public void setExceptionFifteenMinutePercent(double exceptionFifteenMinutePercent) {
-		this.exceptionFifteenMinutePercent = exceptionFifteenMinutePercent;
+	public void setErrorPercent(double errorPercent) {
+		this.errorPercent = errorPercent;
 	}
 
 }

+ 1 - 1
src/main/java/cn/com/qmth/examcloud/web/actuator/MetricNames.java

@@ -17,6 +17,6 @@ public enum MetricNames {
 	/**
 	 * 接口异常meter
 	 */
-	API_EXCEPTION_METER
+	API_ERROR_METER
 
 }

+ 1 - 1
src/main/java/cn/com/qmth/examcloud/web/interceptor/ApiStatisticInterceptor.java

@@ -60,7 +60,7 @@ public class ApiStatisticInterceptor implements HandlerInterceptor {
 
 			if (null != apiInfo) {
 				Meter meter = MetricRegistryHolder.getDefalut().meter(MetricRegistry
-						.name(MetricNames.API_EXCEPTION_METER.name(), apiInfo.getMapping()));
+						.name(MetricNames.API_ERROR_METER.name(), apiInfo.getMapping()));
 				meter.mark();
 			}
 		}