Adjust compatibility and tests of runtime fields telemetry

rest-api-spec/src/main/resources/rest-api-spec/test/cluster.stats/10_basic.yml

@@ -86,8 +86,8 @@
 ---
 "get cluster stats without runtime fields":
   - skip:
-      version: " - 7.99.99"
-      reason:  "cluster stats includes runtime fields from 8.0 on"
+      version: " - 7.12.99"
+      reason:  "cluster stats includes runtime fields from 7.13 on"
   - do:
       indices.create:
         index: sensor
@@ -99,8 +99,8 @@
 ---
 "Usage stats with script-less runtime fields":
   - skip:
-      version: " - 7.99.99"
-      reason:  "cluster stats includes runtime fields from 8.0 on"
+      version: " - 7.12.99"
+      reason:  "cluster stats includes runtime fields from 7.13 on"
   - do:
       indices.create:
         index: sensor

server/src/main/java/org/elasticsearch/action/admin/cluster/stats/MappingStats.java

@@ -8,7 +8,6 @@
 
 package org.elasticsearch.action.admin.cluster.stats;
 
-import org.elasticsearch.Version;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
 import org.elasticsearch.cluster.metadata.MappingMetadata;
 import org.elasticsearch.cluster.metadata.Metadata;
@@ -139,19 +138,13 @@ private static int countOccurrences(String script, String keyword) {
 
     MappingStats(StreamInput in) throws IOException {
         fieldTypeStats = Collections.unmodifiableSet(new LinkedHashSet<>(in.readList(IndexFeatureStats::new)));
-        if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
-            runtimeFieldTypeStats = Collections.unmodifiableSet(new LinkedHashSet<>(in.readList(RuntimeFieldStats::new)));
-        } else {
-            runtimeFieldTypeStats = Collections.emptySet();
-        }
+        runtimeFieldTypeStats = Collections.unmodifiableSet(new LinkedHashSet<>(in.readList(RuntimeFieldStats::new)));
     }
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         out.writeCollection(fieldTypeStats);
-        if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
-            out.writeCollection(runtimeFieldTypeStats);
-        }
+        out.writeCollection(runtimeFieldTypeStats);
     }
 
     /**

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

@@ -158,7 +158,6 @@
 import org.elasticsearch.xpack.core.rollup.action.StopRollupJobAction;
 import org.elasticsearch.xpack.core.rollup.job.RollupJob;
 import org.elasticsearch.xpack.core.rollup.job.RollupJobStatus;
-import org.elasticsearch.xpack.core.runtimefields.RuntimeFieldsFeatureSetUsage;
 import org.elasticsearch.xpack.core.search.action.GetAsyncSearchAction;
 import org.elasticsearch.xpack.core.search.action.SubmitAsyncSearchAction;
 import org.elasticsearch.xpack.core.searchablesnapshots.SearchableSnapshotFeatureSetUsage;
@@ -535,8 +534,7 @@ public List<NamedWriteableRegistry.Entry> getNamedWriteables() {
             // Data Streams
             new NamedWriteableRegistry.Entry(XPackFeatureSet.Usage.class, XPackField.DATA_STREAMS, DataStreamFeatureSetUsage::new),
             // Data Tiers
-            new NamedWriteableRegistry.Entry(XPackFeatureSet.Usage.class, XPackField.DATA_TIERS, DataTiersFeatureSetUsage::new),
-            new NamedWriteableRegistry.Entry(XPackFeatureSet.Usage.class, "runtime_fields", RuntimeFieldsFeatureSetUsage::new)
+            new NamedWriteableRegistry.Entry(XPackFeatureSet.Usage.class, XPackField.DATA_TIERS, DataTiersFeatureSetUsage::new)
         ));
 
         if (RollupV2.isEnabled()) {