Skip to content

Mute tracing for subprocesses executed in by the tracer #6584

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
smola merged 1 commit into from
Jan 30, 2024
Merged

Mute tracing for subprocesses executed in by the tracer #6584

Show file tree
Hide file tree
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
4 changes: 3 additions & 1 deletion ...ng-controller/src/main/java/com/datadog/profiling/controller/ProfilerSettingsSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
import datadog.trace.api.Platform;
import datadog.trace.api.config.ProfilingConfig;
import datadog.trace.bootstrap.config.provider.ConfigProvider;
import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
import datadog.trace.context.TraceScope;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
Expand Down Expand Up @@ -116,7 +118,7 @@ protected ProfilerSettingsSupport(ConfigProvider configProvider) {
private String getSELinuxStatus() {
String value = "Not present";
if (Platform.isLinux()) {
try {
try (final TraceScope scope = AgentTracer.get().muteTracing()) {
ProcessBuilder pb = new ProcessBuilder("getenforce");
Process process = pb.start();
// wait for at most 500ms for the process to finish
Expand Down
7 changes: 0 additions & 7 deletions ...va-lang/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplStartAdvice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package datadog.trace.instrumentation.java.lang;

import static datadog.trace.util.AgentThreadFactory.AGENT_THREAD_GROUP;

import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
import datadog.trace.bootstrap.instrumentation.api.java.lang.ProcessImplInstrumentationHelpers;
Expand All @@ -19,11 +17,6 @@ public static AgentSpan startSpan(@Advice.Argument(0) final String[] command) th
return null;
}

// Don't create spans for agent threads
if (AGENT_THREAD_GROUP.equals(Thread.currentThread().getThreadGroup())) {
return null;
}

final AgentTracer.TracerAPI tracer = AgentTracer.get();
final AgentSpan span = tracer.startSpan("appsec", "command_execution");
span.setSpanType("system");
Expand Down
9 changes: 6 additions & 3 deletions internal-api/src/main/java/datadog/trace/api/Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,6 +447,8 @@
import datadog.trace.bootstrap.config.provider.CapturedEnvironmentConfigSource;
import datadog.trace.bootstrap.config.provider.ConfigProvider;
import datadog.trace.bootstrap.config.provider.SystemPropertiesConfigSource;
import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
import datadog.trace.context.TraceScope;
import datadog.trace.util.PidHelper;
import datadog.trace.util.Strings;
import datadog.trace.util.throwable.FatalAgentMisconfigurationError;
Expand Down Expand Up @@ -3848,9 +3850,10 @@ static String initHostName() {
}

// Try hostname command
try (final BufferedReader reader =
new BufferedReader(
new InputStreamReader(Runtime.getRuntime().exec("hostname").getInputStream()))) {
try (final TraceScope scope = AgentTracer.get().muteTracing();
final BufferedReader reader =
new BufferedReader(
new InputStreamReader(Runtime.getRuntime().exec("hostname").getInputStream()))) {
possibleHostname = reader.readLine();
} catch (final Throwable ignore) {
// Ignore. Hostname command is not always available
Expand Down