Skip to content

Ensure client stat reporter is started when the agent is not available at bootstrap #9082

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 3 commits into from
Jul 3, 2025
Merged

Ensure client stat reporter is started when the agent is not available at bootstrap #9082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b6315c3
Ensure metric reporter is started when the agent is not available at …
amarziali Jul 2, 2025
de1e111
Update dd-trace-core/src/test/groovy/datadog/trace/common/metrics/Con…
amarziali Jul 2, 2025
ca32710
Merge branch 'master' into andrea.marziali/ensure-metrics-run
amarziali Jul 3, 2025
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
24 changes: 10 additions & 14 deletions dd-trace-core/src/main/java/datadog/trace/common/metrics/ConflatingMetricsAggregator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,20 +143,16 @@ public ConflatingMetricsAggregator(

@Override
public void start() {
if (isMetricsEnabled()) {
sink.register(this);
thread.start();
cancellation =
AgentTaskScheduler.INSTANCE.scheduleAtFixedRate(
new ReportTask(),
this,
reportingInterval,
reportingInterval,
reportingIntervalTimeUnit);
log.debug("started metrics aggregator");
} else {
log.debug("metrics not supported by trace agent");
}
sink.register(this);
thread.start();
cancellation =
AgentTaskScheduler.INSTANCE.scheduleAtFixedRate(
new ReportTask(),
this,
reportingInterval,
reportingInterval,
reportingIntervalTimeUnit);
log.debug("started metrics aggregator");
}

private boolean isMetricsEnabled() {
Expand Down
31 changes: 31 additions & 0 deletions ...e-core/src/test/groovy/datadog/trace/common/metrics/ConflatingMetricAggregatorTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,37 @@ class ConflatingMetricAggregatorTest extends DDSpecification {
aggregator.close()
}

def "should start even if the agent is not available"() {
setup:
MetricWriter writer = Mock(MetricWriter)
Sink sink = Stub(Sink)
DDAgentFeaturesDiscovery features = Mock(DDAgentFeaturesDiscovery)
features.supportsMetrics() >> false
ConflatingMetricsAggregator aggregator = new ConflatingMetricsAggregator(empty,
features, sink, writer, 10, queueSize, 200, MILLISECONDS)
final spans = [
new SimpleSpan("service" , "operation", "resource", "type", false, true, false, 0, 10, HTTP_OK)
]
aggregator.start()

when:
aggregator.publish(spans)
Thread.sleep(1_000)

then:
0 * writer._
when:
features.supportsMetrics() >> true
aggregator.publish(spans)
Thread.sleep(1_000)

then:
(1.._) * writer._

cleanup:
aggregator.close()
}

def "force flush should wait for aggregator to start"() {
setup:
int maxAggregates = 10
Expand Down