This is an automated email from the ASF dual-hosted git repository.
wuzhiguo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/bigtop-manager.git
The following commit(s) were added to refs/heads/main by this push:
new c649c16c BIGTOP-4465: Make the service process names clear and
intuitive (#241)
c649c16c is described below
commit c649c16ceb8766e05683b10daa9fdaa6163d71e3
Author: Lex Li <[email protected]>
AuthorDate: Thu Jul 10 10:36:46 2025 +0800
BIGTOP-4465: Make the service process names clear and intuitive (#241)
---
.../{AgentApplication.java => BigtopManagerAgent.java} | 4 ++--
bigtop-manager-agent/src/main/resources/bin/start.sh | 2 +-
...tApplicationTest.java => BigtopManagerAgentTest.java} | 16 ++++++++--------
.../{ServerApplication.java => BigtopManagerServer.java} | 4 ++--
bigtop-manager-server/src/main/resources/bin/start.sh | 2 +-
.../src/main/resources/scripts/setup-agent.sh | 2 +-
6 files changed, 15 insertions(+), 15 deletions(-)
diff --git
a/bigtop-manager-agent/src/main/java/org/apache/bigtop/manager/agent/AgentApplication.java
b/bigtop-manager-agent/src/main/java/org/apache/bigtop/manager/agent/BigtopManagerAgent.java
similarity index 95%
rename from
bigtop-manager-agent/src/main/java/org/apache/bigtop/manager/agent/AgentApplication.java
rename to
bigtop-manager-agent/src/main/java/org/apache/bigtop/manager/agent/BigtopManagerAgent.java
index bd2c3b6b..5b28ef79 100644
---
a/bigtop-manager-agent/src/main/java/org/apache/bigtop/manager/agent/AgentApplication.java
+++
b/bigtop-manager-agent/src/main/java/org/apache/bigtop/manager/agent/BigtopManagerAgent.java
@@ -33,10 +33,10 @@ import io.micrometer.core.instrument.MultiGauge;
@EnableAsync
@EnableScheduling
@SpringBootApplication(scanBasePackages = {"org.apache.bigtop.manager.agent",
"org.apache.bigtop.manager.common"})
-public class AgentApplication {
+public class BigtopManagerAgent {
public static void main(String[] args) {
- SpringApplication.run(AgentApplication.class, args);
+ SpringApplication.run(BigtopManagerAgent.class, args);
}
@Bean
diff --git a/bigtop-manager-agent/src/main/resources/bin/start.sh
b/bigtop-manager-agent/src/main/resources/bin/start.sh
index e871f190..e95db26b 100755
--- a/bigtop-manager-agent/src/main/resources/bin/start.sh
+++ b/bigtop-manager-agent/src/main/resources/bin/start.sh
@@ -64,4 +64,4 @@ cd $BIGTOP_MANAGER_HOME
$JAVA_CMD $JAVA_OPTS \
-cp "${BIGTOP_MANAGER_HOME}/conf":"${BIGTOP_MANAGER_HOME}/libs/*" \
- org.apache.bigtop.manager.agent.AgentApplication
+ org.apache.bigtop.manager.agent.BigtopManagerAgent
diff --git
a/bigtop-manager-agent/src/test/java/org/apache/bigtop/manager/agent/AgentApplicationTest.java
b/bigtop-manager-agent/src/test/java/org/apache/bigtop/manager/agent/BigtopManagerAgentTest.java
similarity index 85%
rename from
bigtop-manager-agent/src/test/java/org/apache/bigtop/manager/agent/AgentApplicationTest.java
rename to
bigtop-manager-agent/src/test/java/org/apache/bigtop/manager/agent/BigtopManagerAgentTest.java
index 0d0eb16f..5ea5dd40 100644
---
a/bigtop-manager-agent/src/test/java/org/apache/bigtop/manager/agent/AgentApplicationTest.java
+++
b/bigtop-manager-agent/src/test/java/org/apache/bigtop/manager/agent/BigtopManagerAgentTest.java
@@ -36,7 +36,7 @@ import static org.mockito.Mockito.mockStatic;
import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
-public class AgentApplicationTest {
+public class BigtopManagerAgentTest {
@Mock
private MeterRegistry meterRegistry;
@@ -54,13 +54,13 @@ public class AgentApplicationTest {
private MultiGauge diskIOMultiGauge;
@InjectMocks
- private AgentApplication agentApplication;
+ private BigtopManagerAgent bigtopManagerAgent;
@Test
public void testDiskMultiGaugeBean() {
try (MockedStatic<AgentHostMonitoring> mockedStatic =
mockStatic(AgentHostMonitoring.class)) {
when(AgentHostMonitoring.newDiskMultiGauge(meterRegistry)).thenReturn(diskMultiGauge);
- MultiGauge result = agentApplication.diskMultiGauge(meterRegistry);
+ MultiGauge result =
bigtopManagerAgent.diskMultiGauge(meterRegistry);
assertNotNull(result);
}
}
@@ -69,7 +69,7 @@ public class AgentApplicationTest {
public void testCPUMultiGaugeBean() {
try (MockedStatic<AgentHostMonitoring> mockedStatic =
mockStatic(AgentHostMonitoring.class)) {
when(AgentHostMonitoring.newCPUMultiGauge(meterRegistry)).thenReturn(cpuMultiGauge);
- MultiGauge result = agentApplication.cpuMultiGauge(meterRegistry);
+ MultiGauge result =
bigtopManagerAgent.cpuMultiGauge(meterRegistry);
assertNotNull(result);
}
}
@@ -78,7 +78,7 @@ public class AgentApplicationTest {
public void testMemMultiGaugeBean() {
try (MockedStatic<AgentHostMonitoring> mockedStatic =
mockStatic(AgentHostMonitoring.class)) {
when(AgentHostMonitoring.newMemMultiGauge(meterRegistry)).thenReturn(memMultiGauge);
- MultiGauge result = agentApplication.memMultiGauge(meterRegistry);
+ MultiGauge result =
bigtopManagerAgent.memMultiGauge(meterRegistry);
assertNotNull(result);
}
}
@@ -87,7 +87,7 @@ public class AgentApplicationTest {
public void testDiskIOMultiGaugeBean() {
try (MockedStatic<AgentHostMonitoring> mockedStatic =
mockStatic(AgentHostMonitoring.class)) {
when(AgentHostMonitoring.newDiskIOMultiGauge(meterRegistry)).thenReturn(diskIOMultiGauge);
- MultiGauge result =
agentApplication.diskIOMultiGauge(meterRegistry);
+ MultiGauge result =
bigtopManagerAgent.diskIOMultiGauge(meterRegistry);
assertNotNull(result);
}
}
@@ -95,8 +95,8 @@ public class AgentApplicationTest {
@Test
public void testMainMethod() {
try (MockedStatic<SpringApplication> mockedStatic =
mockStatic(SpringApplication.class)) {
- AgentApplication.main(new String[] {});
- mockedStatic.verify(() ->
SpringApplication.run(AgentApplication.class, new String[] {}));
+ BigtopManagerAgent.main(new String[] {});
+ mockedStatic.verify(() ->
SpringApplication.run(BigtopManagerAgent.class, new String[] {}));
}
}
}
diff --git
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/ServerApplication.java
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/BigtopManagerServer.java
similarity index 93%
rename from
bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/ServerApplication.java
rename to
bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/BigtopManagerServer.java
index 7c03ea33..a69e7fa8 100644
---
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/ServerApplication.java
+++
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/BigtopManagerServer.java
@@ -31,9 +31,9 @@ import
org.springframework.scheduling.annotation.EnableScheduling;
"org.apache.bigtop.manager.common",
"org.apache.bigtop.manager.ai"
})
-public class ServerApplication {
+public class BigtopManagerServer {
public static void main(String[] args) {
- SpringApplication.run(ServerApplication.class, args);
+ SpringApplication.run(BigtopManagerServer.class, args);
}
}
diff --git a/bigtop-manager-server/src/main/resources/bin/start.sh
b/bigtop-manager-server/src/main/resources/bin/start.sh
index 3603a94f..507d4eae 100755
--- a/bigtop-manager-server/src/main/resources/bin/start.sh
+++ b/bigtop-manager-server/src/main/resources/bin/start.sh
@@ -62,4 +62,4 @@ cd $BIGTOP_MANAGER_HOME
$JAVA_CMD $JAVA_OPTS \
-cp "${BIGTOP_MANAGER_HOME}/conf":"${BIGTOP_MANAGER_HOME}/libs/*" \
- org.apache.bigtop.manager.server.ServerApplication
+ org.apache.bigtop.manager.server.BigtopManagerServer
diff --git a/bigtop-manager-server/src/main/resources/scripts/setup-agent.sh
b/bigtop-manager-server/src/main/resources/scripts/setup-agent.sh
index 38486faa..fdeda989 100644
--- a/bigtop-manager-server/src/main/resources/scripts/setup-agent.sh
+++ b/bigtop-manager-server/src/main/resources/scripts/setup-agent.sh
@@ -55,7 +55,7 @@ CHECK_VAL="${5:-}"
TAR_FILE="${DIR_PREFIX}/bigtop-manager-agent.tar.gz"
TARGET_DIR="${DIR_PREFIX}/bigtop-manager-agent"
DOWNLOAD_URL="${REPO_URL}/bigtop-manager-agent.tar.gz"
-PROCESS_NAME="org.apache.bigtop.manager.agent.AgentApplication"
+PROCESS_NAME="org.apache.bigtop.manager.agent.BigtopManagerAgent"
validate_checksum() {
local file="$1"
