Update some PerformanceMonitor limits

tmfg · Apr 3, 2024 · 2c3f3bf · 2c3f3bf
1 parent 746f5f1
commit 2c3f3bf
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 7 deletions.
diff --git a/src/main/java/fi/livi/digitraffic/tie/service/lotju/LotjuCameraStationMetadataClient.java b/src/main/java/fi/livi/digitraffic/tie/service/lotju/LotjuCameraStationMetadataClient.java
@@ -41,7 +41,6 @@ public LotjuCameraStationMetadataClient(@Qualifier("kameraMetadataJaxb2Marshalle
         super(kameraMetadataJaxb2Marshaller, lotjuMetadataProperties, lotjuMetadataProperties.getPath().camera);
     }
 
-    @PerformanceMonitor(maxWarnExcecutionTime = 20000)
     @Retryable(maxAttempts = 5)
     public List<KameraVO> getKameras() {
         final HaeKaikkiKamerat request = new HaeKaikkiKamerat();

diff --git a/src/main/java/fi/livi/digitraffic/tie/service/lotju/LotjuTmsStationMetadataClient.java b/src/main/java/fi/livi/digitraffic/tie/service/lotju/LotjuTmsStationMetadataClient.java
@@ -55,7 +55,7 @@ public LotjuTmsStationMetadataClient(@Qualifier("lamMetadataJaxb2Marshaller")
         super(lamMetadataJaxb2Marshaller, lotjuMetadataProperties, lotjuMetadataProperties.getPath().tms);
     }
 
-    @PerformanceMonitor(maxWarnExcecutionTime = 10000)
+    @PerformanceMonitor(maxWarnExcecutionTime = 20000) // Normally takes around 10s
     @Retryable(maxAttempts = 5)
     @NotTransactionalServiceMethod
     public List<LamAsemaVO> getLamAsemas() {

diff --git a/...main/java/fi/livi/digitraffic/tie/service/lotju/LotjuTmsStationMetadataClientWrapper.java b/...main/java/fi/livi/digitraffic/tie/service/lotju/LotjuTmsStationMetadataClientWrapper.java
@@ -45,6 +45,7 @@ public LotjuTmsStationMetadataClientWrapper(final LotjuTmsStationMetadataClient
         this.lotjuTmsStationMetadataClient = lotjuTmsStationMetadataClient;
     }
 
+    @PerformanceMonitor(maxWarnExcecutionTime = 20000) // Normally takes around 10s
     public List<LamAsemaVO> getLamAsemas() {
         return lotjuTmsStationMetadataClient.getLamAsemas();
     }

diff --git a/src/main/java/fi/livi/digitraffic/tie/service/lotju/LotjuWeatherStationMetadataClient.java b/src/main/java/fi/livi/digitraffic/tie/service/lotju/LotjuWeatherStationMetadataClient.java
@@ -42,7 +42,7 @@ public LotjuWeatherStationMetadataClient(@Qualifier("tiesaaMetadataJaxb2Marshall
         super(tiesaaMetadataJaxb2Marshaller, lotjuMetadataProperties, lotjuMetadataProperties.getPath().weather);
     }
 
-    @PerformanceMonitor(maxWarnExcecutionTime = 20000)
+    @PerformanceMonitor(maxWarnExcecutionTime = 30000) // Normally takes around 20s
     @Retryable(maxAttempts = 5)
     public List<TiesaaAsemaVO> getTiesaaAsemas() {
         log.info("Fetching TiesaaAsemas from " + getDefaultUri());

diff --git a/.../java/fi/livi/digitraffic/tie/service/lotju/LotjuWeatherStationMetadataClientWrapper.java b/.../java/fi/livi/digitraffic/tie/service/lotju/LotjuWeatherStationMetadataClientWrapper.java
@@ -37,7 +37,7 @@ public LotjuWeatherStationMetadataClientWrapper(final LotjuWeatherStationMetadat
         this.lotjuWeatherStationClient = lotjuWeatherStationClient;
     }
 
-    @PerformanceMonitor(maxWarnExcecutionTime = 20000)
+    @PerformanceMonitor(maxWarnExcecutionTime = 30000) // Normally takes around 20s
     public List<TiesaaAsemaVO> getTiesaaAsemas() {
         return lotjuWeatherStationClient.getTiesaaAsemas();
     }

diff --git a/src/main/java/fi/livi/digitraffic/tie/service/roadstation/SensorDataUpdateService.java b/src/main/java/fi/livi/digitraffic/tie/service/roadstation/SensorDataUpdateService.java
@@ -22,6 +22,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import fi.livi.digitraffic.common.annotation.PerformanceMonitor;
 import fi.livi.digitraffic.tie.annotation.NotTransactionalServiceMethod;
 import fi.livi.digitraffic.tie.dao.roadstation.RoadStationDao;
 import fi.livi.digitraffic.tie.dao.roadstation.SensorValueDao;
@@ -268,6 +269,7 @@ private void updateDataMeasuredTime(final RoadStationType roadStationType, final
         dataStatusService.updateDataUpdated(DataType.getSensorValueMeasuredDataType(roadStationType), maxMeasuredTime.toInstant());
     }
 
+    @PerformanceMonitor(maxWarnExcecutionTime = 10000) // Normally takes around 7s
     @Transactional
     public int cleanWeatherHistoryData(final ZonedDateTime before) {
         final StopWatch stopWatch = StopWatch.createStarted();

diff --git a/src/main/java/fi/livi/digitraffic/tie/service/tms/TmsStationUpdater.java b/src/main/java/fi/livi/digitraffic/tie/service/tms/TmsStationUpdater.java
@@ -72,7 +72,7 @@ public boolean updateTmsStations() {
         return false;
     }
 
-    @PerformanceMonitor(maxWarnExcecutionTime = 10000)
+    @PerformanceMonitor(maxWarnExcecutionTime = 20000) // Fetching data takes normally around 10s and updating few seconds
     public int updateTmsStationsStatuses() {
         final List<LamAsemaVO> allLams = lotjuTmsStationMetadataClientWrapper.getLamAsemas();
 

diff --git a/src/main/java/fi/livi/digitraffic/tie/service/weather/WeatherStationUpdater.java b/src/main/java/fi/livi/digitraffic/tie/service/weather/WeatherStationUpdater.java
@@ -119,7 +119,7 @@ public boolean updateWeatherStations() {
         return updateWeatherStationsMetadata(tiesaaAsemas);
     }
 
-    @PerformanceMonitor(maxWarnExcecutionTime = 10000)
+    @PerformanceMonitor(maxWarnExcecutionTime = 30000) // Normally takes around 20s to fetch data and few seconds to update
     public int updateWeatherStationsStatuses() {
         final List<TiesaaAsemaVO> allTiesaaAsemas = lotjuWeatherStationMetadataClientWrapper.getTiesaaAsemas();
 

diff --git a/...ain/java/fi/livi/digitraffic/tie/service/weather/forecast/ForecastSectionDataUpdater.java b/...ain/java/fi/livi/digitraffic/tie/service/weather/forecast/ForecastSectionDataUpdater.java
@@ -17,6 +17,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import fi.livi.digitraffic.common.annotation.PerformanceMonitor;
 import fi.livi.digitraffic.tie.dao.weather.forecast.ForecastSectionRepository;
 import fi.livi.digitraffic.tie.dto.weather.forecast.ForecastSectionApiVersion;
 import fi.livi.digitraffic.tie.dto.weather.forecast.client.ForecastSectionDataDto;
@@ -50,6 +51,7 @@ public ForecastSectionDataUpdater(final ForecastSectionClient forecastSectionCli
         this.dataStatusService = dataStatusService;
     }
 
+    @PerformanceMonitor(maxWarnExcecutionTime = 20000) // normally takes around 12s
     @Transactional
     public Instant updateForecastSectionWeatherData(final ForecastSectionApiVersion version) {
         final ForecastSectionDataDto data = forecastSectionClient.getRoadConditions(version.getVersion());

diff --git a/src/main/java/fi/livi/digitraffic/tie/service/weathercam/CameraStationUpdater.java b/src/main/java/fi/livi/digitraffic/tie/service/weathercam/CameraStationUpdater.java
@@ -90,7 +90,7 @@ public boolean updateCameras() {
         return updatedCameras;
     }
 
-    @PerformanceMonitor(maxWarnExcecutionTime = 50000, maxErrorExcecutionTime = 80000) // FIXME: DPO-2248 This is taking too long
+    @PerformanceMonitor(maxWarnExcecutionTime = 70000, maxErrorExcecutionTime = 100000) // FIXME: DPO-2248 This is taking too long
     public int updateCameraStationsStatuses() {
         log.info("method=updateCameraStationsStatuses start");
         final List<KameraVO> kameras = lotjuCameraStationMetadataClientWrapper.getKameras();