diff options
| -rw-r--r-- | container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileProperties.java | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileProperties.java b/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileProperties.java index 5a12eeddd17..3f9df4d9955 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileProperties.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileProperties.java @@ -31,6 +31,9 @@ import java.util.Map; */ public class QueryProfileProperties extends Properties { + private static final String ENVIRONMENT = "environment"; + private static final String REGION = "region"; + private static final String INSTANCE = "instance"; private final CompiledQueryProfile profile; private final Map<String, Embedder> embedders; private final ZoneInfo zoneInfo; @@ -70,9 +73,9 @@ public class QueryProfileProperties extends Properties { this.embedders = embedders; this.zoneInfo = zoneInfo; this.zoneContext = Map.of( - "environment", zoneInfo.zone().environment().name(), - "region", zoneInfo.zone().region(), - "instance", zoneInfo.application().instance()); + ENVIRONMENT, zoneInfo.zone().environment().name(), + REGION, zoneInfo.zone().region(), + INSTANCE, zoneInfo.application().instance()); } @@ -297,11 +300,12 @@ public class QueryProfileProperties extends Properties { if (zoneInfo == ZoneInfo.defaultInfo()) return context; if (context == null) return zoneContext; if (context == zoneContext) return context; + if (context.containsKey(ENVIRONMENT) && context.containsKey(REGION) && context.containsKey(INSTANCE)) return context; Map<String, String> contextWithZoneInfo = new HashMap<>(context); - contextWithZoneInfo.putIfAbsent("environment", zoneInfo.zone().environment().name()); - contextWithZoneInfo.putIfAbsent("region", zoneInfo.zone().region()); - contextWithZoneInfo.putIfAbsent("instance", zoneInfo.application().instance()); + contextWithZoneInfo.putIfAbsent(ENVIRONMENT, zoneInfo.zone().environment().name()); + contextWithZoneInfo.putIfAbsent(REGION, zoneInfo.zone().region()); + contextWithZoneInfo.putIfAbsent(INSTANCE, zoneInfo.application().instance()); return Collections.unmodifiableMap(contextWithZoneInfo); } |