From 0c28d10d374741b77fb2928fa688ba8ee6948411 Mon Sep 17 00:00:00 2001 From: Amit Galitzky Date: Thu, 5 Oct 2023 13:02:15 -0700 Subject: [PATCH] [2.x] Fix TransportService constructor due to changes in core plus guava bump (#1069) * adjust transportService constructor due to changes in core Signed-off-by: Amit Galitzky * updated guava and fixed another compile issue Signed-off-by: Amit Galitzky * fixed mocking of transport service Signed-off-by: Amit Galitzky * adding 2.11 release notes Signed-off-by: Amit Galitzky --------- Signed-off-by: Amit Galitzky (cherry picked from commit f81b75db2ddaceff06cd74aff041e051f0577791) --- build.gradle | 2 +- ...arch-anomaly-detection.release-notes-2.11.0.0.md | 10 ++++++++++ .../org/opensearch/ad/task/ADTaskManagerTests.java | 13 ++++++++++++- .../ad/transport/DeleteAnomalyDetectorTests.java | 4 +++- .../opensearch/ad/transport/EntityProfileTests.java | 5 ++++- .../ad/transport/GetAnomalyDetectorTests.java | 4 +++- .../opensearch/ad/transport/RCFPollingTests.java | 4 +++- .../org/opensearch/ad/transport/RCFResultTests.java | 13 +++++++++---- .../transport/SearchAnomalyResultActionTests.java | 4 +++- .../ad/transport/ThresholdResultTests.java | 7 +++++-- .../java/test/org/opensearch/ad/util/FakeNode.java | 7 +++++-- 11 files changed, 58 insertions(+), 15 deletions(-) create mode 100644 release-notes/opensearch-anomaly-detection.release-notes-2.11.0.0.md diff --git a/build.gradle b/build.gradle index 3cfec0e61..4e7c768be 100644 --- a/build.gradle +++ b/build.gradle @@ -741,7 +741,7 @@ dependencies { compileOnly "org.opensearch:opensearch-job-scheduler-spi:${job_scheduler_version}" implementation "org.opensearch:common-utils:${common_utils_version}" implementation "org.opensearch.client:opensearch-rest-client:${opensearch_version}" - compileOnly group: 'com.google.guava', name: 'guava', version:'32.0.1-jre' + compileOnly group: 'com.google.guava', name: 'guava', version:'32.1.2-jre' compileOnly group: 'com.google.guava', name: 'failureaccess', version:'1.0.1' implementation group: 'org.javassist', name: 'javassist', version:'3.28.0-GA' implementation group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1' diff --git a/release-notes/opensearch-anomaly-detection.release-notes-2.11.0.0.md b/release-notes/opensearch-anomaly-detection.release-notes-2.11.0.0.md new file mode 100644 index 000000000..59fa6ef75 --- /dev/null +++ b/release-notes/opensearch-anomaly-detection.release-notes-2.11.0.0.md @@ -0,0 +1,10 @@ +Compatible with OpenSearch 2.11.0. + +### Refactor + +* [2.x] Fix TransportService constructor due to changes in core plus guava bump ([#1069](https://github.com/opensearch-project/anomaly-detection/pull/1069)) + +### Infrastructure + +* Add dependabot.yml ([#1026](https://github.com/opensearch-project/anomaly-detection/pull/1026)) + diff --git a/src/test/java/org/opensearch/ad/task/ADTaskManagerTests.java b/src/test/java/org/opensearch/ad/task/ADTaskManagerTests.java index 69f77b851..08645a279 100644 --- a/src/test/java/org/opensearch/ad/task/ADTaskManagerTests.java +++ b/src/test/java/org/opensearch/ad/task/ADTaskManagerTests.java @@ -128,7 +128,9 @@ import org.opensearch.search.SearchHits; import org.opensearch.search.aggregations.InternalAggregations; import org.opensearch.search.internal.InternalSearchResponse; +import org.opensearch.telemetry.tracing.noop.NoopTracer; import org.opensearch.threadpool.ThreadPool; +import org.opensearch.transport.Transport; import org.opensearch.transport.TransportResponseHandler; import org.opensearch.transport.TransportService; @@ -233,7 +235,16 @@ public void setUp() throws Exception { detectionIndices = mock(AnomalyDetectionIndices.class); adTaskCacheManager = mock(ADTaskCacheManager.class); hashRing = mock(HashRing.class); - transportService = mock(TransportService.class); + transportService = new TransportService( + Settings.EMPTY, + mock(Transport.class), + null, + TransportService.NOOP_TRANSPORT_INTERCEPTOR, + x -> null, + null, + Collections.emptySet(), + NoopTracer.INSTANCE + ); threadPool = mock(ThreadPool.class); threadContext = new ThreadContext(settings); when(threadPool.getThreadContext()).thenReturn(threadContext); diff --git a/src/test/java/org/opensearch/ad/transport/DeleteAnomalyDetectorTests.java b/src/test/java/org/opensearch/ad/transport/DeleteAnomalyDetectorTests.java index e8af668ec..6b9b08dfa 100644 --- a/src/test/java/org/opensearch/ad/transport/DeleteAnomalyDetectorTests.java +++ b/src/test/java/org/opensearch/ad/transport/DeleteAnomalyDetectorTests.java @@ -58,6 +58,7 @@ import org.opensearch.index.get.GetResult; import org.opensearch.jobscheduler.spi.schedule.IntervalSchedule; import org.opensearch.tasks.Task; +import org.opensearch.telemetry.tracing.noop.NoopTracer; import org.opensearch.transport.Transport; import org.opensearch.transport.TransportService; @@ -99,7 +100,8 @@ public void setUp() throws Exception { TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> null, null, - Collections.emptySet() + Collections.emptySet(), + NoopTracer.INSTANCE ); client = mock(Client.class); diff --git a/src/test/java/org/opensearch/ad/transport/EntityProfileTests.java b/src/test/java/org/opensearch/ad/transport/EntityProfileTests.java index 66d783782..e370d71e6 100644 --- a/src/test/java/org/opensearch/ad/transport/EntityProfileTests.java +++ b/src/test/java/org/opensearch/ad/transport/EntityProfileTests.java @@ -52,6 +52,7 @@ import org.opensearch.core.transport.TransportResponse; import org.opensearch.core.xcontent.ToXContent; import org.opensearch.tasks.Task; +import org.opensearch.telemetry.tracing.noop.NoopTracer; import org.opensearch.transport.ConnectTransportException; import org.opensearch.transport.Transport; import org.opensearch.transport.TransportException; @@ -124,7 +125,9 @@ public void setUp() throws Exception { TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> null, null, - Collections.emptySet() + Collections.emptySet(), + NoopTracer.INSTANCE + ); settings = Settings.EMPTY; diff --git a/src/test/java/org/opensearch/ad/transport/GetAnomalyDetectorTests.java b/src/test/java/org/opensearch/ad/transport/GetAnomalyDetectorTests.java index 98165ca55..6b8ee81cc 100644 --- a/src/test/java/org/opensearch/ad/transport/GetAnomalyDetectorTests.java +++ b/src/test/java/org/opensearch/ad/transport/GetAnomalyDetectorTests.java @@ -59,6 +59,7 @@ import org.opensearch.core.action.ActionListener; import org.opensearch.core.common.bytes.BytesReference; import org.opensearch.index.get.GetResult; +import org.opensearch.telemetry.tracing.noop.NoopTracer; import org.opensearch.transport.Transport; import org.opensearch.transport.TransportService; @@ -106,7 +107,8 @@ public void setUp() throws Exception { TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> null, null, - Collections.emptySet() + Collections.emptySet(), + NoopTracer.INSTANCE ); nodeFilter = mock(DiscoveryNodeFilterer.class); diff --git a/src/test/java/org/opensearch/ad/transport/RCFPollingTests.java b/src/test/java/org/opensearch/ad/transport/RCFPollingTests.java index 61a6832b2..40d9d8e02 100644 --- a/src/test/java/org/opensearch/ad/transport/RCFPollingTests.java +++ b/src/test/java/org/opensearch/ad/transport/RCFPollingTests.java @@ -45,6 +45,7 @@ import org.opensearch.core.transport.TransportResponse; import org.opensearch.core.xcontent.ToXContent; import org.opensearch.tasks.Task; +import org.opensearch.telemetry.tracing.noop.NoopTracer; import org.opensearch.transport.ConnectTransportException; import org.opensearch.transport.Transport; import org.opensearch.transport.TransportException; @@ -112,7 +113,8 @@ public void setUp() throws Exception { TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> null, null, - Collections.emptySet() + Collections.emptySet(), + NoopTracer.INSTANCE ); future = new PlainActionFuture<>(); diff --git a/src/test/java/org/opensearch/ad/transport/RCFResultTests.java b/src/test/java/org/opensearch/ad/transport/RCFResultTests.java index 07a20bbcd..786809ec6 100644 --- a/src/test/java/org/opensearch/ad/transport/RCFResultTests.java +++ b/src/test/java/org/opensearch/ad/transport/RCFResultTests.java @@ -57,6 +57,7 @@ import org.opensearch.core.xcontent.ToXContent; import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.tasks.Task; +import org.opensearch.telemetry.tracing.noop.NoopTracer; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.transport.Transport; import org.opensearch.transport.TransportService; @@ -106,7 +107,8 @@ public void testNormal() { TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> null, null, - Collections.emptySet() + Collections.emptySet(), + NoopTracer.INSTANCE ); ModelManager manager = mock(ModelManager.class); @@ -164,7 +166,8 @@ public void testExecutionException() { TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> null, null, - Collections.emptySet() + Collections.emptySet(), + NoopTracer.INSTANCE ); ModelManager manager = mock(ModelManager.class); @@ -280,7 +283,8 @@ public void testCircuitBreaker() { TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> null, null, - Collections.emptySet() + Collections.emptySet(), + NoopTracer.INSTANCE ); ModelManager manager = mock(ModelManager.class); @@ -331,7 +335,8 @@ public void testCorruptModel() { TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> null, null, - Collections.emptySet() + Collections.emptySet(), + NoopTracer.INSTANCE ); ModelManager manager = mock(ModelManager.class); diff --git a/src/test/java/org/opensearch/ad/transport/SearchAnomalyResultActionTests.java b/src/test/java/org/opensearch/ad/transport/SearchAnomalyResultActionTests.java index 00ed8cf7e..01914e81a 100644 --- a/src/test/java/org/opensearch/ad/transport/SearchAnomalyResultActionTests.java +++ b/src/test/java/org/opensearch/ad/transport/SearchAnomalyResultActionTests.java @@ -59,6 +59,7 @@ import org.opensearch.search.aggregations.bucket.terms.StringTerms; import org.opensearch.search.aggregations.bucket.terms.TermsAggregator; import org.opensearch.tasks.Task; +import org.opensearch.telemetry.tracing.noop.NoopTracer; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.Transport; import org.opensearch.transport.TransportService; @@ -101,7 +102,8 @@ public void setUp() throws Exception { TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> null, null, - Collections.emptySet() + Collections.emptySet(), + NoopTracer.INSTANCE ); client = mock(Client.class); diff --git a/src/test/java/org/opensearch/ad/transport/ThresholdResultTests.java b/src/test/java/org/opensearch/ad/transport/ThresholdResultTests.java index 419c09f5a..5b277a545 100644 --- a/src/test/java/org/opensearch/ad/transport/ThresholdResultTests.java +++ b/src/test/java/org/opensearch/ad/transport/ThresholdResultTests.java @@ -38,6 +38,7 @@ import org.opensearch.core.xcontent.ToXContent; import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.tasks.Task; +import org.opensearch.telemetry.tracing.noop.NoopTracer; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.transport.Transport; import org.opensearch.transport.TransportService; @@ -55,7 +56,8 @@ public void testNormal() { TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> null, null, - Collections.emptySet() + Collections.emptySet(), + NoopTracer.INSTANCE ); ModelManager manager = mock(ModelManager.class); @@ -84,7 +86,8 @@ public void testExecutionException() { TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> null, null, - Collections.emptySet() + Collections.emptySet(), + NoopTracer.INSTANCE ); ModelManager manager = mock(ModelManager.class); diff --git a/src/test/java/test/org/opensearch/ad/util/FakeNode.java b/src/test/java/test/org/opensearch/ad/util/FakeNode.java index 39d93c41a..15dfe9f3c 100644 --- a/src/test/java/test/org/opensearch/ad/util/FakeNode.java +++ b/src/test/java/test/org/opensearch/ad/util/FakeNode.java @@ -49,6 +49,7 @@ import org.opensearch.core.indices.breaker.NoneCircuitBreakerService; import org.opensearch.tasks.TaskManager; import org.opensearch.tasks.TaskResourceTrackingService; +import org.opensearch.telemetry.tracing.noop.NoopTracer; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.tasks.MockTaskManager; import org.opensearch.threadpool.ThreadPool; @@ -80,7 +81,8 @@ public FakeNode( new NetworkService(Collections.emptyList()), PageCacheRecycler.NON_RECYCLING_INSTANCE, new NamedWriteableRegistry(ClusterModule.getNamedWriteables()), - new NoneCircuitBreakerService() + new NoneCircuitBreakerService(), + NoopTracer.INSTANCE ) { @Override public TransportAddress[] addressesFromString(String address) { @@ -91,7 +93,8 @@ public TransportAddress[] addressesFromString(String address) { transportInterceptor, boundTransportAddressDiscoveryNodeFunction, null, - Collections.emptySet() + Collections.emptySet(), + NoopTracer.INSTANCE ) { @Override protected TaskManager createTaskManager(