Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[2.x] Fix TransportService constructor due to changes in core plus guava bump #1069

Merged
merged 4 commits into from
Oct 5, 2023
Merged

[2.x] Fix TransportService constructor due to changes in core plus guava bump #1069

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d504b24
adjust transportService constructor due to changes in core
amitgalitz Oct 4, 2023
42ce1b9
updated guava and fixed another compile issue
amitgalitz Oct 5, 2023
aca627d
fixed mocking of transport service
amitgalitz Oct 5, 2023
811ac33
adding 2.11 release notes
amitgalitz Oct 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
13 changes: 12 additions & 1 deletion src/test/java/org/opensearch/ad/task/ADTaskManagerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);
Expand Down
4 changes: 3 additions & 1 deletion src/test/java/org/opensearch/ad/transport/DeleteAnomalyDetectorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);
Expand Down
5 changes: 4 additions & 1 deletion src/test/java/org/opensearch/ad/transport/EntityProfileTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down
4 changes: 3 additions & 1 deletion src/test/java/org/opensearch/ad/transport/GetAnomalyDetectorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);
Expand Down
4 changes: 3 additions & 1 deletion src/test/java/org/opensearch/ad/transport/RCFPollingTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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<>();

Expand Down
13 changes: 9 additions & 4 deletions src/test/java/org/opensearch/ad/transport/RCFResultTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 3 additions & 1 deletion src/test/java/org/opensearch/ad/transport/SearchAnomalyResultActionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
7 changes: 5 additions & 2 deletions src/test/java/org/opensearch/ad/transport/ThresholdResultTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
7 changes: 5 additions & 2 deletions src/test/java/test/org/opensearch/ad/util/FakeNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand All @@ -91,7 +93,8 @@ public TransportAddress[] addressesFromString(String address) {
transportInterceptor,
boundTransportAddressDiscoveryNodeFunction,
null,
Collections.emptySet()
Collections.emptySet(),
NoopTracer.INSTANCE
) {
@Override
protected TaskManager createTaskManager(
Expand Down
Loading