Revert "Add zone info to query profile context"

1 files changed, 10 insertions, 45 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
index 8925c647ad2..739058ade71 100644
--- a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
+++ b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
@@ -1,8 +1,6 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.handler;
 
-import ai.vespa.cloud.Environment;
-import ai.vespa.cloud.Zone;
 import com.google.inject.Inject;
 import com.yahoo.collections.Tuple2;
 import com.yahoo.component.ComponentSpecification;
@@ -55,7 +53,6 @@ import com.yahoo.statistics.Statistics;
 import com.yahoo.vespa.configdefinition.SpecialtokensConfig;
 import com.yahoo.yolean.Exceptions;
 import com.yahoo.yolean.trace.TraceNode;
-import ai.vespa.cloud.ZoneInfo;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -73,7 +70,6 @@ import java.util.logging.Logger;
  * Handles search request.
  *
  * @author Steinar Knutsen
- * @author bratseth
  */
 public class SearchHandler extends LoggingRequestHandler {
 
@@ -107,46 +103,22 @@ public class SearchHandler extends LoggingRequestHandler {
     private final ExecutionFactory executionFactory;
     private final AtomicLong numRequestsLeftToTrace;
 
-    private final ZoneInfo zoneInfo;
-
     private final static RequestHandlerSpec REQUEST_HANDLER_SPEC = RequestHandlerSpec.builder()
             .withAclMapping(SearchHandler.aclRequestMapper()).build();
 
-
     @Inject
     public SearchHandler(Metric metric,
                          ContainerThreadPool threadpool,
                          CompiledQueryProfileRegistry queryProfileRegistry,
                          ContainerHttpConfig config,
                          Embedder embedder,
-                         ExecutionFactory executionFactory,
-                         ZoneInfo zoneInfo) {
-        this(metric, threadpool.executor(), queryProfileRegistry, embedder, executionFactory,
-             config.numQueriesToTraceOnDebugAfterConstruction(),
-             config.hostResponseHeaderKey().equals("") ? Optional.empty() : Optional.of(config.hostResponseHeaderKey()),
-             zoneInfo);
-    }
-
-    /**
-     * @deprecated Use the @Inject annotated constructor instead.
-     */
-    @Deprecated // Vespa 8
-    public SearchHandler(Metric metric,
-                         ContainerThreadPool threadpool,
-                         CompiledQueryProfileRegistry queryProfileRegistry,
-                         ContainerHttpConfig config,
-                         Embedder embedder,
                          ExecutionFactory executionFactory) {
         this(metric, threadpool.executor(), queryProfileRegistry, embedder, executionFactory,
-             config.numQueriesToTraceOnDebugAfterConstruction(),
-             config.hostResponseHeaderKey().equals("") ? Optional.empty() : Optional.of(config.hostResponseHeaderKey()),
-             ZoneInfo.defaultInfo());
+                config.numQueriesToTraceOnDebugAfterConstruction(),
+                config.hostResponseHeaderKey().equals("") ? Optional.empty() : Optional.of(config.hostResponseHeaderKey()));
     }
 
-    /**
-     * @deprecated Use the @Inject annotated constructor instead.
-     */
-    @Deprecated // Vespa 8
+    @Deprecated
     public SearchHandler(Statistics statistics,
                          Metric metric,
                          ContainerThreadPool threadpool,
@@ -156,8 +128,7 @@ public class SearchHandler extends LoggingRequestHandler {
                          ExecutionFactory executionFactory) {
         this(metric, threadpool.executor(), queryProfileRegistry, embedder, executionFactory,
              config.numQueriesToTraceOnDebugAfterConstruction(),
-             config.hostResponseHeaderKey().equals("") ? Optional.empty() : Optional.of(config.hostResponseHeaderKey()),
-             ZoneInfo.defaultInfo());
+             config.hostResponseHeaderKey().equals("") ? Optional.empty() : Optional.of(config.hostResponseHeaderKey()));
     }
 
     /**
@@ -187,9 +158,8 @@ public class SearchHandler extends LoggingRequestHandler {
                          ExecutionFactory executionFactory) {
         this(metric, executor, queryProfileRegistry, Embedder.throwsOnUse, executionFactory,
              containerHttpConfig.numQueriesToTraceOnDebugAfterConstruction(),
-             containerHttpConfig.hostResponseHeaderKey().equals("") ? Optional.empty()
-                                                                    : Optional.of(containerHttpConfig.hostResponseHeaderKey()),
-             ZoneInfo.defaultInfo());
+             containerHttpConfig.hostResponseHeaderKey().equals("") ?
+                     Optional.empty() : Optional.of(containerHttpConfig.hostResponseHeaderKey()));
     }
 
     /**
@@ -206,9 +176,8 @@ public class SearchHandler extends LoggingRequestHandler {
         this(metric, executor, QueryProfileConfigurer.createFromConfig(queryProfileConfig).compile(),
              Embedder.throwsOnUse, executionFactory,
              containerHttpConfig.numQueriesToTraceOnDebugAfterConstruction(),
-             containerHttpConfig.hostResponseHeaderKey().equals("") ? Optional.empty()
-                                                                    : Optional.of( containerHttpConfig.hostResponseHeaderKey()),
-             ZoneInfo.defaultInfo());
+             containerHttpConfig.hostResponseHeaderKey().equals("") ?
+                     Optional.empty() : Optional.of( containerHttpConfig.hostResponseHeaderKey()));
     }
 
     /**
@@ -223,8 +192,7 @@ public class SearchHandler extends LoggingRequestHandler {
                          ExecutionFactory executionFactory,
                          Optional<String> hostResponseHeaderKey) {
         this(metric, executor, queryProfileRegistry, Embedder.throwsOnUse,
-             executionFactory, 0, hostResponseHeaderKey,
-             ZoneInfo.defaultInfo());
+             executionFactory, 0, hostResponseHeaderKey);
     }
 
     private SearchHandler(Metric metric,
@@ -233,8 +201,7 @@ public class SearchHandler extends LoggingRequestHandler {
                           Embedder embedder,
                           ExecutionFactory executionFactory,
                           long numQueriesToTraceOnDebugAfterStartup,
-                          Optional<String> hostResponseHeaderKey,
-                          ZoneInfo zoneInfo) {
+                          Optional<String> hostResponseHeaderKey) {
         super(executor, metric, true);
         log.log(Level.FINE, () -> "SearchHandler.init " + System.identityHashCode(this));
         this.queryProfileRegistry = queryProfileRegistry;
@@ -246,7 +213,6 @@ public class SearchHandler extends LoggingRequestHandler {
         this.hostResponseHeaderKey = hostResponseHeaderKey;
         this.numRequestsLeftToTrace = new AtomicLong(numQueriesToTraceOnDebugAfterStartup);
         metric.set(SEARCH_CONNECTIONS, 0.0d, null);
-        this.zoneInfo = zoneInfo;
     }
 
     /** @deprecated use the other constructor */
@@ -342,7 +308,6 @@ public class SearchHandler extends LoggingRequestHandler {
                                          .setRequestMap(requestMap)
                                          .setQueryProfile(queryProfile)
                                          .setEmbedder(embedder)
-                                         .setZoneInfo(zoneInfo)
                                          .build();
 
         boolean benchmarking = VespaHeaders.benchmarkOutput(request);