diff --git a/data-prepper-plugins/saas-source-plugins/confluence-source/src/main/java/org/opensearch/dataprepper/plugins/source/confluence/ConfluenceService.java b/data-prepper-plugins/saas-source-plugins/confluence-source/src/main/java/org/opensearch/dataprepper/plugins/source/confluence/ConfluenceService.java index b71342089f..877960c634 100644 --- a/data-prepper-plugins/saas-source-plugins/confluence-source/src/main/java/org/opensearch/dataprepper/plugins/source/confluence/ConfluenceService.java +++ b/data-prepper-plugins/saas-source-plugins/confluence-source/src/main/java/org/opensearch/dataprepper/plugins/source/confluence/ConfluenceService.java @@ -62,13 +62,14 @@ public class ConfluenceService { private final ConfluenceSourceConfig confluenceSourceConfig; private final ConfluenceRestClient confluenceRestClient; private final Counter searchResultsFoundCounter; - private final PluginMetrics jiraPluginMetrics = PluginMetrics.fromNames("jiraService", "aws"); - public ConfluenceService(ConfluenceSourceConfig confluenceSourceConfig, ConfluenceRestClient confluenceRestClient) { + public ConfluenceService(ConfluenceSourceConfig confluenceSourceConfig, + ConfluenceRestClient confluenceRestClient, + PluginMetrics pluginMetrics) { this.confluenceSourceConfig = confluenceSourceConfig; this.confluenceRestClient = confluenceRestClient; - this.searchResultsFoundCounter = jiraPluginMetrics.counter(SEARCH_RESULTS_FOUND); + this.searchResultsFoundCounter = pluginMetrics.counter(SEARCH_RESULTS_FOUND); } /** diff --git a/data-prepper-plugins/saas-source-plugins/confluence-source/src/test/java/org/opensearch/dataprepper/plugins/source/confluence/ConfluenceIteratorTest.java b/data-prepper-plugins/saas-source-plugins/confluence-source/src/test/java/org/opensearch/dataprepper/plugins/source/confluence/ConfluenceIteratorTest.java index cc2bfde044..3dfbe0be6e 100644 --- a/data-prepper-plugins/saas-source-plugins/confluence-source/src/test/java/org/opensearch/dataprepper/plugins/source/confluence/ConfluenceIteratorTest.java +++ b/data-prepper-plugins/saas-source-plugins/confluence-source/src/test/java/org/opensearch/dataprepper/plugins/source/confluence/ConfluenceIteratorTest.java @@ -15,6 +15,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import org.opensearch.dataprepper.metrics.PluginMetrics; import org.opensearch.dataprepper.plugins.source.confluence.models.ConfluenceSearchResults; import org.opensearch.dataprepper.plugins.source.confluence.rest.ConfluenceRestClient; import org.opensearch.dataprepper.plugins.source.source_crawler.base.PluginExecutorServiceProvider; @@ -41,11 +42,12 @@ public class ConfluenceIteratorTest { @Mock private ConfluenceSourceConfig confluenceSourceConfig; private ConfluenceIterator confluenceIterator; + private final PluginMetrics pluginMetrics = PluginMetrics.fromNames("confluenceService", "aws"); private final PluginExecutorServiceProvider executorServiceProvider = new PluginExecutorServiceProvider(); @BeforeEach void setUp() { - confluenceService = spy(new ConfluenceService(confluenceSourceConfig, confluenceRestClient)); + confluenceService = spy(new ConfluenceService(confluenceSourceConfig, confluenceRestClient, pluginMetrics)); } public ConfluenceIterator createObjectUnderTest() { diff --git a/data-prepper-plugins/saas-source-plugins/confluence-source/src/test/java/org/opensearch/dataprepper/plugins/source/confluence/ConfluenceServiceTest.java b/data-prepper-plugins/saas-source-plugins/confluence-source/src/test/java/org/opensearch/dataprepper/plugins/source/confluence/ConfluenceServiceTest.java index df4b9d32be..d966b2e3ad 100644 --- a/data-prepper-plugins/saas-source-plugins/confluence-source/src/test/java/org/opensearch/dataprepper/plugins/source/confluence/ConfluenceServiceTest.java +++ b/data-prepper-plugins/saas-source-plugins/confluence-source/src/test/java/org/opensearch/dataprepper/plugins/source/confluence/ConfluenceServiceTest.java @@ -18,6 +18,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import org.opensearch.dataprepper.metrics.PluginMetrics; import org.opensearch.dataprepper.model.plugin.PluginConfigVariable; import org.opensearch.dataprepper.plugins.source.confluence.configuration.Oauth2Config; import org.opensearch.dataprepper.plugins.source.confluence.exception.BadRequestException; @@ -74,6 +75,7 @@ public class ConfluenceServiceTest { @Mock private ConfluenceRestClient confluenceRestClient; private final PluginExecutorServiceProvider executorServiceProvider = new PluginExecutorServiceProvider(); + private final PluginMetrics pluginMetrics = PluginMetrics.fromNames("confluenceService", "aws"); private static InputStream getResourceAsStream(String resourceName) { InputStream inputStream = Thread.currentThread().getContextClassLoader().getResourceAsStream(resourceName); @@ -176,7 +178,7 @@ void testJiraServiceInitialization() throws JsonProcessingException { List issueStatus = new ArrayList<>(); List projectKey = new ArrayList<>(); ConfluenceSourceConfig confluenceSourceConfig = createJiraConfiguration(BASIC, issueType, issueStatus, projectKey); - ConfluenceService confluenceService = new ConfluenceService(confluenceSourceConfig, confluenceRestClient); + ConfluenceService confluenceService = new ConfluenceService(confluenceSourceConfig, confluenceRestClient, pluginMetrics); assertNotNull(confluenceService); when(confluenceRestClient.getContent(anyString())).thenReturn("test String"); assertNotNull(confluenceService.getContent("test Key")); @@ -191,7 +193,7 @@ public void testGetPages() throws JsonProcessingException { issueStatus.add("Done"); projectKey.add("KAN"); ConfluenceSourceConfig confluenceSourceConfig = createJiraConfiguration(BASIC, issueType, issueStatus, projectKey); - ConfluenceService confluenceService = spy(new ConfluenceService(confluenceSourceConfig, confluenceRestClient)); + ConfluenceService confluenceService = spy(new ConfluenceService(confluenceSourceConfig, confluenceRestClient, pluginMetrics)); List mockIssues = new ArrayList<>(); ConfluenceItem issue1 = createConfluenceItemBean(false, false); mockIssues.add(issue1); @@ -217,7 +219,7 @@ public void buildIssueItemInfoMultipleFutureThreads() throws JsonProcessingExcep List projectKey = new ArrayList<>(); issueType.add("Task"); ConfluenceSourceConfig confluenceSourceConfig = createJiraConfiguration(BASIC, issueType, issueStatus, projectKey); - ConfluenceService confluenceService = spy(new ConfluenceService(confluenceSourceConfig, confluenceRestClient)); + ConfluenceService confluenceService = spy(new ConfluenceService(confluenceSourceConfig, confluenceRestClient, pluginMetrics)); List mockIssues = new ArrayList<>(); for (int i = 0; i < 50; i++) { ConfluenceItem issue1 = createConfluenceItemBean(false, false); @@ -248,7 +250,7 @@ public void testBadProjectKeys() throws JsonProcessingException { projectKey.add("AAAAAAAAAAAAAA"); ConfluenceSourceConfig confluenceSourceConfig = createJiraConfiguration(BASIC, issueType, issueStatus, projectKey); - ConfluenceService confluenceService = new ConfluenceService(confluenceSourceConfig, confluenceRestClient); + ConfluenceService confluenceService = new ConfluenceService(confluenceSourceConfig, confluenceRestClient, pluginMetrics); Instant timestamp = Instant.ofEpochSecond(0); Queue itemInfoQueue = new ConcurrentLinkedQueue<>(); @@ -263,7 +265,7 @@ public void testGetPagesException() throws JsonProcessingException { List projectKey = new ArrayList<>(); issueType.add("Task"); ConfluenceSourceConfig confluenceSourceConfig = createJiraConfiguration(BASIC, issueType, issueStatus, projectKey); - ConfluenceService confluenceService = spy(new ConfluenceService(confluenceSourceConfig, confluenceRestClient)); + ConfluenceService confluenceService = spy(new ConfluenceService(confluenceSourceConfig, confluenceRestClient, pluginMetrics)); doThrow(RuntimeException.class).when(confluenceRestClient).getAllContent(any(StringBuilder.class), anyInt());