Skip to content

Commit 4c1e2c6

Browse files
committed
fix Copilot review and CI fail
1 parent f65414b commit 4c1e2c6

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

docs/en/setup/backend/backend-alarm.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,8 @@ See the following example:
252252
"ruleName": "service_resp_time_rule",
253253
"alarmMessage": "alarmMessage xxxx",
254254
"startTime": 1560524171000,
255-
"recoveryTime": 15596606810000,
256-
"tags": [{
255+
"recoveryTime": 1560524351000,
256+
"tags": [{
257257
"key": "level",
258258
"value": "WARNING"
259259
}]

oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRule.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,7 @@ public List<AlarmMessage> check() {
223223
log.trace("RuleName:{} AlarmEntity {} {} {} expired", ruleName, alarmEntity.getName(),
224224
alarmEntity.getId0(), alarmEntity.getId1());
225225
}
226+
return;
226227
}
227228

228229
Optional<AlarmMessage> alarmMessageOptional = window.checkAlarm();
@@ -496,10 +497,8 @@ public AlarmStateMachine(int silencePeriod, int recoveryObservationPeriod) {
496497

497498
public void onMatch() {
498499
if (log.isTraceEnabled()) {
499-
if (log.isTraceEnabled()) {
500-
log.trace("RuleName:{} AlarmEntity {} {} {} onMatch silenceCountdown:{} currentState:{}",
501-
ruleName, entity.getName(), entity.getId0(), entity.getId1(), silenceCountdown, currentState);
502-
}
500+
log.trace("RuleName:{} AlarmEntity {} {} {} onMatch silenceCountdown:{} currentState:{}",
501+
ruleName, entity.getName(), entity.getId0(), entity.getId1(), silenceCountdown, currentState);
503502
}
504503
silenceCountdown--;
505504
switch (currentState) {

oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/grpc/GRPCCallback.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ public GRPCCallback(AlarmRulesWatcher alarmRulesWatcher) {
5656
this.alarmRulesWatcher = alarmRulesWatcher;
5757
this.alarmServiceStubMap = new HashMap<>();
5858
this.grpcClientMap = new HashMap<>();
59+
this.alarmSettingMap = new HashMap<>();
5960
Map<String, GRPCAlarmSetting> alarmSettingMap = alarmRulesWatcher.getGrpchookSetting();
6061
if (CollectionUtils.isNotEmpty(alarmSettingMap)) {
6162
alarmSettingMap.forEach((name, alarmSetting) -> {

oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRuleTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* contributor license agreements. See the NOTICE file distributed with
44
* this work for additional information regarding copyright ownership.
55
* The ASF licenses this file to You under the Apache License, Version 2.0
6-
* (the "License");you may not use this file except in compliance with
6+
* (the "License"); you may not use this file except in compliance with
77
* the License. You may obtain a copy of the License at
88
*
99
* http://www.apache.org/licenses/LICENSE-2.0

oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/wechat/WechatHookCallbackTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public void testWechatWebhook() throws Exception {
9292
AlarmRulesWatcher alarmRulesWatcher = new AlarmRulesWatcher(rules, null, null);
9393
WechatHookCallback wechatHookCallback = new WechatHookCallback(alarmRulesWatcher);
9494
List<AlarmMessage> alarmMessages = new ArrayList<>(2);
95-
List<AlarmRecoveryMessage> alarmRecoveryMessages = new ArrayList<>(1);
95+
List<AlarmMessage> alarmRecoveryMessages = new ArrayList<>(1);
9696
AlarmMessage alarmMessage = new AlarmMessage();
9797
alarmMessage.setScopeId(DefaultScopeDefine.SERVICE);
9898
alarmMessage.setRuleName("service_resp_time_rule");
@@ -108,7 +108,7 @@ public void testWechatWebhook() throws Exception {
108108
wechatHookCallback.doAlarm(alarmMessages);
109109
AlarmRecoveryMessage alarmRecoveryMessage = new AlarmRecoveryMessage(anotherAlarmMessage);
110110
alarmRecoveryMessages.add(alarmRecoveryMessage);
111-
wechatHookCallback.doAlarmRecovery(alarmMessages);
111+
wechatHookCallback.doAlarmRecovery(alarmRecoveryMessages);
112112
Assertions.assertTrue(IS_SUCCESS.get());
113113
}
114114
}

0 commit comments

Comments
 (0)