|
32 | 32 | import datadog.trace.api.config.CrashTrackingConfig; |
33 | 33 | import datadog.trace.api.config.CwsConfig; |
34 | 34 | import datadog.trace.api.config.DebuggerConfig; |
35 | | -import datadog.trace.api.config.FeatureFlagConfig; |
| 35 | +import datadog.trace.api.config.FeatureFlaggingConfig; |
36 | 36 | import datadog.trace.api.config.GeneralConfig; |
37 | 37 | import datadog.trace.api.config.IastConfig; |
38 | 38 | import datadog.trace.api.config.JmxFetchConfig; |
@@ -127,7 +127,7 @@ private enum AgentFeature { |
127 | 127 | AGENTLESS_LOG_SUBMISSION(GeneralConfig.AGENTLESS_LOG_SUBMISSION_ENABLED, false), |
128 | 128 | LLMOBS(LlmObsConfig.LLMOBS_ENABLED, false), |
129 | 129 | LLMOBS_AGENTLESS(LlmObsConfig.LLMOBS_AGENTLESS_ENABLED, false), |
130 | | - FEATURE_FLAG(FeatureFlagConfig.FLAGGING_PROVIDER_ENABLED, false); |
| 130 | + FEATURE_FLAGGING(FeatureFlaggingConfig.FLAGGING_PROVIDER_ENABLED, false); |
131 | 131 |
|
132 | 132 | private final String configKey; |
133 | 133 | private final String systemProp; |
@@ -186,7 +186,7 @@ public boolean isEnabledByDefault() { |
186 | 186 | private static boolean codeOriginEnabled = false; |
187 | 187 | private static boolean distributedDebuggerEnabled = false; |
188 | 188 | private static boolean agentlessLogSubmissionEnabled = false; |
189 | | - private static boolean featureFlagEnabled = false; |
| 189 | + private static boolean featureFlaggingEnabled = false; |
190 | 190 |
|
191 | 191 | private static void safelySetContextClassLoader(ClassLoader classLoader) { |
192 | 192 | try { |
@@ -271,7 +271,7 @@ public static void start( |
271 | 271 | codeOriginEnabled = isFeatureEnabled(AgentFeature.CODE_ORIGIN); |
272 | 272 | agentlessLogSubmissionEnabled = isFeatureEnabled(AgentFeature.AGENTLESS_LOG_SUBMISSION); |
273 | 273 | llmObsEnabled = isFeatureEnabled(AgentFeature.LLMOBS); |
274 | | - featureFlagEnabled = isFeatureEnabled(AgentFeature.FEATURE_FLAG); |
| 274 | + featureFlaggingEnabled = isFeatureEnabled(AgentFeature.FEATURE_FLAGGING); |
275 | 275 |
|
276 | 276 | // setup writers when llmobs is enabled to accomodate apm and llmobs |
277 | 277 | if (llmObsEnabled) { |
@@ -666,7 +666,7 @@ public void execute() { |
666 | 666 | maybeStartDebugger(instrumentation, scoClass, sco); |
667 | 667 | maybeStartRemoteConfig(scoClass, sco); |
668 | 668 | maybeStartAiGuard(); |
669 | | - maybeStartFeatureFlag(scoClass, sco); |
| 669 | + maybeStartFeatureFlagging(scoClass, sco); |
670 | 670 |
|
671 | 671 | if (telemetryEnabled) { |
672 | 672 | startTelemetry(instrumentation, scoClass, sco); |
@@ -1088,20 +1088,20 @@ private static void maybeStartLLMObs(Instrumentation inst, Class<?> scoClass, Ob |
1088 | 1088 | } |
1089 | 1089 | } |
1090 | 1090 |
|
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"); |
1094 | 1094 |
|
1095 | 1095 | try { |
1096 | 1096 | final Class<?> ffSysClass = |
1097 | 1097 | AGENT_CLASSLOADER.loadClass("com.datadog.featureflag.FeatureFlaggingSystem"); |
1098 | 1098 | final Method ffSysMethod = ffSysClass.getMethod("start", scoClass); |
1099 | 1099 | ffSysMethod.invoke(null, sco); |
1100 | 1100 | } catch (final Throwable e) { |
1101 | | - log.warn("Not starting Feature Flag subsystem", e); |
| 1101 | + log.warn("Not starting Feature Flagging subsystem", e); |
1102 | 1102 | } |
1103 | 1103 |
|
1104 | | - StaticEventLogger.end("Feature Flag"); |
| 1104 | + StaticEventLogger.end("Feature Flagging"); |
1105 | 1105 | } |
1106 | 1106 | } |
1107 | 1107 |
|
|
0 commit comments