Skip to content

Commit cb4d7ff

Browse files
authored
Skip CCS Usage telemetry ITs if feature flags is not enabled. (#112365)
1 parent 5fb3c1d commit cb4d7ff

File tree

2 files changed

+17
-1
lines changed

2 files changed

+17
-1
lines changed

server/src/internalClusterTest/java/org/elasticsearch/search/ccs/CCSUsageTelemetryIT.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.elasticsearch.common.bytes.BytesReference;
2525
import org.elasticsearch.common.settings.Settings;
2626
import org.elasticsearch.common.util.CollectionUtils;
27+
import org.elasticsearch.common.util.FeatureFlag;
2728
import org.elasticsearch.core.TimeValue;
2829
import org.elasticsearch.index.query.MatchAllQueryBuilder;
2930
import org.elasticsearch.plugins.Plugin;
@@ -36,6 +37,7 @@
3637
import org.elasticsearch.test.InternalTestCluster;
3738
import org.elasticsearch.usage.UsageService;
3839
import org.junit.Assert;
40+
import org.junit.BeforeClass;
3941
import org.junit.Rule;
4042
import org.junit.rules.TestRule;
4143
import org.junit.runner.Description;
@@ -66,6 +68,7 @@ public class CCSUsageTelemetryIT extends AbstractMultiClustersTestCase {
6668
private static final Logger LOGGER = LogManager.getLogger(CCSUsageTelemetryIT.class);
6769
private static final String REMOTE1 = "cluster-a";
6870
private static final String REMOTE2 = "cluster-b";
71+
private static final FeatureFlag CCS_TELEMETRY_FEATURE_FLAG = new FeatureFlag("ccs_telemetry");
6972

7073
@Override
7174
protected boolean reuseClusters() {
@@ -80,6 +83,11 @@ protected Collection<String> remoteClusterAlias() {
8083
@Rule
8184
public SkipUnavailableRule skipOverride = new SkipUnavailableRule(REMOTE1, REMOTE2);
8285

86+
@BeforeClass
87+
protected static void skipIfTelemetryDisabled() {
88+
assumeTrue("Skipping test as CCS_TELEMETRY_FEATURE_FLAG is disabled", CCS_TELEMETRY_FEATURE_FLAG.isEnabled());
89+
}
90+
8391
@Override
8492
protected Map<String, Boolean> skipUnavailableForRemoteClusters() {
8593
var map = skipOverride.getMap();
@@ -443,7 +451,7 @@ public void testRemoteTimesOut() throws Exception {
443451
// partial failure, and we disable partial results..
444452
searchRequest.setCcsMinimizeRoundtrips(true);
445453

446-
TimeValue searchTimeout = new TimeValue(200, TimeUnit.MILLISECONDS);
454+
TimeValue searchTimeout = new TimeValue(500, TimeUnit.MILLISECONDS);
447455
// query builder that will sleep for the specified amount of time in the query phase
448456
SlowRunningQueryBuilder slowRunningQueryBuilder = new SlowRunningQueryBuilder(searchTimeout.millis() * 5, remoteIndex);
449457
SearchSourceBuilder sourceBuilder = new SearchSourceBuilder().query(slowRunningQueryBuilder).timeout(searchTimeout);

x-pack/plugin/async-search/src/internalClusterTest/java/org/elasticsearch/xpack/search/CCSUsageTelemetryAsyncSearchIT.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import org.elasticsearch.action.search.TransportSearchAction;
1515
import org.elasticsearch.client.internal.Client;
1616
import org.elasticsearch.common.settings.Settings;
17+
import org.elasticsearch.common.util.FeatureFlag;
1718
import org.elasticsearch.core.TimeValue;
1819
import org.elasticsearch.index.query.MatchAllQueryBuilder;
1920
import org.elasticsearch.plugins.Plugin;
@@ -33,6 +34,7 @@
3334
import org.elasticsearch.xpack.core.search.action.SubmitAsyncSearchRequest;
3435
import org.hamcrest.Matchers;
3536
import org.junit.Before;
37+
import org.junit.BeforeClass;
3638

3739
import java.util.Arrays;
3840
import java.util.Collection;
@@ -53,6 +55,12 @@
5355
public class CCSUsageTelemetryAsyncSearchIT extends AbstractMultiClustersTestCase {
5456
private static final String REMOTE1 = "cluster-a";
5557
private static final String REMOTE2 = "cluster-b";
58+
private static final FeatureFlag CCS_TELEMETRY_FEATURE_FLAG = new FeatureFlag("ccs_telemetry");
59+
60+
@BeforeClass
61+
protected static void skipIfTelemetryDisabled() {
62+
assumeTrue("Skipping test as CCS_TELEMETRY_FEATURE_FLAG is disabled", CCS_TELEMETRY_FEATURE_FLAG.isEnabled());
63+
}
5664

5765
@Override
5866
protected boolean reuseClusters() {

0 commit comments

Comments
 (0)