Remove assumed features in xpack for 9.0 (#120049)

Remove all assumed features defined in xpack added before 8.18

Author: thecoop

x-pack/plugin/core/src/main/java/org/elasticsearch/license/ClusterStateLicenseService.java

@@ -28,7 +28,6 @@
 import org.elasticsearch.core.Nullable;
 import org.elasticsearch.core.SuppressForbidden;
 import org.elasticsearch.core.TimeValue;
-import org.elasticsearch.features.FeatureService;
 import org.elasticsearch.gateway.GatewayService;
 import org.elasticsearch.license.internal.MutableLicenseService;
 import org.elasticsearch.license.internal.TrialLicenseVersion;
@@ -65,7 +64,6 @@ public class ClusterStateLicenseService extends AbstractLifecycleComponent
     private final Settings settings;
 
     private final ClusterService clusterService;
-    private final FeatureService featureService;
 
     /**
      * The xpack feature state to update when license changes are made.
@@ -104,12 +102,10 @@ public ClusterStateLicenseService(
         ThreadPool threadPool,
         ClusterService clusterService,
         Clock clock,
-        XPackLicenseState xPacklicenseState,
-        FeatureService featureService
+        XPackLicenseState xPacklicenseState
     ) {
         this.settings = settings;
         this.clusterService = clusterService;
-        this.featureService = featureService;
         this.startTrialTaskQueue = clusterService.createTaskQueue(
             "license-service-start-trial",
             Priority.NORMAL,
@@ -344,7 +340,7 @@ public void startTrialLicense(PostStartTrialRequest request, final ActionListene
         }
         startTrialTaskQueue.submitTask(
             StartTrialClusterTask.TASK_SOURCE,
-            new StartTrialClusterTask(logger, clusterService.getClusterName().value(), clock, featureService, request, listener),
+            new StartTrialClusterTask(logger, clusterService.getClusterName().value(), clock, request, listener),
             null             // TODO should pass in request.masterNodeTimeout() here
         );
     }

x-pack/plugin/core/src/main/java/org/elasticsearch/license/License.java

@@ -16,7 +16,6 @@
 import org.elasticsearch.common.xcontent.LoggingDeprecationHandler;
 import org.elasticsearch.common.xcontent.XContentHelper;
 import org.elasticsearch.core.UpdateForV9;
-import org.elasticsearch.features.NodeFeature;
 import org.elasticsearch.xcontent.ToXContentObject;
 import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xcontent.XContentParser;
@@ -39,8 +38,6 @@
  */
 public class License implements ToXContentObject {
 
-    public static final NodeFeature INDEPENDENT_TRIAL_VERSION_FEATURE = new NodeFeature("license-trial-independent-version", true);
-
     public enum LicenseType {
         BASIC,
         STANDARD,

x-pack/plugin/core/src/main/java/org/elasticsearch/license/StartTrialClusterTask.java

@@ -13,7 +13,6 @@
 import org.elasticsearch.cluster.ClusterStateTaskListener;
 import org.elasticsearch.cluster.metadata.Metadata;
 import org.elasticsearch.core.Nullable;
-import org.elasticsearch.features.FeatureService;
 import org.elasticsearch.license.internal.TrialLicenseVersion;
 import org.elasticsearch.xpack.core.XPackPlugin;
 
@@ -41,13 +40,11 @@ public class StartTrialClusterTask implements ClusterStateTaskListener {
     private final PostStartTrialRequest request;
     private final ActionListener<PostStartTrialResponse> listener;
     private final Clock clock;
-    private final FeatureService featureService;
 
     StartTrialClusterTask(
         Logger logger,
         String clusterName,
         Clock clock,
-        FeatureService featureService,
         PostStartTrialRequest request,
         ActionListener<PostStartTrialResponse> listener
     ) {
@@ -56,7 +53,6 @@ public class StartTrialClusterTask implements ClusterStateTaskListener {
         this.request = request;
         this.listener = listener;
         this.clock = clock;
-        this.featureService = featureService;
     }
 
     private LicensesMetadata execute(
@@ -65,9 +61,6 @@ private LicensesMetadata execute(
         ClusterStateTaskExecutor.TaskContext<StartTrialClusterTask> taskContext
     ) {
         assert taskContext.getTask() == this;
-        if (featureService.clusterHasFeature(state, License.INDEPENDENT_TRIAL_VERSION_FEATURE) == false) {
-            throw new IllegalStateException("Please ensure all nodes are up to date before starting your trial");
-        }
         final var listener = ActionListener.runBefore(this.listener, () -> {
             logger.debug("started self generated trial license: {}", currentLicensesMetadata);
         });

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackFeatures.java

@@ -9,25 +9,15 @@
 
 import org.elasticsearch.features.FeatureSpecification;
 import org.elasticsearch.features.NodeFeature;
-import org.elasticsearch.license.License;
-import org.elasticsearch.xpack.core.datatiers.NodesDataTiersUsageTransportAction;
 
 import java.util.Set;
 
 /**
  * Provides the XPack features that this version of the code supports
  */
 public class XPackFeatures implements FeatureSpecification {
-    public static final NodeFeature LOGSDB_TELEMETRY = new NodeFeature("logsdb_telemetry", true);
-    public static final NodeFeature LOGSDB_TELMETRY_STATS = new NodeFeature("logsdb_telemetry_stats", true);
-
     @Override
     public Set<NodeFeature> getFeatures() {
-        return Set.of(
-            NodesDataTiersUsageTransportAction.LOCALLY_PRECALCULATED_STATS_FEATURE, // Added in 8.12
-            License.INDEPENDENT_TRIAL_VERSION_FEATURE, // 8.14.0
-            LOGSDB_TELEMETRY,
-            LOGSDB_TELMETRY_STATS
-        );
+        return Set.of();
     }
 }

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackPlugin.java

@@ -331,8 +331,7 @@ public Collection<?> createComponents(PluginServices services) {
                 services.threadPool(),
                 services.clusterService(),
                 getClock(),
-                getLicenseState(),
-                services.featureService()
+                getLicenseState()
             );
             setLicenseService(licenseService);
         }

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datatiers/DataTiersUsageTransportAction.java

@@ -9,7 +9,6 @@
 
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.admin.cluster.node.stats.NodeStats;
-import org.elasticsearch.action.admin.indices.stats.CommonStatsFlags;
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.client.internal.Client;
 import org.elasticsearch.client.internal.ParentTaskAssigningClient;
@@ -22,7 +21,6 @@
 import org.elasticsearch.cluster.routing.ShardRouting;
 import org.elasticsearch.cluster.routing.allocation.DataTier;
 import org.elasticsearch.cluster.service.ClusterService;
-import org.elasticsearch.features.FeatureService;
 import org.elasticsearch.indices.NodeIndicesStats;
 import org.elasticsearch.injection.guice.Inject;
 import org.elasticsearch.protocol.xpack.XPackUsageRequest;
@@ -46,7 +44,6 @@
 public class DataTiersUsageTransportAction extends XPackUsageFeatureTransportAction {
 
     private final Client client;
-    private final FeatureService featureService;
 
     @Inject
     public DataTiersUsageTransportAction(
@@ -55,8 +52,7 @@ public DataTiersUsageTransportAction(
         ThreadPool threadPool,
         ActionFilters actionFilters,
         IndexNameExpressionResolver indexNameExpressionResolver,
-        Client client,
-        FeatureService featureService
+        Client client
     ) {
         super(
             XPackUsageFeatureAction.DATA_TIERS.name(),
@@ -67,7 +63,6 @@ public DataTiersUsageTransportAction(
             indexNameExpressionResolver
         );
         this.client = client;
-        this.featureService = featureService;
     }
 
     @Override
@@ -77,42 +72,22 @@ protected void masterOperation(
         ClusterState state,
         ActionListener<XPackUsageFeatureResponse> listener
     ) {
-        if (featureService.clusterHasFeature(state, NodesDataTiersUsageTransportAction.LOCALLY_PRECALCULATED_STATS_FEATURE)) {
-            new ParentTaskAssigningClient(client, clusterService.localNode(), task).admin()
-                .cluster()
-                .execute(
-                    NodesDataTiersUsageTransportAction.TYPE,
-                    new NodesDataTiersUsageTransportAction.NodesRequest(),
-                    listener.delegateFailureAndWrap((delegate, response) -> {
-                        // Generate tier specific stats for the nodes and indices
-                        delegate.onResponse(
-                            new XPackUsageFeatureResponse(
-                                new DataTiersFeatureSetUsage(
-                                    aggregateStats(response.getNodes(), getIndicesGroupedByTier(state, response.getNodes()))
-                                )
-                            )
-                        );
-                    })
-                );
-        } else {
-            new ParentTaskAssigningClient(client, clusterService.localNode(), task).admin()
-                .cluster()
-                .prepareNodesStats()
-                .setIndices(new CommonStatsFlags(CommonStatsFlags.Flag.Docs, CommonStatsFlags.Flag.Store))
-                .execute(listener.delegateFailureAndWrap((delegate, nodesStatsResponse) -> {
-                    List<NodeDataTiersUsage> response = nodesStatsResponse.getNodes()
-                        .stream()
-                        .map(
-                            nodeStats -> new NodeDataTiersUsage(nodeStats.getNode(), precalculateLocalStatsFromNodeStats(nodeStats, state))
-                        )
-                        .toList();
+        new ParentTaskAssigningClient(client, clusterService.localNode(), task).admin()
+            .cluster()
+            .execute(
+                NodesDataTiersUsageTransportAction.TYPE,
+                new NodesDataTiersUsageTransportAction.NodesRequest(),
+                listener.delegateFailureAndWrap((delegate, response) -> {
+                    // Generate tier specific stats for the nodes and indices
                     delegate.onResponse(
                         new XPackUsageFeatureResponse(
-                            new DataTiersFeatureSetUsage(aggregateStats(response, getIndicesGroupedByTier(state, response)))
+                            new DataTiersFeatureSetUsage(
+                                aggregateStats(response.getNodes(), getIndicesGroupedByTier(state, response.getNodes()))
+                            )
                         )
                     );
-                }));
-        }
+                })
+            );
     }
 
     // Visible for testing

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datatiers/NodesDataTiersUsageTransportAction.java

@@ -26,7 +26,6 @@
 import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
-import org.elasticsearch.features.NodeFeature;
 import org.elasticsearch.index.shard.DocsStats;
 import org.elasticsearch.index.store.StoreStats;
 import org.elasticsearch.indices.IndicesService;
@@ -58,7 +57,6 @@ public class NodesDataTiersUsageTransportAction extends TransportNodesAction<
     Void> {
 
     public static final ActionType<NodesResponse> TYPE = new ActionType<>("cluster:monitor/nodes/data_tier_usage");
-    public static final NodeFeature LOCALLY_PRECALCULATED_STATS_FEATURE = new NodeFeature("usage.data_tiers.precalculate_stats", true);
 
     private static final CommonStatsFlags STATS_FLAGS = new CommonStatsFlags().clear()
         .set(CommonStatsFlags.Flag.Docs, true)

x-pack/plugin/core/src/test/java/org/elasticsearch/license/AbstractClusterStateLicenseServiceTestCase.java

@@ -18,7 +18,6 @@
 import org.elasticsearch.common.component.Lifecycle;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.env.Environment;
-import org.elasticsearch.features.FeatureService;
 import org.elasticsearch.test.ESTestCase;
 import org.elasticsearch.threadpool.TestThreadPool;
 import org.elasticsearch.threadpool.ThreadPool;
@@ -27,7 +26,6 @@
 import org.junit.After;
 import org.junit.Before;
 
-import java.util.List;
 import java.util.stream.Stream;
 
 import static java.util.Collections.emptySet;
@@ -66,14 +64,7 @@ protected void setInitialState(License license, XPackLicenseState licenseState,
     protected void setInitialState(License license, XPackLicenseState licenseState, Settings settings, String selfGeneratedType) {
         licenseType = selfGeneratedType;
         settings = Settings.builder().put(settings).put(LicenseSettings.SELF_GENERATED_LICENSE_TYPE.getKey(), licenseType).build();
-        licenseService = new ClusterStateLicenseService(
-            settings,
-            threadPool,
-            clusterService,
-            clock,
-            licenseState,
-            new FeatureService(List.of())
-        );
+        licenseService = new ClusterStateLicenseService(settings, threadPool, clusterService, clock, licenseState);
         ClusterState state = mock(ClusterState.class);
         final ClusterBlocks noBlock = ClusterBlocks.builder().build();
         when(state.blocks()).thenReturn(noBlock);

x-pack/plugin/core/src/test/java/org/elasticsearch/license/ClusterStateLicenseServiceTests.java

@@ -19,7 +19,6 @@
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.core.TimeValue;
-import org.elasticsearch.features.FeatureService;
 import org.elasticsearch.license.licensor.LicenseSigner;
 import org.elasticsearch.protocol.xpack.license.LicensesStatus;
 import org.elasticsearch.protocol.xpack.license.PutLicenseResponse;
@@ -91,8 +90,7 @@ public void testLogExpirationWarning() {
             mock(ThreadPool.class),
             mockDefaultClusterService(),
             mock(Clock.class),
-            mock(XPackLicenseState.class),
-            new FeatureService(List.of())
+            mock(XPackLicenseState.class)
         );
         final String message = service.buildExpirationMessage(time, expired).toString();
         if (expired) {
@@ -187,8 +185,7 @@ public void testStartBasicStartsNewLicenseIfFieldsDifferent() throws Exception {
             mock(ThreadPool.class),
             clusterService,
             clock,
-            mock(XPackLicenseState.class),
-            new FeatureService(List.of())
+            mock(XPackLicenseState.class)
         );
         verify(clusterService).createTaskQueue(eq("license-service-start-basic"), any(), taskExecutorCaptor.capture());
 
@@ -280,8 +277,7 @@ private void tryRegisterLicense(Settings baseSettings, License license, Consumer
             threadPool,
             clusterService,
             clock,
-            licenseState,
-            new FeatureService(List.of())
+            licenseState
         );
 
         final PutLicenseRequest request = new PutLicenseRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT);

x-pack/plugin/core/src/test/java/org/elasticsearch/license/LicenseScheduleTests.java

@@ -10,15 +10,13 @@
 import org.elasticsearch.common.scheduler.SchedulerEngine;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.core.TimeValue;
-import org.elasticsearch.features.FeatureService;
 import org.elasticsearch.test.ESTestCase;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.junit.Before;
 
 import java.time.Clock;
 import java.time.Instant;
 import java.time.format.DateTimeFormatter;
-import java.util.List;
 import java.util.Locale;
 
 import static org.hamcrest.Matchers.equalTo;
@@ -37,8 +35,7 @@ public void setup() throws Exception {
             mock(ThreadPool.class),
             mock(ClusterService.class),
             mock(Clock.class),
-            mock(XPackLicenseState.class),
-            new FeatureService(List.of())
+            mock(XPackLicenseState.class)
         );
         schedule = service.nextLicenseCheck(license);
     }