Skip to content

[#2434] Avoid per-command MDC add+remove in TransportConnection.service #2435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattrpav merged 1 commit into from
Aug 10, 2026
+11 −2
Merged

[#2434] Avoid per-command MDC add+remove in TransportConnection.service #2435

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,8 @@ public class TransportConnection implements Connection, Task, CommandVisitor {
private final Transport transport;
private MessageAuthorizationPolicy messageAuthorizationPolicy;
private WireFormatInfo wireFormatInfo;
// Cached connector URI for the MDC tag; connector.getUri() is stable once started.
private String connectorUriString = "unset";
// Used to do async dispatch.. this should perhaps be pushed down into the
// transport layer..
private boolean inServiceException;
Expand Down Expand Up @@ -329,7 +331,14 @@ public void serviceException(Throwable e) {

@Override
public Response service(Command command) {
MDC.put("activemq.connector", connector.getUri().toString());
// MDC entries are copy-on-write maps in log4j2 — a put per command is a
// full thread-context map copy per message. Put only when this thread's
// tag actually changes and leave it sticky between commands (same
// lifecycle-scoped pattern as the activemq.broker MDC entry), so the
// steady-state per-command cost is a single allocation-free MDC.get.
if (!connectorUriString.equals(MDC.get("activemq.connector"))) {
MDC.put("activemq.connector", connectorUriString);
}
Response response = null;
boolean responseRequired = command.isResponseRequired();
int commandId = command.getCommandId();
Expand Down Expand Up @@ -379,7 +388,6 @@ public Response service(Command command) {
}
context = null;
}
MDC.remove("activemq.connector");
return response;
}

Expand Down Expand Up @@ -1132,6 +1140,7 @@ public void start() throws Exception {
if (status.compareAndSet(NEW, STARTING)) {
try {
synchronized (this) {
connectorUriString = connector.getUri().toString();
if (taskRunnerFactory != null) {
taskRunner = taskRunnerFactory.createTaskRunner(this, "ActiveMQ Connection Dispatcher: "
+ getRemoteAddress());
Expand Down
Loading