Skip to content

Commit bbf46e4

Browse files
Update config name
1 parent 90c6ded commit bbf46e4

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import datadog.trace.api.config.CrashTrackingConfig;
3333
import datadog.trace.api.config.CwsConfig;
3434
import datadog.trace.api.config.DebuggerConfig;
35-
import datadog.trace.api.config.FeatureFlagConfig;
35+
import datadog.trace.api.config.FeatureFlaggingConfig;
3636
import datadog.trace.api.config.GeneralConfig;
3737
import datadog.trace.api.config.IastConfig;
3838
import datadog.trace.api.config.JmxFetchConfig;
@@ -127,7 +127,7 @@ private enum AgentFeature {
127127
AGENTLESS_LOG_SUBMISSION(GeneralConfig.AGENTLESS_LOG_SUBMISSION_ENABLED, false),
128128
LLMOBS(LlmObsConfig.LLMOBS_ENABLED, false),
129129
LLMOBS_AGENTLESS(LlmObsConfig.LLMOBS_AGENTLESS_ENABLED, false),
130-
FEATURE_FLAG(FeatureFlagConfig.FLAGGING_PROVIDER_ENABLED, false);
130+
FEATURE_FLAGGING(FeatureFlaggingConfig.FLAGGING_PROVIDER_ENABLED, false);
131131

132132
private final String configKey;
133133
private final String systemProp;
@@ -186,7 +186,7 @@ public boolean isEnabledByDefault() {
186186
private static boolean codeOriginEnabled = false;
187187
private static boolean distributedDebuggerEnabled = false;
188188
private static boolean agentlessLogSubmissionEnabled = false;
189-
private static boolean featureFlagEnabled = false;
189+
private static boolean featureFlaggingEnabled = false;
190190

191191
private static void safelySetContextClassLoader(ClassLoader classLoader) {
192192
try {
@@ -271,7 +271,7 @@ public static void start(
271271
codeOriginEnabled = isFeatureEnabled(AgentFeature.CODE_ORIGIN);
272272
agentlessLogSubmissionEnabled = isFeatureEnabled(AgentFeature.AGENTLESS_LOG_SUBMISSION);
273273
llmObsEnabled = isFeatureEnabled(AgentFeature.LLMOBS);
274-
featureFlagEnabled = isFeatureEnabled(AgentFeature.FEATURE_FLAG);
274+
featureFlaggingEnabled = isFeatureEnabled(AgentFeature.FEATURE_FLAGGING);
275275

276276
// setup writers when llmobs is enabled to accomodate apm and llmobs
277277
if (llmObsEnabled) {
@@ -666,7 +666,7 @@ public void execute() {
666666
maybeStartDebugger(instrumentation, scoClass, sco);
667667
maybeStartRemoteConfig(scoClass, sco);
668668
maybeStartAiGuard();
669-
maybeStartFeatureFlag(scoClass, sco);
669+
maybeStartFeatureFlagging(scoClass, sco);
670670

671671
if (telemetryEnabled) {
672672
startTelemetry(instrumentation, scoClass, sco);
@@ -1088,20 +1088,20 @@ private static void maybeStartLLMObs(Instrumentation inst, Class<?> scoClass, Ob
10881088
}
10891089
}
10901090

1091-
private static void maybeStartFeatureFlag(final Class<?> scoClass, final Object sco) {
1092-
if (featureFlagEnabled) {
1093-
StaticEventLogger.begin("Feature Flag");
1091+
private static void maybeStartFeatureFlagging(final Class<?> scoClass, final Object sco) {
1092+
if (featureFlaggingEnabled) {
1093+
StaticEventLogger.begin("Feature Flagging");
10941094

10951095
try {
10961096
final Class<?> ffSysClass =
10971097
AGENT_CLASSLOADER.loadClass("com.datadog.featureflag.FeatureFlaggingSystem");
10981098
final Method ffSysMethod = ffSysClass.getMethod("start", scoClass);
10991099
ffSysMethod.invoke(null, sco);
11001100
} catch (final Throwable e) {
1101-
log.warn("Not starting Feature Flag subsystem", e);
1101+
log.warn("Not starting Feature Flagging subsystem", e);
11021102
}
11031103

1104-
StaticEventLogger.end("Feature Flag");
1104+
StaticEventLogger.end("Feature Flagging");
11051105
}
11061106
}
11071107

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package datadog.trace.api.config;
22

3-
public class FeatureFlagConfig {
3+
public class FeatureFlaggingConfig {
44

55
public static final String FLAGGING_PROVIDER_ENABLED = "experimental.flagging.provider.enabled";
66
}

0 commit comments

Comments
 (0)