Merge branch 'master' into bratseth/validate-model-elements

4 files changed, 8 insertions, 13 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilder.java
index 72358c1d413..1631bd228df 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilder.java
@@ -11,10 +11,8 @@ import com.yahoo.vespa.config.util.ConfigUtils;
 import com.yahoo.yolean.Exceptions;
 import org.w3c.dom.Element;
 import java.util.List;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-
 /**
  * Builder that transforms xml config to a slime tree representation of the config. The root element of the xml config
  * must be named 'config' and have a 'name' attribute that matches the name of the {@link ConfigDefinition}. The values
@@ -37,8 +35,8 @@ public class DomConfigPayloadBuilder {
     /**
      * Builds a {@link ConfigPayloadBuilder} representing the input 'config' xml element.
      *
-     * @param configE        The 'config' xml element
-     * @return a new payload builder built from xml.
+     * @param configE the 'config' xml element
+     * @return a new payload builder built from xml
      */
     public ConfigPayloadBuilder build(Element configE) {
         parseConfigName(configE);
@@ -120,7 +118,6 @@ public class DomConfigPayloadBuilder {
     private void parseLeaf(Element element, ConfigPayloadBuilder payloadBuilder, String parentName) {
         String name = extractName(element);
         String value = XML.getValue(element);
-        var definition = payloadBuilder.getConfigDefinition();
         if (value == null) {
             throw new ConfigurationRuntimeException("Element '" + name + "' must have either children or a value");
         }
@@ -134,7 +131,8 @@ public class DomConfigPayloadBuilder {
                 payloadBuilder.getArray(parentName).append(value);
             }
         }
-        else if (definition != null && definition.getModelDefs().containsKey(name)) { // model field special syntax
+        else if (element.hasAttribute("model-id") || element.hasAttribute("url") || element.hasAttribute("path")) {
+            // special syntax for "model" fields
             String modelString = modelElement("model-id", element);
             modelString += " " + modelElement("url", element);
             modelString += " " + modelElement("path", element);
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/PrometheusHelper.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/PrometheusHelper.java
index 43aaba555ab..adb5f389d54 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/state/PrometheusHelper.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/PrometheusHelper.java
@@ -52,6 +52,8 @@ public class PrometheusHelper {
         var value = sanitizeDouble(gaugeMetric.getLast());
         outputStream.write(getMetricLines(sanitizedMetricName, dimensions, value, timestamp));
 
+        /*
+        For now - only push "last" value - to limit metric volume
         sanitizedMetricName = getSanitizedMetricName(metricName, "average");
         value = sanitizeDouble(gaugeMetric.getAverage());
         outputStream.write(getMetricLines(sanitizedMetricName, dimensions, value, timestamp));
@@ -59,6 +61,7 @@ public class PrometheusHelper {
         sanitizedMetricName = getSanitizedMetricName(metricName, "max");
         value = sanitizeDouble(gaugeMetric.getMax());
         outputStream.write(getMetricLines(sanitizedMetricName, dimensions, value, timestamp));
+         */
     }
 
     private static byte[] getMetricLines(String metricName, String dimensions, Number value, long timestamp) {
diff --git a/container-core/src/test/java/com/yahoo/container/jdisc/state/MetricsPacketsHandlerTest.java b/container-core/src/test/java/com/yahoo/container/jdisc/state/MetricsPacketsHandlerTest.java
index 0072b32ad7d..75344f10c07 100644
--- a/container-core/src/test/java/com/yahoo/container/jdisc/state/MetricsPacketsHandlerTest.java
+++ b/container-core/src/test/java/com/yahoo/container/jdisc/state/MetricsPacketsHandlerTest.java
@@ -172,12 +172,6 @@ public class MetricsPacketsHandlerTest extends StateHandlerTestBase {
                 # HELP gauge_metric_last\s
                 # TYPE gauge_metric_last untyped
                 gauge_metric_last{dim1="value1",vespa_service="state-handler-test-base",} 0.2 0
-                # HELP gauge_metric_average\s
-                # TYPE gauge_metric_average untyped
-                gauge_metric_average{dim1="value1",vespa_service="state-handler-test-base",} 0.2 0
-                # HELP gauge_metric_max\s
-                # TYPE gauge_metric_max untyped
-                gauge_metric_max{dim1="value1",vespa_service="state-handler-test-base",} 0.2 0
                 # HELP counter_metric_count\s
                 # TYPE counter_metric_count untyped
                 counter_metric_count{dim1="value1",vespa_service="state-handler-test-base",} 5 0
diff --git a/model-integration/src/main/java/ai/vespa/embedding/BertBaseEmbedder.java b/model-integration/src/main/java/ai/vespa/embedding/BertBaseEmbedder.java
index 149598ee2dd..c25fc8704b0 100644
--- a/model-integration/src/main/java/ai/vespa/embedding/BertBaseEmbedder.java
+++ b/model-integration/src/main/java/ai/vespa/embedding/BertBaseEmbedder.java
@@ -152,7 +152,7 @@ public class BertBaseEmbedder implements Embedder {
     }
 
     private static Tensor createTokenTypeIds(Tensor d)  {
-        return d.map((x) -> x > 0 ? 0:0);
+        return d.map((x) -> 0);  // Assume only one token type
     }
 
     private int modifyThreadCount(int numThreads) {