Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Improve] add redis data queue unit test #2330

Merged
merged 10 commits into from
Jul 23, 2024
Merged

[Improve] add redis data queue unit test #2330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d79f6e2
[Improve] add redis data queue unit test
yuluo-yx Jul 22, 2024
ef46ab9
fix
yuluo-yx Jul 22, 2024
c958a47
Merge branch 'master' into 0722-yuluo/add-redis-queue-test
yuluo-yx Jul 22, 2024
fcd96fb
Merge branch 'master' into 0722-yuluo/add-redis-queue-test
yuluo-yx Jul 23, 2024
c712098
fix
yuluo-yx Jul 23, 2024
9975690
fix
yuluo-yx Jul 23, 2024
9b5eb37
Merge branch '0722-yuluo/add-redis-queue-test' of https://github.com/…
yuluo-yx Jul 23, 2024
3f5117e
fix
yuluo-yx Jul 23, 2024
65bce0d
Merge branch 'master' into 0722-yuluo/add-redis-queue-test
yuluo-yx Jul 23, 2024
5d81e42
Merge branch 'master' into 0722-yuluo/add-redis-queue-test
tomsun28 Jul 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 9 additions & 14 deletions common/src/main/java/org/apache/hertzbeat/common/queue/impl/RedisCommonDataQueue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

package org.apache.hertzbeat.common.queue.impl;

import com.fasterxml.jackson.databind.ObjectMapper;
import io.lettuce.core.RedisClient;
import io.lettuce.core.RedisURI;
import io.lettuce.core.api.StatefulRedisConnection;
Expand All @@ -27,6 +26,8 @@
import org.apache.hertzbeat.common.entity.alerter.Alert;
import org.apache.hertzbeat.common.entity.message.CollectRep;
import org.apache.hertzbeat.common.queue.CommonDataQueue;
import org.apache.hertzbeat.common.util.JsonUtil;
import org.apache.hertzbeat.common.util.ProtoJsonUtil;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Configuration;
Expand All @@ -50,7 +51,6 @@ public class RedisCommonDataQueue implements CommonDataQueue, DisposableBean {
private final String metricsDataQueueNameToPersistentStorage;
private final String metricsDataQueueNameToRealTimeStorage;
private final String alertsDataQueueName;
private final ObjectMapper objectMapper;
private final CommonProperties.RedisProperties redisProperties;

public RedisCommonDataQueue(CommonProperties properties) {
Expand All @@ -61,11 +61,7 @@ public RedisCommonDataQueue(CommonProperties properties) {
}

this.redisProperties = properties.getQueue().getRedis();
RedisURI build = RedisURI.builder()
.withHost(redisProperties.getRedisHost())
.withPort(redisProperties.getRedisPort())
.build();
System.out.println(build.toString());

this.redisClient = RedisClient.create(
RedisURI.builder()
.withHost(redisProperties.getRedisHost())
Expand All @@ -78,7 +74,6 @@ public RedisCommonDataQueue(CommonProperties properties) {
this.metricsDataQueueNameToPersistentStorage = redisProperties.getMetricsDataQueueNameToPersistentStorage();
this.metricsDataQueueNameToRealTimeStorage = redisProperties.getMetricsDataQueueNameToRealTimeStorage();
this.alertsDataQueueName = redisProperties.getAlertsDataQueueName();
this.objectMapper = new ObjectMapper();
}

@Override
Expand All @@ -87,7 +82,7 @@ public Alert pollAlertsData() {
try {
String alertJson = syncCommands.rpop(alertsDataQueueName);
if (alertJson != null) {
return objectMapper.readValue(alertJson, Alert.class);
return JsonUtil.fromJson(alertJson, Alert.class);
}
} catch (Exception e) {
log.error("please config common.queue.redis props correctly", e);
Expand All @@ -102,7 +97,7 @@ public CollectRep.MetricsData pollMetricsDataToAlerter() {
try {
String metricsDataJson = syncCommands.rpop(metricsDataQueueNameToAlerter);
if (metricsDataJson != null) {
return objectMapper.readValue(metricsDataJson, CollectRep.MetricsData.class);
return (CollectRep.MetricsData) ProtoJsonUtil.toProtobuf(metricsDataJson, CollectRep.MetricsData.newBuilder());
}
} catch (Exception e) {
log.error(e.getMessage());
Expand All @@ -117,7 +112,7 @@ public CollectRep.MetricsData pollMetricsDataToPersistentStorage() throws Interr
try {
String metricsDataJson = syncCommands.rpop(metricsDataQueueNameToPersistentStorage);
if (metricsDataJson != null) {
return objectMapper.readValue(metricsDataJson, CollectRep.MetricsData.class);
return JsonUtil.fromJson(metricsDataJson, CollectRep.MetricsData.class);
}
} catch (Exception e) {
log.error(e.getMessage());
Expand All @@ -132,7 +127,7 @@ public CollectRep.MetricsData pollMetricsDataToRealTimeStorage() throws Interrup
try {
String metricsDataJson = syncCommands.rpop(metricsDataQueueNameToRealTimeStorage);
if (metricsDataJson != null) {
return objectMapper.readValue(metricsDataJson, CollectRep.MetricsData.class);
return JsonUtil.fromJson(metricsDataJson, CollectRep.MetricsData.class);
}
} catch (Exception e) {
log.error(e.getMessage());
Expand All @@ -145,7 +140,7 @@ public CollectRep.MetricsData pollMetricsDataToRealTimeStorage() throws Interrup
public void sendAlertsData(Alert alert) {

try {
String alertJson = objectMapper.writeValueAsString(alert);
String alertJson = JsonUtil.toJson(alert);
syncCommands.lpush(alertsDataQueueName, alertJson);
} catch (Exception e) {
log.error(e.getMessage());
Expand All @@ -157,7 +152,7 @@ public void sendAlertsData(Alert alert) {
public void sendMetricsData(CollectRep.MetricsData metricsData) {

try {
String metricsDataJson = objectMapper.writeValueAsString(metricsData);
String metricsDataJson = ProtoJsonUtil.toJsonStr(metricsData);
syncCommands.lpush(metricsDataQueueNameToAlerter, metricsDataJson);
syncCommands.lpush(metricsDataQueueNameToPersistentStorage, metricsDataJson);
syncCommands.lpush(metricsDataQueueNameToRealTimeStorage, metricsDataJson);
Expand Down
157 changes: 157 additions & 0 deletions common/src/test/java/org/apache/hertzbeat/common/queue/impl/RedisCommonDataQueueTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,157 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You 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.apache.hertzbeat.common.queue.impl;

import com.fasterxml.jackson.databind.ObjectMapper;
import io.lettuce.core.RedisClient;
import io.lettuce.core.RedisURI;
import io.lettuce.core.api.StatefulRedisConnection;
import io.lettuce.core.api.sync.RedisCommands;
import org.apache.hertzbeat.common.config.CommonProperties;
import org.apache.hertzbeat.common.entity.alerter.Alert;
import org.apache.hertzbeat.common.entity.message.CollectRep;
import org.apache.hertzbeat.common.util.ProtoJsonUtil;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.MockedStatic;
import org.mockito.MockitoAnnotations;
import org.mockito.junit.jupiter.MockitoExtension;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.mockStatic;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

/**
* test for {@link RedisCommonDataQueue}
*/

@ExtendWith(MockitoExtension.class)
class RedisCommonDataQueueTest {

@Mock
private StatefulRedisConnection<String, String> connection;

@Mock
private RedisCommands<String, String> syncCommands;

@Mock
private ObjectMapper objectMapper;

private RedisClient redisClient;

private CommonProperties commonProperties;

private CommonProperties.RedisProperties redisProperties;

private RedisCommonDataQueue redisCommonDataQueue;

@BeforeEach
public void setUp() {

MockitoAnnotations.openMocks(this);

redisClient = mock(RedisClient.class);
commonProperties = mock(CommonProperties.class);
redisProperties = mock(CommonProperties.RedisProperties.class);
CommonProperties.DataQueueProperties dataQueueProperties = mock(CommonProperties.DataQueueProperties.class);

when(commonProperties.getQueue()).thenReturn(dataQueueProperties);
when(dataQueueProperties.getRedis()).thenReturn(redisProperties);

when(redisProperties.getRedisHost()).thenReturn("localhost");
when(redisProperties.getRedisPort()).thenReturn(6379);
when(redisProperties.getMetricsDataQueueNameToAlerter()).thenReturn("metricsDataQueueToAlerter");
when(redisProperties.getMetricsDataQueueNameToPersistentStorage()).thenReturn("metricsDataQueueToPersistentStorage");
when(redisProperties.getMetricsDataQueueNameToRealTimeStorage()).thenReturn("metricsDataQueueToRealTimeStorage");
when(redisProperties.getAlertsDataQueueName()).thenReturn("alertsDataQueue");

try (MockedStatic<RedisClient> mockedRedisClient = mockStatic(RedisClient.class)) {

mockedRedisClient.when(() -> RedisClient.create(
any(RedisURI.class))
).thenReturn(redisClient);

when(redisClient.connect()).thenReturn(connection);
when(connection.sync()).thenReturn(syncCommands);

redisCommonDataQueue = new RedisCommonDataQueue(commonProperties);
}
}

@Test
public void testPollAlertsData() throws Exception {

String alertJson = "{\"id\":\"1\",\"content\":\"Test Alert\"}";
Alert expectedAlert = Alert.builder().id(1L).content("Test Alert").build();

when(syncCommands.rpop(anyString())).thenReturn(alertJson);
Alert actualAlert = redisCommonDataQueue.pollAlertsData();
assertEquals(expectedAlert, actualAlert);
}

@Test
public void testPollMetricsDataToAlerter() throws Exception {

CollectRep.MetricsData metricsData = CollectRep.MetricsData.newBuilder().setMetrics("test metrics").build();
String metricsDataJson = "{\"metrics\":\"test metrics\"}";

when(syncCommands.rpop("metricsDataQueueToAlerter")).thenReturn(metricsDataJson);

CollectRep.MetricsData actualMetricsData = redisCommonDataQueue.pollMetricsDataToAlerter();
assertEquals(metricsData, actualMetricsData);
}

@Test
public void testSendMetricsData() throws Exception {
CollectRep.MetricsData metricsData = CollectRep.MetricsData.newBuilder().setMetrics("test metrics").build();
String metricsDataJson = ProtoJsonUtil.toJsonStr(metricsData);

redisCommonDataQueue.sendMetricsData(metricsData);

verify(syncCommands).lpush("metricsDataQueueToAlerter", metricsDataJson);
verify(syncCommands).lpush("metricsDataQueueToPersistentStorage", metricsDataJson);
verify(syncCommands).lpush("metricsDataQueueToRealTimeStorage", metricsDataJson);
}

@Test
public void testSendAlertsData() throws Exception {

Alert alert = Alert.builder()
.content("test")
.build();
String alertJson = "{\"id\":null,\"target\":null,\"alertDefineId\":null,\"priority\":0,\"content\":\"test\",\"status\":0,\"times\":null,\"firstAlarmTime\":null,\"lastAlarmTime\":null,\"triggerTimes\":null,\"tags\":null,\"creator\":null,\"modifier\":null,\"gmtCreate\":null,\"gmtUpdate\":null}";
redisCommonDataQueue.sendAlertsData(alert);

verify(syncCommands).lpush("alertsDataQueue", alertJson);
}

@Test
public void testDestroy() {
redisCommonDataQueue.destroy();

verify(connection).close();
verify(redisClient).shutdown();
}

}
Loading