aboutsummaryrefslogtreecommitdiffstats
path: root/container-disc
diff options
context:
space:
mode:
authorArnstein Ressem <aressem@gmail.com>2021-12-10 15:38:21 +0100
committerGitHub <noreply@github.com>2021-12-10 15:38:21 +0100
commit08555794357171dbd299d80ed3e8d353c7b79e9f (patch)
treeb5dd60f1938f743c9798e401f3b29b30aad830a2 /container-disc
parent8ff6429daf9a695f2fa5d45a8033c75fdadfcfe2 (diff)
Revert "Add zone info to query profile context"
Diffstat (limited to 'container-disc')
-rw-r--r--container-disc/src/main/java/com/yahoo/container/jdisc/ZoneInfoProvider.java9
1 files changed, 2 insertions, 7 deletions
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 864d44886cb..30a4c740ff0 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,12 +1,10 @@
// 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;
@@ -22,11 +20,8 @@ public class ZoneInfoProvider extends AbstractComponent implements Provider<Zone
private final ZoneInfo instance;
@Inject
- 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()));
+ public ZoneInfoProvider(ConfigserverConfig csConfig) {
+ this.instance = new ZoneInfo(new Zone(Environment.valueOf(csConfig.environment()), csConfig.region()));
}
@Override