From c1ed21ff3bb29650753b42da670e1726be50b9f7 Mon Sep 17 00:00:00 2001 From: "opensearch-trigger-bot[bot]" <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Date: Thu, 5 Oct 2023 09:51:44 -0700 Subject: [PATCH] Add tracer to getTransports (#556) (#557) Signed-off-by: Gagan Juneja Co-authored-by: Gagan Juneja (cherry picked from commit 999c6892aa39304f98244203599c325546e4490f) Co-authored-by: Gagan Juneja --- .../performanceanalyzer/PerformanceAnalyzerPlugin.java | 4 +++- .../PerformanceAnalyzerPluginTests.java | 10 +++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerPlugin.java b/src/main/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerPlugin.java index 8f391a85..be28d075 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerPlugin.java +++ b/src/main/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerPlugin.java @@ -92,6 +92,7 @@ import org.opensearch.repositories.RepositoriesService; import org.opensearch.rest.RestController; import org.opensearch.script.ScriptService; +import org.opensearch.telemetry.tracing.Tracer; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.Transport; import org.opensearch.transport.TransportInterceptor; @@ -369,7 +370,8 @@ public Map> getTransports( PageCacheRecycler pageCacheRecycler, CircuitBreakerService circuitBreakerService, NamedWriteableRegistry namedWriteableRegistry, - NetworkService networkService) { + NetworkService networkService, + Tracer tracer) { OpenSearchResources.INSTANCE.setSettings(settings); OpenSearchResources.INSTANCE.setCircuitBreakerService(circuitBreakerService); return Collections.emptyMap(); diff --git a/src/test/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerPluginTests.java b/src/test/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerPluginTests.java index 81bbde05..e3045e1a 100644 --- a/src/test/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerPluginTests.java +++ b/src/test/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerPluginTests.java @@ -43,6 +43,7 @@ import org.opensearch.plugins.ActionPlugin.ActionHandler; import org.opensearch.rest.RestController; import org.opensearch.rest.RestHandler; +import org.opensearch.telemetry.tracing.noop.NoopTracer; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; @@ -154,7 +155,14 @@ public void testCreateComponents() { @Test public void testGetTransports() { Map> map = - plugin.getTransports(settings, threadPool, null, circuitBreakerService, null, null); + plugin.getTransports( + settings, + threadPool, + null, + circuitBreakerService, + null, + null, + NoopTracer.INSTANCE); assertEquals(0, map.size()); assertEquals(settings, OpenSearchResources.INSTANCE.getSettings()); assertEquals(