Skip to content

🍒 9135 - Avoid race conditions and multiple agent discovery feature states #9175

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
Jul 15, 2025
Merged

🍒 9135 - Avoid race conditions and multiple agent discovery feature states #9175

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
46 changes: 26 additions & 20 deletions communication/src/main/java/datadog/communication/ddagent/SharedCommunicationObjects.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public class SharedCommunicationObjects {
public OkHttpClient okHttpClient;
public HttpUrl agentUrl;
public Monitoring monitoring;
private DDAgentFeaturesDiscovery featuresDiscovery;
private volatile DDAgentFeaturesDiscovery featuresDiscovery;
private ConfigurationPoller configurationPoller;

public SharedCommunicationObjects() {
Expand Down Expand Up @@ -139,28 +139,34 @@ public void setFeaturesDiscovery(DDAgentFeaturesDiscovery featuresDiscovery) {
}

public DDAgentFeaturesDiscovery featuresDiscovery(Config config) {
if (featuresDiscovery == null) {
createRemaining(config);
featuresDiscovery =
new DDAgentFeaturesDiscovery(
okHttpClient,
monitoring,
agentUrl,
config.isTraceAgentV05Enabled(),
config.isTracerMetricsEnabled());

if (paused) {
// defer remote discovery until remote I/O is allowed
} else {
if (AGENT_THREAD_GROUP.equals(Thread.currentThread().getThreadGroup())) {
featuresDiscovery.discover(); // safe to run on same thread
} else {
// avoid performing blocking I/O operation on application thread
AgentTaskScheduler.INSTANCE.execute(featuresDiscovery::discover);
DDAgentFeaturesDiscovery ret = featuresDiscovery;
if (ret == null) {
synchronized (this) {
if (featuresDiscovery == null) {
createRemaining(config);
ret =
new DDAgentFeaturesDiscovery(
okHttpClient,
monitoring,
agentUrl,
config.isTraceAgentV05Enabled(),
config.isTracerMetricsEnabled());

if (paused) {
// defer remote discovery until remote I/O is allowed
} else {
if (AGENT_THREAD_GROUP.equals(Thread.currentThread().getThreadGroup())) {
ret.discover(); // safe to run on same thread
} else {
// avoid performing blocking I/O operation on application thread
AgentTaskScheduler.INSTANCE.execute(ret::discover);
}
}
featuresDiscovery = ret;
}
}
}
return featuresDiscovery;
return ret;
}

private static final class FixedConfigUrlSupplier implements Supplier<String> {
Expand Down