Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bigtop-manager-agent/src/main/resources/bin/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
import static org.mockito.Mockito.when;

@ExtendWith(MockitoExtension.class)
public class AgentApplicationTest {
public class BigtopManagerAgentTest {

@Mock
private MeterRegistry meterRegistry;
Expand All @@ -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);
}
}
Expand All @@ -69,7 +69,7 @@ public void testDiskMultiGaugeBean() {
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);
}
}
Expand All @@ -78,7 +78,7 @@ public void testCPUMultiGaugeBean() {
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);
}
}
Expand All @@ -87,16 +87,16 @@ public void testMemMultiGaugeBean() {
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);
}
}

@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[] {}));
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
2 changes: 1 addition & 1 deletion bigtop-manager-server/src/main/resources/bin/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading