Merge pull request #9604 from volodymyr-babak/telemetry-edge-processor-fix-error
Telemetry edge processor: added check for attr/timeseries value size
This commit is contained in:
commit
2ca2e637fe
@ -21,6 +21,7 @@ import org.springframework.stereotype.Component;
|
|||||||
import org.thingsboard.server.common.data.DataConstants;
|
import org.thingsboard.server.common.data.DataConstants;
|
||||||
import org.thingsboard.server.common.data.EdgeUtils;
|
import org.thingsboard.server.common.data.EdgeUtils;
|
||||||
import org.thingsboard.server.common.data.EntityType;
|
import org.thingsboard.server.common.data.EntityType;
|
||||||
|
import org.thingsboard.server.common.data.StringUtils;
|
||||||
import org.thingsboard.server.common.data.edge.EdgeEvent;
|
import org.thingsboard.server.common.data.edge.EdgeEvent;
|
||||||
import org.thingsboard.server.gen.edge.v1.DownlinkMsg;
|
import org.thingsboard.server.gen.edge.v1.DownlinkMsg;
|
||||||
import org.thingsboard.server.gen.edge.v1.EntityDataProto;
|
import org.thingsboard.server.gen.edge.v1.EntityDataProto;
|
||||||
@ -37,6 +38,15 @@ public class TelemetryEdgeProcessor extends BaseTelemetryProcessor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public DownlinkMsg convertTelemetryEventToDownlink(EdgeEvent edgeEvent) throws JsonProcessingException {
|
public DownlinkMsg convertTelemetryEventToDownlink(EdgeEvent edgeEvent) throws JsonProcessingException {
|
||||||
|
if (edgeEvent.getBody() != null) {
|
||||||
|
String bodyStr = edgeEvent.getBody().toString();
|
||||||
|
if (bodyStr.length() > 1000) {
|
||||||
|
log.debug("[{}][{}][{}] Conversion to a DownlinkMsg telemetry event failed due to a size limit violation. " +
|
||||||
|
"Current size is {}, but the limit is 1000. {}", edgeEvent.getTenantId(), edgeEvent.getEdgeId(),
|
||||||
|
edgeEvent.getEntityId(), bodyStr.length(), StringUtils.truncate(bodyStr, 100));
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
EntityType entityType = EntityType.valueOf(edgeEvent.getType().name());
|
EntityType entityType = EntityType.valueOf(edgeEvent.getType().name());
|
||||||
EntityDataProto entityDataProto = convertTelemetryEventToEntityDataProto(
|
EntityDataProto entityDataProto = convertTelemetryEventToEntityDataProto(
|
||||||
edgeEvent.getTenantId(), entityType, edgeEvent.getEntityId(),
|
edgeEvent.getTenantId(), entityType, edgeEvent.getEntityId(),
|
||||||
|
|||||||
@ -0,0 +1,42 @@
|
|||||||
|
/**
|
||||||
|
* Copyright © 2016-2023 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.service.edge.rpc.processor.telemetry;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.databind.node.ObjectNode;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.junit.Assert;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
import org.mockito.junit.MockitoJUnitRunner;
|
||||||
|
import org.thingsboard.common.util.JacksonUtil;
|
||||||
|
import org.thingsboard.server.common.data.StringUtils;
|
||||||
|
import org.thingsboard.server.common.data.edge.EdgeEvent;
|
||||||
|
import org.thingsboard.server.gen.edge.v1.DownlinkMsg;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
@RunWith(MockitoJUnitRunner.class)
|
||||||
|
public class TelemetryEdgeProcessorTest {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testConvert_maxSizeLimit() throws Exception {
|
||||||
|
EdgeEvent edgeEvent = new EdgeEvent();
|
||||||
|
ObjectNode body = JacksonUtil.newObjectNode();
|
||||||
|
body.put("value", StringUtils.randomAlphanumeric(10000));
|
||||||
|
edgeEvent.setBody(body);
|
||||||
|
DownlinkMsg downlinkMsg = new TelemetryEdgeProcessor().convertTelemetryEventToDownlink(edgeEvent);
|
||||||
|
Assert.assertNull(downlinkMsg);
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
x
Reference in New Issue
Block a user