This is an automated email from the ASF dual-hosted git repository.
ramanathan1504 pushed a change to branch
dependabot/github_actions/2.x/dependencies-aca0a8a16e
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
from f645fd0854 Generate changelog entries for #4137
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 df1d9a5198 Add developer information for Ramanathan Muthu (#4182)
add 38889a881f Include free-form message when encoding
StructuredDataMessage to XML (#4180)
add 819f2167ca fix: null-check parseAppender result in log4j-1.2-api
XmlConfiguration (#4172)
add 1f484a13d4 Bump org.apache.activemq:activemq-broker from 6.1.7 to
6.2.6 in /log4j-parent (#4178)
add 40e974e3a6 Bump org.apache.kafka:kafka-clients from 3.9.1 to 3.9.2 in
/log4j-parent (#4188)
add 7a862f6ba5 Bump org.codehaus.plexus:plexus-utils from 3.6.0 to 3.6.1
in /log4j-parent (#4187)
add 6d4460755e Bump org.slf4j:slf4j-nop from 2.0.17 to 2.0.18 in
/log4j-mongodb4 in the dependencies group across 1 directory (#4139)
add 06a8e68b1a Merge branch '2.x' into
dependabot/github_actions/2.x/dependencies-aca0a8a16e
No new revisions were added by this update.
Summary of changes:
.github/dependabot.yaml | 16 --
.mvn/wrapper/maven-wrapper.properties | 6 +-
.../org/apache/log4j/xml/XmlConfiguration.java | 16 +-
.../apache/log4j/config/XmlConfigurationTest.java | 13 ++
.../{log4j.xml => log4j1-invalid-appender.xml} | 11 +-
.../logging/log4j/message/MapMessageTest.java | 26 +++
.../log4j/message/StructuredDataMessageTest.java | 40 +++-
.../log4j/message/MapMessageJsonFormatter.java | 30 ++-
.../log4j/message/StructuredDataMessage.java | 9 +
.../logging/log4j/spi/TraceContextProvider.java | 52 +++++
.../org/apache/logging/log4j/spi/package-info.java | 2 +-
.../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 ++++
.../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 | 71 ++++++-
.../core/async/RingBufferLogEventTranslator.java | 51 ++++-
.../logging/log4j/core/async/package-info.java | 2 +-
.../logging/log4j/core/impl/Log4jLogEvent.java | 150 +++++++++++--
.../logging/log4j/core/impl/MutableLogEvent.java | 45 +++-
.../logging/log4j/core/impl/package-info.java | 2 +-
.../apache/logging/log4j/core/package-info.java | 2 +-
.../SpanIdPatternConverter.java} | 33 ++-
...verter.java => TraceFlagsPatternConverter.java} | 42 ++--
.../TraceIdPatternConverter.java} | 33 ++-
.../logging/log4j/core/pattern/package-info.java | 2 +-
.../core/util/TraceContextProviderService.java | 131 ++++++++++++
.../logging/log4j/core/util/package-info.java | 2 +-
log4j-mongodb4/pom.xml | 2 +-
log4j-parent/pom.xml | 6 +-
.../log4j/perf/jmh/AsyncTraceContextBenchmark.java | 181 ++++++++++++++++
mvnw | 48 ++++-
mvnw.cmd | 56 ++++-
pom.xml | 18 +-
...elay.xml => 1976_add_native_tracing_fields.xml} | 9 +-
...ion_delay.xml => 4012_add_max_random_delay.xml} | 2 +-
.../fix-MapMessage-JSON-non-finite-number.xml} | 4 +-
.../fix-StructuredDataMessage-XML-message.xml} | 5 +-
...eporting.xml => fix_xml_parse_appender_npe.xml} | 4 +-
...update_org.apache.activemq_activemq-broker.xml} | 4 +-
.../update_org.apache.kafka_kafka-clients.xml} | 4 +-
...=> update_org.codehaus.plexus_plexus-utils.xml} | 4 +-
...ns_stale.xml => update_org.slf4j_slf4j-nop.xml} | 4 +-
.../{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
...atePatternConverter_locale_without_timezone.xml | 3 +-
.../fix-MapMessage-JSON-non-finite-number.xml} | 4 +-
.../fix-StructuredDataMessage-XML-encoding.xml | 0
...nce-detection-for-exceptions-with-colliding.xml | 2 +-
.../fix-log-disruptor-initialization-errors.xml | 0
.../fix_configuration_source_url_leak.xml | 0
.../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
...atePatternConverter_locale_without_timezone.xml | 3 +-
.../fix-MapMessage-JSON-non-finite-number.xml} | 4 +-
.../fix-StructuredDataMessage-XML-encoding.xml | 0
...nce-detection-for-exceptions-with-colliding.xml | 2 +-
.../fix-log-disruptor-initialization-errors.xml | 0
.../fix_configuration_source_url_leak.xml | 0
.../fix_kafka_appender_retry_error_reporting.xml | 0
.../ROOT/pages/manual/appenders/rolling-file.adoc | 24 ++-
.../modules/ROOT/pages/manual/pattern-layout.adoc | 3 +-
85 files changed, 2043 insertions(+), 826 deletions(-)
copy log4j-1.2-api/src/test/resources/{log4j.xml =>
log4j1-invalid-appender.xml} (82%)
create mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/spi/TraceContextProvider.java
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/fix-MapMessage-JSON-non-finite-number.xml} (70%)
copy
src/changelog/{2.25.1/3787_jakarta-web_relax_the_import_package_constraints.xml
=> .2.x.x/fix-StructuredDataMessage-XML-message.xml} (60%)
copy src/changelog/.2.x.x/{fix_kafka_appender_retry_error_reporting.xml =>
fix_xml_parse_appender_npe.xml} (55%)
copy src/changelog/.2.x.x/{update_actions_stale.xml =>
update_org.apache.activemq_activemq-broker.xml} (61%)
copy src/changelog/{2.22.1/update_org_apache_kafka_kafka_clients.xml =>
.2.x.x/update_org.apache.kafka_kafka-clients.xml} (75%)
copy src/changelog/.2.x.x/{update_actions_stale.xml =>
update_org.codehaus.plexus_plexus-utils.xml} (61%)
copy src/changelog/.2.x.x/{update_actions_stale.xml =>
update_org.slf4j_slf4j-nop.xml} (63%)
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.x.x =>
2.25.5}/LOG4J2-4129_Fix_DatePatternConverter_locale_without_timezone.xml (82%)
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.x.x =>
2.25.5}/fix-circular-reference-detection-for-exceptions-with-colliding.xml (96%)
copy src/changelog/{.2.x.x =>
2.25.5}/fix-log-disruptor-initialization-errors.xml (100%)
copy src/changelog/{.2.x.x => 2.25.5}/fix_configuration_source_url_leak.xml
(100%)
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.x.x =>
2.26.1}/LOG4J2-4129_Fix_DatePatternConverter_locale_without_timezone.xml (82%)
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.x.x =>
2.26.1}/fix-circular-reference-detection-for-exceptions-with-colliding.xml (96%)
copy src/changelog/{.2.x.x =>
2.26.1}/fix-log-disruptor-initialization-errors.xml (100%)
copy src/changelog/{.2.x.x => 2.26.1}/fix_configuration_source_url_leak.xml
(100%)
copy src/changelog/{.2.x.x =>
2.26.1}/fix_kafka_appender_retry_error_reporting.xml (100%)
