From cf7cf81ea64c016e5dcc9032462624ddb4460842 Mon Sep 17 00:00:00 2001
From: Jon Bratseth <bratseth@gmail.com>
Date: Mon, 13 Dec 2021 08:34:42 +0100
Subject: Revert "Merge pull request #20456 from
 vespa-engine/revert-20439-bratseth/zoneinfo-in-query-profile-context"

This reverts commit 2780822f7d1fc66ea2833b2b7aaa2b9cb74f5833, reversing
changes made to 8ff6429daf9a695f2fa5d45a8033c75fdadfcfe2.
---
 .../main/java/com/yahoo/container/jdisc/ZoneInfoProvider.java    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'container-disc/src/main/java/com/yahoo/container/jdisc')

diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/ZoneInfoProvider.java b/container-disc/src/main/java/com/yahoo/container/jdisc/ZoneInfoProvider.java
index 30a4c740ff0..864d44886cb 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/ZoneInfoProvider.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/ZoneInfoProvider.java
@@ -1,10 +1,12 @@
 // 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.Environment;
 import ai.vespa.cloud.Zone;
 import ai.vespa.cloud.ZoneInfo;
 import com.google.inject.Inject;
+import com.yahoo.cloud.config.ApplicationIdConfig;
 import com.yahoo.cloud.config.ConfigserverConfig;
 import com.yahoo.component.AbstractComponent;
 import com.yahoo.container.di.componentgraph.Provider;
@@ -20,8 +22,11 @@ public class ZoneInfoProvider extends AbstractComponent implements Provider<Zone
     private final ZoneInfo instance;
 
     @Inject
-    public ZoneInfoProvider(ConfigserverConfig csConfig) {
-        this.instance = new ZoneInfo(new Zone(Environment.valueOf(csConfig.environment()), csConfig.region()));
+    public ZoneInfoProvider(ConfigserverConfig csConfig, ApplicationIdConfig applicationIdConfig) {
+        this.instance = new ZoneInfo(new ApplicationId(applicationIdConfig.tenant(),
+                                                       applicationIdConfig.application(),
+                                                       applicationIdConfig.instance()),
+                                     new Zone(Environment.valueOf(csConfig.environment()), csConfig.region()));
     }
 
     @Override
-- 
cgit v1.2.3