Skip to content

Commit fa49f3f

Browse files
authored
Activate client stats by default for java 17 services (#9463)
* Activate client stats by default for java 17 services * Add comments
1 parent 1f2c16a commit fa49f3f

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

dd-java-agent/instrumentation/okhttp-3/src/test/groovy/IastOkHttp3InstrumentationTest.groovy

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ class IastOkHttp3InstrumentationTest extends InstrumentationSpecification {
1818
// HttpUrl gets loaded early so we have to disable the advice transformer
1919
IastHttpUrlInstrumentation.ENABLE_ADVICE_TRANSFORMER = false
2020
injectSysConfig('dd.iast.enabled', 'true')
21+
// disable tracer metrics because it uses OkHttp and class loading is
22+
// not isolated in tests
23+
injectSysConfig("trace.stats.computation.enabled", "false")
2124
}
2225

2326
@Override

dd-java-agent/instrumentation/okhttp-3/src/test/groovy/OkHttp3Test.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ abstract class OkHttp3Test extends HttpClientTest {
1414
super.configurePreAgent()
1515
// disable tracer metrics because it uses OkHttp and class loading is
1616
// not isolated in tests
17-
injectSysConfig("dd.trace.tracer.metrics.enabled", "false")
17+
injectSysConfig("trace.stats.computation.enabled", "false")
1818
}
1919

2020
@Override

internal-api/src/main/java/datadog/trace/api/Config.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1812,10 +1812,15 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins
18121812
runtimeMetricsEnabled
18131813
&& configProvider.getBoolean(PERF_METRICS_ENABLED, DEFAULT_PERF_METRICS_ENABLED);
18141814

1815-
// Enable tracer computed trace metrics by default for Azure Functions
1815+
// Enable tracer computed trace metrics by default for Azure Functions or for applications using
1816+
// java 17
1817+
// We're rolling out progressively CSS so we'll target a slice of the java pool.
1818+
// That will be removed once will be activated by default
18161819
tracerMetricsEnabled =
18171820
configProvider.getBoolean(
1818-
TRACE_STATS_COMPUTATION_ENABLED, azureFunctions, TRACER_METRICS_ENABLED);
1821+
TRACE_STATS_COMPUTATION_ENABLED,
1822+
azureFunctions || JavaVirtualMachine.isJavaVersion(17),
1823+
TRACER_METRICS_ENABLED);
18191824
tracerMetricsBufferingEnabled =
18201825
configProvider.getBoolean(TRACER_METRICS_BUFFERING_ENABLED, false);
18211826
tracerMetricsMaxAggregates = configProvider.getInteger(TRACER_METRICS_MAX_AGGREGATES, 2048);

0 commit comments

Comments
 (0)