[activemq-artemis] branch main updated: ARTEMIS-3379 add message details to consumer audit log

[cl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/main by this push:
     new 9f96e2d  ARTEMIS-3379 add message details to consumer audit log
9f96e2d is described below

commit 9f96e2d270197f4d95757f34c6b1757c0bae607b
Author: Justin Bertram <jb...@apache.org>
AuthorDate: Tue Jul 6 13:07:49 2021 -0500

    ARTEMIS-3379 add message details to consumer audit log
---
 .../main/java/org/apache/activemq/artemis/logs/AuditLogger.java   | 8 ++++----
 .../activemq/artemis/core/server/impl/ServerConsumerImpl.java     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AuditLogger.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AuditLogger.java
index 39f383d..cd2fd49 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AuditLogger.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AuditLogger.java
@@ -2428,13 +2428,13 @@ public interface AuditLogger extends BasicLogger {
    void logCoreSendMessage(String user, String messageToString, Object context);
 
    //hot path log using a different logger
-   static void coreConsumeMessage(Subject user, String queue) {
-      MESSAGE_LOGGER.consumeMessage(getCaller(user), queue);
+   static void coreConsumeMessage(Subject user, String queue, String message) {
+      MESSAGE_LOGGER.consumeMessage(getCaller(user), queue, message);
    }
 
    @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601501, value = "User {0} is consuming a message from {1}", format = Message.Format.MESSAGE_FORMAT)
-   void consumeMessage(String user, String address);
+   @Message(id = 601501, value = "User {0} is consuming a message from {1}: {2}", format = Message.Format.MESSAGE_FORMAT)
+   void consumeMessage(String user, String address, String message);
 
    /*
     * This logger is focused on user interaction from the console or thru resource specific functions in the management layer/JMX
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
index 6c4519b..cf56345 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
@@ -494,7 +494,7 @@ public class ServerConsumerImpl implements ServerConsumer, ReadyListener {
          Message message = reference.getMessage();
 
          if (AuditLogger.isMessageEnabled()) {
-            AuditLogger.coreConsumeMessage(session.getRemotingConnection().getAuditSubject(), getQueueName().toString());
+            AuditLogger.coreConsumeMessage(session.getRemotingConnection().getAuditSubject(), getQueueName().toString(), reference.toString());
          }
          if (server.hasBrokerMessagePlugins()) {
             server.callBrokerMessagePlugins(plugin -> plugin.beforeDeliver(this, reference));