sonarcube

Author: Daan Hoogland

plugins/integrations/prometheus/src/main/java/org/apache/cloudstack/metrics/PrometheusExporterImpl.java

@@ -494,7 +494,7 @@ public synchronized void updateMetrics() {
         final long minIntervalMs = TimeUnit.SECONDS.toMillis(PrometheusExporterServer.PrometheusExporterMinRefreshInterval.value());
         final long now = System.currentTimeMillis();
         if (now - lastMetricsUpdateTime < minIntervalMs) {
-            logger.debug("Skipping metrics recomputation, last update was " + (now - lastMetricsUpdateTime) + "ms ago (min interval: " + minIntervalMs + "ms)");
+            logger.debug("Skipping metrics recomputation, last update was {}ms ago (min interval: {}ms)", now - lastMetricsUpdateTime, minIntervalMs);
             return;
         }
 
@@ -520,7 +520,7 @@ public synchronized void updateMetrics() {
             logger.warn("Getting metrics failed ", e);
         } finally {
             final long elapsedMs = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startNanos);
-            logger.info("Prometheus metrics update completed in " + elapsedMs + " ms");
+            logger.info("Prometheus metrics update completed in {} ms", elapsedMs);
         }
         metricsItems = latestMetricsItems;
         lastMetricsUpdateTime = System.currentTimeMillis();

server/src/test/java/com/cloud/alert/AlertManagerImplTest.java

@@ -263,7 +263,8 @@ public void testRecalculateHostCapacitiesLogsAndContinuesOnTaskFailure() {
     @Test
     public void testRecalculateHostCapacitiesReusesExecutorAcrossCalls() throws Exception {
         Mockito.when(hostDao.listIdsByType(Host.Type.Routing)).thenReturn(List.of(1L));
-        Mockito.when(hostDao.findById(Mockito.anyLong())).thenReturn(Mockito.mock(HostVO.class));
+        HostVO hostMock = Mockito.mock(HostVO.class);
+        Mockito.when(hostDao.findById(Mockito.anyLong())).thenReturn(hostMock);
 
         alertManagerImplMock.recalculateHostCapacities();
         ExecutorService firstExecutor = getCapacityExecutorService();
@@ -281,7 +282,8 @@ public void testRecalculateHostCapacitiesReusesExecutorAcrossCalls() throws Exce
     @Test
     public void testRecalculateHostCapacitiesRecreatesExecutorAfterShutdown() throws Exception {
         Mockito.when(hostDao.listIdsByType(Host.Type.Routing)).thenReturn(List.of(1L));
-        Mockito.when(hostDao.findById(Mockito.anyLong())).thenReturn(Mockito.mock(HostVO.class));
+        HostVO hostMock = Mockito.mock(HostVO.class);
+        Mockito.when(hostDao.findById(Mockito.anyLong())).thenReturn(hostMock);
 
         alertManagerImplMock.recalculateHostCapacities();
         ExecutorService firstExecutor = getCapacityExecutorService();
@@ -299,7 +301,8 @@ public void testStopShutsDownCapacityExecutorServiceWhenPresent() throws Excepti
         Timer timerMock = Mockito.mock(Timer.class);
         setTimer(timerMock);
         Mockito.when(hostDao.listIdsByType(Host.Type.Routing)).thenReturn(List.of(1L));
-        Mockito.when(hostDao.findById(Mockito.anyLong())).thenReturn(Mockito.mock(HostVO.class));
+        HostVO hostMock = Mockito.mock(HostVO.class);
+        Mockito.when(hostDao.findById(Mockito.anyLong())).thenReturn(hostMock);
         alertManagerImplMock.recalculateHostCapacities();
 
         boolean result = alertManagerImplMock.stop();