Skip to content

Fix DebuggerAgent commonInit #11183

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

Open
jpbempel wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix DebuggerAgent commonInit #11183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27a5cf1
Fix DebuggerAgent commonInit
jpbempel Apr 22, 2026
5667b1a
fix dispatcher changes with volatile
jpbempel Apr 24, 2026
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
5 changes: 4 additions & 1 deletion communication/src/main/java/datadog/communication/ddagent/DDAgentFeaturesDiscovery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,13 +182,16 @@ private void doDiscovery(State newState) {

if (log.isDebugEnabled()) {
log.debug(
"discovered traceEndpoint={}, metricsEndpoint={}, supportsDropping={}, supportsLongRunning={}, dataStreamsEndpoint={}, configEndpoint={}, evpProxyEndpoint={}, telemetryProxyEndpoint={}",
"discovered traceEndpoint={}, metricsEndpoint={}, supportsDropping={}, supportsLongRunning={}, dataStreamsEndpoint={}, configEndpoint={}, logEndpoint={}, snapshotEndpoint={}, diagnosticsEndpoint={}, evpProxyEndpoint={}, telemetryProxyEndpoint={}",
newState.traceEndpoint,
newState.metricsEndpoint,
newState.supportsDropping,
newState.supportsLongRunning,
newState.dataStreamsEndpoint,
newState.configEndpoint,
newState.debuggerLogEndpoint,
newState.debuggerSnapshotEndpoint,
newState.debuggerDiagnosticsEndpoint,
newState.evpProxyEndpoint,
newState.telemetryProxyEndpoint);
}
Expand Down
5 changes: 4 additions & 1 deletion dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerAgent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,8 @@ private static boolean commonInit(Config config) {
Redaction.addUserDefinedTypes(config);
DDAgentFeaturesDiscovery ddAgentFeaturesDiscovery =
sharedCommunicationObjects.featuresDiscovery(config);
ddAgentFeaturesDiscovery.discoverIfOutdated();
// force to discover because commonInit can be retried if previously failed
ddAgentFeaturesDiscovery.discover();
agentVersion = ddAgentFeaturesDiscovery.getVersion();
String diagnosticEndpoint = getDiagnosticEndpoint(config, ddAgentFeaturesDiscovery);
ProbeStatusSink probeStatusSink =
Expand All @@ -152,6 +153,8 @@ private static boolean commonInit(Config config) {
return true;
} catch (Exception ex) {
LOGGER.debug("Failed to init common component for debugger agent", ex);
// reset commonInitDone to be able to retry commonInit next time
commonInitDone.set(false);
return false;
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...tests/debugger-integration-tests/src/test/java/datadog/smoketest/BaseIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,7 @@ protected static boolean logHasErrors(Path logFilePath, Function<String, Boolean
}

protected static class MockDispatcher extends okhttp3.mockwebserver.QueueDispatcher {
private Function<RecordedRequest, MockResponse> dispatcher;
private volatile Function<RecordedRequest, MockResponse> dispatcher;

@Override
public MockResponse dispatch(RecordedRequest request) throws InterruptedException {
Expand Down
5 changes: 4 additions & 1 deletion ...integration-tests/src/test/java/datadog/smoketest/InProductEnablementIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,15 @@ void testExceptionReplayEnablement() throws Exception {
@Test
@DisplayName("testExceptionReplayEnablementFailure")
void testExceptionReplayEnablementFailure() throws Exception {
additionalJvmArgs.add("-Ddd.symbol.database.upload.enabled=false"); // enabled by default
additionalJvmArgs.add("-Ddd.exception.replay.enabled=true");
additionalJvmArgs.add("-Ddd.third.party.excludes=datadog.smoketest");
this.probeMockDispatcher.setDispatcher(this::noEndpointDispatch);
appUrl = startAppAndAndGetUrl();
waitForSpecificLine(appUrl, "Failed to init common component for debugger agent");
probeMockDispatcher.setDispatcher(this::datadogAgentDispatch);
setConfigOverrides(createConfigOverrides(true, true));
waitForFeatureStarted(appUrl, "Dynamic Instrumentation");
waitForFeatureStarted(appUrl, "Exception Replay");
}

private MockResponse noEndpointDispatch(RecordedRequest request) {
Expand Down
Loading