Skip to content

Commit 00b60d4

Browse files
authored
Don't calculate stats if dropping is disabled (#9742)
1 parent 74931d1 commit 00b60d4

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,9 @@ private static void discoverStatsDPort(final Map<String, Object> info) {
356356
}
357357

358358
public boolean supportsMetrics() {
359-
return metricsEnabled && null != discoveryState.metricsEndpoint;
359+
return metricsEnabled
360+
&& null != discoveryState.metricsEndpoint
361+
&& discoveryState.supportsDropping;
360362
}
361363

362364
public boolean supportsDebugger() {
@@ -439,7 +441,7 @@ public String state() {
439441

440442
@Override
441443
public boolean active() {
442-
return supportsMetrics() && discoveryState.supportsDropping;
444+
return supportsMetrics();
443445
}
444446

445447
public boolean supportsTelemetryProxy() {

communication/src/test/groovy/datadog/communication/ddagent/DDAgentFeaturesDiscoveryTest.groovy

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class DDAgentFeaturesDiscoveryTest extends DDSpecification {
5858
then:
5959
1 * client.newCall(_) >> { Request request -> infoResponse(request, INFO_RESPONSE) }
6060
features.getMetricsEndpoint() == V6_METRICS_ENDPOINT
61-
features.supportsMetrics()
61+
!features.supportsMetrics()
6262
features.getTraceEndpoint() == "v0.5/traces"
6363
!features.supportsDropping()
6464
features.getDataStreamsEndpoint() == V01_DATASTREAMS_ENDPOINT
@@ -87,7 +87,7 @@ class DDAgentFeaturesDiscoveryTest extends DDSpecification {
8787

8888
then: "info returned"
8989
1 * client.newCall(_) >> {
90-
Request request -> infoResponse(request, INFO_RESPONSE)
90+
Request request -> infoResponse(request, INFO_WITH_CLIENT_DROPPING_RESPONSE)
9191
}
9292
features.supportsMetrics()
9393

@@ -116,7 +116,7 @@ class DDAgentFeaturesDiscoveryTest extends DDSpecification {
116116
then:
117117
1 * client.newCall(_) >> { Request request -> infoResponse(request, INFO_RESPONSE) }
118118
features.getMetricsEndpoint() == V6_METRICS_ENDPOINT
119-
features.supportsMetrics()
119+
!features.supportsMetrics()
120120
features.getTraceEndpoint() == "v0.5/traces"
121121
!features.supportsDropping()
122122
features.getDataStreamsEndpoint() == V01_DATASTREAMS_ENDPOINT
@@ -162,7 +162,7 @@ class DDAgentFeaturesDiscoveryTest extends DDSpecification {
162162
then:
163163
1 * client.newCall(_) >> { Request request -> infoResponse(request, INFO_WITHOUT_DATA_STREAMS_RESPONSE) }
164164
features.getMetricsEndpoint() == V6_METRICS_ENDPOINT
165-
features.supportsMetrics()
165+
!features.supportsMetrics()
166166
features.getTraceEndpoint() == "v0.5/traces"
167167
features.getDataStreamsEndpoint() == null
168168
!features.supportsDataStreams()

0 commit comments

Comments
 (0)