Skip to content

Remove telemetry markers from log output #9112

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Remove telemetry markers from log output #9112

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
16 changes: 12 additions & 4 deletions ...a-agent/agent-logging/src/main/java/datadog/trace/logging/ddlogger/DDTelemetryLogger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,25 @@ public DDTelemetryLogger(LoggerHelper helper, String name) {
@Override
public void formatLog(LogLevel level, Marker marker, String format, Object arg) {
telemetryLog(level, marker, format, getIfThrowable(arg));
super.formatLog(level, marker, format, arg);
super.formatLog(level, filterTelemetryLogMarkers(marker), format, arg);
}

@Override
public void formatLog(LogLevel level, Marker marker, String format, Object arg1, Object arg2) {
telemetryLog(level, marker, format, getIfThrowable(arg2));
super.formatLog(level, marker, format, arg1, arg2);
super.formatLog(level, filterTelemetryLogMarkers(marker), format, arg1, arg2);
}

@Override
public void formatLog(LogLevel level, Marker marker, String format, Object... arguments) {
telemetryLog(level, marker, format, MessageFormatter.getThrowableCandidate(arguments));
super.formatLog(level, marker, format, arguments);
super.formatLog(level, filterTelemetryLogMarkers(marker), format, arguments);
}

@Override
protected void log(LogLevel level, Marker marker, String msg, Throwable t) {
telemetryLog(level, marker, msg, t);
super.log(level, marker, msg, t);
super.log(level, filterTelemetryLogMarkers(marker), msg, t);
}

private void telemetryLog(LogLevel level, Marker marker, String msgOrgFormat, Throwable t) {
Expand All @@ -48,6 +48,14 @@ private void telemetryLog(LogLevel level, Marker marker, String msgOrgFormat, Th
LogCollector.get().addLogMessage(level.name(), msgOrgFormat, t);
}

private Marker filterTelemetryLogMarkers(Marker marker) {
if (marker == LogCollector.EXCLUDE_TELEMETRY || marker == LogCollector.SEND_TELEMETRY) {
// Do not log telemetry markers
return null;
}
return marker;
}
Comment on lines +51 to +57
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestion: What about injecting a specific helper for telemetry logger that removes the marker ? E.g. in the DDLoggerFactory, by wrapping the helper for the telemetry logger, the log function could just drop the telemetry markers.

dd-trace-java/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/ddlogger/DDLoggerFactory.java

Lines 61 to 71 in 8c4a17b

@Override
public Logger getLogger(String name) {
LoggerHelper helper = getHelperFactory().loggerHelperForName(name);
HelperWrapper helperWrapper = new HelperWrapper(helper);
if (!telemetryLogCollectionEnabled || Platform.isNativeImageBuilder()) {
return new DDLogger(helperWrapper, name);
} else {
return new DDTelemetryLogger(helperWrapper, name);
}
}


private Throwable getIfThrowable(final Object obj) {
return obj instanceof Throwable ? (Throwable) obj : null;
}
Expand Down
Loading