This is an automated email from the ASF dual-hosted git repository.
robbie pushed a change to branch new-logging
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
discard dca9127cbd fix some file references and update notes
discard f53f19eae3 convert some more test loggers
discard d6405d8f0e remove slf4j->jbl bridge from example
discard 852ed3583a replace a couple of examples logging.properties that enable
audit logger output
discard ab7eaed9cf add a note
discard a7a5a8efcf remove exclusion that is no longer needed
discard 0a40553600 switch another logger missed previously
discard e57dfbad67 fixups after rebase to main at
0ca44c0e6972991cf80e5feda34f6d02cf94dea0
discard f34c8c83e6 remove uses of JBL from compatibility tests, add
artemis-unit-test-support to snapshots CP to ensure test appender class is
found and avoids stacktracing
discard 13f15eb1a3 add another TODO note
discard 2bf49612aa move another old log config file out to root, for any later
comparisons needed
discard 1df5d62755 replace logging.properties files for e2e-tests server
configs
discard 4b46813327 remove commons-logging slf4j bridge now the karaf bits dont
cause beanutils log spam
discard 07ffa54499 move karaf server feature test to its own module, its
logging deps mess with the commons-config handling
discard 89a9c0287b delete old Log4J 1.x log4j.properties files that shouldnt
be doing anything, build isnt using log4j 1.x / reload4j anymore
discard 6f0daf8f0d update deps to match actual SLF4J base usage and simplify
discard 1da884eb9a use latest log4j version
discard 03e8e6e141 remove now-unused import
discard ef83b1142e update notes
discard ac25c21df5 remove rather than reinstate a couple of unnecesarry level
manipulations
discard a12dad1a0a ensure method or class based cleanups for
AssertionLoggerHandler exist or will be effective, where startCapture() has
been called previously
discard 66e877005f reinstate another test manipulating levels
discard ca5efc02b1 restore one of the remaining tests using JBL, manipulating
levels
discard 956a87459f Revert "add commons-logging -> SLF4J bridge and exclude
commons-logging, suppresses unconfigured log spam from beanutils etc"
discard af5bc2ba22 Revert "Moving dependencies as test"
discard 0e9ec84a64 Revert "Remove slf4j bridge depedencies from libs", towards
getting build back to consistent deps state and to more easily revert original
addition leading to issue.
discard eeb52d8122 fixing build after rebase
discard 45976bd903 Rebased upstream/1662bc740eb4435f5236a70e310825c1daef2e08
discard a6a2d5b33f fixing test
discard 33cc92d7df Moving dependencies as test
discard 87d69b3552 Remove slf4j bridge depedencies from libs
discard c3874ee405 Removing log facade package
discard 3abfd6fad5 make start on updating remaining integration tests,
manipulating levels etc
discard a394609d6d remove various mentions of jblm and wildfly-common from
scripts etc, update service config logging details..now to see what it breaks
discard 02523f06c1 also move the old main tests logging.config file
discard 7bd1d3c1d7 move old base logging.properties out of artemis-cli, but
leave it in root for comparison to see needed config updates as others replaced
discard eb59d2373a add some TODOs for area cleanup still needed
discard 58422bcd95 change remaining integration tests except those with TODOs
discard 5ae9b8af9a Adding safeguard against {?} on LogProcessor
discard 2ccca7c7b4 fix compile issues IDE somehow decided not to show
discard c6efc0240e more test changes
discard be6e62a3f1 more test updates
discard 68dc834633 some more integration test updates
discard 33c58663c4 make start on updating integration tests
discard 8c8792f778 add note about e2e-test fixups needed
discard b4ebd4ce2c add artemis-unit-test-support dep to various modules that
have tests, avoid stacktrace on not finding appender from shared logging config
discard 9cfbb68068 Verifying JMX Security and setting up
javax.management.builder.initial before Log4J starts its own JMX
discard eb0d2db6a9 add artemis-unit-test-support dep to various modules that
have tests, and will stacktrace if the appender isnt found which is referenced
in their shared logging test config
discard 6733d22738 fix dep scope
discard dc91ae3063 add note about many integration-tests etc still using JBL
discard a59c62707e fix other files similar to commit titled 'Fixing duplicate
properties'
discard 01fdcba41e Fixing duplicate properties
discard 61e813b99e Setting version as 3.0.0
discard d734e4d667 updating version after rebasing
discard d5e0222461 add log config to get NettyNativeTest working
discard 0e01d3019d simplify test logging config again, adjust assertion to be
more specific and take into account change in output from
07329118c10d14bce018a580b0dadbcf081233a8
discard 339c90fb91 add log config for AuditLoggerAMQPMutualSSLTest
discard c20b2dcedc ARTEMIS-3902 Adding Reason to Security Exception
discard 4110244ced add some TODO notes from memory
discard fb4977b4dd add some [in-flux] config to get more failing audit log
smoke tests passing
discard 9456b33fd8 apply needed change only, and remove old unused
logging.properties file
discard 52e876e180 reset smoke test config to current base assembly config
discard bfd3c85532 some more helper additions to bring default assembly
logging config into line with prior config
discard d8b234af38 Adding a test with no argument on exception (just to be
sure)
discard 972fc66d44 Removing @Cause annotation
discard ea562bb0e4 fix up errorprone error and an IDE warning
discard b6ecd1cd20 ensure exceptions/causes are the last arg passed, as the
logging framework expects, and processor now enforces
discard 7ab5bca92c fix checkstyle on processor
discard c2c275b0cf small tweak on test
discard 5155f88a4f Enforcing exception as the last argument
discard 9bbb3a69b5 log processing improvement with exceptions
discard b24055f947 flesh out assembly default logging config, give output like
previous behaviour
discard 3819ff98ec Removing Reload4J
discard c9d7fd40ce fix some more placeholders missed previously
discard 2245603ad8 make basic start on audit log file config, add [unfinished]
config changes to get AuditLoggerResourceTest smoke test passing
discard 3d66be0c09 reorder args to match previously out-of-order placeholders,
ensure new output matches previous
discard 28cf49861f remove now-unnecessary quote escaping from log/message
bundle format strings, giving same output as before switch to slf4j formatter
discard f6e04b85c7 switch to released 2.0.0 artemis-native dep
discard f18d68ad2f Fixing up some {0} versus {}
discard c9dfcd1ace re-enable GHA CI runs in the main repo, build now in state
it can pass the PR test subset (except for
d153efde4e04703875c92fdcb45f9f65b87a215b needing reverted which would make it
fail)
discard 8e23ff25be add TODO for another fun task
discard 52c7685742 fix various test failures due to unexpected message string;
also make some tests indicate why they failed
discard 1ff0d19a5b temporarily remove test to allow concentrating on other
issues
discard f2e7b37ef7 fix test missed in prior change
discard 0dcac3ffd3 fix format of code prefix in messages, pointed out by
failing test
discard 8ee0f9d392 make a start on a basic loging config for distribution
discard 9c6d08ea92 add some more needed deps; essentially every module with
tests (or without specific log test config) will need this to avoid a
stacktrace from logging setup issues
discard 0768fc187e avoid NPE in a unit test due to audit loggers still being
enabled, unlike prior test logging config
discard 4c399512b5 Using Artemis Native 2.1.0 snapshot until 2.0.0 is released
discard 2acdf12480 add some deps needed/used already, look into test failure
discard 31b46b98c2 fixup for release profile following prior rebases+squashes
discard 19a55b27a8 add commons-logging -> SLF4J bridge and exclude
commons-logging, suppresses unconfigured log spam from beanutils etc
discard ae1209ffb2 basic logging config and some more on
AssertionLoggerHandler to get some tests using it working
discard 2ec9c1e5e9 make a start on restoring AssertionLoggerHandler to get
tests going
discard 0073fc9252 Artemis native at 2.0 snapshot
discard 619d7f8dcf squashed logging changes from Clebert + me, rebased onto
main at 688b894c6205058c24d225b340aea1d8a5599902
add 734e7f4ae5 ARTEMIS-3950: dont prepare unused debug detail during xml
data import processing
add f6bca09afa ARTEMIS-3954: add more detail to core-client javadoc around
the session and children thread model being like the JMS client
add e8337b9c2e ARTEMIS-3933 - ScaleDown NPE on DLA resources with multiple
destinations
add 451514f915 This closes #4175
add 87e9b361bb ARTEMIS-3785 support specifying alias for SSL keystore
add d8a35bf0e7 This closes #4088
add 8511cf3617 ARTEMIS-3843 add/remove connector via management
add 38ee7bad33 This closes #4089
add 63966dcc56 ARTEMIS-3872 send scheduled msg immediately via mgmnt
add 73e57e5ea8 This closes #4120
add a72d894cb7 NO-JIRA Renaming example as opentelemetry
add c99d061784 ARTEMIS-3843: fix audit logging method to call right
logger, tweak message
add f88381430c ARTEMIS-3872 fix NPE
add 729fdc4aab ARTEMIS-3955 consolidate Subject on RemotingConnection
add a0f39a4b28 ARTEMIS-3956 clean up use of RemotingConnection
new 1f18f75a96 squashed logging changes from Clebert + me, rebased onto
main at 688b894c6205058c24d225b340aea1d8a5599902
new 9b357387d1 Artemis native at 2.0 snapshot
new a60680caa7 make a start on restoring AssertionLoggerHandler to get
tests going
new 4d207b2027 basic logging config and some more on
AssertionLoggerHandler to get some tests using it working
new cd51ba0dba add commons-logging -> SLF4J bridge and exclude
commons-logging, suppresses unconfigured log spam from beanutils etc
new 14e179b19a fixup for release profile following prior rebases+squashes
new 171a794a7f add some deps needed/used already, look into test failure
new 0f5309c812 Using Artemis Native 2.1.0 snapshot until 2.0.0 is released
new d5f59a4434 avoid NPE in a unit test due to audit loggers still being
enabled, unlike prior test logging config
new 92ad83f4a9 add some more needed deps; essentially every module with
tests (or without specific log test config) will need this to avoid a
stacktrace from logging setup issues
new 0576d2e6d7 make a start on a basic loging config for distribution
new ef06c3eeff fix format of code prefix in messages, pointed out by
failing test
new a1b742333b fix test missed in prior change
new 6a88806a06 temporarily remove test to allow concentrating on other
issues
new ef3e1417f4 fix various test failures due to unexpected message string;
also make some tests indicate why they failed
new 816cf43fde add TODO for another fun task
new e70d1dabef re-enable GHA CI runs in the main repo, build now in state
it can pass the PR test subset (except for
d153efde4e04703875c92fdcb45f9f65b87a215b needing reverted which would make it
fail)
new 972dcdb74e Fixing up some {0} versus {}
new d768705059 switch to released 2.0.0 artemis-native dep
new 739437af89 remove now-unnecessary quote escaping from log/message
bundle format strings, giving same output as before switch to slf4j formatter
new 2ce1591b9d reorder args to match previously out-of-order placeholders,
ensure new output matches previous
new 46096f642a make basic start on audit log file config, add [unfinished]
config changes to get AuditLoggerResourceTest smoke test passing
new 74a4dd33ce fix some more placeholders missed previously
new c8f2f5db05 Removing Reload4J
new 4771bad90b flesh out assembly default logging config, give output like
previous behaviour
new 68b9d5e510 log processing improvement with exceptions
new 7cfe7e40b2 Enforcing exception as the last argument
new a34f664829 small tweak on test
new 3525059f7c fix checkstyle on processor
new 8f748d3aca ensure exceptions/causes are the last arg passed, as the
logging framework expects, and processor now enforces
new 5c9d3f8b8c fix up errorprone error and an IDE warning
new 5a79df2bf2 Removing @Cause annotation
new 0e3b7afdbd Adding a test with no argument on exception (just to be
sure)
new af68da2a23 some more helper additions to bring default assembly
logging config into line with prior config
new 3e1433bac3 reset smoke test config to current base assembly config
new 63dd977aab apply needed change only, and remove old unused
logging.properties file
new b75b99893b add some [in-flux] config to get more failing audit log
smoke tests passing
new 55fe44d938 add some TODO notes from memory
new 38d202b07d ARTEMIS-3902 Adding Reason to Security Exception
new 4549f6dcc3 add log config for AuditLoggerAMQPMutualSSLTest
new 8ad7caca31 simplify test logging config again, adjust assertion to be
more specific and take into account change in output from
07329118c10d14bce018a580b0dadbcf081233a8
new 8ee8db528f add log config to get NettyNativeTest working
new e8dd376eac updating version after rebasing
new 92f49baab5 Setting version as 3.0.0
new bdda5e079a Fixing duplicate properties
new 96aa2a4d1e fix other files similar to commit titled 'Fixing duplicate
properties'
new a560fe4a0f add note about many integration-tests etc still using JBL
new 9b30c8c905 fix dep scope
new 3ef2834baf add artemis-unit-test-support dep to various modules that
have tests, and will stacktrace if the appender isnt found which is referenced
in their shared logging test config
new a34a6fc9a9 Verifying JMX Security and setting up
javax.management.builder.initial before Log4J starts its own JMX
new 6d178d8034 add artemis-unit-test-support dep to various modules that
have tests, avoid stacktrace on not finding appender from shared logging config
new 3508dcfba5 add note about e2e-test fixups needed
new 25fa9e34d5 make start on updating integration tests
new bc953c7709 some more integration test updates
new 01cb8e7df6 more test updates
new 888980f435 more test changes
new 606be9ddc9 fix compile issues IDE somehow decided not to show
new 7a0d9803f0 Adding safeguard against {?} on LogProcessor
new 671ce1ec3d change remaining integration tests except those with TODOs
new be2418b136 add some TODOs for area cleanup still needed
new 2d1c05ae76 move old base logging.properties out of artemis-cli, but
leave it in root for comparison to see needed config updates as others replaced
new 8c4a1c29c0 also move the old main tests logging.config file
new 43745a6f5c remove various mentions of jblm and wildfly-common from
scripts etc, update service config logging details..now to see what it breaks
new 4a8932f5e0 make start on updating remaining integration tests,
manipulating levels etc
new c961460263 Removing log facade package
new bc2bf539c2 Remove slf4j bridge depedencies from libs
new acd1f1c91b Moving dependencies as test
new 1c779b7ef3 fixing test
new 094d7e83dd Rebased upstream/1662bc740eb4435f5236a70e310825c1daef2e08
new c0a106b92a fixing build after rebase
new 2fd8ab3a55 Revert "Remove slf4j bridge depedencies from libs", towards
getting build back to consistent deps state and to more easily revert original
addition leading to issue.
new f9a0969ca7 Revert "Moving dependencies as test"
new 5ef9745dec Revert "add commons-logging -> SLF4J bridge and exclude
commons-logging, suppresses unconfigured log spam from beanutils etc"
new 64c0022db3 restore one of the remaining tests using JBL, manipulating
levels
new e42aced782 reinstate another test manipulating levels
new 2ca71ee641 ensure method or class based cleanups for
AssertionLoggerHandler exist or will be effective, where startCapture() has
been called previously
new 4cf4509264 remove rather than reinstate a couple of unnecesarry level
manipulations
new a68beaeb49 update notes
new a2eaa2436b remove now-unused import
new e24ee1591d use latest log4j version
new 86fd14a2a5 update deps to match actual SLF4J base usage and simplify
new 7f9b32215a delete old Log4J 1.x log4j.properties files that shouldnt
be doing anything, build isnt using log4j 1.x / reload4j anymore
new a68b237de1 move karaf server feature test to its own module, its
logging deps mess with the commons-config handling
new 1a0ae6e5cd remove commons-logging slf4j bridge now the karaf bits dont
cause beanutils log spam
new 55dcc48ee1 replace logging.properties files for e2e-tests server
configs
new 7aaacb231f move another old log config file out to root, for any later
comparisons needed
new b6876892a1 add another TODO note
new 27ea87c579 remove uses of JBL from compatibility tests, add
artemis-unit-test-support to snapshots CP to ensure test appender class is
found and avoids stacktracing
new cd03a018e4 fixups after rebase to main at
0ca44c0e6972991cf80e5feda34f6d02cf94dea0
new 9bf7a77402 switch another logger missed previously
new 3a58f7759d remove exclusion that is no longer needed
new 66068edfbb add a note
new 8e5b7b3495 replace a couple of examples logging.properties that enable
audit logger output
new 46e20cc1c4 remove slf4j->jbl bridge from example
new b511fc0f31 convert some more test loggers
new ad9a87329c fix some file references and update notes
new 5da4034281 fixup header comments
new b95e6537f4 fixups after rebase to main at
a0f39a4b28545f4010e07d950c34fe9f1f228b68
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (dca9127cbd)
\
N -- N -- N refs/heads/new-logging (b95e6537f4)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 98 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../cli/commands/tools/xml/XmlDataImporter.java | 26 +-
.../apache/activemq/artemis/logs/AuditLogger.java | 21 +
.../activemq/artemis/logs/BundleFactory.java | 3 +-
artemis-core-client/pom.xml | 5 +
.../artemis/api/core/client/ClientConsumer.java | 3 +
.../artemis/api/core/client/ClientSession.java | 7 +-
.../api/core/management/ActiveMQServerControl.java | 7 +
.../artemis/api/core/management/QueueControl.java | 12 +
.../core/client/ActiveMQClientMessageBundle.java | 3 +
.../protocol/core/impl/RemotingConnectionImpl.java | 25 +-
.../core/remoting/impl/netty/NettyConnector.java | 10 +
.../remoting/impl/netty/TransportConstants.java | 6 +
.../core/remoting/impl/ssl/AliasedKeyManager.java | 89 ++++
.../artemis/core/remoting/impl/ssl/SSLSupport.java | 77 +++-
.../core/protocol/AbstractRemotingConnection.java | 46 +-
.../spi/core/protocol/RemotingConnection.java | 14 +-
.../spi/core/remoting/ssl/SSLContextConfig.java | 24 +-
.../core/protocol/core/impl/ChannelImplTest.java | 470 +--------------------
.../artemis/logprocessor/annotation/GetLogger.java | 9 +-
.../artemis/logprocessor/annotation/LogBundle.java | 9 +-
.../logprocessor/annotation/LogMessage.java | 9 +-
.../artemis/logprocessor/annotation/Message.java | 9 +-
.../broker/ActiveMQProtonRemotingConnection.java | 36 +-
.../artemis/core/protocol/mqtt/MQTTConnection.java | 33 +-
.../core/protocol/openwire/OpenWireConnection.java | 19 +-
.../core/protocol/stomp/StompConnection.java | 220 +---------
.../core/protocol/stomp/StompProtocolManager.java | 2 -
.../management/impl/ActiveMQServerControlImpl.java | 32 ++
.../impl/ManagementRemotingConnection.java | 29 +-
.../core/management/impl/QueueControlImpl.java | 27 ++
.../protocol/core/ServerSessionPacketHandler.java | 2 +-
.../protocol/core/impl/ActiveMQPacketHandler.java | 2 +-
.../core/remoting/impl/netty/NettyAcceptor.java | 10 +-
.../core/security/impl/SecurityStoreImpl.java | 2 +-
.../apache/activemq/artemis/core/server/Queue.java | 10 +
.../core/server/ScheduledDeliveryHandler.java | 4 +-
.../core/server/impl/ActiveMQServerImpl.java | 2 +-
.../artemis/core/server/impl/QueueImpl.java | 20 +-
.../artemis/core/server/impl/ScaleDownHandler.java | 8 +-
.../server/impl/ScheduledDeliveryHandlerImpl.java | 6 +-
.../core/server/impl/ServerConsumerImpl.java | 2 +-
.../core/server/impl/ServerSessionImpl.java | 20 +-
.../artemis/core/server/routing/KeyResolver.java | 2 +-
.../core/server/impl/RoutingContextTest.java | 10 +
.../server/impl/ScheduledDeliveryHandlerTest.java | 10 +
.../core/server/routing/KeyResolverTest.java | 4 +-
docs/user-manual/en/configuring-transports.md | 12 +
.../{opentracing => opentelemetry}/pom.xml | 8 +-
.../{opentracing => opentelemetry}/readme.md | 8 +-
.../artemis/jms/example/OpenTelemetryPlugin.java} | 14 +-
.../jms/example/OpenTelemetryPluginExample.java} | 2 +-
.../src/main/resources/activemq/server0/broker.xml | 2 +-
.../src/main/resources/tracing.properties | 2 +-
.../jms/example/OpenTelemetryPluginTest.java} | 4 +-
examples/features/standard/pom.xml | 4 +-
.../management/ActiveMQServerControlTest.java | 27 +-
.../ActiveMQServerControlUsingCoreTest.java | 10 +
.../management/QueueControlUsingCoreTest.java | 18 +
.../integration/mqtt/MQTTSecurityManagerTest.java | 1 -
.../integration/openwire/AdvisoryOpenWireTest.java | 3 +-
.../scheduling/ScheduledMessageTest.java | 84 ++++
.../tests/integration/server/ScaleDownTest.java | 47 +++
.../ssl/CoreClientOverOneWaySSLTest.java | 59 +--
.../ssl/CoreClientOverTwoWaySSLTest.java | 68 +++
.../tests/unit/core/postoffice/impl/FakeQueue.java | 11 +
65 files changed, 843 insertions(+), 937 deletions(-)
create mode 100644
artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/AliasedKeyManager.java
rename examples/features/standard/{opentracing => opentelemetry}/pom.xml (97%)
rename examples/features/standard/{opentracing => opentelemetry}/readme.md
(94%)
rename
examples/features/standard/{opentracing/src/main/java/org/apache/activemq/artemis/jms/example/OpenTracingPlugin.java
=>
opentelemetry/src/main/java/org/apache/activemq/artemis/jms/example/OpenTelemetryPlugin.java}
(86%)
rename
examples/features/standard/{opentracing/src/main/java/org/apache/activemq/artemis/jms/example/OpenTracingPluginExample.java
=>
opentelemetry/src/main/java/org/apache/activemq/artemis/jms/example/OpenTelemetryPluginExample.java}
(98%)
rename examples/features/standard/{opentracing =>
opentelemetry}/src/main/resources/activemq/server0/broker.xml (99%)
rename examples/features/standard/{opentracing =>
opentelemetry}/src/main/resources/tracing.properties (97%)
rename
examples/features/standard/{opentracing/src/test/java/org/apache/activemq/artemis/jms/example/OpenTracingPluginTest.java
=>
opentelemetry/src/test/java/org/apache/activemq/artemis/jms/example/OpenTelemetryPluginTest.java}
(98%)
