Allow setting default_metric for numerics

benchmarks/src/main/java/org/elasticsearch/benchmark/_nightly/esql/ValuesSourceReaderBenchmark.java

@@ -285,6 +285,7 @@ private static BlockLoader numericBlockLoader(WhereAndBaseName w, NumberFieldMap
             false,
             null,
             null,
+            null,
             false
         ).blockLoader(new MappedFieldType.BlockLoaderContext() {
             @Override

benchmarks/src/main/java/org/elasticsearch/benchmark/script/ScriptScoreBenchmark.java

@@ -85,7 +85,10 @@ public class ScriptScoreBenchmark {
     private final ScriptModule scriptModule = new ScriptModule(Settings.EMPTY, pluginsService.filterPlugins(ScriptPlugin.class).toList());
 
     private final Map<String, MappedFieldType> fieldTypes = Map.ofEntries(
-        Map.entry("n", new NumberFieldType("n", NumberType.LONG, false, false, true, true, null, Map.of(), null, false, null, null, false))
+        Map.entry(
+            "n",
+            new NumberFieldType("n", NumberType.LONG, false, false, true, true, null, Map.of(), null, false, null, null, null, false)
+        )
     );
     private final IndexFieldDataCache fieldDataCache = new IndexFieldDataCache.None();
     private final CircuitBreakerService breakerService = new NoneCircuitBreakerService();

modules/data-streams/src/main/java/org/elasticsearch/datastreams/DataStreamFeatures.java

@@ -30,6 +30,10 @@ public class DataStreamFeatures implements FeatureSpecification {
 
     public static final NodeFeature FAILURE_STORE_IN_LOG_DATA_STREAMS = new NodeFeature("logs_data_streams.failure_store.enabled");
 
+    public static final NodeFeature DOWNSAMPLE_DEFAULT_METRIC_FOR_NUMERICS_FIX = new NodeFeature(
+        "data_stream.downsample.default_metric_for_numerics_fix"
+    );
+
     @Override
     public Set<NodeFeature> getFeatures() {
         return Set.of(DataStream.DATA_STREAM_FAILURE_STORE_FEATURE);
@@ -41,7 +45,8 @@ public Set<NodeFeature> getTestFeatures() {
             DATA_STREAM_FAILURE_STORE_TSDB_FIX,
             DOWNSAMPLE_AGGREGATE_DEFAULT_METRIC_FIX,
             LOGS_STREAM_FEATURE,
-            FAILURE_STORE_IN_LOG_DATA_STREAMS
+            FAILURE_STORE_IN_LOG_DATA_STREAMS,
+            DOWNSAMPLE_DEFAULT_METRIC_FOR_NUMERICS_FIX
         );
     }
 }

modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/TokenCountFieldMapper.java

@@ -117,6 +117,7 @@ static class TokenCountFieldType extends NumberFieldMapper.NumberFieldType {
                 false,
                 null,
                 null,
+                null,
                 isSyntheticSource
             );
         }

plugins/mapper-size/src/main/java/org/elasticsearch/index/mapper/size/SizeFieldMapper.java

@@ -50,7 +50,7 @@ public SizeFieldMapper build() {
 
     private static class SizeFieldType extends NumberFieldType {
         SizeFieldType() {
-            super(NAME, NumberType.INTEGER, true, true, true, false, null, Collections.emptyMap(), null, false, null, null, false);
+            super(NAME, NumberType.INTEGER, true, true, true, false, null, Collections.emptyMap(), null, false, null, null, null, false);
         }
 
         @Override

server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java

@@ -45,6 +45,7 @@
 import org.elasticsearch.index.fielddata.SourceValueFetcherSortedNumericIndexFieldData;
 import org.elasticsearch.index.fielddata.plain.SortedDoublesIndexFieldData;
 import org.elasticsearch.index.fielddata.plain.SortedNumericIndexFieldData;
+import org.elasticsearch.index.mapper.TimeSeriesParams.GaugeAggs;
 import org.elasticsearch.index.mapper.TimeSeriesParams.MetricType;
 import org.elasticsearch.index.query.SearchExecutionContext;
 import org.elasticsearch.script.DoubleFieldScript;
@@ -122,6 +123,8 @@ public static final class Builder extends FieldMapper.DimensionBuilder {
          */
         private final Parameter<MetricType> metric;
 
+        private final Parameter<GaugeAggs> defaultMetric;
+
         private final Parameter<Map<String, String>> meta = Parameter.metaParam();
 
         private final ScriptCompiler scriptCompiler;
@@ -223,6 +226,20 @@ public Builder(
                 }
             }).precludesParameters(dimension);
 
+            this.defaultMetric = TimeSeriesParams.defaultMetric(m -> toType(m).defaultMetric).addValidator(s -> {
+                if (s != null && metric.getValue() != MetricType.GAUGE) {
+                    throw new IllegalArgumentException(
+                        "Field ["
+                            + TimeSeriesParams.TIME_SERIES_METRIC_PARAM
+                            + "] must be set to ["
+                            + MetricType.GAUGE
+                            + "] to allow setting of ["
+                            + TimeSeriesParams.TIME_SERIES_DEFAULT_METRIC_PARAM
+                            + "]"
+                    );
+                }
+            });
+
             this.script.precludesParameters(ignoreMalformed, coerce, nullValue);
             addScriptValidation(script, indexed, hasDocValues);
 
@@ -278,7 +295,8 @@ protected Parameter<?>[] getParameters() {
                 onScriptErrorParam,
                 meta,
                 dimension,
-                metric };
+                metric,
+                defaultMetric };
         }
 
         @Override
@@ -1843,6 +1861,7 @@ public static class NumberFieldType extends SimpleMappedFieldType {
         private final FieldValues<Number> scriptValues;
         private final boolean isDimension;
         private final MetricType metricType;
+        private final GaugeAggs defaultMetric;
         private final IndexMode indexMode;
         private final boolean isSyntheticSource;
 
@@ -1858,6 +1877,7 @@ public NumberFieldType(
             FieldValues<Number> script,
             boolean isDimension,
             MetricType metricType,
+            GaugeAggs defaultMetric,
             IndexMode indexMode,
             boolean isSyntheticSource
         ) {
@@ -1868,6 +1888,7 @@ public NumberFieldType(
             this.scriptValues = script;
             this.isDimension = isDimension;
             this.metricType = metricType;
+            this.defaultMetric = defaultMetric;
             this.indexMode = indexMode;
             this.isSyntheticSource = isSyntheticSource;
         }
@@ -1885,6 +1906,7 @@ public NumberFieldType(
                 builder.scriptValues(),
                 builder.dimension.getValue(),
                 builder.metric.getValue(),
+                builder.defaultMetric.getValue(),
                 builder.indexMode,
                 isSyntheticSource
             );
@@ -1895,7 +1917,7 @@ public NumberFieldType(String name, NumberType type) {
         }
 
         public NumberFieldType(String name, NumberType type, boolean isIndexed) {
-            this(name, type, isIndexed, false, true, true, null, Collections.emptyMap(), null, false, null, null, false);
+            this(name, type, isIndexed, false, true, true, null, Collections.emptyMap(), null, false, null, null, null, false);
         }
 
         @Override
@@ -2092,6 +2114,7 @@ public MetricType getMetricType() {
     private final ScriptCompiler scriptCompiler;
     private final Script script;
     private final MetricType metricType;
+    private final GaugeAggs defaultMetric;
     private boolean allowMultipleValues;
     private final IndexVersion indexCreatedVersion;
     private final boolean isSyntheticSource;
@@ -2123,6 +2146,7 @@ private NumberFieldMapper(
         this.scriptCompiler = builder.scriptCompiler;
         this.script = builder.script.getValue();
         this.metricType = builder.metric.getValue();
+        this.defaultMetric = builder.defaultMetric.getValue();
         this.allowMultipleValues = builder.allowMultipleValues;
         this.indexCreatedVersion = builder.indexCreatedVersion;
         this.isSyntheticSource = isSyntheticSource;

server/src/main/java/org/elasticsearch/index/mapper/TimeSeriesParams.java

@@ -11,7 +11,9 @@
 
 import java.util.Arrays;
 import java.util.EnumSet;
+import java.util.List;
 import java.util.Locale;
+import java.util.Set;
 import java.util.function.Function;
 
 /**
@@ -21,6 +23,7 @@ public final class TimeSeriesParams {
 
     public static final String TIME_SERIES_METRIC_PARAM = "time_series_metric";
     public static final String TIME_SERIES_DIMENSION_PARAM = "time_series_dimension";
+    public static final String TIME_SERIES_DEFAULT_METRIC_PARAM = "default_metric";
 
     private TimeSeriesParams() {}
 
@@ -33,7 +36,7 @@ private TimeSeriesParams() {}
      * single number metrics, and `false` for the POSITION metric.
      */
     public enum MetricType {
-        GAUGE(new String[] { "max", "min", "value_count", "sum" }),
+        GAUGE(GaugeAggs.allValuesAsString().toArray(String[]::new)),
         COUNTER(new String[] { "last_value" }),
         POSITION(new String[] {}, false);
 
@@ -74,6 +77,22 @@ public static MetricType fromString(String value) {
         }
     }
 
+    public enum GaugeAggs {
+        MAX,
+        MIN,
+        SUM,
+        VALUE_COUNT;
+
+        @Override
+        public final String toString() {
+            return name().toLowerCase(Locale.ROOT);
+        }
+
+        private static List<String> allValuesAsString() {
+            return Arrays.stream(GaugeAggs.values()).map(GaugeAggs::toString).toList();
+        }
+    }
+
     public static FieldMapper.Parameter<MetricType> metricParam(Function<FieldMapper, MetricType> initializer, MetricType... values) {
         assert values.length > 0;
         EnumSet<MetricType> acceptedValues = EnumSet.noneOf(MetricType.class);
@@ -88,6 +107,17 @@ public static FieldMapper.Parameter<MetricType> metricParam(Function<FieldMapper
         ).acceptsNull();
     }
 
+    public static FieldMapper.Parameter<GaugeAggs> defaultMetric(Function<FieldMapper, GaugeAggs> initializer) {
+        return FieldMapper.Parameter.restrictedEnumParam(
+            TIME_SERIES_DEFAULT_METRIC_PARAM,
+            false,
+            initializer,
+            (GaugeAggs) null,
+            GaugeAggs.class,
+            Set.of(GaugeAggs.values())
+        ).acceptsNull();
+    }
+
     public static FieldMapper.Parameter<Boolean> dimensionParam(Function<FieldMapper, Boolean> initializer) {
         return FieldMapper.Parameter.boolParam(TIME_SERIES_DIMENSION_PARAM, false, initializer, false);
     }

server/src/test/java/org/elasticsearch/index/fielddata/IndexFieldDataServiceTests.java

@@ -337,6 +337,7 @@ public void testRequireDocValuesOnLongs() {
                 false,
                 null,
                 null,
+                null,
                 false
             )
         );
@@ -358,6 +359,7 @@ public void testRequireDocValuesOnDoubles() {
                 false,
                 null,
                 null,
+                null,
                 false
             )
         );

server/src/test/java/org/elasticsearch/index/mapper/NumberFieldTypeTests.java

@@ -141,6 +141,7 @@ private static MappedFieldType unsearchable() {
             false,
             null,
             null,
+            null,
             false
         );
     }

server/src/test/java/org/elasticsearch/search/aggregations/AggregatorBaseTests.java

@@ -93,6 +93,7 @@ private ValuesSourceConfig getVSConfig(
             false,
             null,
             null,
+            null,
             false
         );
         return ValuesSourceConfig.resolveFieldOnly(ft, context);

server/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregatorTests.java

@@ -1495,6 +1495,7 @@ public void testDocValuesFieldExistsForNumber() throws IOException {
             false,
             null,
             null,
+            null,
             false
         );
         docValuesFieldExistsTestCase(new ExistsQueryBuilder("f"), ft, true, i -> {
@@ -1519,6 +1520,7 @@ public void testDocValuesFieldExistsForNumberWithoutData() throws IOException {
                 false,
                 null,
                 null,
+                null,
                 false
             )
         );

server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregatorTests.java

@@ -312,6 +312,7 @@ public void testUnboundedRanges() throws IOException {
                     false,
                     null,
                     null,
+                    null,
                     false
                 )
             )
@@ -428,6 +429,7 @@ public void testNotFitIntoDouble() throws IOException {
             false,
             null,
             null,
+            null,
             false
         );
 
@@ -710,6 +712,7 @@ private void testCase(
             false,
             null,
             null,
+            null,
             false
         );
         RangeAggregationBuilder aggregationBuilder = new RangeAggregationBuilder("test_range_agg");

server/src/test/java/org/elasticsearch/search/collapse/CollapseBuilderTests.java

@@ -155,6 +155,7 @@ public void testBuild() throws IOException {
                 false,
                 null,
                 null,
+                null,
                 false
             );
             when(searchExecutionContext.getFieldType("field")).thenReturn(numberFieldType);
@@ -174,6 +175,7 @@ public void testBuild() throws IOException {
                 false,
                 null,
                 null,
+                null,
                 false
             );
             when(searchExecutionContext.getFieldType("field")).thenReturn(numberFieldType);

x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/rate/TimeSeriesRateAggregatorTests.java

@@ -210,6 +210,7 @@ private MappedFieldType counterField(String name) {
             null,
             false,
             TimeSeriesParams.MetricType.COUNTER,
+            null,
             IndexMode.TIME_SERIES,
             false
         );