diff options
author | Jon Bratseth <bratseth@oath.com> | 2021-12-10 14:01:39 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-10 14:01:39 +0100 |
commit | 13fb8a9a0f83d1d880e6cabcaf883c1af0dae1dd (patch) | |
tree | f0112193f9af6288ddbe784c7d6005f53a643a6c /container-disc | |
parent | 4b208ff41f0f574532aa3a48007e578adcfa6a46 (diff) | |
parent | 601da313b6c7b0ddb005d0870b16160d9c2a5f46 (diff) |
Merge pull request #20439 from vespa-engine/bratseth/zoneinfo-in-query-profile-context
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 |