Skip to content

log when clearing trace #678

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
merged 4 commits into from
Jan 21, 2021
Merged

log when clearing trace #678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
642c3c3
log when clearing trace
tpetracca Jan 20, 2021
bffdb62
Add generated changelog entries
tpetracca Jan 20, 2021
f3ec634
also log on setting trace
tpetracca Jan 20, 2021
1f78302
nits
tpetracca Jan 21, 2021
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
5 changes: 5 additions & 0 deletions changelog/@unreleased/pr-678.v2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
type: improvement
improvement:
description: Add debug logging when clearing a thread's trace
links:
- https://github.com/palantir/tracing-java/pull/678
16 changes: 16 additions & 0 deletions tracing/src/main/java/com/palantir/tracing/Tracer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,6 +657,8 @@ static void setTrace(Trace trace) {
MDC.put(Tracers.TRACE_ID_KEY, trace.getTraceId());
setTraceSampledMdcIfObservable(trace.isObservable());
setTraceRequestId(trace.getRequestId());

logSettingTrace();
}

private static void setTraceSampledMdcIfObservable(boolean observable) {
Expand All @@ -678,6 +680,10 @@ private static void setTraceRequestId(Optional<String> requestId) {
}
}

private static void logSettingTrace() {
log.debug("Setting trace");
}

private static Trace getOrCreateCurrentTrace() {
Trace trace = currentTrace.get();
if (trace == null) {
Expand All @@ -689,9 +695,19 @@ private static Trace getOrCreateCurrentTrace() {

@VisibleForTesting
static void clearCurrentTrace() {
logClearingTrace();
currentTrace.remove();
MDC.remove(Tracers.TRACE_ID_KEY);
MDC.remove(Tracers.TRACE_SAMPLED_KEY);
MDC.remove(Tracers.REQUEST_ID_KEY);
}

private static void logClearingTrace() {
if (log.isDebugEnabled()) {
log.debug("Clearing current trace", SafeArg.of("trace", currentTrace.get()));
if (log.isTraceEnabled()) {
log.trace("Stacktrace at time of clearing trace", new SafeRuntimeException("not a real exception"));
}
}
}
}