Include test features in feature name generation (elastic#116078)

thecoop · Nov 1, 2024 · bcf920f · bcf920f
1 parent f022a53
commit bcf920f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/...c/main/java/org/elasticsearch/extractor/features/HistoricalFeaturesMetadataExtractor.java b/...c/main/java/org/elasticsearch/extractor/features/HistoricalFeaturesMetadataExtractor.java
@@ -29,6 +29,7 @@
 import java.util.Map;
 import java.util.ServiceLoader;
 import java.util.Set;
+import java.util.stream.Stream;
 
 public class HistoricalFeaturesMetadataExtractor {
     private final ClassLoader classLoader;
@@ -92,7 +93,9 @@ void extractHistoricalFeatureMetadata(CheckedBiConsumer<Map<NodeFeature, Version
         ServiceLoader<FeatureSpecification> featureSpecLoader = ServiceLoader.load(FeatureSpecification.class, classLoader);
         for (FeatureSpecification featureSpecification : featureSpecLoader) {
             historicalFeatures.putAll(featureSpecification.getHistoricalFeatures());
-            featureSpecification.getFeatures().stream().map(NodeFeature::id).forEach(featureNames::add);
+            Stream.concat(featureSpecification.getFeatures().stream(), featureSpecification.getTestFeatures().stream())
+                .map(NodeFeature::id)
+                .forEach(featureNames::add);
         }
         metadataConsumer.accept(historicalFeatures, featureNames);
     }

diff --git a/...t/java/org/elasticsearch/extractor/features/HistoricalFeaturesMetadataExtractorTests.java b/...t/java/org/elasticsearch/extractor/features/HistoricalFeaturesMetadataExtractorTests.java
@@ -30,6 +30,7 @@
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.hasEntry;
+import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.hasKey;
 import static org.hamcrest.Matchers.not;
 
@@ -48,6 +49,7 @@ public void testExtractHistoricalMetadata() throws IOException {
         });
         assertThat(nodeFeatureVersionMap, not(anEmptyMap()));
         assertThat(featureNamesSet, not(empty()));
+        assertThat(featureNamesSet, hasItem("test_features_enabled"));
 
         Path outputFile = temporaryFolder.newFile().toPath();
         extractor.generateMetadataFile(outputFile);