diff --git a/modules/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3RetryingInputStream.java b/modules/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3RetryingInputStream.java index 0d8b2561f18f9..0ebf6c54b49aa 100644 --- a/modules/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3RetryingInputStream.java +++ b/modules/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3RetryingInputStream.java @@ -252,7 +252,7 @@ private void maybeLogForSuccessAfterRetries(int initialAttempt, String action) { action, blobStore.bucket(), blobKey, - purpose, + purpose.getKey(), attempt - initialAttempt ); } diff --git a/test/framework/src/main/java/org/elasticsearch/test/MockLogAppender.java b/test/framework/src/main/java/org/elasticsearch/test/MockLogAppender.java index f086230a96012..5e63dd2edefea 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/MockLogAppender.java +++ b/test/framework/src/main/java/org/elasticsearch/test/MockLogAppender.java @@ -241,8 +241,15 @@ public String toString() { } public Releasable capturing(Class... classes) { + return appendToLoggers(Arrays.stream(classes).map(LogManager::getLogger).toList()); + } + + public Releasable capturing(String... names) { + return appendToLoggers(Arrays.stream(names).map(LogManager::getLogger).toList()); + } + + private Releasable appendToLoggers(List loggers) { start(); - final var loggers = Arrays.stream(classes).map(LogManager::getLogger).toArray(Logger[]::new); for (final var logger : loggers) { Loggers.addAppender(logger, this); }