dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not count db call stats in case of JDBCConnectionException

Browse Source
This commit is contained in:
ViacheslavKlimov 2022-09-27 15:33:46 +03:00
parent 7f23367ee9
commit cae9fb55f0
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dao/src/main/java/org/thingsboard/server/dao/aspect/SqlDaoCallsAspect.java
View File

@ -22,11 +22,13 @@ import com.google.common.util.concurrent.MoreExecutors;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.reflect.MethodSignature; import org.aspectj.lang.reflect.MethodSignature;
import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.checker.nullness.qual.Nullable;
import org.hibernate.exception.JDBCConnectionException;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -153,26 +155,29 @@ public class SqlDaoCallsAspect {
new FutureCallback<>() { new FutureCallback<>() {
@Override @Override
public void onSuccess(@Nullable Object result) { public void onSuccess(@Nullable Object result) {
logTenantMethodExecution(tenantId, methodName, true, startTime); logTenantMethodExecution(tenantId, methodName, true, startTime, null);
} }
@Override @Override
public void onFailure(Throwable t) { public void onFailure(Throwable t) {
logTenantMethodExecution(tenantId, methodName, false, startTime); logTenantMethodExecution(tenantId, methodName, false, startTime, t);
} }
}, },
MoreExecutors.directExecutor()); MoreExecutors.directExecutor());
} else { } else {
logTenantMethodExecution(tenantId, methodName, true, startTime); logTenantMethodExecution(tenantId, methodName, true, startTime, null);
} }
return result; return result;
} catch (Throwable t) { } catch (Throwable t) {
logTenantMethodExecution(tenantId, methodName, false, startTime); logTenantMethodExecution(tenantId, methodName, false, startTime, t);
throw t; throw t;
} }
} }
private void logTenantMethodExecution(TenantId tenantId, String method, boolean success, long startTime) { private void logTenantMethodExecution(TenantId tenantId, String method, boolean success, long startTime, Throwable t) {
if (!success && ExceptionUtils.indexOfThrowable(t, JDBCConnectionException.class) >= 0) {
return;
}
statsMap.computeIfAbsent(tenantId, DbCallStats::new) statsMap.computeIfAbsent(tenantId, DbCallStats::new)
.onMethodCall(method, success, System.currentTimeMillis() - startTime); .onMethodCall(method, success, System.currentTimeMillis() - startTime);
} }