1 files changed, 6 insertions, 2 deletions
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/model/ApplicationInstanceGenerator.java b/service-monitor/src/main/java/com/yahoo/vespa/service/model/ApplicationInstanceGenerator.java
index 0116b992e23..d0ecad5f27a 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/model/ApplicationInstanceGenerator.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/model/ApplicationInstanceGenerator.java
@@ -58,8 +58,12 @@ public class ApplicationInstanceGenerator {
     }
 
     public ApplicationInstanceReference toApplicationInstanceReference() {
-        TenantId tenantId = new TenantId(applicationInfo.getApplicationId().tenant().toString());
-        ApplicationInstanceId applicationInstanceId = toApplicationInstanceId(applicationInfo.getApplicationId(), zone);
+        return toApplicationInstanceReference(applicationInfo.getApplicationId(), zone);
+    }
+
+    static ApplicationInstanceReference toApplicationInstanceReference(ApplicationId applicationId, Zone zone) {
+        TenantId tenantId = new TenantId(applicationId.tenant().toString());
+        ApplicationInstanceId applicationInstanceId = toApplicationInstanceId(applicationId, zone);
         return new ApplicationInstanceReference(tenantId, applicationInstanceId);
     }