Skip to content

Commit 8cb0051

Browse files
authored
Move MetricsHelper to common utils class (#6235)
Signed-off-by: Vecheka Chhourn <vecheka@amazon.com>
1 parent 0db1608 commit 8cb0051

3 files changed

Lines changed: 7 additions & 4 deletions

File tree

data-prepper-plugins/saas-source-plugins/microsoft-office365-source/src/main/java/org/opensearch/dataprepper/plugins/source/microsoft_office365/Office365CrawlerClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import java.util.concurrent.TimeoutException;
4343

4444
import static org.opensearch.dataprepper.logging.DataPrepperMarkers.NOISY;
45+
import static org.opensearch.dataprepper.plugins.source.source_crawler.utils.MetricsHelper.REQEUEST_ERRORS;
4546

4647
/**
4748
* Implementation of CrawlerClient for Office 365 audit logs.
@@ -56,7 +57,6 @@ public class Office365CrawlerClient implements CrawlerClient<DimensionalTimeSlic
5657
private static final String BUFFER_WRITE_RETRY_SUCCESS = "bufferWriteRetrySuccess";
5758
private static final String BUFFER_WRITE_RETRY_ATTEMPTS = "bufferWriteRetryAttempts";
5859
private static final String BUFFER_WRITE_FAILURES = "bufferWriteFailures";
59-
private static final String REQEUEST_ERRORS = "requestErrors";
6060
private static final int BUFFER_TIMEOUT_IN_SECONDS = 10;
6161
private static final String CONTENT_ID = "contentId";
6262
private static final String CONTENT_URI = "contentUri";

data-prepper-plugins/saas-source-plugins/microsoft-office365-source/src/main/java/org/opensearch/dataprepper/plugins/source/microsoft_office365/Office365RestClient.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636

3737
import static org.opensearch.dataprepper.logging.DataPrepperMarkers.NOISY;
3838
import static org.opensearch.dataprepper.plugins.source.microsoft_office365.utils.Constants.CONTENT_TYPES;
39-
import static org.opensearch.dataprepper.plugins.source.microsoft_office365.utils.MetricsHelper.getErrorTypeMetricCounterMap;
40-
import static org.opensearch.dataprepper.plugins.source.microsoft_office365.utils.MetricsHelper.publishErrorTypeMetricCounter;
39+
import static org.opensearch.dataprepper.plugins.source.source_crawler.utils.MetricsHelper.getErrorTypeMetricCounterMap;
40+
import static org.opensearch.dataprepper.plugins.source.source_crawler.utils.MetricsHelper.publishErrorTypeMetricCounter;
4141

4242
/**
4343
* REST client for interacting with Office 365 Management API.

data-prepper-plugins/saas-source-plugins/microsoft-office365-source/src/main/java/org/opensearch/dataprepper/plugins/source/microsoft_office365/utils/MetricsHelper.java renamed to data-prepper-plugins/saas-source-plugins/source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler/utils/MetricsHelper.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*/
1010

11-
package org.opensearch.dataprepper.plugins.source.microsoft_office365.utils;
11+
package org.opensearch.dataprepper.plugins.source.source_crawler.utils;
1212

1313
import io.micrometer.core.instrument.Counter;
1414
import org.springframework.http.HttpStatus;
@@ -26,6 +26,9 @@ public class MetricsHelper {
2626
private static final String REQUEST_THROTTLED = "requestThrottled";
2727
private static final String RESOURCE_NOT_FOUND = "resourceNotFound";
2828

29+
// other errors in crawlerClient
30+
public static final String REQEUEST_ERRORS = "requestErrors";
31+
2932
/**
3033
* Get the metric counter map for specific errorType
3134
* FORBIDDEN/UNAUTHORIZED = requestAccessDenied

0 commit comments

Comments
 (0)