diff --git a/buildSrc/src/main/resources/forbidden/es-server-signatures.txt b/buildSrc/src/main/resources/forbidden/es-server-signatures.txt index 9db17aaac0e93..d0757038c599e 100644 --- a/buildSrc/src/main/resources/forbidden/es-server-signatures.txt +++ b/buildSrc/src/main/resources/forbidden/es-server-signatures.txt @@ -133,3 +133,17 @@ java.time.OffsetDateTime#withYear(int) java.time.zone.ZoneRules#getStandardOffset(java.time.Instant) java.time.zone.ZoneRules#getDaylightSavings(java.time.Instant) java.time.zone.ZoneRules#isDaylightSavings(java.time.Instant) + +@defaultMessage Use logger methods with non-Object parameter +org.apache.logging.log4j.Logger#trace(java.lang.Object) +org.apache.logging.log4j.Logger#trace(java.lang.Object, java.lang.Throwable) +org.apache.logging.log4j.Logger#debug(java.lang.Object) +org.apache.logging.log4j.Logger#debug(java.lang.Object, java.lang.Throwable) +org.apache.logging.log4j.Logger#info(java.lang.Object) +org.apache.logging.log4j.Logger#info(java.lang.Object, java.lang.Throwable) +org.apache.logging.log4j.Logger#warn(java.lang.Object) +org.apache.logging.log4j.Logger#warn(java.lang.Object, java.lang.Throwable) +org.apache.logging.log4j.Logger#error(java.lang.Object) +org.apache.logging.log4j.Logger#error(java.lang.Object, java.lang.Throwable) +org.apache.logging.log4j.Logger#fatal(java.lang.Object) +org.apache.logging.log4j.Logger#fatal(java.lang.Object, java.lang.Throwable) diff --git a/server/src/main/java/org/elasticsearch/common/util/concurrent/QueueResizingEsThreadPoolExecutor.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/QueueResizingEsThreadPoolExecutor.java index b62f93d833de0..7cf019bd6c58b 100644 --- a/server/src/main/java/org/elasticsearch/common/util/concurrent/QueueResizingEsThreadPoolExecutor.java +++ b/server/src/main/java/org/elasticsearch/common/util/concurrent/QueueResizingEsThreadPoolExecutor.java @@ -197,7 +197,7 @@ protected void afterExecute(Runnable r, Throwable t) { } } catch (ArithmeticException e) { // There was an integer overflow, so just log about it, rather than adjust the queue size - logger.warn((Supplier) () -> new ParameterizedMessage( + logger.warn(() -> new ParameterizedMessage( "failed to calculate optimal queue size for [{}] thread pool, " + "total frame time [{}ns], tasks [{}], task execution time [{}ns]", getName(), totalRuntime, tasksPerFrame, totalNanos), diff --git a/server/src/main/java/org/elasticsearch/index/IndexService.java b/server/src/main/java/org/elasticsearch/index/IndexService.java index cdcefa5e02bf2..08cfe171712b0 100644 --- a/server/src/main/java/org/elasticsearch/index/IndexService.java +++ b/server/src/main/java/org/elasticsearch/index/IndexService.java @@ -448,7 +448,7 @@ private void closeShard(String reason, ShardId sId, IndexShard indexShard, Store } } catch (Exception e) { logger.warn( - (Supplier) () -> new ParameterizedMessage( + () -> new ParameterizedMessage( "[{}] failed to close store on shard removal (reason: [{}])", shardId, reason), e); } } @@ -467,7 +467,7 @@ private void onShardClose(ShardLock lock) { } catch (IOException e) { shardStoreDeleter.addPendingDelete(lock.getShardId(), indexSettings); logger.debug( - (Supplier) () -> new ParameterizedMessage( + () -> new ParameterizedMessage( "[{}] failed to delete shard content - scheduled a retry", lock.getShardId().id()), e); } } @@ -623,7 +623,7 @@ public synchronized void updateMetaData(final IndexMetaData metadata) { shard.onSettingsChanged(); } catch (Exception e) { logger.warn( - (Supplier) () -> new ParameterizedMessage( + () -> new ParameterizedMessage( "[{}] failed to notify shard about setting change", shard.shardId().id()), e); } } @@ -832,7 +832,7 @@ public final void run() { if (lastThrownException == null || sameException(lastThrownException, ex) == false) { // prevent the annoying fact of logging the same stuff all the time with an interval of 1 sec will spam all your logs indexService.logger.warn( - (Supplier) () -> new ParameterizedMessage( + () -> new ParameterizedMessage( "failed to run task {} - suppressing re-occurring exceptions unless the exception changes", toString()), ex); diff --git a/server/src/main/java/org/elasticsearch/indices/IndicesService.java b/server/src/main/java/org/elasticsearch/indices/IndicesService.java index 61be4e22f72fb..00f425acf740b 100644 --- a/server/src/main/java/org/elasticsearch/indices/IndicesService.java +++ b/server/src/main/java/org/elasticsearch/indices/IndicesService.java @@ -311,7 +311,7 @@ Map> statsByShard(final IndicesService indicesServi } } catch (IllegalIndexShardStateException | AlreadyClosedException e) { // we can safely ignore illegal state on ones that are closing for example - logger.trace((Supplier) () -> new ParameterizedMessage("{} ignoring shard stats", indexShard.shardId()), e); + logger.trace(() -> new ParameterizedMessage("{} ignoring shard stats", indexShard.shardId()), e); } } } @@ -561,7 +561,7 @@ public void removeIndex(final Index index, final IndexRemovalReason reason, fina deleteIndexStore(extraInfo, indexService.index(), indexSettings); } } catch (Exception e) { - logger.warn((Supplier) () -> new ParameterizedMessage("failed to remove index {} ([{}][{}])", index, reason, extraInfo), e); + logger.warn(() -> new ParameterizedMessage("failed to remove index {} ([{}][{}])", index, reason, extraInfo), e); } } @@ -617,7 +617,7 @@ public void deleteUnassignedIndex(String reason, IndexMetaData metaData, Cluster } deleteIndexStore(reason, metaData, clusterState); } catch (Exception e) { - logger.warn((Supplier) () -> new ParameterizedMessage("[{}] failed to delete unassigned index (reason [{}])", metaData.getIndex(), reason), e); + logger.warn(() -> new ParameterizedMessage("[{}] failed to delete unassigned index (reason [{}])", metaData.getIndex(), reason), e); } } } @@ -669,9 +669,9 @@ private void deleteIndexStoreIfDeletionAllowed(final String reason, final Index } success = true; } catch (LockObtainFailedException ex) { - logger.debug((Supplier) () -> new ParameterizedMessage("{} failed to delete index store - at least one shards is still locked", index), ex); + logger.debug(() -> new ParameterizedMessage("{} failed to delete index store - at least one shards is still locked", index), ex); } catch (Exception ex) { - logger.warn((Supplier) () -> new ParameterizedMessage("{} failed to delete index", index), ex); + logger.warn(() -> new ParameterizedMessage("{} failed to delete index", index), ex); } finally { if (success == false) { addPendingDelete(index, indexSettings); @@ -774,7 +774,7 @@ public IndexMetaData verifyIndexIsDeleted(final Index index, final ClusterState try { metaData = metaStateService.loadIndexState(index); } catch (Exception e) { - logger.warn((Supplier) () -> new ParameterizedMessage("[{}] failed to load state file from a stale deleted index, folders will be left on disk", index), e); + logger.warn(() -> new ParameterizedMessage("[{}] failed to load state file from a stale deleted index, folders will be left on disk", index), e); return null; } final IndexSettings indexSettings = buildIndexSettings(metaData); @@ -783,7 +783,7 @@ public IndexMetaData verifyIndexIsDeleted(final Index index, final ClusterState } catch (Exception e) { // we just warn about the exception here because if deleteIndexStoreIfDeletionAllowed // throws an exception, it gets added to the list of pending deletes to be tried again - logger.warn((Supplier) () -> new ParameterizedMessage("[{}] failed to delete index on disk", metaData.getIndex()), e); + logger.warn(() -> new ParameterizedMessage("[{}] failed to delete index on disk", metaData.getIndex()), e); } return metaData; } @@ -960,7 +960,7 @@ public void processPendingDeletes(Index index, IndexSettings indexSettings, Time nodeEnv.deleteIndexDirectoryUnderLock(index, indexSettings); iterator.remove(); } catch (IOException ex) { - logger.debug((Supplier) () -> new ParameterizedMessage("{} retry pending delete", index), ex); + logger.debug(() -> new ParameterizedMessage("{} retry pending delete", index), ex); } } else { assert delete.shardId != -1; @@ -970,7 +970,7 @@ public void processPendingDeletes(Index index, IndexSettings indexSettings, Time deleteShardStore("pending delete", shardLock, delete.settings); iterator.remove(); } catch (IOException ex) { - logger.debug((Supplier) () -> new ParameterizedMessage("{} retry pending delete", shardLock.getShardId()), ex); + logger.debug(() -> new ParameterizedMessage("{} retry pending delete", shardLock.getShardId()), ex); } } else { logger.warn("{} no shard lock for pending delete", delete.shardId); diff --git a/server/src/main/java/org/elasticsearch/rest/RestController.java b/server/src/main/java/org/elasticsearch/rest/RestController.java index 99f368a682fe0..d6aba28ce27eb 100644 --- a/server/src/main/java/org/elasticsearch/rest/RestController.java +++ b/server/src/main/java/org/elasticsearch/rest/RestController.java @@ -177,7 +177,7 @@ public void dispatchRequest(RestRequest request, RestChannel channel, ThreadCont channel.sendResponse(new BytesRestResponse(channel, e)); } catch (Exception inner) { inner.addSuppressed(e); - logger.error((Supplier) () -> + logger.error(() -> new ParameterizedMessage("failed to send failure response for uri [{}]", request.uri()), inner); } } diff --git a/server/src/main/java/org/elasticsearch/transport/TransportService.java b/server/src/main/java/org/elasticsearch/transport/TransportService.java index b63228c6f124c..517f7dd461f97 100644 --- a/server/src/main/java/org/elasticsearch/transport/TransportService.java +++ b/server/src/main/java/org/elasticsearch/transport/TransportService.java @@ -249,7 +249,7 @@ protected void doStop() { public void onRejection(Exception e) { // if we get rejected during node shutdown we don't wanna bubble it up logger.debug( - (Supplier) () -> new ParameterizedMessage( + () -> new ParameterizedMessage( "failed to notify response handler on rejection, action: {}", holderToNotify.action()), e); @@ -257,7 +257,7 @@ public void onRejection(Exception e) { @Override public void onFailure(Exception e) { logger.warn( - (Supplier) () -> new ParameterizedMessage( + () -> new ParameterizedMessage( "failed to notify response handler on exception, action: {}", holderToNotify.action()), e); @@ -611,7 +611,7 @@ private void sendRequestInternal(final Transport.C public void onRejection(Exception e) { // if we get rejected during node shutdown we don't wanna bubble it up logger.debug( - (Supplier) () -> new ParameterizedMessage( + () -> new ParameterizedMessage( "failed to notify response handler on rejection, action: {}", holderToNotify.action()), e); @@ -619,7 +619,7 @@ public void onRejection(Exception e) { @Override public void onFailure(Exception e) { logger.warn( - (Supplier) () -> new ParameterizedMessage( + () -> new ParameterizedMessage( "failed to notify response handler on exception, action: {}", holderToNotify.action()), e); @@ -667,8 +667,7 @@ public void onFailure(Exception e) { channel.sendResponse(e); } catch (Exception inner) { inner.addSuppressed(e); - logger.warn( - (Supplier) () -> new ParameterizedMessage( + logger.warn(() -> new ParameterizedMessage( "failed to notify channel of error message for action [{}]", action), inner); } } @@ -681,7 +680,7 @@ public void onFailure(Exception e) { } catch (Exception inner) { inner.addSuppressed(e); logger.warn( - (Supplier) () -> new ParameterizedMessage( + () -> new ParameterizedMessage( "failed to notify channel of error message for action [{}]", action), inner); } } @@ -1191,7 +1190,7 @@ protected void processException(final TransportResponseHandler handler, final Re handler.handleException(rtx); } catch (Exception e) { logger.error( - (Supplier) () -> new ParameterizedMessage( + () -> new ParameterizedMessage( "failed to handle exception for action [{}], handler [{}]", action, handler), e); } }