diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcService.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcService.java index 936a805ea0..7fc5121ff5 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcService.java +++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcService.java @@ -40,6 +40,7 @@ import org.thingsboard.server.service.edge.EdgeContextComponent; import org.thingsboard.server.service.state.DefaultDeviceStateService; import org.thingsboard.server.service.telemetry.TelemetrySubscriptionService; +import javax.annotation.Nullable; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import java.io.File; @@ -127,7 +128,10 @@ public class EdgeGrpcService extends EdgeRpcServiceGrpc.EdgeRpcServiceImplBase i public void updateEdge(Edge edge) { EdgeGrpcSession session = sessions.get(edge.getId()); if (session != null && session.isConnected()) { + log.debug("[{}] Updating configuration for edge [{}] [{}]", edge.getTenantId(), edge.getName(), edge.getId()); session.onConfigurationUpdate(edge); + } else { + log.warn("[{}] Session doesn't exist for edge [{}] [{}]", edge.getTenantId(), edge.getName(), edge.getId()); } } @@ -135,12 +139,14 @@ public class EdgeGrpcService extends EdgeRpcServiceGrpc.EdgeRpcServiceImplBase i public void deleteEdge(EdgeId edgeId) { EdgeGrpcSession session = sessions.get(edgeId); if (session != null && session.isConnected()) { + log.debug("Closing and removing session for edge [{}]", edgeId); session.close(); sessions.remove(edgeId); } } private void onEdgeConnect(EdgeId edgeId, EdgeGrpcSession edgeGrpcSession) { + log.debug("[{}] onEdgeConnect [{}]", edgeId, edgeGrpcSession.getSessionId()); sessions.put(edgeId, edgeGrpcSession); save(edgeId, DefaultDeviceStateService.ACTIVITY_STATE, true); save(edgeId, DefaultDeviceStateService.LAST_CONNECT_TIME, System.currentTimeMillis()); @@ -180,12 +186,14 @@ public class EdgeGrpcService extends EdgeRpcServiceGrpc.EdgeRpcServiceImplBase i } private void onEdgeDisconnect(EdgeId edgeId) { + log.debug("[{}] onEdgeDisconnect", edgeId); sessions.remove(edgeId); save(edgeId, DefaultDeviceStateService.ACTIVITY_STATE, false); save(edgeId, DefaultDeviceStateService.LAST_DISCONNECT_TIME, System.currentTimeMillis()); } private void save(EdgeId edgeId, String key, long value) { + log.debug("[{}] Updating long edge telemetry [{}] [{}]", edgeId, key, value); if (persistToTelemetry) { tsSubService.saveAndNotify( TenantId.SYS_TENANT_ID, edgeId, @@ -197,6 +205,7 @@ public class EdgeGrpcService extends EdgeRpcServiceGrpc.EdgeRpcServiceImplBase i } private void save(EdgeId edgeId, String key, boolean value) { + log.debug("[{}] Updating boolean edge telemetry [{}] [{}]", edgeId, key, value); if (persistToTelemetry) { tsSubService.saveAndNotify( TenantId.SYS_TENANT_ID, edgeId, @@ -219,7 +228,7 @@ public class EdgeGrpcService extends EdgeRpcServiceGrpc.EdgeRpcServiceImplBase i } @Override - public void onSuccess(@javax.annotation.Nullable Void result) { + public void onSuccess(@Nullable Void result) { log.trace("[{}] Successfully updated attribute [{}] with value [{}]", edgeId, key, value); } diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java index 97caa671af..35f045d66b 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java +++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java @@ -223,26 +223,29 @@ public final class EdgeGrpcSession implements Closeable { } latch.countDown(); } catch (Exception e) { - log.error("Can't process downlink response message [{}]", msg, e); + log.error("[{}] Can't process downlink response message [{}]", this.sessionId, msg, e); } } private void sendResponseMsg(ResponseMsg responseMsg) { + log.trace("[{}] Sending response msg [{}]", this.sessionId, responseMsg); if (isConnected()) { try { responseMsgLock.lock(); outputStream.onNext(responseMsg); } catch (Exception e) { - log.error("Failed to send response message [{}]", responseMsg, e); + log.error("[{}] Failed to send response message [{}]", this.sessionId, responseMsg, e); connected = false; sessionCloseListener.accept(edge.getId()); } finally { responseMsgLock.unlock(); } + log.trace("[{}] Response msg successfully sent [{}]", this.sessionId, responseMsg); } } void onConfigurationUpdate(Edge edge) { + log.debug("[{}] onConfigurationUpdate [{}]", this.sessionId, edge); try { this.edge = edge; EdgeUpdateMsg edgeConfig = EdgeUpdateMsg.newBuilder() @@ -251,13 +254,15 @@ public final class EdgeGrpcSession implements Closeable { .setEdgeUpdateMsg(edgeConfig) .build()); } catch (Exception e) { - log.error("Failed to construct proto objects!", e); + log.error("[{}] Failed to construct proto objects!", this.sessionId, e); } } void processHandleMessages() throws ExecutionException, InterruptedException { + log.trace("[{}] processHandleMessages started", this.sessionId); if (isConnected()) { Long queueStartTs = getQueueStartTs().get(); + log.trace("[{}] trying to find edge events using queue start ts [{}]", this.sessionId, queueStartTs); TimePageLink pageLink = new TimePageLink(ctx.getEdgeEventStorageSettings().getMaxReadRecordsCount(), queueStartTs, null, true); TimePageData pageData; UUID ifOffset = null; @@ -267,7 +272,7 @@ public final class EdgeGrpcSession implements Closeable { if (isConnected() && !pageData.getData().isEmpty()) { log.trace("[{}] [{}] event(s) are going to be processed.", this.sessionId, pageData.getData().size()); List downlinkMsgsPack = convertToDownlinkMsgsPack(pageData.getData()); - log.trace("[{}] downlink msg(s) are going to be send.", downlinkMsgsPack.size()); + log.trace("[{}] [{}] downlink msg(s) are going to be send.", this.sessionId, downlinkMsgsPack.size()); latch = new CountDownLatch(downlinkMsgsPack.size()); for (DownlinkMsg downlinkMsg : downlinkMsgsPack) { @@ -280,14 +285,14 @@ public final class EdgeGrpcSession implements Closeable { success = latch.await(10, TimeUnit.SECONDS); if (!success) { - log.warn("Failed to deliver the batch: {}", downlinkMsgsPack); + log.warn("[{}] Failed to deliver the batch: {}", this.sessionId, downlinkMsgsPack); } } if (isConnected() && (!success || pageData.hasNext())) { try { Thread.sleep(ctx.getEdgeEventStorageSettings().getSleepIntervalBetweenBatches()); } catch (InterruptedException e) { - log.error("Error during sleep between batches", e); + log.error("[{}] Error during sleep between batches", this.sessionId, e); } if (success) { pageLink = pageData.getNextPageLink(); @@ -302,15 +307,16 @@ public final class EdgeGrpcSession implements Closeable { try { Thread.sleep(ctx.getEdgeEventStorageSettings().getNoRecordsSleepInterval()); } catch (InterruptedException e) { - log.error("Error during sleep", e); + log.error("[{}] Error during sleep between no records interval", this.sessionId, e); } } + log.trace("[{}] processHandleMessages finished", this.sessionId); } private List convertToDownlinkMsgsPack(List edgeEvents) { List result = new ArrayList<>(); for (EdgeEvent edgeEvent : edgeEvents) { - log.trace("Processing edge event [{}]", edgeEvent); + log.trace("[{}] Processing edge event [{}]", this.sessionId, edgeEvent); try { DownlinkMsg downlinkMsg = null; switch (edgeEvent.getAction()) { @@ -406,13 +412,14 @@ public final class EdgeGrpcSession implements Closeable { } private void updateQueueStartTs(Long newStartTs) { + log.trace("[{}] updating QueueStartTs [{}][{}]", this.sessionId, edge.getId(), newStartTs); newStartTs = ++newStartTs; // increments ts by 1 - next edge event search starts from current offset + 1 List attributes = Collections.singletonList(new BaseAttributeKvEntry(new LongDataEntry(QUEUE_START_TS_ATTR_KEY, newStartTs), System.currentTimeMillis())); ctx.getAttributesService().save(edge.getTenantId(), edge.getId(), DataConstants.SERVER_SCOPE, attributes); } private DownlinkMsg processTelemetryMessage(EdgeEvent edgeEvent) { - log.trace("Executing processTelemetryMessage, edgeEvent [{}]", edgeEvent); + log.trace("[{}] Executing processTelemetryMessage, edgeEvent [{}]", this.sessionId, edgeEvent); EntityId entityId = null; switch (edgeEvent.getType()) { case DEVICE: @@ -436,11 +443,11 @@ public final class EdgeGrpcSession implements Closeable { } DownlinkMsg downlinkMsg = null; if (entityId != null) { - log.debug("Sending telemetry data msg, entityId [{}], body [{}]", edgeEvent.getEntityId(), edgeEvent.getBody()); + log.debug("[{}] Sending telemetry data msg, entityId [{}], body [{}]", this.sessionId, edgeEvent.getEntityId(), edgeEvent.getBody()); try { downlinkMsg = constructEntityDataProtoMsg(entityId, edgeEvent.getAction(), JsonUtils.parse(mapper.writeValueAsString(edgeEvent.getBody()))); } catch (Exception e) { - log.warn("Can't send telemetry data msg, entityId [{}], body [{}]", edgeEvent.getEntityId(), edgeEvent.getBody(), e); + log.warn("[{}] Can't send telemetry data msg, entityId [{}], body [{}]", this.sessionId, edgeEvent.getEntityId(), edgeEvent.getBody(), e); } } return downlinkMsg; @@ -450,9 +457,6 @@ public final class EdgeGrpcSession implements Closeable { UpdateMsgType msgType = getResponseMsgType(edgeEvent.getAction()); log.trace("Executing processEntityMessage, edgeEvent [{}], action [{}], msgType [{}]", edgeEvent, action, msgType); switch (edgeEvent.getType()) { - case EDGE: - // TODO: voba - add edge update logic - return null; case DEVICE: return processDevice(edgeEvent, msgType, action); case ASSET: @@ -523,6 +527,7 @@ public final class EdgeGrpcSession implements Closeable { } break; } + log.trace("[{}] device processed [{}]", this.sessionId, downlinkMsg); return downlinkMsg; } @@ -554,6 +559,7 @@ public final class EdgeGrpcSession implements Closeable { .build(); break; } + log.trace("[{}] asset processed [{}]", this.sessionId, downlinkMsg); return downlinkMsg; } @@ -585,6 +591,7 @@ public final class EdgeGrpcSession implements Closeable { .build(); break; } + log.trace("[{}] entity view processed [{}]", this.sessionId, downlinkMsg); return downlinkMsg; } @@ -619,6 +626,7 @@ public final class EdgeGrpcSession implements Closeable { .build(); break; } + log.trace("[{}] dashboard processed [{}]", this.sessionId, downlinkMsg); return downlinkMsg; } @@ -645,6 +653,7 @@ public final class EdgeGrpcSession implements Closeable { .build(); break; } + log.trace("[{}] customer processed [{}]", this.sessionId, downlinkMsg); return downlinkMsg; } @@ -671,6 +680,7 @@ public final class EdgeGrpcSession implements Closeable { .build(); break; } + log.trace("[{}] rule chain processed [{}]", this.sessionId, downlinkMsg); return downlinkMsg; } @@ -688,6 +698,7 @@ public final class EdgeGrpcSession implements Closeable { .build(); } } + log.trace("[{}] rule chain metadata processed [{}]", this.sessionId, downlinkMsg); return downlinkMsg; } @@ -720,6 +731,7 @@ public final class EdgeGrpcSession implements Closeable { .build(); } } + log.trace("[{}] user processed [{}]", this.sessionId, downlinkMsg); return downlinkMsg; } @@ -734,9 +746,11 @@ public final class EdgeGrpcSession implements Closeable { private DownlinkMsg processRelation(EdgeEvent edgeEvent, UpdateMsgType msgType) { EntityRelation entityRelation = mapper.convertValue(edgeEvent.getBody(), EntityRelation.class); RelationUpdateMsg r = ctx.getRelationMsgConstructor().constructRelationUpdatedMsg(msgType, entityRelation); - return DownlinkMsg.newBuilder() + DownlinkMsg downlinkMsg = DownlinkMsg.newBuilder() .addAllRelationUpdateMsg(Collections.singletonList(r)) .build(); + log.trace("[{}] relation processed [{}]", this.sessionId, downlinkMsg); + return downlinkMsg; } private DownlinkMsg processAlarm(EdgeEvent edgeEvent, UpdateMsgType msgType) { @@ -752,6 +766,7 @@ public final class EdgeGrpcSession implements Closeable { } catch (Exception e) { log.error("Can't process alarm msg [{}] [{}]", edgeEvent, msgType, e); } + log.trace("[{}] alarm processed [{}]", this.sessionId, downlinkMsg); return downlinkMsg; } @@ -778,6 +793,7 @@ public final class EdgeGrpcSession implements Closeable { .build(); break; } + log.trace("[{}] widget bundle processed [{}]", this.sessionId, downlinkMsg); return downlinkMsg; } @@ -804,15 +820,18 @@ public final class EdgeGrpcSession implements Closeable { .build(); break; } + log.trace("[{}] widget type processed [{}]", this.sessionId, downlinkMsg); return downlinkMsg; } private DownlinkMsg processAdminSettings(EdgeEvent edgeEvent) { AdminSettings adminSettings = mapper.convertValue(edgeEvent.getBody(), AdminSettings.class); AdminSettingsUpdateMsg t = ctx.getAdminSettingsMsgConstructor().constructAdminSettingsUpdateMsg(adminSettings); - return DownlinkMsg.newBuilder() + DownlinkMsg downlinkMsg = DownlinkMsg.newBuilder() .addAllAdminSettingsUpdateMsg(Collections.singletonList(t)) .build(); + log.trace("[{}] admin settings processed [{}]", this.sessionId, downlinkMsg); + return downlinkMsg; } private UpdateMsgType getResponseMsgType(EdgeEventActionType actionType) { @@ -841,9 +860,11 @@ public final class EdgeGrpcSession implements Closeable { private DownlinkMsg constructEntityDataProtoMsg(EntityId entityId, EdgeEventActionType actionType, JsonElement entityData) { EntityDataProto entityDataProto = ctx.getEntityDataMsgConstructor().constructEntityDataMsg(entityId, actionType, entityData); - DownlinkMsg.Builder builder = DownlinkMsg.newBuilder() - .addAllEntityData(Collections.singletonList(entityDataProto)); - return builder.build(); + DownlinkMsg downlinkMsg = DownlinkMsg.newBuilder() + .addAllEntityData(Collections.singletonList(entityDataProto)) + .build(); + log.trace("[{}] entity data proto processed [{}]", this.sessionId, downlinkMsg); + return downlinkMsg; } private ListenableFuture> processUplinkMsg(UplinkMsg uplinkMsg) { @@ -854,7 +875,6 @@ public final class EdgeGrpcSession implements Closeable { result.addAll(ctx.getTelemetryProcessor().onTelemetryUpdate(edge.getTenantId(), entityData)); } } - if (uplinkMsg.getDeviceUpdateMsgList() != null && !uplinkMsg.getDeviceUpdateMsgList().isEmpty()) { for (DeviceUpdateMsg deviceUpdateMsg : uplinkMsg.getDeviceUpdateMsgList()) { result.add(ctx.getDeviceProcessor().onDeviceUpdate(edge.getTenantId(), edge, deviceUpdateMsg)); @@ -906,12 +926,13 @@ public final class EdgeGrpcSession implements Closeable { } } } catch (Exception e) { - log.error("Can't process uplink msg [{}]", uplinkMsg, e); + log.error("[{}] Can't process uplink msg [{}]", this.sessionId, uplinkMsg, e); } return Futures.allAsList(result); } private ConnectResponseMsg processConnect(ConnectRequestMsg request) { + log.trace("[{}] processConnect [{}]", this.sessionId, request); Optional optional = ctx.getEdgeService().findEdgeByRoutingKey(TenantId.SYS_TENANT_ID, request.getEdgeRoutingKey()); if (optional.isPresent()) { edge = optional.get(); @@ -941,7 +962,7 @@ public final class EdgeGrpcSession implements Closeable { .setConfiguration(EdgeConfiguration.getDefaultInstance()).build(); } - private EdgeConfiguration constructEdgeConfigProto(Edge edge) throws JsonProcessingException { + private EdgeConfiguration constructEdgeConfigProto(Edge edge) { return EdgeConfiguration.newBuilder() .setEdgeIdMSB(edge.getId().getId().getMostSignificantBits()) .setEdgeIdLSB(edge.getId().getId().getLeastSignificantBits()) @@ -958,6 +979,7 @@ public final class EdgeGrpcSession implements Closeable { @Override public void close() { + log.debug("[{}] Closing session", sessionId); connected = false; try { outputStream.onCompleted(); diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/init/DefaultSyncEdgeService.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/init/DefaultSyncEdgeService.java index 89d130c386..cdb37c172a 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/init/DefaultSyncEdgeService.java +++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/init/DefaultSyncEdgeService.java @@ -140,6 +140,7 @@ public class DefaultSyncEdgeService implements SyncEdgeService { @Override public void sync(Edge edge) { + log.trace("[{}] staring sync process for edge [{}]", edge.getTenantId(), edge.getName()); try { syncWidgetsBundleAndWidgetTypes(edge); syncAdminSettings(edge); @@ -155,6 +156,7 @@ public class DefaultSyncEdgeService implements SyncEdgeService { } private void syncRuleChains(Edge edge) { + log.trace("[{}] syncRuleChains [{}]", edge.getTenantId(), edge.getName()); try { ListenableFuture> future = ruleChainService.findRuleChainsByTenantIdAndEdgeId(edge.getTenantId(), edge.getId(), new TimePageLink(Integer.MAX_VALUE)); @@ -180,6 +182,7 @@ public class DefaultSyncEdgeService implements SyncEdgeService { } private void syncDevices(Edge edge) { + log.trace("[{}] syncDevices [{}]", edge.getTenantId(), edge.getName()); try { ListenableFuture> future = deviceService.findDevicesByTenantIdAndEdgeId(edge.getTenantId(), edge.getId(), new TimePageLink(Integer.MAX_VALUE)); @@ -205,6 +208,7 @@ public class DefaultSyncEdgeService implements SyncEdgeService { } private void syncAssets(Edge edge) { + log.trace("[{}] syncAssets [{}]", edge.getTenantId(), edge.getName()); try { ListenableFuture> future = assetService.findAssetsByTenantIdAndEdgeId(edge.getTenantId(), edge.getId(), new TimePageLink(Integer.MAX_VALUE)); Futures.addCallback(future, new FutureCallback>() { @@ -229,6 +233,7 @@ public class DefaultSyncEdgeService implements SyncEdgeService { } private void syncEntityViews(Edge edge) { + log.trace("[{}] syncEntityViews [{}]", edge.getTenantId(), edge.getName()); try { ListenableFuture> future = entityViewService.findEntityViewsByTenantIdAndEdgeId(edge.getTenantId(), edge.getId(), new TimePageLink(Integer.MAX_VALUE)); Futures.addCallback(future, new FutureCallback>() { @@ -253,6 +258,7 @@ public class DefaultSyncEdgeService implements SyncEdgeService { } private void syncDashboards(Edge edge) { + log.trace("[{}] syncDashboards [{}]", edge.getTenantId(), edge.getName()); try { ListenableFuture> future = dashboardService.findDashboardsByTenantIdAndEdgeId(edge.getTenantId(), edge.getId(), new TimePageLink(Integer.MAX_VALUE)); Futures.addCallback(future, new FutureCallback>() { @@ -277,6 +283,7 @@ public class DefaultSyncEdgeService implements SyncEdgeService { } private void syncUsers(Edge edge) { + log.trace("[{}] syncUsers [{}]", edge.getTenantId(), edge.getName()); try { TextPageData pageData = userService.findTenantAdmins(edge.getTenantId(), new TextPageLink(Integer.MAX_VALUE)); pushUsersToEdge(pageData, edge); @@ -291,6 +298,7 @@ public class DefaultSyncEdgeService implements SyncEdgeService { } private void syncWidgetsBundleAndWidgetTypes(Edge edge) { + log.trace("[{}] syncWidgetsBundleAndWidgetTypes [{}]", edge.getTenantId(), edge.getName()); List widgetsBundlesToPush = new ArrayList<>(); List widgetTypesToPush = new ArrayList<>(); widgetsBundlesToPush.addAll(widgetsBundleService.findAllTenantWidgetsBundlesByTenantId(edge.getTenantId())); @@ -309,6 +317,7 @@ public class DefaultSyncEdgeService implements SyncEdgeService { } private void syncAdminSettings(Edge edge) { + log.trace("[{}] syncAdminSettings [{}]", edge.getTenantId(), edge.getName()); try { AdminSettings systemMailSettings = adminSettingsService.findAdminSettingsByKey(TenantId.SYS_TENANT_ID, "mail"); saveEdgeEvent(edge.getTenantId(), edge.getId(), EdgeEventType.ADMIN_SETTINGS, EdgeEventActionType.UPDATED, null, mapper.valueToTree(systemMailSettings)); @@ -386,6 +395,7 @@ public class DefaultSyncEdgeService implements SyncEdgeService { @Override public ListenableFuture processRuleChainMetadataRequestMsg(Edge edge, RuleChainMetadataRequestMsg ruleChainMetadataRequestMsg) { + log.trace("[{}] processRuleChainMetadataRequestMsg [{}][{}]", edge.getTenantId(), edge.getName(), ruleChainMetadataRequestMsg); SettableFuture futureToSet = SettableFuture.create(); if (ruleChainMetadataRequestMsg.getRuleChainIdMSB() != 0 && ruleChainMetadataRequestMsg.getRuleChainIdLSB() != 0) { RuleChainId ruleChainId = @@ -409,6 +419,7 @@ public class DefaultSyncEdgeService implements SyncEdgeService { @Override public ListenableFuture processAttributesRequestMsg(Edge edge, AttributesRequestMsg attributesRequestMsg) { + log.trace("[{}] processAttributesRequestMsg [{}][{}]", edge.getTenantId(), edge.getName(), attributesRequestMsg); EntityId entityId = EntityIdFactory.getByTypeAndUuid( EntityType.valueOf(attributesRequestMsg.getEntityType()), new UUID(attributesRequestMsg.getEntityIdMSB(), attributesRequestMsg.getEntityIdLSB())); @@ -482,6 +493,7 @@ public class DefaultSyncEdgeService implements SyncEdgeService { @Override public ListenableFuture processRelationRequestMsg(Edge edge, RelationRequestMsg relationRequestMsg) { + log.trace("[{}] processRelationRequestMsg [{}][{}]", edge.getTenantId(), edge.getName(), relationRequestMsg); EntityId entityId = EntityIdFactory.getByTypeAndUuid( EntityType.valueOf(relationRequestMsg.getEntityType()), new UUID(relationRequestMsg.getEntityIdMSB(), relationRequestMsg.getEntityIdLSB())); @@ -528,6 +540,7 @@ public class DefaultSyncEdgeService implements SyncEdgeService { @Override public ListenableFuture processDeviceCredentialsRequestMsg(Edge edge, DeviceCredentialsRequestMsg deviceCredentialsRequestMsg) { + log.trace("[{}] processDeviceCredentialsRequestMsg [{}][{}]", edge.getTenantId(), edge.getName(), deviceCredentialsRequestMsg); SettableFuture futureToSet = SettableFuture.create(); if (deviceCredentialsRequestMsg.getDeviceIdMSB() != 0 && deviceCredentialsRequestMsg.getDeviceIdLSB() != 0) { DeviceId deviceId = new DeviceId(new UUID(deviceCredentialsRequestMsg.getDeviceIdMSB(), deviceCredentialsRequestMsg.getDeviceIdLSB())); @@ -550,6 +563,7 @@ public class DefaultSyncEdgeService implements SyncEdgeService { @Override public ListenableFuture processUserCredentialsRequestMsg(Edge edge, UserCredentialsRequestMsg userCredentialsRequestMsg) { + log.trace("[{}] processUserCredentialsRequestMsg [{}][{}]", edge.getTenantId(), edge.getName(), userCredentialsRequestMsg); SettableFuture futureToSet = SettableFuture.create(); if (userCredentialsRequestMsg.getUserIdMSB() != 0 && userCredentialsRequestMsg.getUserIdLSB() != 0) { UserId userId = new UserId(new UUID(userCredentialsRequestMsg.getUserIdMSB(), userCredentialsRequestMsg.getUserIdLSB())); @@ -576,7 +590,7 @@ public class DefaultSyncEdgeService implements SyncEdgeService { EdgeEventActionType action, EntityId entityId, JsonNode body) { - log.debug("Pushing edge event to edge queue. tenantId [{}], edgeId [{}], type [{}], action[{}], entityId [{}], body [{}]", + log.trace("Pushing edge event to edge queue. tenantId [{}], edgeId [{}], type [{}], action[{}], entityId [{}], body [{}]", tenantId, edgeId, type, action, entityId, body); EdgeEvent edgeEvent = new EdgeEvent(); diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/DeviceProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/DeviceProcessor.java index dcedf92a81..0d9ca2ab4d 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/DeviceProcessor.java +++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/DeviceProcessor.java @@ -221,6 +221,7 @@ public class DeviceProcessor extends BaseProcessor { } public ListenableFuture processDeviceRpcCallResponseMsg(TenantId tenantId, DeviceRpcCallMsg deviceRpcCallMsg) { + log.trace("[{}] processDeviceRpcCallResponseMsg [{}]", tenantId, deviceRpcCallMsg); SettableFuture futureToSet = SettableFuture.create(); UUID uuid = new UUID(deviceRpcCallMsg.getRequestIdMSB(), deviceRpcCallMsg.getRequestIdLSB()); FromDeviceRpcResponse response; diff --git a/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java index 1c08acdc5e..f9b889c777 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java @@ -174,6 +174,7 @@ public class EdgeServiceImpl extends AbstractEntityService implements EdgeServic @Override public Edge assignEdgeToCustomer(TenantId tenantId, EdgeId edgeId, CustomerId customerId) { + log.trace("[{}] Executing assignEdgeToCustomer [{}][{}]", tenantId, edgeId, customerId); Edge edge = findEdgeById(tenantId, edgeId); edge.setCustomerId(customerId); return saveEdge(edge); @@ -181,6 +182,7 @@ public class EdgeServiceImpl extends AbstractEntityService implements EdgeServic @Override public Edge unassignEdgeFromCustomer(TenantId tenantId, EdgeId edgeId) { + log.trace("[{}] Executing unassignEdgeFromCustomer [{}]", tenantId, edgeId); Edge edge = findEdgeById(tenantId, edgeId); edge.setCustomerId(null); return saveEdge(edge); @@ -279,6 +281,7 @@ public class EdgeServiceImpl extends AbstractEntityService implements EdgeServic @Override public ListenableFuture> findEdgesByQuery(TenantId tenantId, EdgeSearchQuery query) { + log.trace("[{}] Executing findEdgesByQuery [{}]", tenantId, query); ListenableFuture> relations = relationService.findByQuery(tenantId, query.toEntitySearchQuery()); ListenableFuture> edges = Futures.transformAsync(relations, r -> { EntitySearchDirection direction = query.toEntitySearchQuery().getParameters().getDirection(); @@ -455,6 +458,7 @@ public class EdgeServiceImpl extends AbstractEntityService implements EdgeServic @Override public ListenableFuture> findRelatedEdgeIdsByEntityId(TenantId tenantId, EntityId entityId) { + log.trace("[{}] Executing findRelatedEdgeIdsByEntityId [{}]", tenantId, entityId); if (EntityType.TENANT.equals(entityId.getEntityType())) { TextPageData edgesByTenantId = findEdgesByTenantId(tenantId, new TextPageLink(Integer.MAX_VALUE)); return Futures.immediateFuture(edgesByTenantId.getData().stream().map(IdBased::getId).collect(Collectors.toList()));