Skip to content

Commit 80420af

Browse files
PerfectSlayerPerfectSlayer
authored
Merge pull request #6642 from DataDog/bbujon/remote-config-config
Fix remote config activation configuration name
2 parents 70da20b + f63a396 commit 80420af

4 files changed

Lines changed: 17 additions & 7 deletions

File tree

‎dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,10 @@ private enum AgentFeature {
9292
PROFILING(propertyNameToSystemPropertyName(ProfilingConfig.PROFILING_ENABLED), false),
9393
APPSEC(propertyNameToSystemPropertyName(AppSecConfig.APPSEC_ENABLED), false),
9494
IAST(propertyNameToSystemPropertyName(IastConfig.IAST_ENABLED), false),
95-
REMOTE_CONFIG(propertyNameToSystemPropertyName(RemoteConfigConfig.REMOTE_CONFIG_ENABLED), true),
95+
REMOTE_CONFIG(
96+
propertyNameToSystemPropertyName(RemoteConfigConfig.REMOTE_CONFIGURATION_ENABLED), true),
97+
DEPRECATED_REMOTE_CONFIG(
98+
propertyNameToSystemPropertyName(RemoteConfigConfig.REMOTE_CONFIG_ENABLED), true),
9699
CWS(propertyNameToSystemPropertyName(CwsConfig.CWS_ENABLED), false),
97100
CIVISIBILITY(propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_ENABLED), false),
98101
CIVISIBILITY_AGENTLESS(
@@ -209,7 +212,9 @@ public static void start(final Instrumentation inst, final URL agentJarURL, Stri
209212
usmEnabled = isFeatureEnabled(AgentFeature.USM);
210213
appSecEnabled = isFeatureEnabled(AgentFeature.APPSEC);
211214
appSecFullyDisabled = isAppSecFullyDisabled();
212-
remoteConfigEnabled = isFeatureEnabled(AgentFeature.REMOTE_CONFIG);
215+
remoteConfigEnabled =
216+
isFeatureEnabled(AgentFeature.REMOTE_CONFIG)
217+
|| isFeatureEnabled(AgentFeature.DEPRECATED_REMOTE_CONFIG);
213218
cwsEnabled = isFeatureEnabled(AgentFeature.CWS);
214219
telemetryEnabled = isFeatureEnabled(AgentFeature.TELEMETRY);
215220
debuggerEnabled = isFeatureEnabled(AgentFeature.DEBUGGER);

‎dd-trace-api/src/main/java/datadog/trace/api/config/RemoteConfigConfig.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
package datadog.trace.api.config;
22

33
public class RemoteConfigConfig {
4-
public static final String REMOTE_CONFIG_ENABLED = "remote_config.enabled";
4+
/** Replaced by {@link #REMOTE_CONFIGURATION_ENABLED} according the RFC. */
5+
@Deprecated public static final String REMOTE_CONFIG_ENABLED = "remote_config.enabled";
6+
7+
public static final String REMOTE_CONFIGURATION_ENABLED = "remote_configuration.enabled";
58
public static final String REMOTE_CONFIG_INTEGRITY_CHECK_ENABLED =
69
"remote_config.integrity_check.enabled";
710
public static final String REMOTE_CONFIG_URL = "remote_config.url";

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,7 @@
319319
import static datadog.trace.api.config.ProfilingConfig.PROFILING_UPLOAD_TIMEOUT;
320320
import static datadog.trace.api.config.ProfilingConfig.PROFILING_UPLOAD_TIMEOUT_DEFAULT;
321321
import static datadog.trace.api.config.ProfilingConfig.PROFILING_URL;
322+
import static datadog.trace.api.config.RemoteConfigConfig.REMOTE_CONFIGURATION_ENABLED;
322323
import static datadog.trace.api.config.RemoteConfigConfig.REMOTE_CONFIG_ENABLED;
323324
import static datadog.trace.api.config.RemoteConfigConfig.REMOTE_CONFIG_INTEGRITY_CHECK_ENABLED;
324325
import static datadog.trace.api.config.RemoteConfigConfig.REMOTE_CONFIG_MAX_PAYLOAD_SIZE;
@@ -1750,7 +1751,8 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment())
17501751
ciVisibilityModuleName = configProvider.getString(CIVISIBILITY_MODULE_NAME);
17511752

17521753
remoteConfigEnabled =
1753-
configProvider.getBoolean(REMOTE_CONFIG_ENABLED, DEFAULT_REMOTE_CONFIG_ENABLED);
1754+
configProvider.getBoolean(
1755+
REMOTE_CONFIGURATION_ENABLED, DEFAULT_REMOTE_CONFIG_ENABLED, REMOTE_CONFIG_ENABLED);
17541756
remoteConfigIntegrityCheckEnabled =
17551757
configProvider.getBoolean(
17561758
REMOTE_CONFIG_INTEGRITY_CHECK_ENABLED, DEFAULT_REMOTE_CONFIG_INTEGRITY_CHECK_ENABLED);

‎internal-api/src/test/groovy/datadog/trace/api/ConfigTest.groovy‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ import static datadog.trace.api.config.ProfilingConfig.PROFILING_UPLOAD_COMPRESS
8282
import static datadog.trace.api.config.ProfilingConfig.PROFILING_UPLOAD_PERIOD
8383
import static datadog.trace.api.config.ProfilingConfig.PROFILING_UPLOAD_TIMEOUT
8484
import static datadog.trace.api.config.ProfilingConfig.PROFILING_URL
85-
import static datadog.trace.api.config.RemoteConfigConfig.REMOTE_CONFIG_ENABLED
85+
import static datadog.trace.api.config.RemoteConfigConfig.REMOTE_CONFIGURATION_ENABLED
8686
import static datadog.trace.api.config.RemoteConfigConfig.REMOTE_CONFIG_MAX_PAYLOAD_SIZE
8787
import static datadog.trace.api.config.RemoteConfigConfig.REMOTE_CONFIG_POLL_INTERVAL_SECONDS
8888
import static datadog.trace.api.config.RemoteConfigConfig.REMOTE_CONFIG_URL
@@ -230,7 +230,7 @@ class ConfigTest extends DDSpecification {
230230
prop.setProperty(PROFILING_EXCEPTION_HISTOGRAM_MAX_COLLECTION_SIZE, "1122")
231231
prop.setProperty(PROFILING_AGENTLESS, "true")
232232

233-
prop.setProperty(REMOTE_CONFIG_ENABLED, "true")
233+
prop.setProperty(REMOTE_CONFIGURATION_ENABLED, "true")
234234
prop.setProperty(REMOTE_CONFIG_URL, "remote config url")
235235
prop.setProperty(REMOTE_CONFIG_POLL_INTERVAL_SECONDS, "3")
236236
prop.setProperty(REMOTE_CONFIG_MAX_PAYLOAD_SIZE, "2")
@@ -409,7 +409,7 @@ class ConfigTest extends DDSpecification {
409409
System.setProperty(PREFIX + PROFILING_EXCEPTION_HISTOGRAM_MAX_COLLECTION_SIZE, "1122")
410410
System.setProperty(PREFIX + PROFILING_AGENTLESS, "true")
411411

412-
System.setProperty(PREFIX + REMOTE_CONFIG_ENABLED, "true")
412+
System.setProperty(PREFIX + REMOTE_CONFIGURATION_ENABLED, "true")
413413
System.setProperty(PREFIX + REMOTE_CONFIG_URL, "remote config url")
414414
System.setProperty(PREFIX + REMOTE_CONFIG_POLL_INTERVAL_SECONDS, "3")
415415
System.setProperty(PREFIX + REMOTE_CONFIG_MAX_PAYLOAD_SIZE, "2")

0 commit comments

Comments
 (0)