From 94b29f5bf2510500a714485fac3aba531d5c8f0e Mon Sep 17 00:00:00 2001 From: deiflaender Date: Tue, 7 Jun 2022 11:35:23 +0200 Subject: [PATCH] RED-4014: Renamed metrics --- .../v1/server/service/ExcelReportGenerationService.java | 8 ++++---- .../report/v1/server/service/IuclidFunctionService.java | 2 +- .../report/v1/server/service/ReportGenerationService.java | 4 ++-- .../v1/server/service/WordReportGenerationService.java | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ExcelReportGenerationService.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ExcelReportGenerationService.java index 89297e3..2ed886f 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ExcelReportGenerationService.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ExcelReportGenerationService.java @@ -67,7 +67,7 @@ import lombok.extern.slf4j.Slf4j; @RequiredArgsConstructor public class ExcelReportGenerationService { - @Timed("generateExcelReport") + @Timed("redactmanager_generateExcelReport") public void generateExcelReport(List reportEntries, PlaceholderModel placeholderModel, String reportTemplateName, SXSSFWorkbook workbook, String dossierName, FileModel fileModel, ExcelModel excelModel, boolean isLastFile) { @@ -105,7 +105,7 @@ public class ExcelReportGenerationService { @SneakyThrows - @Timed("excel-addRows") + @Timed("redactmanager_excel-addRows") private void addRows(SXSSFWorkbook workbook, Sheet sheet, Map copiedCells, int numberOfRowsToShift, PlaceholderModel placeholderModel, String dossierName, String filename) { @@ -145,7 +145,7 @@ public class ExcelReportGenerationService { } - @Timed("calculateExcelModel") + @Timed("redactmanager_calculateExcelModel") public ExcelModel calculateExcelModel(Sheet sheet) { long start = System.currentTimeMillis(); @@ -182,7 +182,7 @@ public class ExcelReportGenerationService { } - @Timed("excel-addRedactionEntryRows") + @Timed("redactmanager_excel-addRedactionEntryRows") private void addRedactionEntryRows(Sheet sheet, List reportEntries, String filename, ExcelModel excelModel, PlaceholderModel placeholderModel) { diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/IuclidFunctionService.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/IuclidFunctionService.java index c757ea0..da45118 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/IuclidFunctionService.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/IuclidFunctionService.java @@ -16,7 +16,7 @@ import io.micrometer.core.annotation.Timed; @Service public class IuclidFunctionService { - @Timed("computeIuclidFunction") + @Timed("redactmanager_computeIuclidFunction") public String computeIuclidFunction(List reportRedactionEntries, String filename) { Map> entriesPerJustification = new HashMap<>(); diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportGenerationService.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportGenerationService.java index ecd9aeb..ed3bcf1 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportGenerationService.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportGenerationService.java @@ -57,7 +57,7 @@ public class ReportGenerationService { @SneakyThrows - @Timed("generateReports") + @Timed("redactmanager_generateReports") public List generateReports(ReportRequestMessage reportMessage) { List storedFileInformation = Collections.synchronizedList(new ArrayList<>()); @@ -196,7 +196,7 @@ public class ReportGenerationService { } - @Timed("getReportEntries") + @Timed("redactmanager_getReportEntries") private List getReportEntries(String dossierId, String fileId, boolean isExcluded) { if (isExcluded) { diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/WordReportGenerationService.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/WordReportGenerationService.java index cd439e9..a40a85d 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/WordReportGenerationService.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/WordReportGenerationService.java @@ -39,7 +39,7 @@ public class WordReportGenerationService { private final IuclidFunctionService iuclidFunctionService; - @Timed("generateWordReport") + @Timed("redactmanager_generateWordReport") public XWPFDocument generateWordReport(List reportEntries, PlaceholderModel placeholderModel, String reportTemplateName, XWPFDocument doc, FileModel fileModel, Dossier dossier, boolean isLastFile) { @@ -167,7 +167,7 @@ public class WordReportGenerationService { } - @Timed("word-replaceTextPlaceholders") + @Timed("redactmanager_word-replaceTextPlaceholders") public void replaceTextPlaceholders(XWPFDocument doc, PlaceholderModel placeholderModel, String dossierName, String fileName, XWPFTable tableToSkip, List reportRedactionEntries) { @@ -260,7 +260,7 @@ public class WordReportGenerationService { } - @Timed("word-computePlaceholderPos") + @Timed("redactmanager_word-computePlaceholderPos") private PlaceHolderFunctions computePlaceholderPos(XWPFTable table, PlaceholderModel placeholderModel) { Set foundPlaceHolder = new HashSet<>(); @@ -282,7 +282,7 @@ public class WordReportGenerationService { } - @Timed("word-addRedactionEntryRows") + @Timed("redactmanager_word-addRedactionEntryRows") private void addRedactionEntryRows(XWPFTable table, List reportEntries, String filename, PlaceholderModel placeholderModel, PlaceHolderFunctions placeHolderFunctions) {