Skip to content

Commit d08f855

Browse files
Automatically clear MDC after each call
Instead of trying to do that as a part of every method.
1 parent 6f96100 commit d08f855

File tree

2 files changed

+22
-0
lines changed

2 files changed

+22
-0
lines changed

proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/EfspServer.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import edu.suffolk.litlab.efsp.server.setup.tyler.TylerModuleSetup;
2525
import edu.suffolk.litlab.efsp.server.utils.HttpsCallbackHandler;
2626
import edu.suffolk.litlab.efsp.server.utils.JsonExceptionMapper;
27+
import edu.suffolk.litlab.efsp.server.utils.ObservabilityResetInterceptor;
2728
import edu.suffolk.litlab.efsp.server.utils.ObservabilityHeadersInterceptor;
2829
import edu.suffolk.litlab.efsp.server.utils.OrgMessageSender;
2930
import edu.suffolk.litlab.efsp.server.utils.SendMessage;
@@ -149,6 +150,7 @@ protected EfspServer(
149150

150151
sf.setAddress(ServiceHelpers.BASE_LOCAL_URL);
151152
sf.getInInterceptors().add(new ObservabilityHeadersInterceptor());
153+
sf.getOutInterceptors().add(new ObservabilityResetInterceptor());
152154
server = sf.create();
153155
}
154156

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package edu.suffolk.litlab.efsp.server.utils;
2+
3+
import org.apache.cxf.interceptor.AbstractOutDatabindingInterceptor;
4+
import org.apache.cxf.interceptor.Fault;
5+
import org.apache.cxf.message.Message;
6+
import org.apache.cxf.phase.Phase;
7+
8+
/** Clears all MDC entries after our business logic finishes running. */
9+
public class ObservabilityResetInterceptor extends AbstractOutDatabindingInterceptor {
10+
11+
public ObservabilityResetInterceptor() {
12+
// See https://cxf.apache.org/docs/interceptors.html for phase descriptions
13+
super(Phase.POST_LOGICAL);
14+
}
15+
16+
@Override
17+
public void handleMessage(Message message) throws Fault {
18+
MDCWrappers.removeAllMDCs();
19+
}
20+
}

0 commit comments

Comments
 (0)