From: alain <alain.kermis@sonarsource.com>
Date: Wed, 8 Feb 2023 10:53:57 +0000 (+0100)
Subject: SONAR-17714 Enable deprecation logging for ES
X-Git-Tag: 10.0.0.68432~244
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=794e0751ee58c6b636ea5be8742b99fb5f7bb786;p=sonarqube.git

SONAR-17714 Enable deprecation logging for ES

So far, there are no logs regarding deprecated features. However, we want to be notified in the logs should there be any deprecations in future ES releases.
---

diff --git a/server/sonar-main/src/main/java/org/sonar/application/es/EsLogging.java b/server/sonar-main/src/main/java/org/sonar/application/es/EsLogging.java
index b24a26818be..6a3fd6ec54e 100644
--- a/server/sonar-main/src/main/java/org/sonar/application/es/EsLogging.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/es/EsLogging.java
@@ -56,10 +56,6 @@ public class EsLogging {
       .logLevelConfig(
         LogLevelConfig.newBuilder(log4JPropertiesBuilder.getRootLoggerName())
           .rootLevelFor(ProcessId.ELASTICSEARCH)
-          // turn off ES type deprecation logging to not flood logs
-          .immutableLevel("DEPRECATION", Level.ERROR)
-          .immutableLevel("org.elasticsearch.deprecation", Level.ERROR)
-          .immutableLevel("org.elasticsearch.client.RestClient", Level.ERROR)
           .build())
       .build();
   }
diff --git a/server/sonar-main/src/test/java/org/sonar/application/es/EsLoggingTest.java b/server/sonar-main/src/test/java/org/sonar/application/es/EsLoggingTest.java
index 330cfc00e6b..6336e311249 100644
--- a/server/sonar-main/src/test/java/org/sonar/application/es/EsLoggingTest.java
+++ b/server/sonar-main/src/test/java/org/sonar/application/es/EsLoggingTest.java
@@ -64,15 +64,7 @@ public class EsLoggingTest {
       "appender.file_es.strategy.action.condition.nested_condition.type", "IfAccumulatedFileCount",
       "appender.file_es.strategy.action.condition.nested_condition.exceeds", "7",
       "rootLogger.level", "INFO",
-      "rootLogger.appenderRef.file_es.ref", "file_es",
-      "loggers", "DEPRECATION,org.elasticsearch.client.RestClient,org.elasticsearch.deprecation",
-      "logger.org.elasticsearch.client.RestClient.name", "org.elasticsearch.client.RestClient",
-      "logger.org.elasticsearch.deprecation.level", "ERROR",
-      "logger.org.elasticsearch.deprecation.name", "org.elasticsearch.deprecation",
-      "logger.DEPRECATION.level", "ERROR",
-      "logger.DEPRECATION.name", "DEPRECATION",
-      "logger.org.elasticsearch.client.RestClient.level", "ERROR"
-
+      "rootLogger.appenderRef.file_es.ref", "file_es"
     );
   }
 
diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/log/ServerProcessLogging.java b/server/sonar-server-common/src/main/java/org/sonar/server/log/ServerProcessLogging.java
index 85ff4a68e29..93566010bfa 100644
--- a/server/sonar-server-common/src/main/java/org/sonar/server/log/ServerProcessLogging.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/log/ServerProcessLogging.java
@@ -79,11 +79,6 @@ public abstract class ServerProcessLogging {
     builder.immutableLevel("org.elasticsearch.node", Level.INFO);
     builder.immutableLevel("org.elasticsearch.http", Level.INFO);
 
-    // turn off ES type deprecation logging to not flood logs
-    builder.immutableLevel("DEPRECATION", Level.ERROR);
-    builder.immutableLevel("org.elasticsearch.deprecation", Level.ERROR);
-    builder.immutableLevel("org.elasticsearch.client.RestClient", Level.ERROR);
-
     builder.immutableLevel("ch.qos.logback", Level.WARN);
     builder.immutableLevel("org.apache.catalina", Level.INFO);
     builder.immutableLevel("org.apache.coyote", Level.INFO);