Skip to content

Commit fb6cf96

Browse files
committed
chore: Keep logging p0 drop support
# Conflicts: # communication/src/main/java/datadog/communication/ddagent/DDAgentFeaturesDiscovery.java
1 parent f0a2f75 commit fb6cf96

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

communication/src/main/java/datadog/communication/ddagent/DDAgentFeaturesDiscovery.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ private static class State {
8787
String dataStreamsEndpoint;
8888
boolean supportsLongRunning;
8989
boolean supportsClientSideStats;
90+
boolean supportsDropping;
9091
String state;
9192
String configEndpoint;
9293
String debuggerLogEndpoint;
@@ -184,10 +185,10 @@ private void doDiscovery(State newState) {
184185

185186
if (log.isDebugEnabled()) {
186187
log.debug(
187-
"discovered traceEndpoint={}, metricsEndpoint={}, supportsClientSideStats={}, supportsLongRunning={}, dataStreamsEndpoint={}, configEndpoint={}, evpProxyEndpoint={}, telemetryProxyEndpoint={}",
188+
"discovered traceEndpoint={}, metricsEndpoint={}, supportsDropping={}, supportsLongRunning={}, dataStreamsEndpoint={}, configEndpoint={}, evpProxyEndpoint={}, telemetryProxyEndpoint={}",
188189
newState.traceEndpoint,
189190
newState.metricsEndpoint,
190-
newState.supportsClientSideStats,
191+
newState.supportsDropping,
191192
newState.supportsLongRunning,
192193
newState.dataStreamsEndpoint,
193194
newState.configEndpoint,
@@ -306,14 +307,15 @@ private boolean processInfoResponse(State newState, String response) {
306307
Boolean.TRUE.equals(map.getOrDefault("long_running_spans", false));
307308

308309
if (metricsEnabled) {
309-
newState.supportsClientSideStats =
310-
!AgentVersion.isVersionBelow(newState.version, 7, 65, 0);
311310
Object canDrop = map.get("client_drop_p0s");
312-
newState.supportsClientSideStats &=
311+
newState.supportsDropping =
313312
null != canDrop
314313
&& ("true".equalsIgnoreCase(String.valueOf(canDrop))
315314
|| Boolean.TRUE.equals(canDrop));
316315

316+
newState.supportsClientSideStats =
317+
newState.supportsDropping && !AgentVersion.isVersionBelow(newState.version, 7, 65, 0);
318+
317319
Object peer_tags = map.get("peer_tags");
318320
newState.peerTags =
319321
peer_tags instanceof List

0 commit comments

Comments
 (0)