From bd23f263e69097e0cb185be6d08c9ee82e83815f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= <wu.sheng@foxmail.com>
Date: Tue, 20 Jul 2021 19:47:22 +0800
Subject: [PATCH] Revert "Adjust the project structure of the alarm module"
 (#7342)

This reverts commit 62411964a46aa22d47319ca863feed3a39169548.
---
 CHANGES.md                                    |  1 -
 .../alarm-default-plugin/pom.xml              | 86 -------------------
 oap-server/server-alarm-plugin/pom.xml        | 59 ++++++++++++-
 .../server/core/alarm/provider/AlarmCore.java |  0
 .../alarm/provider/AlarmMessageFormatter.java |  0
 .../alarm/provider/AlarmModuleProvider.java   |  0
 .../server/core/alarm/provider/AlarmRule.java |  0
 .../alarm/provider/AlarmRulesWatcher.java     |  0
 .../core/alarm/provider/AlarmSettings.java    |  0
 .../alarm/provider/CompositeAlarmRule.java    |  0
 .../provider/CompositeRuleEvaluator.java      |  0
 .../alarm/provider/EventHookCallback.java     |  0
 .../core/alarm/provider/MetricsValueType.java |  0
 .../core/alarm/provider/NotifyHandler.java    |  0
 .../oap/server/core/alarm/provider/OP.java    |  0
 .../oap/server/core/alarm/provider/Rules.java |  0
 .../core/alarm/provider/RulesReader.java      |  0
 .../core/alarm/provider/RunningRule.java      |  0
 .../server/core/alarm/provider/Threshold.java |  0
 .../core/alarm/provider/WebhookCallback.java  |  0
 .../dingtalk/DingtalkHookCallback.java        |  0
 .../provider/dingtalk/DingtalkSettings.java   |  0
 .../alarm/provider/expression/Expression.java |  0
 .../expression/ExpressionContext.java         |  0
 .../provider/feishu/FeishuHookCallback.java   |  0
 .../alarm/provider/feishu/FeishuSettings.java |  0
 .../alarm/provider/grpc/GRPCAlarmSetting.java |  0
 .../alarm/provider/grpc/GRPCCallback.java     |  0
 .../alarm/provider/slack/SlackSettings.java   |  0
 .../provider/slack/SlackhookCallback.java     |  0
 .../provider/wechat/WechatHookCallback.java   |  0
 .../alarm/provider/wechat/WechatSettings.java |  0
 .../provider/welink/WeLinkHookCallback.java   |  0
 .../alarm/provider/welink/WeLinkSettings.java |  0
 .../src/main/proto/alarm-hook.proto           |  0
 ...g.oap.server.library.module.ModuleProvider |  0
 .../core/alarm/provider/AlarmCoreTest.java    |  0
 .../provider/AlarmMessageFormatterTest.java   |  0
 .../provider/AlarmModuleProviderTest.java     |  0
 .../alarm/provider/AlarmRulesWatcherTest.java |  0
 .../provider/CompositeRuleEvaluatorTest.java  |  0
 .../alarm/provider/EventHookCallbackTest.java |  0
 .../alarm/provider/NotifyHandlerTest.java     |  0
 .../server/core/alarm/provider/OPTest.java    |  0
 .../core/alarm/provider/RulesReaderTest.java  |  0
 .../core/alarm/provider/RunningRuleTest.java  |  0
 .../core/alarm/provider/ThresholdTest.java    |  0
 .../alarm/provider/WebhookCallbackTest.java   |  0
 .../dingtalk/DingtalkHookCallbackTest.java    |  0
 .../expression/ExpressionContextTest.java     |  0
 .../provider/expression/ExpressionTest.java   |  0
 .../feishu/FeishuHookCallbackTest.java        |  0
 .../provider/grpc/AlarmMockReceiver.java      |  0
 .../provider/grpc/GRPChookCallbackTest.java   |  0
 .../wechat/WechatHookCallbackTest.java        |  0
 .../welink/WeLinkHookCallbackTest.java        |  0
 .../src/test/resources/alarm-settings.yml     |  0
 .../src/test/resources/log4j2-test.xml        |  0
 oap-server/server-bootstrap/pom.xml           |  2 +-
 59 files changed, 56 insertions(+), 92 deletions(-)
 delete mode 100644 oap-server/server-alarm-plugin/alarm-default-plugin/pom.xml
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmCore.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmMessageFormatter.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmModuleProvider.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmRule.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmRulesWatcher.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmSettings.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/CompositeAlarmRule.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/CompositeRuleEvaluator.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/EventHookCallback.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/MetricsValueType.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/NotifyHandler.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/OP.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/Rules.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/RulesReader.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRule.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/Threshold.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/WebhookCallback.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/dingtalk/DingtalkHookCallback.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/dingtalk/DingtalkSettings.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/expression/Expression.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/expression/ExpressionContext.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/feishu/FeishuHookCallback.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/feishu/FeishuSettings.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/grpc/GRPCAlarmSetting.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/grpc/GRPCCallback.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/slack/SlackSettings.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/slack/SlackhookCallback.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/wechat/WechatHookCallback.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/wechat/WechatSettings.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/welink/WeLinkHookCallback.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/welink/WeLinkSettings.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/main/proto/alarm-hook.proto (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmCoreTest.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmMessageFormatterTest.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmModuleProviderTest.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmRulesWatcherTest.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/CompositeRuleEvaluatorTest.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/EventHookCallbackTest.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/NotifyHandlerTest.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/OPTest.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/RulesReaderTest.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRuleTest.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/ThresholdTest.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/WebhookCallbackTest.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/dingtalk/DingtalkHookCallbackTest.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/expression/ExpressionContextTest.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/expression/ExpressionTest.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/feishu/FeishuHookCallbackTest.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/grpc/AlarmMockReceiver.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/grpc/GRPChookCallbackTest.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/wechat/WechatHookCallbackTest.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/welink/WeLinkHookCallbackTest.java (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/test/resources/alarm-settings.yml (100%)
 rename oap-server/server-alarm-plugin/{alarm-default-plugin => }/src/test/resources/log4j2-test.xml (100%)

diff --git a/CHANGES.md b/CHANGES.md
index c04f34d708..80da75371a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,7 +13,6 @@ Release Notes.
   consume.
 * Build and push snapshot Docker images to GitHub Container Registry, this is only for people who want to help to test
   the master branch codes, please don't use in production environments.
-* Adjust the project structure of the alarm module for convenient the user to add their own implementation.
 
 #### Java Agent
 
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/pom.xml b/oap-server/server-alarm-plugin/alarm-default-plugin/pom.xml
deleted file mode 100644
index e0f91fba96..0000000000
--- a/oap-server/server-alarm-plugin/alarm-default-plugin/pom.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ 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.
-  ~
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>server-alarm-plugin</artifactId>
-        <groupId>org.apache.skywalking</groupId>
-        <version>8.7.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>alarm-default-plugin</artifactId>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.skywalking</groupId>
-            <artifactId>server-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.skywalking</groupId>
-            <artifactId>library-util</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.skywalking</groupId>
-            <artifactId>event-analyzer</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.grpc</groupId>
-            <artifactId>grpc-testing</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.mvel</groupId>
-            <artifactId>mvel2</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.xolstice.maven.plugins</groupId>
-                <artifactId>protobuf-maven-plugin</artifactId>
-                <version>${protobuf-maven-plugin.version}</version>
-                <configuration>
-                    <!--
-                      The version of protoc must match protobuf-java. If you don't depend on
-                      protobuf-java directly, you will be transitively depending on the
-                      protobuf-java version that grpc depends on.
-                    -->
-                    <protocArtifact>com.google.protobuf:protoc:${com.google.protobuf.protoc.version}:exe:${os.detected.classifier}
-                    </protocArtifact>
-                    <pluginId>grpc-java</pluginId>
-                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:${protoc-gen-grpc-java.plugin.version}:exe:${os.detected.classifier}
-                    </pluginArtifact>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>compile</goal>
-                            <goal>compile-custom</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
\ No newline at end of file
diff --git a/oap-server/server-alarm-plugin/pom.xml b/oap-server/server-alarm-plugin/pom.xml
index 0e5e213788..9564d7e249 100644
--- a/oap-server/server-alarm-plugin/pom.xml
+++ b/oap-server/server-alarm-plugin/pom.xml
@@ -26,10 +26,61 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>server-alarm-plugin</artifactId>
-    <packaging>pom</packaging>
 
-    <modules>
-        <module>alarm-default-plugin</module>
-    </modules>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.skywalking</groupId>
+            <artifactId>server-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.skywalking</groupId>
+            <artifactId>library-util</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.skywalking</groupId>
+            <artifactId>event-analyzer</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-testing</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mvel</groupId>
+            <artifactId>mvel2</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.xolstice.maven.plugins</groupId>
+                <artifactId>protobuf-maven-plugin</artifactId>
+                <version>${protobuf-maven-plugin.version}</version>
+                <configuration>
+                    <!--
+                      The version of protoc must match protobuf-java. If you don't depend on
+                      protobuf-java directly, you will be transitively depending on the
+                      protobuf-java version that grpc depends on.
+                    -->
+                    <protocArtifact>com.google.protobuf:protoc:${com.google.protobuf.protoc.version}:exe:${os.detected.classifier}
+                    </protocArtifact>
+                    <pluginId>grpc-java</pluginId>
+                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:${protoc-gen-grpc-java.plugin.version}:exe:${os.detected.classifier}
+                    </pluginArtifact>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>compile</goal>
+                            <goal>compile-custom</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
\ No newline at end of file
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmCore.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmCore.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmCore.java
rename to oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmCore.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmMessageFormatter.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmMessageFormatter.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmMessageFormatter.java
rename to oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmMessageFormatter.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmModuleProvider.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmModuleProvider.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmModuleProvider.java
rename to oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmModuleProvider.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmRule.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmRule.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmRule.java
rename to oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmRule.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmRulesWatcher.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmRulesWatcher.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmRulesWatcher.java
rename to oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmRulesWatcher.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmSettings.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmSettings.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmSettings.java
rename to oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmSettings.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/CompositeAlarmRule.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/CompositeAlarmRule.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/CompositeAlarmRule.java
rename to oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/CompositeAlarmRule.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/CompositeRuleEvaluator.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/CompositeRuleEvaluator.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/CompositeRuleEvaluator.java
rename to oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/CompositeRuleEvaluator.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/EventHookCallback.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/EventHookCallback.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/EventHookCallback.java
rename to oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/EventHookCallback.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/MetricsValueType.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/MetricsValueType.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/MetricsValueType.java
rename to oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/MetricsValueType.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/NotifyHandler.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/NotifyHandler.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/NotifyHandler.java
rename to oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/NotifyHandler.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/OP.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/OP.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/OP.java
rename to oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/OP.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/Rules.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/Rules.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/Rules.java
rename to oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/Rules.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/RulesReader.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/RulesReader.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/RulesReader.java
rename to oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/RulesReader.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRule.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRule.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRule.java
rename to oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRule.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/Threshold.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/Threshold.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/Threshold.java
rename to oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/Threshold.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/WebhookCallback.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/WebhookCallback.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/WebhookCallback.java
rename to oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/WebhookCallback.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/dingtalk/DingtalkHookCallback.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/dingtalk/DingtalkHookCallback.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/dingtalk/DingtalkHookCallback.java
rename to oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/dingtalk/DingtalkHookCallback.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/dingtalk/DingtalkSettings.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/dingtalk/DingtalkSettings.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/dingtalk/DingtalkSettings.java
rename to oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/dingtalk/DingtalkSettings.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/expression/Expression.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/expression/Expression.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/expression/Expression.java
rename to oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/expression/Expression.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/expression/ExpressionContext.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/expression/ExpressionContext.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/expression/ExpressionContext.java
rename to oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/expression/ExpressionContext.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/feishu/FeishuHookCallback.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/feishu/FeishuHookCallback.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/feishu/FeishuHookCallback.java
rename to oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/feishu/FeishuHookCallback.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/feishu/FeishuSettings.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/feishu/FeishuSettings.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/feishu/FeishuSettings.java
rename to oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/feishu/FeishuSettings.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/grpc/GRPCAlarmSetting.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/grpc/GRPCAlarmSetting.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/grpc/GRPCAlarmSetting.java
rename to oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/grpc/GRPCAlarmSetting.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/grpc/GRPCCallback.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/grpc/GRPCCallback.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/grpc/GRPCCallback.java
rename to oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/grpc/GRPCCallback.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/slack/SlackSettings.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/slack/SlackSettings.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/slack/SlackSettings.java
rename to oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/slack/SlackSettings.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/slack/SlackhookCallback.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/slack/SlackhookCallback.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/slack/SlackhookCallback.java
rename to oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/slack/SlackhookCallback.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/wechat/WechatHookCallback.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/wechat/WechatHookCallback.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/wechat/WechatHookCallback.java
rename to oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/wechat/WechatHookCallback.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/wechat/WechatSettings.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/wechat/WechatSettings.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/wechat/WechatSettings.java
rename to oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/wechat/WechatSettings.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/welink/WeLinkHookCallback.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/welink/WeLinkHookCallback.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/welink/WeLinkHookCallback.java
rename to oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/welink/WeLinkHookCallback.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/welink/WeLinkSettings.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/welink/WeLinkSettings.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/welink/WeLinkSettings.java
rename to oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/welink/WeLinkSettings.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/main/proto/alarm-hook.proto b/oap-server/server-alarm-plugin/src/main/proto/alarm-hook.proto
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/main/proto/alarm-hook.proto
rename to oap-server/server-alarm-plugin/src/main/proto/alarm-hook.proto
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider b/oap-server/server-alarm-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
rename to oap-server/server-alarm-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmCoreTest.java b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmCoreTest.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmCoreTest.java
rename to oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmCoreTest.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmMessageFormatterTest.java b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmMessageFormatterTest.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmMessageFormatterTest.java
rename to oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmMessageFormatterTest.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmModuleProviderTest.java b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmModuleProviderTest.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmModuleProviderTest.java
rename to oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmModuleProviderTest.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmRulesWatcherTest.java b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmRulesWatcherTest.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmRulesWatcherTest.java
rename to oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmRulesWatcherTest.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/CompositeRuleEvaluatorTest.java b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/CompositeRuleEvaluatorTest.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/CompositeRuleEvaluatorTest.java
rename to oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/CompositeRuleEvaluatorTest.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/EventHookCallbackTest.java b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/EventHookCallbackTest.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/EventHookCallbackTest.java
rename to oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/EventHookCallbackTest.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/NotifyHandlerTest.java b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/NotifyHandlerTest.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/NotifyHandlerTest.java
rename to oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/NotifyHandlerTest.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/OPTest.java b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/OPTest.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/OPTest.java
rename to oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/OPTest.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/RulesReaderTest.java b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/RulesReaderTest.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/RulesReaderTest.java
rename to oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/RulesReaderTest.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRuleTest.java b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRuleTest.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRuleTest.java
rename to oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRuleTest.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/ThresholdTest.java b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/ThresholdTest.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/ThresholdTest.java
rename to oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/ThresholdTest.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/WebhookCallbackTest.java b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/WebhookCallbackTest.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/WebhookCallbackTest.java
rename to oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/WebhookCallbackTest.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/dingtalk/DingtalkHookCallbackTest.java b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/dingtalk/DingtalkHookCallbackTest.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/dingtalk/DingtalkHookCallbackTest.java
rename to oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/dingtalk/DingtalkHookCallbackTest.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/expression/ExpressionContextTest.java b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/expression/ExpressionContextTest.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/expression/ExpressionContextTest.java
rename to oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/expression/ExpressionContextTest.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/expression/ExpressionTest.java b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/expression/ExpressionTest.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/expression/ExpressionTest.java
rename to oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/expression/ExpressionTest.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/feishu/FeishuHookCallbackTest.java b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/feishu/FeishuHookCallbackTest.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/feishu/FeishuHookCallbackTest.java
rename to oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/feishu/FeishuHookCallbackTest.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/grpc/AlarmMockReceiver.java b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/grpc/AlarmMockReceiver.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/grpc/AlarmMockReceiver.java
rename to oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/grpc/AlarmMockReceiver.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/grpc/GRPChookCallbackTest.java b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/grpc/GRPChookCallbackTest.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/grpc/GRPChookCallbackTest.java
rename to oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/grpc/GRPChookCallbackTest.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/wechat/WechatHookCallbackTest.java b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/wechat/WechatHookCallbackTest.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/wechat/WechatHookCallbackTest.java
rename to oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/wechat/WechatHookCallbackTest.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/welink/WeLinkHookCallbackTest.java b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/welink/WeLinkHookCallbackTest.java
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/welink/WeLinkHookCallbackTest.java
rename to oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/welink/WeLinkHookCallbackTest.java
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/test/resources/alarm-settings.yml b/oap-server/server-alarm-plugin/src/test/resources/alarm-settings.yml
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/test/resources/alarm-settings.yml
rename to oap-server/server-alarm-plugin/src/test/resources/alarm-settings.yml
diff --git a/oap-server/server-alarm-plugin/alarm-default-plugin/src/test/resources/log4j2-test.xml b/oap-server/server-alarm-plugin/src/test/resources/log4j2-test.xml
similarity index 100%
rename from oap-server/server-alarm-plugin/alarm-default-plugin/src/test/resources/log4j2-test.xml
rename to oap-server/server-alarm-plugin/src/test/resources/log4j2-test.xml
diff --git a/oap-server/server-bootstrap/pom.xml b/oap-server/server-bootstrap/pom.xml
index 43a17300c2..e9dbccadab 100644
--- a/oap-server/server-bootstrap/pom.xml
+++ b/oap-server/server-bootstrap/pom.xml
@@ -190,7 +190,7 @@
         <!-- alarm module -->
         <dependency>
             <groupId>org.apache.skywalking</groupId>
-            <artifactId>alarm-default-plugin</artifactId>
+            <artifactId>server-alarm-plugin</artifactId>
             <version>${project.version}</version>
         </dependency>
 
-- 
GitLab