Skip to content

Improve agentServiceCheck to handle scenarios where the tracer is configured to use UDS #7098

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 1 commit into from
Jun 3, 2024
Merged

Improve agentServiceCheck to handle scenarios where the tracer is configured to use UDS #7098

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
15 changes: 10 additions & 5 deletions dd-trace-core/src/main/java/datadog/trace/core/StatusLogger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import datadog.trace.api.ProductActivation;
import datadog.trace.logging.LoggingSettingsDescription;
import datadog.trace.util.AgentTaskScheduler;
import java.io.File;
import java.io.IOException;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
Expand Down Expand Up @@ -153,11 +154,15 @@ public void toJson(JsonWriter writer, Config config) throws IOException {
}

private static boolean agentServiceCheck(Config config) {
try (Socket s = new Socket()) {
s.connect(new InetSocketAddress(config.getAgentHost(), config.getAgentPort()), 500);
return true;
} catch (IOException ex) {
return false;
if (config.getAgentUrl().startsWith("unix:")) {
return new File(config.getAgentUnixDomainSocket()).exists();
} else {
try (Socket s = new Socket()) {
s.connect(new InetSocketAddress(config.getAgentHost(), config.getAgentPort()), 500);
return true;
} catch (IOException ex) {
return false;
}
}
}

Expand Down