From efbe16f8d05fc9c4843b156e09e74158953ae686 Mon Sep 17 00:00:00 2001 From: Andrii Shvaika Date: Fri, 16 Sep 2022 09:00:21 +0300 Subject: [PATCH 1/4] Implementation of the TenantDbCall annotation --- .../src/main/resources/thingsboard.yml | 2 + .../server/dao/util/TenantDbCall.java | 27 +++ .../server/dao/aspect/DbCallStats.java | 60 ++++++ .../dao/aspect/DbCallStatsSnapshot.java | 39 ++++ .../server/dao/aspect/TenantDbCallAspect.java | 190 ++++++++++++++++++ .../server/dao/sql/JpaAbstractDao.java | 3 + 6 files changed, 321 insertions(+) create mode 100644 common/dao-api/src/main/java/org/thingsboard/server/dao/util/TenantDbCall.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/aspect/DbCallStats.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/aspect/DbCallStatsSnapshot.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/aspect/TenantDbCallAspect.java diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml index 9edd5d0ed5..5730f022b7 100644 --- a/application/src/main/resources/thingsboard.yml +++ b/application/src/main/resources/thingsboard.yml @@ -272,6 +272,8 @@ sql: # Specify whether to log database queries and their parameters generated by entity query repository log_queries: "${SQL_LOG_QUERIES:false}" log_queries_threshold: "${SQL_LOG_QUERIES_THRESHOLD:5000}" + log_tenant_stats: "${SQL_LOG_TENANT_STATS:true}" + log_tenant_stats_interval: "${SQL_LOG_TENANT_STATS_INTERVAL:60000}" postgres: # Specify partitioning size for timestamp key-value storage. Example: DAYS, MONTHS, YEARS, INDEFINITE. ts_key_value_partitioning: "${SQL_POSTGRES_TS_KV_PARTITIONING:MONTHS}" diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/util/TenantDbCall.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/util/TenantDbCall.java new file mode 100644 index 0000000000..84c3d6b362 --- /dev/null +++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/util/TenantDbCall.java @@ -0,0 +1,27 @@ +/** + * Copyright © 2016-2022 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.server.dao.util; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +public @interface TenantDbCall { + +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/aspect/DbCallStats.java b/dao/src/main/java/org/thingsboard/server/dao/aspect/DbCallStats.java new file mode 100644 index 0000000000..18fdfa30c8 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/aspect/DbCallStats.java @@ -0,0 +1,60 @@ +/** + * Copyright © 2016-2022 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.server.dao.aspect; + +import lombok.Data; +import org.springframework.data.util.Pair; +import org.thingsboard.server.common.data.id.TenantId; + +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicLong; +import java.util.stream.Collectors; + +@Data +public class DbCallStats { + + private final TenantId tenantId; + private final ConcurrentMap> methodStats = new ConcurrentHashMap<>(); + private final AtomicInteger successCalls = new AtomicInteger(); + private final AtomicInteger failureCalls = new AtomicInteger(); + + public void onMethodCall(String methodName, boolean success, long executionTime) { + var pair = methodStats.computeIfAbsent(methodName, + m -> Pair.of(new AtomicInteger(0), new AtomicLong(0L))); + pair.getFirst().incrementAndGet(); + pair.getSecond().addAndGet(executionTime); + if (success) { + successCalls.incrementAndGet(); + } else { + failureCalls.incrementAndGet(); + } + } + + public DbCallStatsSnapshot snapshot() { + return DbCallStatsSnapshot.builder() + .tenantId(tenantId) + .totalSuccess(successCalls.get()) + .totalFailure(failureCalls.get()) + .methodExecutions(methodStats.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().getFirst().get()))) + .methodTimings(methodStats.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().getSecond().get()))) + .totalTiming(methodStats.values().stream().map(Pair::getSecond).map(AtomicLong::get).reduce(0L, Long::sum)) + .build(); + } + +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/aspect/DbCallStatsSnapshot.java b/dao/src/main/java/org/thingsboard/server/dao/aspect/DbCallStatsSnapshot.java new file mode 100644 index 0000000000..f9bc46b93b --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/aspect/DbCallStatsSnapshot.java @@ -0,0 +1,39 @@ +/** + * Copyright © 2016-2022 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.server.dao.aspect; + +import lombok.Builder; +import lombok.Data; +import org.thingsboard.server.common.data.id.TenantId; + +import java.util.Map; + +@Data +@Builder +public class DbCallStatsSnapshot { + + private final TenantId tenantId; + private final int totalSuccess; + private final int totalFailure; + private final long totalTiming; + private final Map methodExecutions; + private final Map methodTimings; + + public int getTotalCalls() { + return totalSuccess + totalFailure; + } + +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/aspect/TenantDbCallAspect.java b/dao/src/main/java/org/thingsboard/server/dao/aspect/TenantDbCallAspect.java new file mode 100644 index 0000000000..202f6aebf0 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/aspect/TenantDbCallAspect.java @@ -0,0 +1,190 @@ +/** + * Copyright © 2016-2022 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.server.dao.aspect; + +import com.google.common.util.concurrent.FutureCallback; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.MoreExecutors; +import lombok.extern.slf4j.Slf4j; +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.annotation.Around; +import org.aspectj.lang.annotation.Aspect; +import org.checkerframework.checker.nullness.qual.Nullable; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; +import org.thingsboard.server.common.data.id.TenantId; + +import java.util.Arrays; +import java.util.Comparator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.function.Consumer; +import java.util.function.Function; +import java.util.stream.Collectors; + +@Aspect +@ConditionalOnProperty(prefix = "sql", value = "log_tenant_stats", havingValue = "true") +@Component +@Slf4j +public class TenantDbCallAspect { + + private final Set invalidTenantDbCallMethods = ConcurrentHashMap.newKeySet(); + private final ConcurrentMap statsMap = new ConcurrentHashMap<>(); + + @Scheduled(fixedDelayString = "${sql.log_tenant_stats.log_tenant_stats_interval:60000}") + public void printStats() { + try { + if (log.isTraceEnabled()) { + List snapshots = snapshot(); + logTopNTenants(snapshots, Comparator.comparing(DbCallStatsSnapshot::getTotalTiming).reversed(), 0, snapshot -> { + log.trace("[{}]: calls: {}, exec time: {} ", snapshot.getTenantId(), snapshot.getTotalCalls(), snapshot.getTotalTiming()); + snapshot.getMethodExecutions().forEach((method, count) -> { + log.trace("[{}]: method: {}, count: {}, exec time: {}", + snapshot.getTenantId(), method, count, snapshot.getMethodTimings().getOrDefault(method, 0L)); + }); + }); + // todo: log top 10 tenants for each method sorted by number of execution. + } else if (log.isDebugEnabled()) { + List snapshots = snapshot(); + log.debug("Total calls statistics below:"); + logTopNTenants(snapshots, Comparator.comparingInt(DbCallStatsSnapshot::getTotalCalls).reversed(), + 10, s -> logSnapshotWithDebugLevel(s, 10)); + log.debug("Total timing statistics below:"); + logTopNTenants(snapshots, Comparator.comparingLong(DbCallStatsSnapshot::getTotalTiming).reversed(), + 10, s -> logSnapshotWithDebugLevel(s, 10)); + log.debug("Total errors statistics below:"); + logTopNTenants(snapshots, Comparator.comparingInt(DbCallStatsSnapshot::getTotalFailure).reversed(), + 10, s -> logSnapshotWithDebugLevel(s, 10)); + } else if (log.isInfoEnabled()) { + log.debug("Total calls statistics below:"); + List snapshots = snapshot(); + logTopNTenants(snapshots, Comparator.comparingInt(DbCallStatsSnapshot::getTotalFailure).reversed(), + 3, s -> logSnapshotWithDebugLevel(s, 3)); + } + } finally { + statsMap.clear(); + } + } + + private void logSnapshotWithDebugLevel(DbCallStatsSnapshot snapshot, int limit) { + log.debug("[{}]: calls: {}, failures: {}, exec time: {} ", + snapshot.getTenantId(), snapshot.getTotalCalls(), snapshot.getTotalFailure(), snapshot.getTotalTiming()); + var stream = snapshot.getMethodTimings().entrySet().stream() + .sorted(Map.Entry.comparingByValue(Comparator.reverseOrder())); + if (limit > 0) { + stream = stream.limit(limit); + } + stream.forEach(e -> { + long timing = snapshot.getMethodTimings().getOrDefault(e.getKey(), 0L); + log.debug("[{}]: method: {}, count: {}, exec time: {}", snapshot.getTenantId(), e.getKey(), e.getValue(), timing); + }); + } + + private List snapshot() { + return statsMap.values().stream().map(DbCallStats::snapshot).collect(Collectors.toList()); + } + +// private void logTopNMethods(List snapshots, Comparator comparator, +// int n, Consumer logFunction) { +//// var stream = snapshots.stream().sorted(comparator).sorted(); +// // find top methods by execution time and then top +// if (n > 0) { +// stream = stream.limit(n); +// } +// stream.forEach(logFunction); +// } + + private void logTopNTenants(List snapshots, Comparator comparator, + int n, Consumer logFunction) { + var stream = snapshots.stream().sorted(comparator).sorted(); + if (n > 0) { + stream = stream.limit(n); + } + stream.forEach(logFunction); + } + + @SuppressWarnings({"rawtypes", "unchecked"}) + @Around("@annotation(org.thingsboard.server.dao.util.TenantDbCall)") + public Object logExecutionTime(ProceedingJoinPoint joinPoint) throws Throwable { + var signature = joinPoint.getSignature(); + var method = signature.toShortString(); + if (invalidTenantDbCallMethods.contains(method)) { + //Simply call the method if tenant is not found + return joinPoint.proceed(); + } + var tenantId = getTenantId(method, joinPoint.getArgs()); + if (tenantId == null) { + //Simply call the method if tenant is null + return joinPoint.proceed(); + } + var startTime = System.currentTimeMillis(); + try { + var result = joinPoint.proceed(); + if (result instanceof ListenableFuture) { + Futures.addCallback((ListenableFuture) result, + new FutureCallback<>() { + @Override + public void onSuccess(@Nullable Object result) { + logTenantMethodExecution(tenantId, method, true, startTime); + } + + @Override + public void onFailure(Throwable t) { + logTenantMethodExecution(tenantId, method, false, startTime); + } + }, + MoreExecutors.directExecutor()); + } else { + logTenantMethodExecution(tenantId, method, true, startTime); + } + return result; + } catch (Throwable t) { + logTenantMethodExecution(tenantId, method, false, startTime); + throw t; + } + } + + private void logTenantMethodExecution(TenantId tenantId, String method, boolean success, long startTime) { + statsMap.computeIfAbsent(tenantId, DbCallStats::new) + .onMethodCall(method, success, System.currentTimeMillis() - startTime); + } + + TenantId getTenantId(String methodName, Object[] args) { + if (args == null || args.length == 0) { + addAndLogInvalidMethods(methodName); + return null; + } + for (Object arg : args) { + if (arg instanceof TenantId) { + log.debug("Method: {} is annotated with @TenantDbCall but the TenantId is null. Args: {}", methodName, Arrays.toString(args)); + return (TenantId) arg; + } + } + addAndLogInvalidMethods(methodName); + return null; + } + + private void addAndLogInvalidMethods(String methodName) { + log.warn("Method: {} is annotated with @TenantDbCall but no TenantId in args", methodName); + invalidTenantDbCallMethods.add(methodName); + } + +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java index ad6bb5ccec..43cc60bf01 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java @@ -25,6 +25,7 @@ import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.dao.Dao; import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.BaseEntity; +import org.thingsboard.server.dao.util.TenantDbCall; import java.util.Collection; import java.util.List; @@ -75,6 +76,7 @@ public abstract class JpaAbstractDao, D> return d; } + @TenantDbCall @Override public D findById(TenantId tenantId, UUID key) { log.debug("Get entity by key {}", key); @@ -82,6 +84,7 @@ public abstract class JpaAbstractDao, D> return DaoUtil.getData(entity); } + @TenantDbCall @Override public ListenableFuture findByIdAsync(TenantId tenantId, UUID key) { log.debug("Get entity by key async {}", key); From 7f23367ee9be0d8f5a2b9cbb8928932449328c06 Mon Sep 17 00:00:00 2001 From: ViacheslavKlimov Date: Tue, 27 Sep 2022 10:12:35 +0300 Subject: [PATCH 2/4] Improvements for dao calls audit --- .../util/{TenantDbCall.java => SqlDao.java} | 5 +- .../server/dao/aspect/DbCallStats.java | 15 ++- .../dao/aspect/DbCallStatsSnapshot.java | 3 +- .../server/dao/aspect/MethodCallStats.java | 33 +++++ .../dao/aspect/MethodCallStatsSnapshot.java | 25 ++++ ...CallAspect.java => SqlDaoCallsAspect.java} | 119 ++++++++++-------- .../server/dao/sql/JpaAbstractDao.java | 5 +- .../server/dao/sql/alarm/JpaAlarmDao.java | 2 + .../server/dao/sql/asset/JpaAssetDao.java | 2 + .../dao/sql/attributes/JpaAttributeDao.java | 2 + .../server/dao/sql/audit/JpaAuditLogDao.java | 2 + .../dao/sql/customer/JpaCustomerDao.java | 2 + .../dao/sql/dashboard/JpaDashboardDao.java | 2 + .../sql/dashboard/JpaDashboardInfoDao.java | 2 + .../sql/device/JpaDeviceCredentialsDao.java | 2 + .../server/dao/sql/device/JpaDeviceDao.java | 2 + .../dao/sql/device/JpaDeviceProfileDao.java | 2 + .../dao/sql/edge/JpaBaseEdgeEventDao.java | 2 + .../server/dao/sql/edge/JpaEdgeDao.java | 2 + .../dao/sql/entityview/JpaEntityViewDao.java | 2 + .../server/dao/sql/event/JpaBaseEventDao.java | 2 + ...paOAuth2ClientRegistrationTemplateDao.java | 2 + .../dao/sql/oauth2/JpaOAuth2DomainDao.java | 2 + .../dao/sql/oauth2/JpaOAuth2MobileDao.java | 2 + .../dao/sql/oauth2/JpaOAuth2ParamsDao.java | 2 + .../sql/oauth2/JpaOAuth2RegistrationDao.java | 2 + .../server/dao/sql/ota/JpaOtaPackageDao.java | 2 + .../dao/sql/ota/JpaOtaPackageInfoDao.java | 2 + .../server/dao/sql/queue/JpaQueueDao.java | 2 + .../dao/sql/relation/JpaRelationDao.java | 2 + .../dao/sql/resource/JpaTbResourceDao.java | 2 + .../sql/resource/JpaTbResourceInfoDao.java | 2 + .../server/dao/sql/rpc/JpaRpcDao.java | 2 + .../server/dao/sql/rule/JpaRuleChainDao.java | 2 + .../server/dao/sql/rule/JpaRuleNodeDao.java | 2 + .../dao/sql/rule/JpaRuleNodeStateDao.java | 2 + .../dao/sql/settings/JpaAdminSettingsDao.java | 2 + .../server/dao/sql/tenant/JpaTenantDao.java | 2 + .../dao/sql/tenant/JpaTenantProfileDao.java | 2 + .../sql/usagerecord/JpaApiUsageStateDao.java | 2 + .../dao/sql/user/JpaUserAuthSettingsDao.java | 2 + .../dao/sql/user/JpaUserCredentialsDao.java | 2 + .../server/dao/sql/user/JpaUserDao.java | 2 + .../dao/sql/widget/JpaWidgetTypeDao.java | 2 + .../dao/sql/widget/JpaWidgetsBundleDao.java | 2 + 45 files changed, 215 insertions(+), 66 deletions(-) rename common/dao-api/src/main/java/org/thingsboard/server/dao/util/{TenantDbCall.java => SqlDao.java} (93%) create mode 100644 dao/src/main/java/org/thingsboard/server/dao/aspect/MethodCallStats.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/aspect/MethodCallStatsSnapshot.java rename dao/src/main/java/org/thingsboard/server/dao/aspect/{TenantDbCallAspect.java => SqlDaoCallsAspect.java} (53%) diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/util/TenantDbCall.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/util/SqlDao.java similarity index 93% rename from common/dao-api/src/main/java/org/thingsboard/server/dao/util/TenantDbCall.java rename to common/dao-api/src/main/java/org/thingsboard/server/dao/util/SqlDao.java index 84c3d6b362..801d4af1a6 100644 --- a/common/dao-api/src/main/java/org/thingsboard/server/dao/util/TenantDbCall.java +++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/util/SqlDao.java @@ -20,8 +20,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -@Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) -public @interface TenantDbCall { - +@Target(ElementType.TYPE) +public @interface SqlDao { } diff --git a/dao/src/main/java/org/thingsboard/server/dao/aspect/DbCallStats.java b/dao/src/main/java/org/thingsboard/server/dao/aspect/DbCallStats.java index 18fdfa30c8..06efa38cc5 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/aspect/DbCallStats.java +++ b/dao/src/main/java/org/thingsboard/server/dao/aspect/DbCallStats.java @@ -30,19 +30,19 @@ import java.util.stream.Collectors; public class DbCallStats { private final TenantId tenantId; - private final ConcurrentMap> methodStats = new ConcurrentHashMap<>(); + private final ConcurrentMap methodStats = new ConcurrentHashMap<>(); private final AtomicInteger successCalls = new AtomicInteger(); private final AtomicInteger failureCalls = new AtomicInteger(); public void onMethodCall(String methodName, boolean success, long executionTime) { - var pair = methodStats.computeIfAbsent(methodName, - m -> Pair.of(new AtomicInteger(0), new AtomicLong(0L))); - pair.getFirst().incrementAndGet(); - pair.getSecond().addAndGet(executionTime); + var methodCallStats = methodStats.computeIfAbsent(methodName, m -> new MethodCallStats()); + methodCallStats.getExecutions().incrementAndGet(); + methodCallStats.getTiming().addAndGet(executionTime); if (success) { successCalls.incrementAndGet(); } else { failureCalls.incrementAndGet(); + methodCallStats.getFailures().incrementAndGet(); } } @@ -51,9 +51,8 @@ public class DbCallStats { .tenantId(tenantId) .totalSuccess(successCalls.get()) .totalFailure(failureCalls.get()) - .methodExecutions(methodStats.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().getFirst().get()))) - .methodTimings(methodStats.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().getSecond().get()))) - .totalTiming(methodStats.values().stream().map(Pair::getSecond).map(AtomicLong::get).reduce(0L, Long::sum)) + .methodStats(methodStats.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().snapshot()))) + .totalTiming(methodStats.values().stream().map(MethodCallStats::getTiming).map(AtomicLong::get).reduce(0L, Long::sum)) .build(); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/aspect/DbCallStatsSnapshot.java b/dao/src/main/java/org/thingsboard/server/dao/aspect/DbCallStatsSnapshot.java index f9bc46b93b..b29e3a1a7a 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/aspect/DbCallStatsSnapshot.java +++ b/dao/src/main/java/org/thingsboard/server/dao/aspect/DbCallStatsSnapshot.java @@ -29,8 +29,7 @@ public class DbCallStatsSnapshot { private final int totalSuccess; private final int totalFailure; private final long totalTiming; - private final Map methodExecutions; - private final Map methodTimings; + private final Map methodStats; public int getTotalCalls() { return totalSuccess + totalFailure; diff --git a/dao/src/main/java/org/thingsboard/server/dao/aspect/MethodCallStats.java b/dao/src/main/java/org/thingsboard/server/dao/aspect/MethodCallStats.java new file mode 100644 index 0000000000..22d9086964 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/aspect/MethodCallStats.java @@ -0,0 +1,33 @@ +/** + * Copyright © 2016-2022 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.server.dao.aspect; + +import lombok.Data; + +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicLong; + +@Data +public class MethodCallStats { + private final AtomicInteger executions = new AtomicInteger(); + private final AtomicInteger failures = new AtomicInteger(); + private final AtomicLong timing = new AtomicLong(); + + public MethodCallStatsSnapshot snapshot() { + return new MethodCallStatsSnapshot(executions.get(), failures.get(), timing.get()); + } + +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/aspect/MethodCallStatsSnapshot.java b/dao/src/main/java/org/thingsboard/server/dao/aspect/MethodCallStatsSnapshot.java new file mode 100644 index 0000000000..75eff38c6d --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/aspect/MethodCallStatsSnapshot.java @@ -0,0 +1,25 @@ +/** + * Copyright © 2016-2022 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.server.dao.aspect; + +import lombok.Data; + +@Data +public class MethodCallStatsSnapshot { + private final int executions; + private final int failures; + private final long timing; +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/aspect/TenantDbCallAspect.java b/dao/src/main/java/org/thingsboard/server/dao/aspect/SqlDaoCallsAspect.java similarity index 53% rename from dao/src/main/java/org/thingsboard/server/dao/aspect/TenantDbCallAspect.java rename to dao/src/main/java/org/thingsboard/server/dao/aspect/SqlDaoCallsAspect.java index 202f6aebf0..434f1a8e7c 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/aspect/TenantDbCallAspect.java +++ b/dao/src/main/java/org/thingsboard/server/dao/aspect/SqlDaoCallsAspect.java @@ -20,9 +20,12 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.MoreExecutors; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.StringUtils; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.reflect.MethodSignature; import org.checkerframework.checker.nullness.qual.Nullable; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; @@ -31,70 +34,87 @@ import org.thingsboard.server.common.data.id.TenantId; import java.util.Arrays; import java.util.Comparator; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.function.Consumer; -import java.util.function.Function; import java.util.stream.Collectors; @Aspect @ConditionalOnProperty(prefix = "sql", value = "log_tenant_stats", havingValue = "true") @Component @Slf4j -public class TenantDbCallAspect { +public class SqlDaoCallsAspect { private final Set invalidTenantDbCallMethods = ConcurrentHashMap.newKeySet(); private final ConcurrentMap statsMap = new ConcurrentHashMap<>(); - @Scheduled(fixedDelayString = "${sql.log_tenant_stats.log_tenant_stats_interval:60000}") + @Scheduled(initialDelayString = "${sql.log_tenant_stats.log_tenant_stats_interval:60000}", + fixedDelayString = "${sql.log_tenant_stats.log_tenant_stats_interval:60000}") public void printStats() { + List snapshots = snapshot(); + if (snapshots.isEmpty()) return; try { if (log.isTraceEnabled()) { - List snapshots = snapshot(); logTopNTenants(snapshots, Comparator.comparing(DbCallStatsSnapshot::getTotalTiming).reversed(), 0, snapshot -> { - log.trace("[{}]: calls: {}, exec time: {} ", snapshot.getTenantId(), snapshot.getTotalCalls(), snapshot.getTotalTiming()); - snapshot.getMethodExecutions().forEach((method, count) -> { - log.trace("[{}]: method: {}, count: {}, exec time: {}", - snapshot.getTenantId(), method, count, snapshot.getMethodTimings().getOrDefault(method, 0L)); + logSnapshot(snapshot, 0, Comparator.comparing(MethodCallStatsSnapshot::getTiming).reversed(), log::trace); + }); + + Map> byMethodStats = new HashMap<>(); + for (DbCallStatsSnapshot snapshot : snapshots) { + snapshot.getMethodStats().forEach((method, stats) -> { + byMethodStats.computeIfAbsent(method, m -> new HashMap<>()) + .put(snapshot.getTenantId(), stats); }); + } + byMethodStats.forEach((method, byTenantStats) -> { + log.trace("Top tenants for method {} by calls:", method); + byTenantStats.entrySet().stream() + .sorted(Map.Entry.comparingByValue(Comparator.comparing(MethodCallStatsSnapshot::getExecutions).reversed())) + .limit(10) + .forEach(e -> { + TenantId tenantId = e.getKey(); + MethodCallStatsSnapshot methodStats = e.getValue(); + log.trace("[{}] calls: {}, failures: {}, timing: {}", tenantId, + methodStats.getExecutions(), methodStats.getFailures(), methodStats.getTiming()); + }); }); - // todo: log top 10 tenants for each method sorted by number of execution. } else if (log.isDebugEnabled()) { - List snapshots = snapshot(); log.debug("Total calls statistics below:"); - logTopNTenants(snapshots, Comparator.comparingInt(DbCallStatsSnapshot::getTotalCalls).reversed(), - 10, s -> logSnapshotWithDebugLevel(s, 10)); + logTopNTenants(snapshots, Comparator.comparingInt(DbCallStatsSnapshot::getTotalCalls).reversed(), 10, + s -> logSnapshot(s, 10, Comparator.comparing(MethodCallStatsSnapshot::getExecutions).reversed(), log::debug)); log.debug("Total timing statistics below:"); logTopNTenants(snapshots, Comparator.comparingLong(DbCallStatsSnapshot::getTotalTiming).reversed(), - 10, s -> logSnapshotWithDebugLevel(s, 10)); + 10, s -> logSnapshot(s, 10, Comparator.comparing(MethodCallStatsSnapshot::getTiming).reversed(), log::debug)); log.debug("Total errors statistics below:"); logTopNTenants(snapshots, Comparator.comparingInt(DbCallStatsSnapshot::getTotalFailure).reversed(), - 10, s -> logSnapshotWithDebugLevel(s, 10)); + 10, s -> logSnapshot(s, 10, Comparator.comparing(MethodCallStatsSnapshot::getFailures).reversed(), log::debug)); } else if (log.isInfoEnabled()) { - log.debug("Total calls statistics below:"); - List snapshots = snapshot(); + log.info("Total calls statistics below:"); logTopNTenants(snapshots, Comparator.comparingInt(DbCallStatsSnapshot::getTotalFailure).reversed(), - 3, s -> logSnapshotWithDebugLevel(s, 3)); + 3, s -> logSnapshot(s, 3, Comparator.comparing(MethodCallStatsSnapshot::getFailures).reversed(), log::info)); } } finally { statsMap.clear(); } } - private void logSnapshotWithDebugLevel(DbCallStatsSnapshot snapshot, int limit) { - log.debug("[{}]: calls: {}, failures: {}, exec time: {} ", - snapshot.getTenantId(), snapshot.getTotalCalls(), snapshot.getTotalFailure(), snapshot.getTotalTiming()); - var stream = snapshot.getMethodTimings().entrySet().stream() - .sorted(Map.Entry.comparingByValue(Comparator.reverseOrder())); + private void logSnapshot(DbCallStatsSnapshot snapshot, int limit, Comparator methodStatsComparator, Consumer logger) { + logger.accept(String.format("[%s]: calls: %s, failures: %s, exec time: %s ", + snapshot.getTenantId(), snapshot.getTotalCalls(), snapshot.getTotalFailure(), snapshot.getTotalTiming())); + var stream = snapshot.getMethodStats().entrySet().stream() + .sorted(Map.Entry.comparingByValue(methodStatsComparator)); if (limit > 0) { stream = stream.limit(limit); } stream.forEach(e -> { - long timing = snapshot.getMethodTimings().getOrDefault(e.getKey(), 0L); - log.debug("[{}]: method: {}, count: {}, exec time: {}", snapshot.getTenantId(), e.getKey(), e.getValue(), timing); + MethodCallStatsSnapshot methodStats = e.getValue(); + logger.accept(String.format("[%s]: method: %s, calls: %s, failures: %s, exec time: %s", snapshot.getTenantId(), e.getKey(), + methodStats.getExecutions(), methodStats.getFailures(), methodStats.getTiming())); }); } @@ -102,19 +122,9 @@ public class TenantDbCallAspect { return statsMap.values().stream().map(DbCallStats::snapshot).collect(Collectors.toList()); } -// private void logTopNMethods(List snapshots, Comparator comparator, -// int n, Consumer logFunction) { -//// var stream = snapshots.stream().sorted(comparator).sorted(); -// // find top methods by execution time and then top -// if (n > 0) { -// stream = stream.limit(n); -// } -// stream.forEach(logFunction); -// } - private void logTopNTenants(List snapshots, Comparator comparator, int n, Consumer logFunction) { - var stream = snapshots.stream().sorted(comparator).sorted(); + var stream = snapshots.stream().sorted(comparator); if (n > 0) { stream = stream.limit(n); } @@ -122,16 +132,16 @@ public class TenantDbCallAspect { } @SuppressWarnings({"rawtypes", "unchecked"}) - @Around("@annotation(org.thingsboard.server.dao.util.TenantDbCall)") + @Around("@within(org.thingsboard.server.dao.util.SqlDao)") public Object logExecutionTime(ProceedingJoinPoint joinPoint) throws Throwable { - var signature = joinPoint.getSignature(); - var method = signature.toShortString(); - if (invalidTenantDbCallMethods.contains(method)) { + MethodSignature signature = (MethodSignature) joinPoint.getSignature(); + var methodName = signature.toShortString(); + if (invalidTenantDbCallMethods.contains(methodName)) { //Simply call the method if tenant is not found return joinPoint.proceed(); } - var tenantId = getTenantId(method, joinPoint.getArgs()); - if (tenantId == null) { + var tenantId = getTenantId(signature, methodName, joinPoint.getArgs()); + if (tenantId == null || tenantId.isNullUid()) { //Simply call the method if tenant is null return joinPoint.proceed(); } @@ -143,21 +153,21 @@ public class TenantDbCallAspect { new FutureCallback<>() { @Override public void onSuccess(@Nullable Object result) { - logTenantMethodExecution(tenantId, method, true, startTime); + logTenantMethodExecution(tenantId, methodName, true, startTime); } @Override public void onFailure(Throwable t) { - logTenantMethodExecution(tenantId, method, false, startTime); + logTenantMethodExecution(tenantId, methodName, false, startTime); } }, MoreExecutors.directExecutor()); } else { - logTenantMethodExecution(tenantId, method, true, startTime); + logTenantMethodExecution(tenantId, methodName, true, startTime); } return result; } catch (Throwable t) { - logTenantMethodExecution(tenantId, method, false, startTime); + logTenantMethodExecution(tenantId, methodName, false, startTime); throw t; } } @@ -167,23 +177,32 @@ public class TenantDbCallAspect { .onMethodCall(method, success, System.currentTimeMillis() - startTime); } - TenantId getTenantId(String methodName, Object[] args) { + TenantId getTenantId(MethodSignature signature, String methodName, Object[] args) { if (args == null || args.length == 0) { addAndLogInvalidMethods(methodName); return null; } - for (Object arg : args) { + for (int i = 0; i < args.length; i++) { + Object arg = args[i]; if (arg instanceof TenantId) { - log.debug("Method: {} is annotated with @TenantDbCall but the TenantId is null. Args: {}", methodName, Arrays.toString(args)); return (TenantId) arg; + } else if (arg instanceof UUID) { + if (signature.getParameterNames() != null && StringUtils.equals(signature.getParameterNames()[i], "tenantId")) { + log.trace("Method {} uses UUID for tenantId param instead of TenantId class", methodName); + return TenantId.fromUUID((UUID) arg); + } } } - addAndLogInvalidMethods(methodName); + if (ArrayUtils.contains(signature.getParameterTypes(), TenantId.class) || + ArrayUtils.contains(signature.getParameterNames(), "tenantId")) { + log.debug("Null was submitted as tenantId to method {}. Args: {}", methodName, Arrays.toString(args)); + } else { + addAndLogInvalidMethods(methodName); + } return null; } private void addAndLogInvalidMethods(String methodName) { - log.warn("Method: {} is annotated with @TenantDbCall but no TenantId in args", methodName); invalidTenantDbCallMethods.add(methodName); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java index 43cc60bf01..81fc5d5ad9 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java @@ -25,7 +25,7 @@ import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.dao.Dao; import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.BaseEntity; -import org.thingsboard.server.dao.util.TenantDbCall; +import org.thingsboard.server.dao.util.SqlDao; import java.util.Collection; import java.util.List; @@ -36,6 +36,7 @@ import java.util.UUID; * @author Valerii Sosliuk */ @Slf4j +@SqlDao public abstract class JpaAbstractDao, D> extends JpaAbstractDaoListeningExecutorService implements Dao { @@ -76,7 +77,6 @@ public abstract class JpaAbstractDao, D> return d; } - @TenantDbCall @Override public D findById(TenantId tenantId, UUID key) { log.debug("Get entity by key {}", key); @@ -84,7 +84,6 @@ public abstract class JpaAbstractDao, D> return DaoUtil.getData(entity); } - @TenantDbCall @Override public ListenableFuture findByIdAsync(TenantId tenantId, UUID key) { log.debug("Get entity by key async {}", key); diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java index 8e165898a2..b2a3eb4f49 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java @@ -42,6 +42,7 @@ import org.thingsboard.server.dao.model.sql.AlarmEntity; import org.thingsboard.server.dao.model.sql.EntityAlarmEntity; import org.thingsboard.server.dao.sql.JpaAbstractDao; import org.thingsboard.server.dao.sql.query.AlarmQueryRepository; +import org.thingsboard.server.dao.util.SqlDao; import java.util.Collection; import java.util.Collections; @@ -55,6 +56,7 @@ import java.util.UUID; */ @Slf4j @Component +@SqlDao public class JpaAlarmDao extends JpaAbstractDao implements AlarmDao { @Autowired diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java index b18d6c5f51..f0dc410b30 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java @@ -33,6 +33,7 @@ import org.thingsboard.server.dao.asset.AssetDao; import org.thingsboard.server.dao.model.sql.AssetEntity; import org.thingsboard.server.dao.model.sql.AssetInfoEntity; import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; +import org.thingsboard.server.dao.util.SqlDao; import java.util.ArrayList; import java.util.Collections; @@ -47,6 +48,7 @@ import static org.thingsboard.server.dao.asset.BaseAssetService.TB_SERVICE_QUEUE * Created by Valerii Sosliuk on 5/19/2017. */ @Component +@SqlDao @Slf4j public class JpaAssetDao extends JpaAbstractSearchTextDao implements AssetDao { diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributeDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributeDao.java index 169ef55fbe..e040789f65 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributeDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributeDao.java @@ -37,6 +37,7 @@ import org.thingsboard.server.dao.sql.JpaAbstractDaoListeningExecutorService; import org.thingsboard.server.dao.sql.ScheduledLogExecutorComponent; import org.thingsboard.server.dao.sql.TbSqlBlockingQueueParams; import org.thingsboard.server.dao.sql.TbSqlBlockingQueueWrapper; +import org.thingsboard.server.dao.util.SqlDao; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; @@ -50,6 +51,7 @@ import java.util.stream.Collectors; @Component @Slf4j +@SqlDao public class JpaAttributeDao extends JpaAbstractDaoListeningExecutorService implements AttributesDao { @Autowired diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/audit/JpaAuditLogDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/audit/JpaAuditLogDao.java index 9c72bec397..5d701a9c4d 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/audit/JpaAuditLogDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/audit/JpaAuditLogDao.java @@ -30,12 +30,14 @@ import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.audit.AuditLogDao; import org.thingsboard.server.dao.model.sql.AuditLogEntity; import org.thingsboard.server.dao.sql.JpaAbstractDao; +import org.thingsboard.server.dao.util.SqlDao; import java.util.List; import java.util.Objects; import java.util.UUID; @Component +@SqlDao public class JpaAuditLogDao extends JpaAbstractDao implements AuditLogDao { @Autowired diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDao.java index ab3a4b4f8d..2db855db28 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDao.java @@ -28,6 +28,7 @@ import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.customer.CustomerDao; import org.thingsboard.server.dao.model.sql.CustomerEntity; import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; +import org.thingsboard.server.dao.util.SqlDao; import java.util.Objects; import java.util.Optional; @@ -37,6 +38,7 @@ import java.util.UUID; * Created by Valerii Sosliuk on 5/6/2017. */ @Component +@SqlDao public class JpaCustomerDao extends JpaAbstractSearchTextDao implements CustomerDao { @Autowired diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardDao.java index 425c54c647..2e72155363 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardDao.java @@ -28,6 +28,7 @@ import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.dashboard.DashboardDao; import org.thingsboard.server.dao.model.sql.DashboardEntity; import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; +import org.thingsboard.server.dao.util.SqlDao; import java.util.List; import java.util.Optional; @@ -37,6 +38,7 @@ import java.util.UUID; * Created by Valerii Sosliuk on 5/6/2017. */ @Component +@SqlDao public class JpaDashboardDao extends JpaAbstractSearchTextDao implements DashboardDao { @Autowired diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardInfoDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardInfoDao.java index d98312e7d5..98efbe917e 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardInfoDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardInfoDao.java @@ -27,6 +27,7 @@ import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.dashboard.DashboardInfoDao; import org.thingsboard.server.dao.model.sql.DashboardInfoEntity; import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; +import org.thingsboard.server.dao.util.SqlDao; import java.util.ArrayList; import java.util.List; @@ -38,6 +39,7 @@ import java.util.UUID; */ @Slf4j @Component +@SqlDao public class JpaDashboardInfoDao extends JpaAbstractSearchTextDao implements DashboardInfoDao { @Autowired diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceCredentialsDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceCredentialsDao.java index e88b09a2bc..b1ffacc0e9 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceCredentialsDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceCredentialsDao.java @@ -25,6 +25,7 @@ import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.device.DeviceCredentialsDao; import org.thingsboard.server.dao.model.sql.DeviceCredentialsEntity; import org.thingsboard.server.dao.sql.JpaAbstractDao; +import org.thingsboard.server.dao.util.SqlDao; import java.util.UUID; @@ -32,6 +33,7 @@ import java.util.UUID; * Created by Valerii Sosliuk on 5/6/2017. */ @Component +@SqlDao public class JpaDeviceCredentialsDao extends JpaAbstractDao implements DeviceCredentialsDao { @Autowired diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java index 62516232d2..a00a1ba48f 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java @@ -41,6 +41,7 @@ import org.thingsboard.server.dao.device.DeviceDao; import org.thingsboard.server.dao.model.sql.DeviceEntity; import org.thingsboard.server.dao.model.sql.DeviceInfoEntity; import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; +import org.thingsboard.server.dao.util.SqlDao; import java.util.ArrayList; import java.util.Collections; @@ -53,6 +54,7 @@ import java.util.UUID; * Created by Valerii Sosliuk on 5/6/2017. */ @Component +@SqlDao @Slf4j public class JpaDeviceDao extends JpaAbstractSearchTextDao implements DeviceDao { diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceProfileDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceProfileDao.java index 6f4cd8587a..1a30c6627d 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceProfileDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceProfileDao.java @@ -32,12 +32,14 @@ import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.device.DeviceProfileDao; import org.thingsboard.server.dao.model.sql.DeviceProfileEntity; import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; +import org.thingsboard.server.dao.util.SqlDao; import java.util.Objects; import java.util.Optional; import java.util.UUID; @Component +@SqlDao public class JpaDeviceProfileDao extends JpaAbstractSearchTextDao implements DeviceProfileDao { @Autowired diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/edge/JpaBaseEdgeEventDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/edge/JpaBaseEdgeEventDao.java index 2f05f66cdf..df182659bf 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/edge/JpaBaseEdgeEventDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/edge/JpaBaseEdgeEventDao.java @@ -36,6 +36,7 @@ import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; import org.thingsboard.server.dao.sql.ScheduledLogExecutorComponent; import org.thingsboard.server.dao.sql.TbSqlBlockingQueueParams; import org.thingsboard.server.dao.sql.TbSqlBlockingQueueWrapper; +import org.thingsboard.server.dao.util.SqlDao; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; @@ -53,6 +54,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; @Slf4j @Component +@SqlDao public class JpaBaseEdgeEventDao extends JpaAbstractSearchTextDao implements EdgeEventDao { private final UUID systemTenantId = NULL_UUID; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/edge/JpaEdgeDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/edge/JpaEdgeDao.java index 802c9b99b8..f7888e2ffd 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/edge/JpaEdgeDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/edge/JpaEdgeDao.java @@ -32,6 +32,7 @@ import org.thingsboard.server.dao.edge.EdgeDao; import org.thingsboard.server.dao.model.sql.EdgeEntity; import org.thingsboard.server.dao.model.sql.EdgeInfoEntity; import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; +import org.thingsboard.server.dao.util.SqlDao; import java.util.ArrayList; import java.util.Collections; @@ -42,6 +43,7 @@ import java.util.UUID; @Component @Slf4j +@SqlDao public class JpaEdgeDao extends JpaAbstractSearchTextDao implements EdgeDao { @Autowired diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/entityview/JpaEntityViewDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/entityview/JpaEntityViewDao.java index 5cf70b021d..878195c4e2 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/entityview/JpaEntityViewDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/entityview/JpaEntityViewDao.java @@ -33,6 +33,7 @@ import org.thingsboard.server.dao.entityview.EntityViewDao; import org.thingsboard.server.dao.model.sql.EntityViewEntity; import org.thingsboard.server.dao.model.sql.EntityViewInfoEntity; import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; +import org.thingsboard.server.dao.util.SqlDao; import java.util.ArrayList; import java.util.Collections; @@ -46,6 +47,7 @@ import java.util.UUID; */ @Component @Slf4j +@SqlDao public class JpaEntityViewDao extends JpaAbstractSearchTextDao implements EntityViewDao { diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java index a9a3e25db2..543b2aa30b 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java @@ -44,6 +44,7 @@ import org.thingsboard.server.dao.sql.TbSqlBlockingQueueParams; import org.thingsboard.server.dao.sql.TbSqlBlockingQueueWrapper; import org.thingsboard.server.dao.sqlts.insert.sql.SqlPartitioningRepository; import org.thingsboard.server.dao.timeseries.SqlPartition; +import org.thingsboard.server.dao.util.SqlDao; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; @@ -61,6 +62,7 @@ import java.util.function.Function; */ @Slf4j @Component +@SqlDao public class JpaBaseEventDao implements EventDao { private final Map> partitionsByEventType = new ConcurrentHashMap<>(); diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/oauth2/JpaOAuth2ClientRegistrationTemplateDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/oauth2/JpaOAuth2ClientRegistrationTemplateDao.java index 344f8e97db..61b98886ba 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/oauth2/JpaOAuth2ClientRegistrationTemplateDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/oauth2/JpaOAuth2ClientRegistrationTemplateDao.java @@ -23,6 +23,7 @@ import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.sql.OAuth2ClientRegistrationTemplateEntity; import org.thingsboard.server.dao.oauth2.OAuth2ClientRegistrationTemplateDao; import org.thingsboard.server.dao.sql.JpaAbstractDao; +import org.thingsboard.server.dao.util.SqlDao; import java.util.ArrayList; import java.util.List; @@ -31,6 +32,7 @@ import java.util.UUID; @Component @RequiredArgsConstructor +@SqlDao public class JpaOAuth2ClientRegistrationTemplateDao extends JpaAbstractDao implements OAuth2ClientRegistrationTemplateDao { private final OAuth2ClientRegistrationTemplateRepository repository; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/oauth2/JpaOAuth2DomainDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/oauth2/JpaOAuth2DomainDao.java index e191fc12f4..c1be2d86bc 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/oauth2/JpaOAuth2DomainDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/oauth2/JpaOAuth2DomainDao.java @@ -23,12 +23,14 @@ import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.sql.OAuth2DomainEntity; import org.thingsboard.server.dao.oauth2.OAuth2DomainDao; import org.thingsboard.server.dao.sql.JpaAbstractDao; +import org.thingsboard.server.dao.util.SqlDao; import java.util.List; import java.util.UUID; @Component @RequiredArgsConstructor +@SqlDao public class JpaOAuth2DomainDao extends JpaAbstractDao implements OAuth2DomainDao { private final OAuth2DomainRepository repository; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/oauth2/JpaOAuth2MobileDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/oauth2/JpaOAuth2MobileDao.java index 94fc0a9a17..2b4cc39001 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/oauth2/JpaOAuth2MobileDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/oauth2/JpaOAuth2MobileDao.java @@ -23,12 +23,14 @@ import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.sql.OAuth2MobileEntity; import org.thingsboard.server.dao.oauth2.OAuth2MobileDao; import org.thingsboard.server.dao.sql.JpaAbstractDao; +import org.thingsboard.server.dao.util.SqlDao; import java.util.List; import java.util.UUID; @Component @RequiredArgsConstructor +@SqlDao public class JpaOAuth2MobileDao extends JpaAbstractDao implements OAuth2MobileDao { private final OAuth2MobileRepository repository; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/oauth2/JpaOAuth2ParamsDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/oauth2/JpaOAuth2ParamsDao.java index d18494a015..51e1dcbfe9 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/oauth2/JpaOAuth2ParamsDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/oauth2/JpaOAuth2ParamsDao.java @@ -22,11 +22,13 @@ import org.thingsboard.server.common.data.oauth2.OAuth2Params; import org.thingsboard.server.dao.model.sql.OAuth2ParamsEntity; import org.thingsboard.server.dao.oauth2.OAuth2ParamsDao; import org.thingsboard.server.dao.sql.JpaAbstractDao; +import org.thingsboard.server.dao.util.SqlDao; import java.util.UUID; @Component @RequiredArgsConstructor +@SqlDao public class JpaOAuth2ParamsDao extends JpaAbstractDao implements OAuth2ParamsDao { private final OAuth2ParamsRepository repository; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/oauth2/JpaOAuth2RegistrationDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/oauth2/JpaOAuth2RegistrationDao.java index 0a0021bf66..8703b6880a 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/oauth2/JpaOAuth2RegistrationDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/oauth2/JpaOAuth2RegistrationDao.java @@ -25,12 +25,14 @@ import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.sql.OAuth2RegistrationEntity; import org.thingsboard.server.dao.oauth2.OAuth2RegistrationDao; import org.thingsboard.server.dao.sql.JpaAbstractDao; +import org.thingsboard.server.dao.util.SqlDao; import java.util.List; import java.util.UUID; @Component @RequiredArgsConstructor +@SqlDao public class JpaOAuth2RegistrationDao extends JpaAbstractDao implements OAuth2RegistrationDao { private final OAuth2RegistrationRepository repository; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/ota/JpaOtaPackageDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/ota/JpaOtaPackageDao.java index 6af11346fd..26d425a964 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/ota/JpaOtaPackageDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/ota/JpaOtaPackageDao.java @@ -25,11 +25,13 @@ import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.dao.model.sql.OtaPackageEntity; import org.thingsboard.server.dao.ota.OtaPackageDao; import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; +import org.thingsboard.server.dao.util.SqlDao; import java.util.UUID; @Slf4j @Component +@SqlDao public class JpaOtaPackageDao extends JpaAbstractSearchTextDao implements OtaPackageDao { @Autowired diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/ota/JpaOtaPackageInfoDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/ota/JpaOtaPackageInfoDao.java index ab8528c3ff..07e341b320 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/ota/JpaOtaPackageInfoDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/ota/JpaOtaPackageInfoDao.java @@ -30,12 +30,14 @@ import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.sql.OtaPackageInfoEntity; import org.thingsboard.server.dao.ota.OtaPackageInfoDao; import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; +import org.thingsboard.server.dao.util.SqlDao; import java.util.Objects; import java.util.UUID; @Slf4j @Component +@SqlDao public class JpaOtaPackageInfoDao extends JpaAbstractSearchTextDao implements OtaPackageInfoDao { @Autowired diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/queue/JpaQueueDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/queue/JpaQueueDao.java index 3d68a08f0a..f11952f3e9 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/queue/JpaQueueDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/queue/JpaQueueDao.java @@ -28,6 +28,7 @@ import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.sql.QueueEntity; import org.thingsboard.server.dao.queue.QueueDao; import org.thingsboard.server.dao.sql.JpaAbstractDao; +import org.thingsboard.server.dao.util.SqlDao; import java.util.List; import java.util.Objects; @@ -35,6 +36,7 @@ import java.util.UUID; @Slf4j @Component +@SqlDao public class JpaQueueDao extends JpaAbstractDao implements QueueDao { @Autowired diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java index 422e0a8623..e4b51d62f1 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java @@ -32,6 +32,7 @@ import org.thingsboard.server.dao.model.sql.RelationCompositeKey; import org.thingsboard.server.dao.model.sql.RelationEntity; import org.thingsboard.server.dao.relation.RelationDao; import org.thingsboard.server.dao.sql.JpaAbstractDaoListeningExecutorService; +import org.thingsboard.server.dao.util.SqlDao; import java.util.ArrayList; import java.util.Arrays; @@ -44,6 +45,7 @@ import java.util.stream.Collectors; */ @Slf4j @Component +@SqlDao public class JpaRelationDao extends JpaAbstractDaoListeningExecutorService implements RelationDao { private static final List ALL_TYPE_GROUP_NAMES = new ArrayList<>(); diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/resource/JpaTbResourceDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/resource/JpaTbResourceDao.java index 5e4914f470..e3fdb90aee 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/resource/JpaTbResourceDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/resource/JpaTbResourceDao.java @@ -28,6 +28,7 @@ import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.sql.TbResourceEntity; import org.thingsboard.server.dao.resource.TbResourceDao; import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; +import org.thingsboard.server.dao.util.SqlDao; import java.util.List; import java.util.Objects; @@ -35,6 +36,7 @@ import java.util.UUID; @Slf4j @Component +@SqlDao public class JpaTbResourceDao extends JpaAbstractSearchTextDao implements TbResourceDao { private final TbResourceRepository resourceRepository; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/resource/JpaTbResourceInfoDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/resource/JpaTbResourceInfoDao.java index e2d68a6db4..0a80efad14 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/resource/JpaTbResourceInfoDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/resource/JpaTbResourceInfoDao.java @@ -27,12 +27,14 @@ import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.sql.TbResourceInfoEntity; import org.thingsboard.server.dao.resource.TbResourceInfoDao; import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; +import org.thingsboard.server.dao.util.SqlDao; import java.util.Objects; import java.util.UUID; @Slf4j @Component +@SqlDao public class JpaTbResourceInfoDao extends JpaAbstractSearchTextDao implements TbResourceInfoDao { @Autowired diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/rpc/JpaRpcDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/rpc/JpaRpcDao.java index 6c30b85d31..1ccd5270f3 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/rpc/JpaRpcDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/rpc/JpaRpcDao.java @@ -30,12 +30,14 @@ import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.sql.RpcEntity; import org.thingsboard.server.dao.rpc.RpcDao; import org.thingsboard.server.dao.sql.JpaAbstractDao; +import org.thingsboard.server.dao.util.SqlDao; import java.util.UUID; @Slf4j @Component @AllArgsConstructor +@SqlDao public class JpaRpcDao extends JpaAbstractDao implements RpcDao { private final RpcRepository rpcRepository; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaRuleChainDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaRuleChainDao.java index 9ec2bab280..b9b991bc15 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaRuleChainDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaRuleChainDao.java @@ -30,6 +30,7 @@ import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.sql.RuleChainEntity; import org.thingsboard.server.dao.rule.RuleChainDao; import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; +import org.thingsboard.server.dao.util.SqlDao; import java.util.Collection; import java.util.Objects; @@ -38,6 +39,7 @@ import java.util.UUID; @Slf4j @Component +@SqlDao public class JpaRuleChainDao extends JpaAbstractSearchTextDao implements RuleChainDao { @Autowired diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaRuleNodeDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaRuleNodeDao.java index 7fc1229cd3..9a768871af 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaRuleNodeDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaRuleNodeDao.java @@ -30,6 +30,7 @@ import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.sql.RuleNodeEntity; import org.thingsboard.server.dao.rule.RuleNodeDao; import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; +import org.thingsboard.server.dao.util.SqlDao; import java.util.List; import java.util.Objects; @@ -38,6 +39,7 @@ import java.util.stream.Collectors; @Slf4j @Component +@SqlDao public class JpaRuleNodeDao extends JpaAbstractSearchTextDao implements RuleNodeDao { @Autowired diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaRuleNodeStateDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaRuleNodeStateDao.java index 9b8c7ff8e7..760cb0fdc5 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaRuleNodeStateDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaRuleNodeStateDao.java @@ -27,11 +27,13 @@ import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.sql.RuleNodeStateEntity; import org.thingsboard.server.dao.rule.RuleNodeStateDao; import org.thingsboard.server.dao.sql.JpaAbstractDao; +import org.thingsboard.server.dao.util.SqlDao; import java.util.UUID; @Slf4j @Component +@SqlDao public class JpaRuleNodeStateDao extends JpaAbstractDao implements RuleNodeStateDao { @Autowired diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/settings/JpaAdminSettingsDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/settings/JpaAdminSettingsDao.java index bd815bc410..f335dac81b 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/settings/JpaAdminSettingsDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/settings/JpaAdminSettingsDao.java @@ -26,10 +26,12 @@ import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.sql.AdminSettingsEntity; import org.thingsboard.server.dao.settings.AdminSettingsDao; import org.thingsboard.server.dao.sql.JpaAbstractDao; +import org.thingsboard.server.dao.util.SqlDao; import java.util.UUID; @Component +@SqlDao @Slf4j public class JpaAdminSettingsDao extends JpaAbstractDao implements AdminSettingsDao { diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDao.java index dfbae0e9b7..635b138815 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDao.java @@ -30,6 +30,7 @@ import org.thingsboard.server.dao.model.sql.TenantEntity; import org.thingsboard.server.dao.model.sql.TenantInfoEntity; import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; import org.thingsboard.server.dao.tenant.TenantDao; +import org.thingsboard.server.dao.util.SqlDao; import java.util.List; import java.util.Objects; @@ -41,6 +42,7 @@ import java.util.stream.Collectors; * Created by Valerii Sosliuk on 4/30/2017. */ @Component +@SqlDao public class JpaTenantDao extends JpaAbstractSearchTextDao implements TenantDao { @Autowired diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantProfileDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantProfileDao.java index 3cad31f553..cc35af7519 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantProfileDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantProfileDao.java @@ -27,11 +27,13 @@ import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.sql.TenantProfileEntity; import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; import org.thingsboard.server.dao.tenant.TenantProfileDao; +import org.thingsboard.server.dao.util.SqlDao; import java.util.Objects; import java.util.UUID; @Component +@SqlDao public class JpaTenantProfileDao extends JpaAbstractSearchTextDao implements TenantProfileDao { @Autowired diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/usagerecord/JpaApiUsageStateDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/usagerecord/JpaApiUsageStateDao.java index 96a0ecaede..d950a3c9fa 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/usagerecord/JpaApiUsageStateDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/usagerecord/JpaApiUsageStateDao.java @@ -25,6 +25,7 @@ import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.sql.ApiUsageStateEntity; import org.thingsboard.server.dao.sql.JpaAbstractDao; import org.thingsboard.server.dao.usagerecord.ApiUsageStateDao; +import org.thingsboard.server.dao.util.SqlDao; import java.util.UUID; @@ -32,6 +33,7 @@ import java.util.UUID; * @author Andrii Shvaika */ @Component +@SqlDao public class JpaApiUsageStateDao extends JpaAbstractDao implements ApiUsageStateDao { private final ApiUsageStateRepository apiUsageStateRepository; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserAuthSettingsDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserAuthSettingsDao.java index 55cc195f6b..3759ab88b5 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserAuthSettingsDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserAuthSettingsDao.java @@ -24,11 +24,13 @@ import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.sql.UserAuthSettingsEntity; import org.thingsboard.server.dao.sql.JpaAbstractDao; import org.thingsboard.server.dao.user.UserAuthSettingsDao; +import org.thingsboard.server.dao.util.SqlDao; import java.util.UUID; @Component @RequiredArgsConstructor +@SqlDao public class JpaUserAuthSettingsDao extends JpaAbstractDao implements UserAuthSettingsDao { private final UserAuthSettingsRepository repository; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserCredentialsDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserCredentialsDao.java index 69f83efc86..2a9381b3df 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserCredentialsDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserCredentialsDao.java @@ -24,6 +24,7 @@ import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.sql.UserCredentialsEntity; import org.thingsboard.server.dao.sql.JpaAbstractDao; import org.thingsboard.server.dao.user.UserCredentialsDao; +import org.thingsboard.server.dao.util.SqlDao; import java.util.UUID; @@ -31,6 +32,7 @@ import java.util.UUID; * Created by Valerii Sosliuk on 4/22/2017. */ @Component +@SqlDao public class JpaUserCredentialsDao extends JpaAbstractDao implements UserCredentialsDao { @Autowired diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java index dc632091c7..ad8cac6a28 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java @@ -28,6 +28,7 @@ import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.sql.UserEntity; import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; import org.thingsboard.server.dao.user.UserDao; +import org.thingsboard.server.dao.util.SqlDao; import java.util.Objects; import java.util.UUID; @@ -38,6 +39,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; * @author Valerii Sosliuk */ @Component +@SqlDao public class JpaUserDao extends JpaAbstractSearchTextDao implements UserDao { @Autowired diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDao.java index eac0a15b1e..96e22142f8 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDao.java @@ -26,6 +26,7 @@ import org.thingsboard.server.common.data.widget.WidgetTypeInfo; import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.sql.WidgetTypeDetailsEntity; import org.thingsboard.server.dao.sql.JpaAbstractDao; +import org.thingsboard.server.dao.util.SqlDao; import org.thingsboard.server.dao.widget.WidgetTypeDao; import java.util.List; @@ -35,6 +36,7 @@ import java.util.UUID; * Created by Valerii Sosliuk on 4/29/2017. */ @Component +@SqlDao public class JpaWidgetTypeDao extends JpaAbstractDao implements WidgetTypeDao { @Autowired diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java index 1ae399e28d..cf201efa36 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java @@ -28,6 +28,7 @@ import org.thingsboard.server.common.data.widget.WidgetsBundle; import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.sql.WidgetsBundleEntity; import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; +import org.thingsboard.server.dao.util.SqlDao; import org.thingsboard.server.dao.widget.WidgetsBundleDao; import java.util.Objects; @@ -40,6 +41,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; * Created by Valerii Sosliuk on 4/23/2017. */ @Component +@SqlDao public class JpaWidgetsBundleDao extends JpaAbstractSearchTextDao implements WidgetsBundleDao { @Autowired From cae9fb55f0ca392ce79c72e056652e4af552e301 Mon Sep 17 00:00:00 2001 From: ViacheslavKlimov Date: Tue, 27 Sep 2022 15:33:46 +0300 Subject: [PATCH 3/4] Do not count db call stats in case of JDBCConnectionException --- .../server/dao/aspect/SqlDaoCallsAspect.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/aspect/SqlDaoCallsAspect.java b/dao/src/main/java/org/thingsboard/server/dao/aspect/SqlDaoCallsAspect.java index 434f1a8e7c..132e7fc333 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/aspect/SqlDaoCallsAspect.java +++ b/dao/src/main/java/org/thingsboard/server/dao/aspect/SqlDaoCallsAspect.java @@ -22,11 +22,13 @@ import com.google.common.util.concurrent.MoreExecutors; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.reflect.MethodSignature; import org.checkerframework.checker.nullness.qual.Nullable; +import org.hibernate.exception.JDBCConnectionException; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -153,26 +155,29 @@ public class SqlDaoCallsAspect { new FutureCallback<>() { @Override public void onSuccess(@Nullable Object result) { - logTenantMethodExecution(tenantId, methodName, true, startTime); + logTenantMethodExecution(tenantId, methodName, true, startTime, null); } @Override public void onFailure(Throwable t) { - logTenantMethodExecution(tenantId, methodName, false, startTime); + logTenantMethodExecution(tenantId, methodName, false, startTime, t); } }, MoreExecutors.directExecutor()); } else { - logTenantMethodExecution(tenantId, methodName, true, startTime); + logTenantMethodExecution(tenantId, methodName, true, startTime, null); } return result; } catch (Throwable t) { - logTenantMethodExecution(tenantId, methodName, false, startTime); + logTenantMethodExecution(tenantId, methodName, false, startTime, 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) .onMethodCall(method, success, System.currentTimeMillis() - startTime); } From ac5708f6ff70e466f18aa36783de335c8aba6852 Mon Sep 17 00:00:00 2001 From: ViacheslavKlimov Date: Wed, 28 Sep 2022 15:36:06 +0300 Subject: [PATCH 4/4] Fix properties naming for SqlDaoCallsAspect --- application/src/main/resources/thingsboard.yml | 2 +- .../org/thingsboard/server/dao/aspect/SqlDaoCallsAspect.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml index 5730f022b7..0002cf718e 100644 --- a/application/src/main/resources/thingsboard.yml +++ b/application/src/main/resources/thingsboard.yml @@ -273,7 +273,7 @@ sql: log_queries: "${SQL_LOG_QUERIES:false}" log_queries_threshold: "${SQL_LOG_QUERIES_THRESHOLD:5000}" log_tenant_stats: "${SQL_LOG_TENANT_STATS:true}" - log_tenant_stats_interval: "${SQL_LOG_TENANT_STATS_INTERVAL:60000}" + log_tenant_stats_interval_ms: "${SQL_LOG_TENANT_STATS_INTERVAL_MS:60000}" postgres: # Specify partitioning size for timestamp key-value storage. Example: DAYS, MONTHS, YEARS, INDEFINITE. ts_key_value_partitioning: "${SQL_POSTGRES_TS_KV_PARTITIONING:MONTHS}" diff --git a/dao/src/main/java/org/thingsboard/server/dao/aspect/SqlDaoCallsAspect.java b/dao/src/main/java/org/thingsboard/server/dao/aspect/SqlDaoCallsAspect.java index 132e7fc333..ec8c97e19f 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/aspect/SqlDaoCallsAspect.java +++ b/dao/src/main/java/org/thingsboard/server/dao/aspect/SqlDaoCallsAspect.java @@ -55,8 +55,8 @@ public class SqlDaoCallsAspect { private final Set invalidTenantDbCallMethods = ConcurrentHashMap.newKeySet(); private final ConcurrentMap statsMap = new ConcurrentHashMap<>(); - @Scheduled(initialDelayString = "${sql.log_tenant_stats.log_tenant_stats_interval:60000}", - fixedDelayString = "${sql.log_tenant_stats.log_tenant_stats_interval:60000}") + @Scheduled(initialDelayString = "${sql.log_tenant_stats_interval_ms:60000}", + fixedDelayString = "${sql.log_tenant_stats_interval_ms:60000}") public void printStats() { List snapshots = snapshot(); if (snapshots.isEmpty()) return;