1 files changed, 10 insertions, 2 deletions
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/SystemInfoProvider.java b/container-disc/src/main/java/com/yahoo/container/jdisc/SystemInfoProvider.java
index a34b7506666..39c4b108aa6 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/SystemInfoProvider.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/SystemInfoProvider.java
@@ -1,12 +1,14 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.container.jdisc;
 
+import ai.vespa.cloud.ApplicationId;
 import ai.vespa.cloud.Cluster;
 import ai.vespa.cloud.Environment;
 import ai.vespa.cloud.Node;
 import ai.vespa.cloud.SystemInfo;
 import ai.vespa.cloud.Zone;
 import com.google.inject.Inject;
+import com.yahoo.cloud.config.ApplicationIdConfig;
 import com.yahoo.cloud.config.ClusterInfoConfig;
 import com.yahoo.cloud.config.ConfigserverConfig;
 import com.yahoo.component.AbstractComponent;
@@ -24,8 +26,14 @@ public class SystemInfoProvider extends AbstractComponent implements Provider<Sy
     private final SystemInfo instance;
 
     @Inject
-    public SystemInfoProvider(ConfigserverConfig csConfig, QrConfig qrConfig, ClusterInfoConfig ciConfig) {
-        this.instance = new SystemInfo(new Zone(Environment.valueOf(csConfig.environment()), csConfig.region()),
+    public SystemInfoProvider(ConfigserverConfig csConfig,
+                              QrConfig qrConfig,
+                              ClusterInfoConfig ciConfig,
+                              ApplicationIdConfig applicationIdConfig) {
+        this.instance = new SystemInfo(new ApplicationId(applicationIdConfig.tenant(),
+                                                         applicationIdConfig.application(),
+                                                         applicationIdConfig.instance()),
+                                       new Zone(Environment.valueOf(csConfig.environment()), csConfig.region()),
                                        new Cluster(ciConfig.nodeCount(), ciConfig.nodeIndices()),
                                        new Node(qrConfig.nodeIndex()));
     }