Merge pull request #35902 from vespa-engine/arnej/locale-configserver

arnej27959 · web-flow · commit 1f302243efa8 · 2026-02-13T10:47:25.000+01:00
Use Text.format in configserver module
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigConvergenceChecker.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigConvergenceChecker.java
@@ -24,6 +24,7 @@
 import org.apache.hc.core5.reactor.IOReactorConfig;
 import org.apache.hc.core5.util.TimeValue;
 import org.apache.hc.core5.util.Timeout;
+import com.yahoo.text.Text;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -183,7 +184,7 @@ private Map<ServiceInfo, Long> getServiceGenerations(List<ServiceInfo> services,
                                 log.log(
                                         FINE,
                                         error,
-                                        () -> String.format("Failed to retrieve service config generation for '%s': %s", service, error.getMessage()));
+                                        () -> Text.format("Failed to retrieve service config generation for '%s': %s", service, error.getMessage()));
                                 temporaryResult.put(service, -1L);
                             }
                             return null;
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigStateChecker.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigStateChecker.java
@@ -22,6 +22,7 @@
 import org.apache.hc.core5.reactor.IOReactorConfig;
 import org.apache.hc.core5.util.TimeValue;
 import org.apache.hc.core5.util.Timeout;
+import com.yahoo.text.Text;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -103,7 +104,7 @@ private Map<ServiceInfo, ServiceConfigState> getServiceConfigStates(List<Service
                                 log.log(
                                         FINE,
                                         error,
-                                        () -> String.format(
+                                        () -> Text.format(
                                                 "Failed to retrieve service config state for '%s': %s",
                                                 service, error.getMessage()));
                                 temporaryResult.put(service, new ServiceConfigState(-1L, Optional.empty()));
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/DefaultClusterReindexingStatusClient.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/DefaultClusterReindexingStatusClient.java
@@ -17,6 +17,7 @@
 import org.apache.hc.core5.http.HttpStatus;
 import org.apache.hc.core5.reactor.IOReactorConfig;
 import org.apache.hc.core5.util.Timeout;
+import com.yahoo.text.Text;
 
 import java.io.IOException;
 import java.net.URI;
@@ -75,7 +76,7 @@ public Map<String, ClusterReindexing> getReindexingStatus(ModelResult applicatio
     @Override public void close() { uncheck(() -> httpClient.close()); }
 
     private CompletableFuture<Map<String, ClusterReindexing>> getReindexingStatus(ServiceInfo service) {
-        URI uri = URI.create(String.format("http://%s:%d/reindexing/v1/status", service.getHostName(), getStatePort(service)));
+        URI uri = URI.create(Text.format("http://%s:%d/reindexing/v1/status", service.getHostName(), getStatePort(service)));
         CompletableFuture<SimpleHttpResponse> responsePromise = new CompletableFuture<>();
         httpClient.execute(SimpleRequestBuilder.get(uri).build(), new FutureCallback<>() {
             @Override public void completed(SimpleHttpResponse result) { responsePromise.complete(result); }
@@ -86,7 +87,7 @@ private CompletableFuture<Map<String, ClusterReindexing>> getReindexingStatus(Se
             if (response != null) {
                 return uncheck(() -> toClusterReindexing(response));
             } else {
-                throw throwUnchecked(new IOException(String.format("For '%s': %s", uri, error.getMessage()), error));
+                throw throwUnchecked(new IOException(Text.format("For '%s': %s", uri, error.getMessage()), error));
             }
         }, executor);
     }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java
@@ -31,6 +31,7 @@
 import com.yahoo.vespa.flags.PermanentFlags;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent;
+import com.yahoo.text.Text;
 
 import java.nio.file.Files;
 import java.nio.file.Paths;
@@ -374,7 +375,7 @@ private Application getApplication(ApplicationId appId, Optional<Version> vespaV
         try {
             return applicationMapper.getForVersion(appId, vespaVersion, clock.instant());
         } catch (VersionDoesNotExistException ex) {
-            throw new NotFoundException(String.format("%sNo such application (id %s): %s", TenantRepository.logPre(tenant), appId, ex.getMessage()));
+            throw new NotFoundException(Text.format("%sNo such application (id %s): %s", TenantRepository.logPre(tenant), appId, ex.getMessage()));
         }
     }
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java
@@ -30,6 +30,7 @@
 import com.yahoo.vespa.config.server.tenant.Tenant;
 import com.yahoo.yolean.Exceptions;
 import com.yahoo.yolean.concurrent.Memoized;
+import com.yahoo.text.Text;
 
 import java.time.Clock;
 import java.time.Duration;
@@ -181,9 +182,9 @@ private void restartServicesIfNeeded(ApplicationId applicationId) {
         long configGeneration = session.getSessionId();
         applicationRepository.modifyPendingRestarts(applicationId, pendingRestarts -> pendingRestarts.withRestarts(configGeneration, nodesToRestart));
         String hostnames = nodesToRestart.stream().sorted().collect(joining(", "));
-        deployLogger.log(Level.INFO, String.format("Scheduled service restart of %d nodes: %s",
+        deployLogger.log(Level.INFO, Text.format("Scheduled service restart of %d nodes: %s",
                                                    nodesToRestart.size(), hostnames));
-        log.info(String.format("%sWill schedule service restart of %d nodes after convergence on generation %d (unless restartOnDeploy enabled): %s",
+        log.info(Text.format("%sWill schedule service restart of %d nodes after convergence on generation %d (unless restartOnDeploy enabled): %s",
                                session.logPre(), nodesToRestart.size(), configGeneration, hostnames));
         configChangeActions = configChangeActions == null ? null : configChangeActions.withRestartActions(new RestartActions());
     }
@@ -200,7 +201,7 @@ private void storeReindexing(ApplicationId applicationId) {
 
             return reindexing;
         });
-        deployLogger.log(Level.INFO, String.format("Scheduled reindexing of %d document types across %d clusters: %s",
+        deployLogger.log(Level.INFO, Text.format("Scheduled reindexing of %d document types across %d clusters: %s",
                                                    entries.size(),
                                                    entries.stream().map(Reindexing::clusterId).distinct().count(),
                                                    entries.stream().collect(groupingBy(Reindexing::clusterId)).entrySet().stream()
@@ -224,8 +225,7 @@ private void applyDeferredReconfigurationOfClusters() {
                         "Cannot apply deferred reconfiguration: no model available for session " + session.getSessionId()));
         model.markClustersForDeferredReconfiguration(clustersWithDeferredReconfiguration);
         clustersWithDeferredReconfiguration.forEach(clusterName ->
-            deployLogger.log(Level.INFO, "Deferring reconfiguration of cluster '%s' until restart is completed"
-                    .formatted(clusterName)));
+            deployLogger.log(Level.INFO, Text.format("Deferring reconfiguration of cluster '%s' until restart is completed", clusterName)));
     }
 
     /**
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SecretStoreValidator.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SecretStoreValidator.java
@@ -15,6 +15,7 @@
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
 import org.apache.hc.core5.http.ContentType;
 import org.apache.hc.core5.http.io.entity.ByteArrayEntity;
+import com.yahoo.text.Text;
 
 import java.io.IOException;
 import java.net.URI;
@@ -64,7 +65,7 @@ private HttpResponse postRequest(URI uri, Slime slime) {
             return new ProxyResponse(httpClient.execute(postRequest));
         } catch (IOException e) {
             return HttpErrorResponse.internalServerError(
-                    String.format("Failed to post request to %s: %s", uri, Exceptions.toMessageString(e))
+                    Text.format("Failed to post request to %s: %s", uri, Exceptions.toMessageString(e))
             );
         }
     }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v1/RoutingStatusApiHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v1/RoutingStatusApiHandler.java
@@ -16,6 +16,8 @@
 import com.yahoo.vespa.curator.transaction.CuratorOperations;
 import com.yahoo.vespa.curator.transaction.CuratorTransaction;
 import com.yahoo.yolean.Exceptions;
+import com.yahoo.yolean.Exceptions;
+import com.yahoo.text.Text;
 
 import java.time.Clock;
 import java.time.Instant;
@@ -112,7 +114,7 @@ private SlimeJsonResponse getDeploymentStatus(RestApi.RequestContext context) {
         DeploymentRoutingStatus deploymentRoutingStatus = deploymentStatus(upstreamName);
         // If the entire zone is out, we always return OUT regardless of the actual routing status
         if (zoneStatus() == RoutingStatus.out) {
-            String reason = String.format("Rotation is OUT because the zone is OUT (actual deployment status is %s)",
+            String reason = Text.format("Rotation is OUT because the zone is OUT (actual deployment status is %s)",
                                           deploymentRoutingStatus.status().name().toUpperCase(Locale.ENGLISH));
             deploymentRoutingStatus = new DeploymentRoutingStatus(RoutingStatus.out, "operator", reason,
                                                                   clock.instant());
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/PendingRestartsMaintainer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/PendingRestartsMaintainer.java
@@ -101,7 +101,7 @@ static PendingRestarts triggerPendingRestarts(Function<Set<String>, ServiceListR
         long lowestGeneration = convergence.currentGeneration;
         Set<String> nodesToRestart = restarts.restartsReadyAt(lowestGeneration);
         if (nodesToRestart.isEmpty()) {
-            log.info(String.format("Cannot yet restart nodes of %s, as some services are still on generation %d:\n\t%s",
+            log.info(Text.format("Cannot yet restart nodes of %s, as some services are still on generation %d:\n\t%s",
                     id.toFullString(),
                     lowestGeneration,
                     convergence.services().stream()
@@ -112,7 +112,7 @@ static PendingRestarts triggerPendingRestarts(Function<Set<String>, ServiceListR
         }
 
         restarter.accept(id, nodesToRestart);
-        log.info(String.format("Scheduled restart of %d nodes after observing generation %d: %s",
+        log.info(Text.format("Scheduled restart of %d nodes after observing generation %d: %s",
                 nodesToRestart.size(), lowestGeneration, nodesToRestart.stream().sorted().collect(Collectors.joining(", "))));
 
         return restarts.withoutPreviousGenerations(lowestGeneration);
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetriever.java b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetriever.java
@@ -18,6 +18,7 @@
 import org.apache.hc.core5.http.io.entity.EntityUtils;
 import org.apache.hc.core5.util.TimeValue;
 import org.apache.hc.core5.util.Timeout;
+import com.yahoo.text.Text;
 
 import java.io.IOException;
 import java.net.URI;
@@ -91,7 +92,7 @@ public Map<ClusterInfo, DeploymentMetricsAggregator> requestMetricsGroupedByClus
         }
 
         log.log(Level.FINE, () ->
-                String.format("Metric retrieval for %d nodes took %d milliseconds", hosts.size(), System.currentTimeMillis() - startTime)
+                Text.format("Metric retrieval for %d nodes took %d milliseconds", hosts.size(), System.currentTimeMillis() - startTime)
         );
 
         return clusterMetricsMap;
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterSearchNodeMetricsRetriever.java b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterSearchNodeMetricsRetriever.java
@@ -56,7 +56,7 @@ public Map<String, SearchNodeMetricsAggregator> requestMetricsGroupedByCluster(C
         }
 
         log.log(Level.FINE, () ->
-                String.format("Proton metric retrieval for %d nodes took %d milliseconds", hosts.size(), System.currentTimeMillis() - startTime)
+                Text.format("Proton metric retrieval for %d nodes took %d milliseconds", hosts.size(), System.currentTimeMillis() - startTime)
         );*/
 
         return clusterMetricsMap;
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java
@@ -33,6 +33,7 @@
 import com.yahoo.vespa.config.server.tenant.TenantRepository;
 import com.yahoo.vespa.curator.Curator;
 import com.yahoo.vespa.flags.FlagSource;
+import com.yahoo.text.Text;
 
 import java.util.Comparator;
 import java.util.List;
@@ -98,7 +99,7 @@ protected Application buildModelVersion(ModelFactory modelFactory,
                                             ApplicationId applicationId,
                                             Optional<DockerImage> wantedDockerImageRepository,
                                             Version wantedNodeVespaVersion) {
-        log.log(Level.FINE, () -> String.format("Loading model version %s for session %s application %s",
+        log.log(Level.FINE, () -> Text.format("Loading model version %s for session %s application %s",
                                                 modelFactory.version(), applicationGeneration, applicationId));
         ModelContext.Properties modelContextProperties = createModelContextProperties(applicationId, modelFactory.version(), applicationPackage);
         Provisioned provisioned = new Provisioned();
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/security/GlobalConfigAuthorizationPolicy.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/security/GlobalConfigAuthorizationPolicy.java
@@ -5,6 +5,8 @@
 import com.yahoo.config.ConfigInstance;
 import com.yahoo.config.provision.NodeType;
 import com.yahoo.vespa.config.ConfigKey;
+import com.yahoo.vespa.config.ConfigKey;
+import com.yahoo.text.Text;
 
 import java.util.Arrays;
 import java.util.EnumSet;
@@ -32,7 +34,7 @@ enum GlobalConfigAuthorizationPolicy {
     static void verifyAccessAllowed(ConfigKey<?> configKey, NodeType nodeType) {
         GlobalConfigAuthorizationPolicy policy = findPolicyFromConfigKey(configKey);
         if (!policy.allowedToAccess.contains(nodeType)) {
-            String message = String.format(
+            String message = Text.format(
                     "Node with type '%s' is not allowed to access global config [%s]",
                     nodeType, configKey);
             throw new AuthorizationException(message);
@@ -43,7 +45,7 @@ private static GlobalConfigAuthorizationPolicy findPolicyFromConfigKey(ConfigKey
         return Arrays.stream(values())
                 .filter(policy -> policy.namespace.equals(configKey.getNamespace()) && policy.name.equals(configKey.getName()))
                 .findAny()
-                .orElseThrow(() -> new AuthorizationException(String.format("No policy defined for global config [%s]", configKey)));
+                .orElseThrow(() -> new AuthorizationException(Text.format("No policy defined for global config [%s]", configKey)));
     }
 
 }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/security/MultiTenantRpcAuthorizer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/security/MultiTenantRpcAuthorizer.java
@@ -18,6 +18,7 @@
 import com.yahoo.vespa.config.server.RequestHandler;
 import com.yahoo.vespa.config.server.host.HostRegistry;
 import com.yahoo.vespa.config.server.rpc.RequestHandlerProvider;
+import com.yahoo.text.Text;
 
 import java.security.cert.X509Certificate;
 import java.util.List;
@@ -83,7 +84,7 @@ private CompletableFuture<Void> doAsyncAuthorization(Request request, BiConsumer
                     try {
                         getPeerIdentity(request)
                                 .ifPresent(peerIdentity -> authorizer.accept(request, peerIdentity));
-                        log.log(Level.FINE, () -> String.format("Authorization succeeded for request '%s' from '%s'",
+                        log.log(Level.FINE, () -> Text.format("Authorization succeeded for request '%s' from '%s'",
                                                                    request.methodName(), request.target().toString()));
                     } catch (Throwable t) {
                         handleAuthorizationFailure(request, t);
@@ -111,7 +112,7 @@ private void doConfigRequestAuthorization(Request request, NodeIdentity peerIden
                         if (isConfigKeyForSentinelConfig(configKey)) {
                             return; // config processor will return empty sentinel config for unknown nodes
                         }
-                        throw new AuthorizationException(Type.SILENT, String.format("Host '%s' not found in host registry for [%s]", hostname, configKey));
+                        throw new AuthorizationException(Type.SILENT, Text.format("Host '%s' not found in host registry for [%s]", hostname, configKey));
                     }
                     RequestHandler tenantHandler = getTenantHandler(applicationId.tenant());
                     ApplicationId resolvedApplication = tenantHandler.resolveApplicationId(hostname);
@@ -120,12 +121,12 @@ private void doConfigRequestAuthorization(Request request, NodeIdentity peerIden
                         return; // allowed to access
                     }
                     throw new AuthorizationException(
-                            String.format(
+                            Text.format(
                                     "Peer is not allowed to access config owned by %s. Peer is owned by %s",
                                     resolvedApplication.toShortString(), peerOwner.toShortString()));
                 }
             default:
-                throw new AuthorizationException(String.format("'%s' nodes are not allowed to access config", peerIdentity.nodeType()));
+                throw new AuthorizationException(Text.format("'%s' nodes are not allowed to access config", peerIdentity.nodeType()));
         }
     }
 
@@ -144,16 +145,16 @@ private void doFileRequestAuthorization(Request request, NodeIdentity peerIdenti
                     return; // allowed to access
                 }
                 throw new AuthorizationException(
-                        String.format("Peer is not allowed to access file reference %s. Peer is owned by %s. File references owned by this application: %s",
+                        Text.format("Peer is not allowed to access file reference %s. Peer is owned by %s. File references owned by this application: %s",
                                       requestedFile.value(), peerOwner.toShortString(), filesOwnedByApplication));
             default:
-                throw new AuthorizationException(String.format("'%s' nodes are not allowed to access files", peerIdentity.nodeType()));
+                throw new AuthorizationException(Text.format("'%s' nodes are not allowed to access files", peerIdentity.nodeType()));
         }
     }
 
     private void handleAuthorizationFailure(Request request, Throwable throwable) {
         boolean isAuthorizationException = throwable instanceof AuthorizationException;
-        String errorMessage = String.format("For request '%s' from '%s': %s", request.methodName(), request.target().toString(), throwable.getMessage());
+        String errorMessage = Text.format("For request '%s' from '%s': %s", request.methodName(), request.target().toString(), throwable.getMessage());
         if (!isAuthorizationException || ((AuthorizationException) throwable).type() != Type.SILENT) {
             log.log(Level.INFO, errorMessage);
         }
@@ -179,7 +180,7 @@ private Optional<NodeIdentity> getPeerIdentity(Request request) {
         }
         try {
             NodeIdentity identity = nodeIdentifier.identifyNode(certChain);
-            log.log(Level.FINE, () -> String.format("Client '%s' identified as %s", request.target().toString(), identity.toString()));
+            log.log(Level.FINE, () -> Text.format("Client '%s' identified as %s", request.target().toString(), identity.toString()));
             return Optional.of(identity);
         } catch (NodeIdentifierException e) {
             throw new AuthorizationException("Failed to identify peer: " + e.getMessage(), e);
@@ -202,7 +203,7 @@ private static ApplicationId applicationId(NodeIdentity peerIdentity) {
 
     private RequestHandler getTenantHandler(TenantName tenantName) {
         return handlerProvider.getRequestHandler(tenantName)
-                .orElseThrow(() -> new AuthorizationException(String.format("No handler exists for tenant '%s'", tenantName.value())));
+                .orElseThrow(() -> new AuthorizationException(Text.format("No handler exists for tenant '%s'", tenantName.value())));
     }
 
     private enum JrtErrorCode {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/version/VersionState.java b/configserver/src/main/java/com/yahoo/vespa/config/server/version/VersionState.java
@@ -9,6 +9,7 @@
 import com.yahoo.text.Utf8;
 import com.yahoo.vespa.curator.Curator;
 import com.yahoo.vespa.defaults.Defaults;
+import com.yahoo.text.Text;
 
 import java.io.File;
 import java.io.FileReader;
@@ -115,7 +116,7 @@ File versionFile() {
 
     @Override
     public String toString() {
-        return String.format("Current version:%s, stored version:%s", currentVersion(), storedVersion());
+        return Text.format("Current version:%s, stored version:%s", currentVersion(), storedVersion());
     }
 
     private void verifyVersionIntervalForUpgrade(Version storedVersion) {

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@`
`31`	`31`	`import com.yahoo.vespa.flags.PermanentFlags;`
`32`	`32`	`import org.apache.curator.framework.CuratorFramework;`
`33`	`33`	`import org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent;`
	`34`	`+import com.yahoo.text.Text;`
`34`	`35`
`35`	`36`	`import java.nio.file.Files;`
`36`	`37`	`import java.nio.file.Paths;`
`@@ -374,7 +375,7 @@ private Application getApplication(ApplicationId appId, Optional<Version> vespaV`
`374`	`375`	`try {`
`375`	`376`	`return applicationMapper.getForVersion(appId, vespaVersion, clock.instant());`
`376`	`377`	`} catch (VersionDoesNotExistException ex) {`
`377`		`- throw new NotFoundException(String.format("%sNo such application (id %s): %s", TenantRepository.logPre(tenant), appId, ex.getMessage()));`
	`378`	`+ throw new NotFoundException(Text.format("%sNo such application (id %s): %s", TenantRepository.logPre(tenant), appId, ex.getMessage()));`
`378`	`379`	`}`
`379`	`380`	`}`
`380`	`381`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public Map<String, SearchNodeMetricsAggregator> requestMetricsGroupedByCluster(C`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`log.log(Level.FINE, () ->`
`59`		`- String.format("Proton metric retrieval for %d nodes took %d milliseconds", hosts.size(), System.currentTimeMillis() - startTime)`
	`59`	`+ Text.format("Proton metric retrieval for %d nodes took %d milliseconds", hosts.size(), System.currentTimeMillis() - startTime)`
`60`	`60`	`);*/`
`61`	`61`
`62`	`62`	`return clusterMetricsMap;`