Fix log message format bugs (#118354)

Author: joegallo

docs/changelog/118354.yaml

@@ -0,0 +1,5 @@
+pr: 118354
+summary: Fix log message format bugs
+area: Ingest Node
+type: bug
+issues: []

modules/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3BlobContainer.java

@@ -1025,7 +1025,7 @@ public void onResponse(Void unused) {
                             // should be no other processes interacting with the repository.
                             logger.warn(
                                 Strings.format(
-                                    "failed to clean up multipart upload [{}] of blob [{}][{}][{}]",
+                                    "failed to clean up multipart upload [%s] of blob [%s][%s][%s]",
                                     abortMultipartUploadRequest.getUploadId(),
                                     blobStore.getRepositoryMetadata().name(),
                                     abortMultipartUploadRequest.getBucketName(),

qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/FullClusterRestartDownsampleIT.java

@@ -263,7 +263,7 @@ private String getRollupIndexName() throws IOException {
         if (asMap.size() == 1) {
             return (String) asMap.keySet().toArray()[0];
         }
-        logger.warn("--> No matching rollup name for path [%s]", endpoint);
+        logger.warn("--> No matching rollup name for path [{}]", endpoint);
         return null;
     }
 

qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/DownsampleIT.java

@@ -238,7 +238,7 @@ private String getRollupIndexName() throws IOException {
         if (asMap.size() == 1) {
             return (String) asMap.keySet().toArray()[0];
         }
-        logger.warn("--> No matching rollup name for path [%s]", endpoint);
+        logger.warn("--> No matching rollup name for path [{}]", endpoint);
         return null;
     }
 

server/src/internalClusterTest/java/org/elasticsearch/index/seqno/RetentionLeaseIT.java

@@ -336,7 +336,7 @@ public void testRetentionLeasesSyncOnRecovery() throws Exception {
             .getShardOrNull(new ShardId(resolveIndex("index"), 0));
         final int length = randomIntBetween(1, 8);
         final Map<String, RetentionLease> currentRetentionLeases = new LinkedHashMap<>();
-        logger.info("adding retention [{}}] leases", length);
+        logger.info("adding retention [{}] leases", length);
         for (int i = 0; i < length; i++) {
             final String id = randomValueOtherThanMany(currentRetentionLeases.keySet()::contains, () -> randomAlphaOfLength(8));
             final long retainingSequenceNumber = randomLongBetween(0, Long.MAX_VALUE);

server/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java

@@ -3484,12 +3484,10 @@ private static void ensureNotAborted(ShardId shardId, SnapshotId snapshotId, Ind
                 // A normally running shard snapshot should be in stage INIT or STARTED. And we know it's not in PAUSING or ABORTED because
                 // the ensureNotAborted() call above did not throw. The remaining options don't make sense, if they ever happen.
                 logger.error(
-                    () -> Strings.format(
-                        "Shard snapshot found an unexpected state. ShardId [{}], SnapshotID [{}], Stage [{}]",
-                        shardId,
-                        snapshotId,
-                        shardSnapshotStage
-                    )
+                    "Shard snapshot found an unexpected state. ShardId [{}], SnapshotID [{}], Stage [{}]",
+                    shardId,
+                    snapshotId,
+                    shardSnapshotStage
                 );
                 assert false;
             }

x-pack/plugin/downsample/src/main/java/org/elasticsearch/xpack/downsample/DownsampleShardIndexer.java

@@ -386,7 +386,7 @@ public void collect(int docId, long owningBucketOrd) throws IOException {
 
                     if (logger.isTraceEnabled()) {
                         logger.trace(
-                            "Doc: [{}] - _tsid: [{}], @timestamp: [{}}] -> downsample bucket ts: [{}]",
+                            "Doc: [{}] - _tsid: [{}], @timestamp: [{}] -> downsample bucket ts: [{}]",
                             docId,
                             DocValueFormat.TIME_SERIES_ID.format(tsidHash),
                             timestampFormat.format(timestamp),

x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichPlugin.java

@@ -172,7 +172,7 @@ public EnrichPlugin(final Settings settings) {
             if (settings.hasValue(CACHE_SIZE_SETTING_NAME)) {
                 throw new IllegalArgumentException(
                     Strings.format(
-                        "Both [{}] and [{}] are set, please use [{}]",
+                        "Both [%s] and [%s] are set, please use [%s]",
                         CACHE_SIZE_SETTING_NAME,
                         CACHE_SIZE_SETTING_BWC_NAME,
                         CACHE_SIZE_SETTING_NAME