forked from DataDog/dd-trace-java
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add launcher for trace agent and dogstatsd
- Loading branch information
1 parent
a910af3
commit 6f1aeb4
Showing
7 changed files
with
185 additions
and
1 deletion.
There are no files selected for viewing
47 changes: 47 additions & 0 deletions
47
communication/src/main/java/datadog/communication/ddagent/ExternalAgentLauncher.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| package datadog.communication.ddagent; | ||
|
|
||
| import datadog.trace.api.Config; | ||
| import datadog.trace.util.ProcessSupervisor; | ||
| import java.io.Closeable; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| public class ExternalAgentLauncher implements Closeable { | ||
| private static final Logger log = LoggerFactory.getLogger(ExternalAgentLauncher.class); | ||
|
|
||
| private ProcessSupervisor traceProcessSupervisor; | ||
| private ProcessSupervisor dogStatsDProcessSupervisor; | ||
|
|
||
| public ExternalAgentLauncher(Config config) { | ||
| if (config.isAzureAppServices()) { | ||
| if (config.getTraceAgentPath() != null) { | ||
| ProcessBuilder traceProcessBuilder = new ProcessBuilder(config.getTraceAgentPath()); | ||
| traceProcessBuilder.command().addAll(config.getTraceAgentArgs()); | ||
|
|
||
| traceProcessSupervisor = new ProcessSupervisor("Trace Agent", traceProcessBuilder); | ||
| } else { | ||
| log.warn("Trace agent path not set. Will not start trace agent process"); | ||
| } | ||
|
|
||
| if (config.getDogStatsDPath() != null) { | ||
| ProcessBuilder dogStatsDProcessBuilder = new ProcessBuilder(config.getDogStatsDPath()); | ||
| dogStatsDProcessBuilder.command().addAll(config.getDogStatsDArgs()); | ||
|
|
||
| dogStatsDProcessSupervisor = new ProcessSupervisor("DogStatsD", dogStatsDProcessBuilder); | ||
| } else { | ||
| log.warn("DogStatsD path not set. Will not start DogStatsD process"); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void close() { | ||
| if (traceProcessSupervisor != null) { | ||
| traceProcessSupervisor.close(); | ||
| } | ||
|
|
||
| if (dogStatsDProcessSupervisor != null) { | ||
| dogStatsDProcessSupervisor.close(); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
77 changes: 77 additions & 0 deletions
77
internal-api/src/main/java/datadog/trace/util/ProcessSupervisor.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| package datadog.trace.util; | ||
|
|
||
| import static datadog.trace.util.AgentThreadFactory.AgentThread.PROCESS_SUPERVISOR; | ||
|
|
||
| import java.io.Closeable; | ||
| import java.io.IOException; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| /** Starts an external process and restarts the process if it dies */ | ||
| public class ProcessSupervisor implements Closeable { | ||
| private static final Logger log = LoggerFactory.getLogger(ProcessSupervisor.class); | ||
| private static final long MIN_RESTART_INTERVAL_MS = 30 * 1000; | ||
|
|
||
| private final String name; | ||
| private final ProcessBuilder processBuilder; | ||
| private final Thread supervisorThread; | ||
|
|
||
| private long nextRestartTime = 0; | ||
| private Process currentProcess; | ||
| private volatile boolean stopped = false; | ||
|
|
||
| /** | ||
| * @param name For logging purposes | ||
| * @param processBuilder Builder to create the process | ||
| */ | ||
| public ProcessSupervisor(String name, ProcessBuilder processBuilder) { | ||
| this.name = name; | ||
| this.processBuilder = processBuilder; | ||
| supervisorThread = AgentThreadFactory.newAgentThread(PROCESS_SUPERVISOR, new SupervisorLoop()); | ||
| supervisorThread.start(); | ||
| } | ||
|
|
||
| private class SupervisorLoop implements Runnable { | ||
| @Override | ||
| public void run() { | ||
| try { | ||
| while (!stopped) { | ||
| try { | ||
| if (currentProcess == null) { | ||
| long restartDelay = nextRestartTime - System.currentTimeMillis(); | ||
| if (restartDelay > 0) { | ||
| Thread.sleep(restartDelay); | ||
| continue; | ||
| } | ||
|
|
||
| log.debug("Starting process: {}", name); | ||
| nextRestartTime = System.currentTimeMillis() + MIN_RESTART_INTERVAL_MS; | ||
| currentProcess = processBuilder.start(); | ||
| } | ||
|
|
||
| // Block until the process exits | ||
| int code = currentProcess.waitFor(); | ||
| log.debug("Process [{}] has exited with code {}", name, code); | ||
|
|
||
| // Process is dead, no longer needs to be tracked | ||
| currentProcess = null; | ||
| } catch (InterruptedException ignored) { | ||
| } catch (IOException e) { | ||
| log.error("Exception starting process: {}", name, e); | ||
| } | ||
| } | ||
| } finally { | ||
| if (currentProcess != null) { | ||
| log.debug("Stopping process [{}]", name); | ||
| currentProcess.destroy(); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void close() { | ||
| stopped = true; | ||
| supervisorThread.interrupt(); | ||
| } | ||
| } |