diff options
author | Jon Bratseth <bratseth@gmail.com> | 2021-12-09 15:31:17 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2021-12-09 15:31:17 +0100 |
commit | 9822c3c3e54cab0befb7dfb7f34dc4eced6a796d (patch) | |
tree | 34bad004b0c26f6d290215c5272b64469c8dc13a /container-disc | |
parent | 800c53c580717f7f1d8bcc02d31235ac6d3673d2 (diff) |
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.java | 9 |
1 files changed, 7 insertions, 2 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 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 |