File tree Expand file tree Collapse file tree 4 files changed +16
-12
lines changed
agent-bootstrap/src/main/java/datadog/trace/bootstrap
agent-debugger/src/main/java/com/datadog/debugger/agent
internal-api/src/main/java/datadog/trace/api Expand file tree Collapse file tree 4 files changed +16
-12
lines changed Original file line number Diff line number Diff line change 22
33import static datadog .environment .JavaVirtualMachine .isJavaVersionAtLeast ;
44import static datadog .environment .JavaVirtualMachine .isOracleJDK8 ;
5+ import static datadog .trace .api .Config .isExplicitlyDisabled ;
56import static datadog .trace .api .ConfigDefaults .DEFAULT_STARTUP_LOGS_ENABLED ;
67import static datadog .trace .api .config .GeneralConfig .DATA_JOBS_COMMAND_PATTERN ;
78import static datadog .trace .api .config .GeneralConfig .DATA_JOBS_ENABLED ;
@@ -1457,11 +1458,6 @@ && isExplicitlyDisabled(DebuggerConfig.DISTRIBUTED_DEBUGGER_ENABLED)) {
14571458 startDebuggerAgent (inst , scoClass , sco );
14581459 }
14591460
1460- private static boolean isExplicitlyDisabled (String booleanKey ) {
1461- return Config .get ().configProvider ().isSet (booleanKey )
1462- && !Config .get ().configProvider ().getBoolean (booleanKey );
1463- }
1464-
14651461 private static synchronized void startDebuggerAgent (
14661462 Instrumentation inst , Class <?> scoClass , Object sco ) {
14671463 StaticEventLogger .begin ("Debugger" );
Original file line number Diff line number Diff line change 2727import datadog .remoteconfig .ConfigurationPoller ;
2828import datadog .remoteconfig .Product ;
2929import datadog .trace .api .Config ;
30+ import datadog .trace .api .config .DebuggerConfig ;
31+ import datadog .trace .api .config .TraceInstrumentationConfig ;
3032import datadog .trace .api .debugger .DebuggerConfigBridge ;
3133import datadog .trace .api .flare .TracerFlare ;
3234import datadog .trace .api .git .GitInfo ;
@@ -89,8 +91,12 @@ public static synchronized void run(
8991 }
9092 if (config .isDynamicInstrumentationEnabled ()) {
9193 startDynamicInstrumentation (config );
92- startCodeOriginForSpans (config );
93- startSymbolDatabase (config );
94+ if (!Config .isExplicitlyDisabled (TraceInstrumentationConfig .CODE_ORIGIN_FOR_SPANS_ENABLED )) {
95+ startCodeOriginForSpans (config );
96+ }
97+ if (!Config .isExplicitlyDisabled (DebuggerConfig .SYMBOL_DATABASE_ENABLED )) {
98+ startSymbolDatabase (config );
99+ }
94100 if (config .getDynamicInstrumentationInstrumentTheWorld () != null ) {
95101 setupInstrumentTheWorldTransformer (config , instrumentation , sink );
96102 }
Original file line number Diff line number Diff line change 11package com .datadog .debugger .agent ;
22
3+ import static datadog .trace .api .Config .isExplicitlyDisabled ;
4+
35import datadog .trace .api .Config ;
46import datadog .trace .api .config .DebuggerConfig ;
57import datadog .trace .api .config .TraceInstrumentationConfig ;
@@ -67,11 +69,6 @@ public boolean isDistributedDebuggerEnabled() {
6769 return DebuggerAgent .distributedDebuggerEnabled .get ();
6870 }
6971
70- private static boolean isExplicitlyDisabled (String booleanKey ) {
71- return Config .get ().configProvider ().isSet (booleanKey )
72- && !Config .get ().configProvider ().getBoolean (booleanKey );
73- }
74-
7572 private static void startOrStopFeature (
7673 Config config ,
7774 String booleanKey ,
Original file line number Diff line number Diff line change @@ -5705,6 +5705,11 @@ public static Config get() {
57055705 return INSTANCE ;
57065706 }
57075707
5708+ public static boolean isExplicitlyDisabled (String booleanKey ) {
5709+ return Config .get ().configProvider ().isSet (booleanKey )
5710+ && !Config .get ().configProvider ().getBoolean (booleanKey );
5711+ }
5712+
57085713 /**
57095714 * This method is deprecated since the method of configuration will be changed in the future. The
57105715 * properties instance should instead be passed directly into the DDTracer builder:
You can’t perform that action at this time.
0 commit comments