This is an automated email from the ASF dual-hosted git repository.
ramanathan1504 pushed a change to branch fix-prop-config-format
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
from 522a0f1f92 Fix properties configuration format for nested custom
logger properties
add 019a92865a Fix stack trace rendering for exceptions with identity
malfunction (#4133)
add 2ca8348810 Remove the `patternFlags` attribute from `RegexFilter`
(#4119)
add dec43515eb Fix `DatePatternConverter` locale parsing when timezone is
omitted (#4130)
add 823d53d677 Harden `readObject(ObjectInputStream)` method argument
checks (#4098)
add f10c986684 Fix resource leaks in `ConfigurationSource` when loading
via URL (#4127)
add c588dd5e24 Adopt the Dependabot changelog 'draft trick' (#4148)
add ffef6a692a Add Dependabot config for the 2.26.x maintenance branch
(#4149)
add 19edb23e16 Fix handling of non-finite numbers while encoding
`MapMessage` to JSON (#4163)
add 6c0719998a Remove `/log4j-slf4j-impl` Dependabot execution (#4151)
add 07948345a9 Upgrade Maven and Maven Wrapper versions to `3.9.16` and
`3.3.4`, respectively (#4167)
add 7775e125ae Adds `maxRandomDelay` configure to Rolling Appenders (#4165)
add 7f5459bb11 Merge `2.26.1` to `2.x` (#4169)
add a52ad57022 Add `2.25.5` release notes (#4174)
add b6ba7d0af6 Add native tracing fields to LogEvent to eliminate async
MDC overhead (#4171)
add ae6e06ca6d Merge remote-tracking branch 'origin/2.x' into
fix-prop-config-format
add 9e99b10d6a Refactor PropertiesConfigurationBuilder to streamline
filter, appender, and logger creation
No new revisions were added by this update.
Summary of changes:
.github/dependabot.yaml | 37 +-
.github/workflows/build.yaml | 7 +
.github/workflows/codeql-analysis.yaml | 7 +
.github/workflows/process-dependabot.yaml | 7 +-
.mvn/wrapper/maven-wrapper.properties | 6 +-
.../src/main/java/org/apache/log4j/Level.java | 2 +
.../apache/log4j/util/SerializationTestHelper.java | 21 +-
.../logging/log4j/test/SerializableMatchers.java | 23 +-
.../logging/log4j/test/junit/SerialUtil.java | 44 ++-
.../logging/log4j/test/junit/package-info.java | 2 +-
.../apache/logging/log4j/test/package-info.java | 2 +-
.../log4j/message/FormattedMessageTest.java | 16 +-
.../log4j/message/LocalizedMessageTest.java | 7 +-
.../logging/log4j/message/MapMessageTest.java | 26 ++
.../log4j/message/ObjectArrayMessageTest.java | 13 +
.../log4j/message/StringFormattedMessageTest.java | 16 +-
.../logging/log4j/message/FormattedMessage.java | 2 +
.../logging/log4j/message/LocalizedMessage.java | 2 +
.../log4j/message/MapMessageJsonFormatter.java | 30 +-
.../log4j/message/MessageFormatMessage.java | 2 +
.../logging/log4j/message/ObjectArrayMessage.java | 2 +
.../logging/log4j/message/SimpleMessage.java | 2 +
.../log4j/message/StringFormattedMessage.java | 2 +
.../logging/log4j/message/ThreadDumpMessage.java | 2 +
.../logging/log4j/spi/TraceContextProvider.java | 52 +++
.../org/apache/logging/log4j/spi/package-info.java | 2 +-
.../logging/log4j/util/internal}/package-info.java | 17 +-
.../src/test/java/foo/TestFriendlyException.java | 76 +++-
.../rolling/FileExtensionCompressDelayTest.java | 179 ----------
.../rolling/RollingAppenderDirectCronTest.java | 12 +-
.../rolling/RollingAppenderRandomDelayTest.java | 235 ++++++++++++
.../rolling/action/GzCompressActionTest.java | 70 +---
.../rolling/action/ZipCompressActionTest.java | 70 +---
.../log4j/core/async/RingBufferLogEventTest.java | 45 +++
.../log4j/core/config/ConfigurationSourceTest.java | 94 +++++
.../log4j/core/filter/AbstractFilterTest.java | 1 -
.../log4j/core/filter/AbstractFilterableTest.java | 24 +-
.../logging/log4j/core/filter/RegexFilterTest.java | 133 +++++--
.../logging/log4j/core/impl/Log4jLogEventTest.java | 165 +++++++++
.../log4j/core/impl/MutableLogEventTest.java | 29 ++
.../log4j/core/impl/TestTraceContextProvider.java | 53 +++
.../core/impl/TraceContextIntegrationTest.java | 233 ++++++++++++
...g.apache.logging.log4j.spi.TraceContextProvider | 1 +
.../org/apache/logging/log4j/core/LogEvent.java | 41 +++
.../log4j/core/appender/RollingFileAppender.java | 17 +-
.../appender/RollingRandomAccessFileAppender.java | 12 +
.../logging/log4j/core/appender/package-info.java | 2 +-
.../appender/rolling/DefaultRolloverStrategy.java | 77 +---
.../log4j/core/appender/rolling/FileExtension.java | 108 +-----
.../core/appender/rolling/RollingFileManager.java | 167 ++++++---
.../rolling/RollingRandomAccessFileManager.java | 38 +-
.../appender/rolling/action/AbstractAction.java | 19 -
.../rolling/action/CommonsCompressAction.java | 27 --
.../appender/rolling/action/GzCompressAction.java | 45 +--
.../appender/rolling/action/ZipCompressAction.java | 31 +-
.../core/appender/rolling/action/package-info.java | 2 +-
.../log4j/core/async/RingBufferLogEvent.java | 73 +++-
.../core/async/RingBufferLogEventTranslator.java | 51 ++-
.../logging/log4j/core/async/package-info.java | 2 +-
.../log4j/core/config/ConfigurationSource.java | 51 +--
.../properties/PropertiesConfigurationBuilder.java | 177 ++--------
.../logging/log4j/core/filter/AbstractFilter.java | 28 ++
.../logging/log4j/core/filter/RegexFilter.java | 393 ++++++++++++++++-----
.../logging/log4j/core/filter/package-info.java | 2 +-
.../logging/log4j/core/impl/Log4jLogEvent.java | 152 +++++++-
.../logging/log4j/core/impl/MutableLogEvent.java | 47 ++-
.../logging/log4j/core/impl/ThrowableProxy.java | 14 +-
.../logging/log4j/core/impl/package-info.java | 2 +-
.../apache/logging/log4j/core/package-info.java | 2 +-
.../SpanIdPatternConverter.java} | 33 +-
.../core/pattern/ThrowableStackTraceRenderer.java | 16 +-
...verter.java => TraceFlagsPatternConverter.java} | 42 +--
.../TraceIdPatternConverter.java} | 33 +-
.../logging/log4j/core/pattern/package-info.java | 2 +-
.../apache/logging/log4j/core/util/Builder.java | 4 +
.../core/util/TraceContextProviderService.java | 131 +++++++
.../log4j/core/util/datetime/FastDatePrinter.java | 2 +
.../logging/log4j/core/util/package-info.java | 2 +-
.../log4j/perf/jmh/AsyncTraceContextBenchmark.java | 181 ++++++++++
.../logging/log4j/perf/nogc/OpenHashStringMap.java | 2 +
.../java/org/apache/logging/slf4j/Log4jLogger.java | 2 +
.../org/apache/logging/slf4j/SerializeTest.java | 6 +-
.../java/org/apache/logging/slf4j/Log4jLogger.java | 2 +
.../org/apache/logging/slf4j/SerializeTest.java | 6 +-
mvnw | 48 ++-
mvnw.cmd | 56 ++-
pom.xml | 6 +-
...elay.xml => 1976_add_native_tracing_fields.xml} | 9 +-
...ion_delay.xml => 4012_add_max_random_delay.xml} | 2 +-
...tePatternConverter_locale_without_timezone.xml} | 5 +-
.../fix-MapMessage-JSON-non-finite-number.xml} | 4 +-
...ce-detection-for-exceptions-with-colliding.xml} | 7 +-
.../fix_configuration_source_url_leak.xml} | 3 +-
.../harden_message_deserialization.xml} | 6 +-
.../.2.x.x/regexfilter_patternflags_builder.xml | 15 +
.../{2.24.3 => 2.25.5}/.release-notes.adoc.ftl | 2 +-
src/changelog/{2.23.0 => 2.25.5}/.release.xml | 2 +-
...2006_Fix_RollingFileAppender_createOnDemand.xml | 0
...tePatternConverter_locale_without_timezone.xml} | 4 +-
.../fix-MapMessage-JSON-non-finite-number.xml} | 4 +-
.../fix-StructuredDataMessage-XML-encoding.xml | 0
...ce-detection-for-exceptions-with-colliding.xml} | 5 +-
.../fix-log-disruptor-initialization-errors.xml | 0
.../fix_configuration_source_url_leak.xml} | 3 +-
.../fix_kafka_appender_retry_error_reporting.xml | 0
.../{2.25.2 => 2.26.1}/.release-notes.adoc.ftl | 2 +-
src/changelog/{2.23.0 => 2.26.1}/.release.xml | 2 +-
...2006_Fix_RollingFileAppender_createOnDemand.xml | 0
...tePatternConverter_locale_without_timezone.xml} | 4 +-
.../fix-MapMessage-JSON-non-finite-number.xml} | 4 +-
.../fix-StructuredDataMessage-XML-encoding.xml | 0
...ce-detection-for-exceptions-with-colliding.xml} | 5 +-
.../fix-log-disruptor-initialization-errors.xml | 0
.../fix_configuration_source_url_leak.xml} | 3 +-
.../fix_kafka_appender_retry_error_reporting.xml | 0
.../ROOT/pages/manual/appenders/rolling-file.adoc | 24 +-
.../modules/ROOT/pages/manual/pattern-layout.adoc | 11 +-
117 files changed, 2868 insertions(+), 1183 deletions(-)
create mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/spi/TraceContextProvider.java
copy
{log4j-core/src/main/java/org/apache/logging/log4j/core/util/internal/instant
=>
log4j-api/src/main/java/org/apache/logging/log4j/util/internal}/package-info.java
(78%)
delete mode 100644
log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/rolling/FileExtensionCompressDelayTest.java
create mode 100644
log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderRandomDelayTest.java
create mode 100644
log4j-core-test/src/test/java/org/apache/logging/log4j/core/impl/TestTraceContextProvider.java
create mode 100644
log4j-core-test/src/test/java/org/apache/logging/log4j/core/impl/TraceContextIntegrationTest.java
create mode 100644
log4j-core-test/src/test/resources/META-INF/services/org.apache.logging.log4j.spi.TraceContextProvider
copy
log4j-core/src/main/java/org/apache/logging/log4j/core/{lookup/MarkerLookup.java
=> pattern/SpanIdPatternConverter.java} (57%)
copy
log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/{LoggerFqcnPatternConverter.java
=> TraceFlagsPatternConverter.java} (55%)
copy
log4j-core/src/main/java/org/apache/logging/log4j/core/{lookup/MarkerLookup.java
=> pattern/TraceIdPatternConverter.java} (56%)
create mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/util/TraceContextProviderService.java
create mode 100644
log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncTraceContextBenchmark.java
copy src/changelog/.2.x.x/{4012_add_max_compression_delay.xml =>
1976_add_native_tracing_fields.xml} (50%)
rename src/changelog/.2.x.x/{4012_add_max_compression_delay.xml =>
4012_add_max_random_delay.xml} (74%)
copy src/changelog/{2.26.0/fix_RollingRandomAccessFileManager_writeHeader.xml
=> .2.x.x/LOG4J2-4129_Fix_DatePatternConverter_locale_without_timezone.xml}
(56%)
copy src/changelog/{2.26.0/fix_RollingRandomAccessFileManager_writeHeader.xml
=> .2.x.x/fix-MapMessage-JSON-non-finite-number.xml} (70%)
copy src/changelog/{2.25.1/3770_LoggerContext_start.xml =>
.2.x.x/fix-circular-reference-detection-for-exceptions-with-colliding.xml} (52%)
copy src/changelog/{2.18.0/Fix_minor_typo_792.xml =>
.2.x.x/fix_configuration_source_url_leak.xml} (59%)
copy src/changelog/{2.25.2/3852-default-target.xml =>
.2.x.x/harden_message_deserialization.xml} (64%)
create mode 100644 src/changelog/.2.x.x/regexfilter_patternflags_builder.xml
copy src/changelog/{2.24.3 => 2.25.5}/.release-notes.adoc.ftl (94%)
copy src/changelog/{2.23.0 => 2.25.5}/.release.xml (95%)
copy src/changelog/{.2.x.x =>
2.25.5}/LOG4J2-2006_Fix_RollingFileAppender_createOnDemand.xml (100%)
copy src/changelog/{2.26.0/fix_RollingRandomAccessFileManager_writeHeader.xml
=> 2.25.5/LOG4J2-4129_Fix_DatePatternConverter_locale_without_timezone.xml}
(59%)
copy src/changelog/{2.26.0/fix_RollingRandomAccessFileManager_writeHeader.xml
=> 2.25.5/fix-MapMessage-JSON-non-finite-number.xml} (70%)
copy src/changelog/{.2.x.x =>
2.25.5}/fix-StructuredDataMessage-XML-encoding.xml (100%)
copy src/changelog/{2.25.1/3770_LoggerContext_start.xml =>
2.25.5/fix-circular-reference-detection-for-exceptions-with-colliding.xml} (55%)
copy src/changelog/{.2.x.x =>
2.25.5}/fix-log-disruptor-initialization-errors.xml (100%)
copy src/changelog/{2.18.0/Fix_minor_typo_792.xml =>
2.25.5/fix_configuration_source_url_leak.xml} (59%)
copy src/changelog/{.2.x.x =>
2.25.5}/fix_kafka_appender_retry_error_reporting.xml (100%)
copy src/changelog/{2.25.2 => 2.26.1}/.release-notes.adoc.ftl (92%)
copy src/changelog/{2.23.0 => 2.26.1}/.release.xml (95%)
copy src/changelog/{.2.x.x =>
2.26.1}/LOG4J2-2006_Fix_RollingFileAppender_createOnDemand.xml (100%)
copy src/changelog/{2.26.0/fix_RollingRandomAccessFileManager_writeHeader.xml
=> 2.26.1/LOG4J2-4129_Fix_DatePatternConverter_locale_without_timezone.xml}
(59%)
copy src/changelog/{2.26.0/fix_RollingRandomAccessFileManager_writeHeader.xml
=> 2.26.1/fix-MapMessage-JSON-non-finite-number.xml} (70%)
copy src/changelog/{.2.x.x =>
2.26.1}/fix-StructuredDataMessage-XML-encoding.xml (100%)
copy src/changelog/{2.25.1/3770_LoggerContext_start.xml =>
2.26.1/fix-circular-reference-detection-for-exceptions-with-colliding.xml} (55%)
copy src/changelog/{.2.x.x =>
2.26.1}/fix-log-disruptor-initialization-errors.xml (100%)
copy src/changelog/{2.18.0/Fix_minor_typo_792.xml =>
2.26.1/fix_configuration_source_url_leak.xml} (59%)
copy src/changelog/{.2.x.x =>
2.26.1}/fix_kafka_appender_retry_error_reporting.xml (100%)
