From b872e7fa9ba67c2ea520bd767fb806e24cc6113f Mon Sep 17 00:00:00 2001 From: Tyler Benson Date: Thu, 11 Apr 2019 14:40:44 -0700 Subject: [PATCH] Set default value for partial trace flush to 1k This should help reduce memory impact of large traces and reduce risk if scope is opened and never closed. --- dd-trace-api/src/main/java/datadog/trace/api/Config.java | 2 +- .../src/test/groovy/datadog/trace/api/ConfigTest.groovy | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dd-trace-api/src/main/java/datadog/trace/api/Config.java b/dd-trace-api/src/main/java/datadog/trace/api/Config.java index c6321745e2..380e4d17cd 100644 --- a/dd-trace-api/src/main/java/datadog/trace/api/Config.java +++ b/dd-trace-api/src/main/java/datadog/trace/api/Config.java @@ -91,7 +91,7 @@ public class Config { private static final Set DEFAULT_HTTP_CLIENT_ERROR_STATUSES = parseIntegerRangeSet("400-499", "default"); private static final boolean DEFAULT_HTTP_CLIENT_SPLIT_BY_DOMAIN = false; - private static final int DEFAULT_PARTIAL_FLUSH_MIN_SPANS = 0; + private static final int DEFAULT_PARTIAL_FLUSH_MIN_SPANS = 1000; private static final String DEFAULT_PROPAGATION_STYLE_EXTRACT = PropagationStyle.DATADOG.name(); private static final String DEFAULT_PROPAGATION_STYLE_INJECT = PropagationStyle.DATADOG.name(); private static final boolean DEFAULT_JMX_FETCH_ENABLED = false; diff --git a/dd-trace-api/src/test/groovy/datadog/trace/api/ConfigTest.groovy b/dd-trace-api/src/test/groovy/datadog/trace/api/ConfigTest.groovy index cc5c14f570..e64a3c7a93 100644 --- a/dd-trace-api/src/test/groovy/datadog/trace/api/ConfigTest.groovy +++ b/dd-trace-api/src/test/groovy/datadog/trace/api/ConfigTest.groovy @@ -74,7 +74,7 @@ class ConfigTest extends Specification { config.httpServerErrorStatuses == (500..599).toSet() config.httpClientErrorStatuses == (400..499).toSet() config.httpClientSplitByDomain == false - config.partialFlushMinSpans == 0 + config.partialFlushMinSpans == 1000 config.runtimeContextFieldInjection == true config.propagationStylesToExtract.toList() == [Config.PropagationStyle.DATADOG] config.propagationStylesToInject.toList() == [Config.PropagationStyle.DATADOG] @@ -172,7 +172,7 @@ class ConfigTest extends Specification { System.setProperty(PREFIX + HTTP_SERVER_ERROR_STATUSES, "123-456,457,124-125,122") System.setProperty(PREFIX + HTTP_CLIENT_ERROR_STATUSES, "111") System.setProperty(PREFIX + HTTP_CLIENT_HOST_SPLIT_BY_DOMAIN, "true") - System.setProperty(PREFIX + PARTIAL_FLUSH_MIN_SPANS, "15") + System.setProperty(PREFIX + PARTIAL_FLUSH_MIN_SPANS, "25") System.setProperty(PREFIX + RUNTIME_CONTEXT_FIELD_INJECTION, "false") System.setProperty(PREFIX + PROPAGATION_STYLE_EXTRACT, "Datadog, B3") System.setProperty(PREFIX + PROPAGATION_STYLE_INJECT, "B3, Datadog") @@ -201,7 +201,7 @@ class ConfigTest extends Specification { config.httpServerErrorStatuses == (122..457).toSet() config.httpClientErrorStatuses == (111..111).toSet() config.httpClientSplitByDomain == true - config.partialFlushMinSpans == 15 + config.partialFlushMinSpans == 25 config.runtimeContextFieldInjection == false config.propagationStylesToExtract.toList() == [Config.PropagationStyle.DATADOG, Config.PropagationStyle.B3] config.propagationStylesToInject.toList() == [Config.PropagationStyle.B3, Config.PropagationStyle.DATADOG]