From 6c8fb79a510d602f5268e627e30191a5ea44f10f Mon Sep 17 00:00:00 2001 From: Lex Li Date: Thu, 10 Jul 2025 09:34:26 +0800 Subject: [PATCH 1/9] Update AgentApplication.java --- .../org/apache/bigtop/manager/agent/AgentApplication.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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/AgentApplication.java index bd2c3b6b4..5b28ef79a 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/AgentApplication.java @@ -33,10 +33,10 @@ @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 From 420e9a4eb651934600e1780b184065f25bef23db Mon Sep 17 00:00:00 2001 From: Lex Li Date: Thu, 10 Jul 2025 09:36:38 +0800 Subject: [PATCH 2/9] Update AgentApplicationTest.java --- .../manager/agent/AgentApplicationTest.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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/AgentApplicationTest.java index 0d0eb16f0..5ea5dd40e 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/AgentApplicationTest.java @@ -36,7 +36,7 @@ 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 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 void testDiskMultiGaugeBean() { public void testCPUMultiGaugeBean() { try (MockedStatic 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 void testCPUMultiGaugeBean() { public void testMemMultiGaugeBean() { try (MockedStatic 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 void testMemMultiGaugeBean() { public void testDiskIOMultiGaugeBean() { try (MockedStatic 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 void testDiskIOMultiGaugeBean() { @Test public void testMainMethod() { try (MockedStatic 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[] {})); } } } From 421a5e42ec9e2131b6d3c6498e48c3c46cafd95a Mon Sep 17 00:00:00 2001 From: Lex Li Date: Thu, 10 Jul 2025 09:37:13 +0800 Subject: [PATCH 3/9] Update ServerApplication.java --- .../org/apache/bigtop/manager/server/ServerApplication.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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/ServerApplication.java index 7c03ea334..a69e7fa87 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/ServerApplication.java @@ -31,9 +31,9 @@ "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); } } From cb112d208ac976b2d7d2ce30f62ffeaa375ca525 Mon Sep 17 00:00:00 2001 From: Lex Li Date: Thu, 10 Jul 2025 09:37:54 +0800 Subject: [PATCH 4/9] Update setup-agent.sh --- bigtop-manager-server/src/main/resources/scripts/setup-agent.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 38486faa3..fdeda989d 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" From 2b7ded8450c87c3c0485ea58e12991054629702f Mon Sep 17 00:00:00 2001 From: Lex Li Date: Thu, 10 Jul 2025 09:38:32 +0800 Subject: [PATCH 5/9] Update start.sh --- bigtop-manager-agent/src/main/resources/bin/start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bigtop-manager-agent/src/main/resources/bin/start.sh b/bigtop-manager-agent/src/main/resources/bin/start.sh index e871f1904..e95db26b2 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 From 3ae7578c14cf9b91b0fab6be30fb1599b4d89898 Mon Sep 17 00:00:00 2001 From: Lex Li Date: Thu, 10 Jul 2025 09:38:52 +0800 Subject: [PATCH 6/9] Update start.sh --- bigtop-manager-server/src/main/resources/bin/start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bigtop-manager-server/src/main/resources/bin/start.sh b/bigtop-manager-server/src/main/resources/bin/start.sh index 3603a94ff..507d4eae5 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 From d6c8664389358ca5921b9fb45958194dc5058e0c Mon Sep 17 00:00:00 2001 From: Lex Li Date: Thu, 10 Jul 2025 10:09:35 +0800 Subject: [PATCH 7/9] Rename ServerApplication.java to BigtopManagerServer.java --- .../server/{ServerApplication.java => BigtopManagerServer.java} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/{ServerApplication.java => BigtopManagerServer.java} (100%) 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 100% 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 From 81f52136da194d45812099acc7427ec625dcc5b2 Mon Sep 17 00:00:00 2001 From: Lex Li Date: Thu, 10 Jul 2025 10:10:07 +0800 Subject: [PATCH 8/9] Rename AgentApplication.java to BigtopManagerAgent.java --- .../agent/{AgentApplication.java => BigtopManagerAgent.java} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename bigtop-manager-agent/src/main/java/org/apache/bigtop/manager/agent/{AgentApplication.java => BigtopManagerAgent.java} (100%) 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 100% 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 From 5d12c9adb60ac52f39c54c40b8fcfa17de7852f5 Mon Sep 17 00:00:00 2001 From: Lex Li Date: Thu, 10 Jul 2025 10:14:17 +0800 Subject: [PATCH 9/9] Rename AgentApplicationTest.java to BigtopManagerAgentTest.java --- .../{AgentApplicationTest.java => BigtopManagerAgentTest.java} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename bigtop-manager-agent/src/test/java/org/apache/bigtop/manager/agent/{AgentApplicationTest.java => BigtopManagerAgentTest.java} (100%) 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 100% 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