Skip to content

Commit 0a67cb4

Browse files
LOGGING: Upgrade to Log4J 2.11.1 (#32616)
* LOGGING: Upgrade to Log4J 2.11.1 * Upgrade to `2.11.1` to fix memory leaks in slow logger when logging large requests * This was caused by a bug in Log4J https://issues.apache.org/jira/browse/LOG4J2-2269 and is fixed in `2.11.1` via https://git-wip-us.apache.org/repos/asf?p=logging-log4j2.git;h=9496c0c * Fixes #32537 * Fixes #27300
1 parent 826399f commit 0a67cb4

21 files changed

+41
-27
lines changed

buildSrc/version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jts = 1.15.0
77
jackson = 2.8.10
88
snakeyaml = 1.17
99
# when updating log4j, please update also docs/java-api/index.asciidoc
10-
log4j = 2.9.1
10+
log4j = 2.11.1
1111
slf4j = 1.6.2
1212

1313
# when updating the JNA version, also update the version in buildSrc/build.gradle

docs/java-api/index.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ You need to also include Log4j 2 dependencies:
8181
<dependency>
8282
<groupId>org.apache.logging.log4j</groupId>
8383
<artifactId>log4j-core</artifactId>
84-
<version>2.9.1</version>
84+
<version>2.11.1</version>
8585
</dependency>
8686
--------------------------------------------------
8787

@@ -109,7 +109,7 @@ If you want to use another logger than Log4j 2, you can use http://www.slf4j.org
109109
<dependency>
110110
<groupId>org.apache.logging.log4j</groupId>
111111
<artifactId>log4j-to-slf4j</artifactId>
112-
<version>2.9.1</version>
112+
<version>2.11.1</version>
113113
</dependency>
114114
<dependency>
115115
<groupId>org.slf4j</groupId>

plugins/repository-hdfs/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,6 @@ thirdPartyAudit.excludes = [
564564
// we are not pulling in slf4j-ext, this is okay, Log4j will fallback gracefully
565565
'org.slf4j.ext.EventData',
566566

567-
'org.apache.log4j.AppenderSkeleton',
568567
'org.apache.log4j.AsyncAppender',
569568
'org.apache.log4j.helpers.ISO8601DateFormat',
570569
'org.apache.log4j.spi.ThrowableInformation',
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
4b41b53a3a2d299ce381a69d165381ca19f62912

plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.9.1.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

server/build.gradle

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,6 @@ thirdPartyAudit.excludes = [
220220
'com.fasterxml.jackson.dataformat.xml.JacksonXmlModule',
221221
'com.fasterxml.jackson.dataformat.xml.XmlMapper',
222222
'com.fasterxml.jackson.dataformat.xml.util.DefaultXmlPrettyPrinter',
223-
'com.fasterxml.jackson.databind.node.JsonNodeFactory',
224223
'com.fasterxml.jackson.databind.node.ObjectNode',
225224
'org.fusesource.jansi.Ansi',
226225
'org.fusesource.jansi.AnsiRenderer$Code',
@@ -262,12 +261,6 @@ thirdPartyAudit.excludes = [
262261
'javax.mail.internet.MimeMultipart',
263262
'javax.mail.internet.MimeUtility',
264263
'javax.mail.util.ByteArrayDataSource',
265-
'javax.persistence.AttributeConverter',
266-
'javax.persistence.EntityManager',
267-
'javax.persistence.EntityManagerFactory',
268-
'javax.persistence.EntityTransaction',
269-
'javax.persistence.Persistence',
270-
'javax.persistence.PersistenceException',
271264
'org.apache.commons.compress.compressors.CompressorStreamFactory',
272265
'org.apache.commons.compress.utils.IOUtils',
273266
'org.apache.commons.csv.CSVFormat',
@@ -311,6 +304,16 @@ thirdPartyAudit.excludes = [
311304
'com.google.common.geometry.S2LatLng',
312305
]
313306

307+
if (JavaVersion.current() <= JavaVersion.VERSION_1_8) {
308+
// Used by Log4J 2.11.1
309+
thirdPartyAudit.excludes += [
310+
'java.io.ObjectInputFilter',
311+
'java.io.ObjectInputFilter$Config',
312+
'java.io.ObjectInputFilter$FilterInfo',
313+
'java.io.ObjectInputFilter$Status'
314+
]
315+
}
316+
314317
if (JavaVersion.current() > JavaVersion.VERSION_1_8) {
315318
thirdPartyAudit.excludes += ['javax.xml.bind.DatatypeConverter']
316319
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3aba3398fe064a3eab4331f88161c7480e848418

server/licenses/log4j-1.2-api-2.9.1.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
268f0fe4df3eefe052b57c87ec48517d64fb2a10

server/licenses/log4j-api-2.9.1.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
592a48674c926b01a9a747c7831bcd82a9e6d6e4

server/licenses/log4j-core-2.9.1.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

server/src/test/java/org/elasticsearch/common/logging/LoggersTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ static class MockAppender extends AbstractAppender {
4646

4747
@Override
4848
public void append(LogEvent event) {
49-
lastEvent = event;
49+
lastEvent = event.toImmutable();
5050
}
5151

5252
ParameterizedMessage lastParameterizedMessage() {

test/logger-usage/build.gradle

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,13 @@ thirdPartyAudit.excludes = [
4545
'org.osgi.framework.wiring.BundleWire',
4646
'org.osgi.framework.wiring.BundleWiring'
4747
]
48+
49+
if (JavaVersion.current() <= JavaVersion.VERSION_1_8) {
50+
// Used by Log4J 2.11.1
51+
thirdPartyAudit.excludes += [
52+
'java.io.ObjectInputFilter',
53+
'java.io.ObjectInputFilter$Config',
54+
'java.io.ObjectInputFilter$FilterInfo',
55+
'java.io.ObjectInputFilter$Status'
56+
]
57+
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
4b41b53a3a2d299ce381a69d165381ca19f62912

x-pack/plugin/security/licenses/log4j-slf4j-impl-2.9.1.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

x-pack/plugin/sql/sql-action/build.gradle

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,6 @@ thirdPartyAudit.excludes = [
7676
'com.fasterxml.jackson.dataformat.xml.JacksonXmlModule',
7777
'com.fasterxml.jackson.dataformat.xml.XmlMapper',
7878
'com.fasterxml.jackson.dataformat.xml.util.DefaultXmlPrettyPrinter',
79-
'com.fasterxml.jackson.databind.node.JsonNodeFactory',
80-
'com.fasterxml.jackson.databind.node.ObjectNode',
8179
'com.lmax.disruptor.BlockingWaitStrategy',
8280
'com.lmax.disruptor.BusySpinWaitStrategy',
8381
'com.lmax.disruptor.EventFactory',
@@ -116,12 +114,6 @@ thirdPartyAudit.excludes = [
116114
'javax.mail.internet.MimeMultipart',
117115
'javax.mail.internet.MimeUtility',
118116
'javax.mail.util.ByteArrayDataSource',
119-
'javax.persistence.AttributeConverter',
120-
'javax.persistence.EntityManager',
121-
'javax.persistence.EntityManagerFactory',
122-
'javax.persistence.EntityTransaction',
123-
'javax.persistence.Persistence',
124-
'javax.persistence.PersistenceException',
125117
'org.apache.commons.compress.compressors.CompressorStreamFactory',
126118
'org.apache.commons.compress.utils.IOUtils',
127119
'org.apache.commons.csv.CSVFormat',
@@ -150,3 +142,13 @@ thirdPartyAudit.excludes = [
150142
'org.zeromq.ZMQ$Socket',
151143
'org.zeromq.ZMQ'
152144
]
145+
146+
if (JavaVersion.current() <= JavaVersion.VERSION_1_8) {
147+
// Used by Log4J 2.11.1
148+
thirdPartyAudit.excludes += [
149+
'java.io.ObjectInputFilter',
150+
'java.io.ObjectInputFilter$Config',
151+
'java.io.ObjectInputFilter$FilterInfo',
152+
'java.io.ObjectInputFilter$Status'
153+
]
154+
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
268f0fe4df3eefe052b57c87ec48517d64fb2a10

x-pack/plugin/sql/sql-action/licenses/log4j-api-2.9.1.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
592a48674c926b01a9a747c7831bcd82a9e6d6e4

x-pack/plugin/sql/sql-action/licenses/log4j-core-2.9.1.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)