Skip to content

Commit 4ef3a58

Browse files
pgomulkapgomulka
authored
Change default deprecation logger level to CRITICAL backport(#77030) (#77482)
This commit changes default deprecation logger level to CRITICAL, where default means deprecations emitted by DeprecationLogger#critical method. It also introduces WARN deprecations which are emitted by DeprecationLogger#warn Those log lines emitted at WARN are meant to indicate that a functionality is deprecated but will not break at next major version. relates #76754
1 parent 6cccbf5 commit 4ef3a58

File tree

195 files changed

+509
-365
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

195 files changed

+509
-365
lines changed

‎distribution/src/config/log4j2.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ appender.deprecation_rolling_old.strategy.type = DefaultRolloverStrategy
9393
appender.deprecation_rolling_old.strategy.max = 4
9494
#################################################
9595
logger.deprecation.name = org.elasticsearch.deprecation
96-
logger.deprecation.level = deprecation
96+
logger.deprecation.level = WARN
9797
logger.deprecation.appenderRef.deprecation_rolling.ref = deprecation_rolling
9898
logger.deprecation.appenderRef.deprecation_rolling_old.ref = deprecation_rolling_old
9999
logger.deprecation.appenderRef.header_warning.ref = header_warning

‎docs/reference/setup/logging-config.asciidoc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,12 +200,12 @@ By default, {es} rolls and compresses deprecation logs at 1GB. The default
200200
configuration preserves a maximum of five log files: four rolled logs and an
201201
active log.
202202

203-
{es} emits deprecation log messages at the `DEPRECATION` level. To stop writing
204-
deprecation log messages, set `logger.deprecation.level` to `error`:
203+
{es} emits deprecation log messages at the `CRITICAL` level. To stop writing
204+
deprecation log messages, set `logger.deprecation.level` to `OFF`:
205205

206206
[source,properties]
207207
----
208-
logger.deprecation.level = error
208+
logger.deprecation.level = OFF
209209
----
210210

211211
You can identify what is triggering deprecated functionality if `X-Opaque-Id` was used as an HTTP header.

‎modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/CJKBigramFilterFactory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public TokenFilterFactory getSynonymFilter() {
9292
"] cannot be used to parse synonyms");
9393
}
9494
else {
95-
DEPRECATION_LOGGER.deprecate(DeprecationCategory.ANALYSIS, "synonym_tokenfilters", "Token filter [" + name()
95+
DEPRECATION_LOGGER.critical(DeprecationCategory.ANALYSIS, "synonym_tokenfilters", "Token filter [" + name()
9696
+ "] will not be usable to parse synonyms after v7.0");
9797
}
9898
}

‎modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/CommonAnalysisPlugin.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ public Map<String, AnalysisProvider<TokenFilterFactory>> getTokenFilters() {
239239
filters.put("dutch_stem", DutchStemTokenFilterFactory::new);
240240
filters.put("edge_ngram", EdgeNGramTokenFilterFactory::new);
241241
filters.put("edgeNGram", (IndexSettings indexSettings, Environment environment, String name, Settings settings) -> {
242-
deprecationLogger.deprecate(DeprecationCategory.ANALYSIS, "edgeNGram_deprecation",
242+
deprecationLogger.critical(DeprecationCategory.ANALYSIS, "edgeNGram_deprecation",
243243
"The [edgeNGram] token filter name is deprecated and will be removed in a future version. "
244244
+ "Please change the filter name to [edge_ngram] instead.");
245245
return new EdgeNGramTokenFilterFactory(indexSettings, environment, name, settings);
@@ -264,7 +264,7 @@ public Map<String, AnalysisProvider<TokenFilterFactory>> getTokenFilters() {
264264
filters.put("multiplexer", MultiplexerTokenFilterFactory::new);
265265
filters.put("ngram", NGramTokenFilterFactory::new);
266266
filters.put("nGram", (IndexSettings indexSettings, Environment environment, String name, Settings settings) -> {
267-
deprecationLogger.deprecate(DeprecationCategory.ANALYSIS, "nGram_deprecation",
267+
deprecationLogger.critical(DeprecationCategory.ANALYSIS, "nGram_deprecation",
268268
"The [nGram] token filter name is deprecated and will be removed in a future version. "
269269
+ "Please change the filter name to [ngram] instead.");
270270
return new NGramTokenFilterFactory(indexSettings, environment, name, settings);
@@ -313,7 +313,7 @@ public Map<String, AnalysisProvider<TokenizerFactory>> getTokenizers() {
313313
tokenizers.put("thai", ThaiTokenizerFactory::new);
314314
tokenizers.put("nGram", (IndexSettings indexSettings, Environment environment, String name, Settings settings) -> {
315315
if (indexSettings.getIndexVersionCreated().onOrAfter(org.elasticsearch.Version.V_7_6_0)) {
316-
deprecationLogger.deprecate(DeprecationCategory.ANALYSIS, "nGram_tokenizer_deprecation",
316+
deprecationLogger.critical(DeprecationCategory.ANALYSIS, "nGram_tokenizer_deprecation",
317317
"The [nGram] tokenizer name is deprecated and will be removed in a future version. "
318318
+ "Please change the tokenizer name to [ngram] instead.");
319319
}
@@ -322,7 +322,7 @@ public Map<String, AnalysisProvider<TokenizerFactory>> getTokenizers() {
322322
tokenizers.put("ngram", NGramTokenizerFactory::new);
323323
tokenizers.put("edgeNGram", (IndexSettings indexSettings, Environment environment, String name, Settings settings) -> {
324324
if (indexSettings.getIndexVersionCreated().onOrAfter(org.elasticsearch.Version.V_7_6_0)) {
325-
deprecationLogger.deprecate(DeprecationCategory.ANALYSIS, "edgeNGram_tokenizer_deprecation",
325+
deprecationLogger.critical(DeprecationCategory.ANALYSIS, "edgeNGram_tokenizer_deprecation",
326326
"The [edgeNGram] tokenizer name is deprecated and will be removed in a future version. "
327327
+ "Please change the tokenizer name to [edge_ngram] instead.");
328328
}
@@ -403,7 +403,7 @@ public List<PreConfiguredCharFilter> getPreConfiguredCharFilters() {
403403
filters.add(PreConfiguredCharFilter.singleton("html_strip", false, HTMLStripCharFilter::new));
404404
filters.add(PreConfiguredCharFilter.elasticsearchVersion("htmlStrip", false, (reader, version) -> {
405405
if (version.onOrAfter(org.elasticsearch.Version.V_6_3_0)) {
406-
deprecationLogger.deprecate(DeprecationCategory.ANALYSIS, "htmlStrip_deprecation",
406+
deprecationLogger.critical(DeprecationCategory.ANALYSIS, "htmlStrip_deprecation",
407407
"The [htmpStrip] char filter name is deprecated and will be removed in a future version. "
408408
+ "Please change the filter name to [html_strip] instead.");
409409
}
@@ -434,7 +434,7 @@ public List<PreConfiguredTokenFilter> getPreConfiguredTokenFilters() {
434434
"[delimited_payload_filter] is not supported for new indices, use [delimited_payload] instead");
435435
}
436436
if (version.onOrAfter(Version.V_6_2_0)) {
437-
deprecationLogger.deprecate(DeprecationCategory.ANALYSIS, "analysis_delimited_payload_filter",
437+
deprecationLogger.critical(DeprecationCategory.ANALYSIS, "analysis_delimited_payload_filter",
438438
"Deprecated [delimited_payload_filter] used, replaced by [delimited_payload]");
439439
}
440440
return new DelimitedPayloadTokenFilter(input,
@@ -454,7 +454,7 @@ public List<PreConfiguredTokenFilter> getPreConfiguredTokenFilters() {
454454
"The [edgeNGram] token filter name was deprecated in 6.4 and cannot be used in new indices. "
455455
+ "Please change the filter name to [edge_ngram] instead.");
456456
} else {
457-
deprecationLogger.deprecate(DeprecationCategory.ANALYSIS, "edgeNGram_deprecation",
457+
deprecationLogger.critical(DeprecationCategory.ANALYSIS, "edgeNGram_deprecation",
458458
"The [edgeNGram] token filter name is deprecated and will be removed in a future version. "
459459
+ "Please change the filter name to [edge_ngram] instead.");
460460
}
@@ -481,7 +481,7 @@ public List<PreConfiguredTokenFilter> getPreConfiguredTokenFilters() {
481481
throw new IllegalArgumentException("The [nGram] token filter name was deprecated in 6.4 and cannot be used in new indices. "
482482
+ "Please change the filter name to [ngram] instead.");
483483
} else {
484-
deprecationLogger.deprecate(DeprecationCategory.ANALYSIS, "nGram_deprecation",
484+
deprecationLogger.critical(DeprecationCategory.ANALYSIS, "nGram_deprecation",
485485
"The [nGram] token filter name is deprecated and will be removed in a future version. "
486486
+ "Please change the filter name to [ngram] instead.");
487487
}
@@ -559,15 +559,15 @@ public List<PreConfiguredTokenizer> getPreConfiguredTokenizers() {
559559
// Temporary shim for aliases. TODO deprecate after they are moved
560560
tokenizers.add(PreConfiguredTokenizer.elasticsearchVersion("nGram", (version) -> {
561561
if (version.onOrAfter(org.elasticsearch.Version.V_7_6_0)) {
562-
deprecationLogger.deprecate(DeprecationCategory.ANALYSIS, "nGram_tokenizer_deprecation",
562+
deprecationLogger.critical(DeprecationCategory.ANALYSIS, "nGram_tokenizer_deprecation",
563563
"The [nGram] tokenizer name is deprecated and will be removed in a future version. "
564564
+ "Please change the tokenizer name to [ngram] instead.");
565565
}
566566
return new NGramTokenizer();
567567
}));
568568
tokenizers.add(PreConfiguredTokenizer.elasticsearchVersion("edgeNGram", (version) -> {
569569
if (version.onOrAfter(org.elasticsearch.Version.V_7_6_0)) {
570-
deprecationLogger.deprecate(DeprecationCategory.ANALYSIS, "edgeNGram_tokenizer_deprecation",
570+
deprecationLogger.critical(DeprecationCategory.ANALYSIS, "edgeNGram_tokenizer_deprecation",
571571
"The [edgeNGram] tokenizer name is deprecated and will be removed in a future version. "
572572
+ "Please change the tokenizer name to [edge_ngram] instead.");
573573
}

‎modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/CommonGramsTokenFilterFactory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public TokenFilterFactory getSynonymFilter() {
5959
if (indexSettings.getIndexVersionCreated().onOrAfter(Version.V_7_0_0)) {
6060
throw new IllegalArgumentException("Token filter [" + name() + "] cannot be used to parse synonyms");
6161
} else {
62-
DEPRECATION_LOGGER.deprecate(DeprecationCategory.ANALYSIS, "synonym_tokenfilters", "Token filter [" + name()
62+
DEPRECATION_LOGGER.critical(DeprecationCategory.ANALYSIS, "synonym_tokenfilters", "Token filter [" + name()
6363
+ "] will not be usable to parse synonyms after v7.0");
6464
}
6565

‎modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/EdgeNGramTokenFilterFactory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public TokenFilterFactory getSynonymFilter() {
8181
throw new IllegalArgumentException("Token filter [" + name() + "] cannot be used to parse synonyms");
8282
}
8383
else {
84-
DEPRECATION_LOGGER.deprecate(DeprecationCategory.ANALYSIS, "synonym_tokenfilters",
84+
DEPRECATION_LOGGER.critical(DeprecationCategory.ANALYSIS, "synonym_tokenfilters",
8585
"Token filter [" + name() + "] will not be usable to parse synonyms after v7.0");
8686
return this;
8787
}

‎modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/FingerprintTokenFilterFactory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public TokenFilterFactory getSynonymFilter() {
4848
throw new IllegalArgumentException("Token filter [" + name() + "] cannot be used to parse synonyms");
4949
}
5050
else {
51-
DEPRECATION_LOGGER.deprecate(DeprecationCategory.ANALYSIS, "synonym_tokenfilters", "Token filter [" + name()
51+
DEPRECATION_LOGGER.critical(DeprecationCategory.ANALYSIS, "synonym_tokenfilters", "Token filter [" + name()
5252
+ "] will not be usable to parse synonyms after v7.0");
5353
return this;
5454
}

‎modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/LegacyDelimitedPayloadTokenFilterFactory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class LegacyDelimitedPayloadTokenFilterFactory extends DelimitedPayloadTo
2727
"[delimited_payload_filter] is not supported for new indices, use [delimited_payload] instead");
2828
}
2929
if (indexSettings.getIndexVersionCreated().onOrAfter(Version.V_6_2_0)) {
30-
deprecationLogger.deprecate(DeprecationCategory.ANALYSIS, "analysis_legacy_delimited_payload_filter",
30+
deprecationLogger.critical(DeprecationCategory.ANALYSIS, "analysis_legacy_delimited_payload_filter",
3131
"Deprecated [delimited_payload_filter] used, replaced by [delimited_payload]");
3232
}
3333
}

‎modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/MultiplexerTokenFilterFactory.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public TokenFilterFactory getSynonymFilter() {
5656
}
5757
else {
5858
if (preserveOriginal) {
59-
DEPRECATION_LOGGER.deprecate(DeprecationCategory.ANALYSIS, "synonym_tokenfilters",
59+
DEPRECATION_LOGGER.critical(DeprecationCategory.ANALYSIS, "synonym_tokenfilters",
6060
"Token filter [" + name() + "] will not be usable to parse synonyms after v7.0");
6161
return IDENTITY_FILTER;
6262
}
@@ -119,7 +119,7 @@ public TokenFilterFactory getSynonymFilter() {
119119
}
120120
else {
121121
if (preserveOriginal) {
122-
DEPRECATION_LOGGER.deprecate(DeprecationCategory.ANALYSIS, "synonym_tokenfilters",
122+
DEPRECATION_LOGGER.critical(DeprecationCategory.ANALYSIS, "synonym_tokenfilters",
123123
"Token filter [" + name() + "] will not be usable to parse synonyms after v7.0");
124124
return IDENTITY_FILTER;
125125
}

‎modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/NGramTokenFilterFactory.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public class NGramTokenFilterFactory extends AbstractTokenFilterFactory {
4242
+ maxAllowedNgramDiff + "] but was [" + ngramDiff + "]. This limit can be set by changing the ["
4343
+ IndexSettings.MAX_NGRAM_DIFF_SETTING.getKey() + "] index level setting.");
4444
} else {
45-
deprecationLogger.deprecate(DeprecationCategory.ANALYSIS, "ngram_big_difference",
45+
deprecationLogger.critical(DeprecationCategory.ANALYSIS, "ngram_big_difference",
4646
"Deprecated big difference between max_gram and min_gram in NGram Tokenizer,"
4747
+ "expected difference must be less than or equal to: [" + maxAllowedNgramDiff + "]");
4848
}
@@ -61,7 +61,7 @@ public TokenFilterFactory getSynonymFilter() {
6161
throw new IllegalArgumentException("Token filter [" + name() + "] cannot be used to parse synonyms");
6262
}
6363
else {
64-
DEPRECATION_LOGGER.deprecate(DeprecationCategory.ANALYSIS, "synonym_tokenfilters",
64+
DEPRECATION_LOGGER.critical(DeprecationCategory.ANALYSIS, "synonym_tokenfilters",
6565
"Token filter [" + name() + "] will not be usable to parse synonyms after v7.0");
6666
return this;
6767
}

0 commit comments

Comments
 (0)