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 index fe2833542..c7af82278 100644 --- 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 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 index 452352bdb..ab6021eb4 100644 --- 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 getLamAsemas() { diff --git a/src/main/java/fi/livi/digitraffic/tie/service/lotju/LotjuTmsStationMetadataClientWrapper.java b/src/main/java/fi/livi/digitraffic/tie/service/lotju/LotjuTmsStationMetadataClientWrapper.java index 78e2f0b57..d8d332f55 100644 --- a/src/main/java/fi/livi/digitraffic/tie/service/lotju/LotjuTmsStationMetadataClientWrapper.java +++ b/src/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 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 index de6dc893a..8582bc0c4 100644 --- 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 getTiesaaAsemas() { log.info("Fetching TiesaaAsemas from " + getDefaultUri()); diff --git a/src/main/java/fi/livi/digitraffic/tie/service/lotju/LotjuWeatherStationMetadataClientWrapper.java b/src/main/java/fi/livi/digitraffic/tie/service/lotju/LotjuWeatherStationMetadataClientWrapper.java index 88ff8075e..6e3efb9a7 100644 --- a/src/main/java/fi/livi/digitraffic/tie/service/lotju/LotjuWeatherStationMetadataClientWrapper.java +++ b/src/main/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 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 index d7aea9cd6..08b54554c 100644 --- 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 index 1418a5351..109d672d1 100644 --- 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 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 index 4dc699377..6dea8f208 100644 --- 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 allTiesaaAsemas = lotjuWeatherStationMetadataClientWrapper.getTiesaaAsemas(); diff --git a/src/main/java/fi/livi/digitraffic/tie/service/weather/forecast/ForecastSectionDataUpdater.java b/src/main/java/fi/livi/digitraffic/tie/service/weather/forecast/ForecastSectionDataUpdater.java index f2633f834..fbfa6f47f 100644 --- a/src/main/java/fi/livi/digitraffic/tie/service/weather/forecast/ForecastSectionDataUpdater.java +++ b/src/main/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 index d9d560542..6034c0da4 100644 --- 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 kameras = lotjuCameraStationMetadataClientWrapper.getKameras();