Merge pull request #29090 from vespa-engine/musum/log-using-regular-logger

Supply application id to OnnxModelCost.newCalculator

3 files changed, 36 insertions, 8 deletions

diff --git a/config-model-api/abi-spec.json b/config-model-api/abi-spec.json
index 1fc39b8fa1d..5d9ae6bc26e 100644
--- a/config-model-api/abi-spec.json
+++ b/config-model-api/abi-spec.json
@@ -1460,6 +1460,25 @@
     ],
     "fields" : [ ]
   },
+  "com.yahoo.config.model.api.OnnxModelCost$DisabledOnnxModelCost" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
+      "com.yahoo.config.model.api.OnnxModelCost",
+      "com.yahoo.config.model.api.OnnxModelCost$Calculator"
+    ],
+    "attributes" : [
+      "public"
+    ],
+    "methods" : [
+      "public void <init>()",
+      "public com.yahoo.config.model.api.OnnxModelCost$Calculator newCalculator(com.yahoo.config.application.api.ApplicationPackage, com.yahoo.config.application.api.DeployLogger)",
+      "public com.yahoo.config.model.api.OnnxModelCost$Calculator newCalculator(com.yahoo.config.application.api.ApplicationPackage, com.yahoo.config.provision.ApplicationId)",
+      "public long aggregatedModelCostInBytes()",
+      "public void registerModel(com.yahoo.config.application.api.ApplicationFile)",
+      "public void registerModel(java.net.URI)"
+    ],
+    "fields" : [ ]
+  },
   "com.yahoo.config.model.api.OnnxModelCost" : {
     "superClass" : "java.lang.Object",
     "interfaces" : [ ],
@@ -1470,6 +1489,7 @@
     ],
     "methods" : [
       "public abstract com.yahoo.config.model.api.OnnxModelCost$Calculator newCalculator(com.yahoo.config.application.api.ApplicationPackage, com.yahoo.config.application.api.DeployLogger)",
+      "public abstract com.yahoo.config.model.api.OnnxModelCost$Calculator newCalculator(com.yahoo.config.application.api.ApplicationPackage, com.yahoo.config.provision.ApplicationId)",
       "public static com.yahoo.config.model.api.OnnxModelCost disabled()"
     ],
     "fields" : [ ]
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/OnnxModelCost.java b/config-model-api/src/main/java/com/yahoo/config/model/api/OnnxModelCost.java
index 6ce46e4f2af..02a32852e08 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/OnnxModelCost.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/OnnxModelCost.java
@@ -5,6 +5,7 @@ package com.yahoo.config.model.api;
 import com.yahoo.config.application.api.ApplicationFile;
 import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.config.application.api.DeployLogger;
+import com.yahoo.config.provision.ApplicationId;
 
 import java.net.URI;
 
@@ -13,7 +14,8 @@ import java.net.URI;
  */
 public interface OnnxModelCost {
 
-    Calculator newCalculator(ApplicationPackage appPkg, DeployLogger logger);
+    Calculator newCalculator(ApplicationPackage appPkg, DeployLogger deployLogger); // TODO: Remove when 8.249 is oldest model in use
+    Calculator newCalculator(ApplicationPackage appPkg, ApplicationId applicationId);
 
     interface Calculator {
         long aggregatedModelCostInBytes();
@@ -21,12 +23,14 @@ public interface OnnxModelCost {
         void registerModel(URI uri);
     }
 
-    static OnnxModelCost disabled() {
-        return (__, ___) -> new Calculator() {
-            @Override public long aggregatedModelCostInBytes() { return 0; }
-            @Override public void registerModel(ApplicationFile path) {}
-            @Override public void registerModel(URI uri) {}
-        };
+    static OnnxModelCost disabled() { return new DisabledOnnxModelCost(); }
+
+    class DisabledOnnxModelCost implements OnnxModelCost, Calculator {
+        @Override public Calculator newCalculator(ApplicationPackage appPkg, DeployLogger deployLogger) { return this; }
+        @Override public Calculator newCalculator(ApplicationPackage appPkg, ApplicationId applicationId) { return this; }
+        @Override public long aggregatedModelCostInBytes() {return 0;}
+        @Override public void registerModel(ApplicationFile path) {}
+        @Override public void registerModel(URI uri) {}
     }
 
 }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/JvmHeapSizeValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/JvmHeapSizeValidatorTest.java
index 9d4b8837d34..fd8e93d73ed 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/JvmHeapSizeValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/JvmHeapSizeValidatorTest.java
@@ -13,6 +13,7 @@ import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.config.model.deploy.TestProperties;
 import com.yahoo.config.model.provision.InMemoryProvisioner;
 import com.yahoo.config.model.test.MockApplicationPackage;
+import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.NodeResources;
 import com.yahoo.text.Text;
 import com.yahoo.vespa.model.VespaModel;
@@ -119,7 +120,10 @@ class JvmHeapSizeValidatorTest {
 
         ModelCostDummy(long modelCost) { this.modelCost = modelCost; }
 
-        @Override public Calculator newCalculator(ApplicationPackage appPkg, DeployLogger logger) { return this; }
+        @Override
+        public Calculator newCalculator(ApplicationPackage appPkg, DeployLogger deployLogger) { return this; }
+
+        @Override public Calculator newCalculator(ApplicationPackage appPkg, ApplicationId applicationId) { return this; }
         @Override public long aggregatedModelCostInBytes() { return totalCost.get(); }
         @Override public void registerModel(ApplicationFile path) {}