Skip to content

Commit e9d4e43

Browse files
committed
fix(openfeature): use canonical feature flags kill switch
1 parent de8e8ef commit e9d4e43

7 files changed

Lines changed: 15 additions & 15 deletions

File tree

integration-tests/openfeature/openfeature-agentless.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ describe('OpenFeature agentless configuration integration', () => {
8686
cwd,
8787
env: {
8888
DD_API_KEY: 'integration-api-key',
89-
DD_FEATURE_FLAGGING_PROVIDER_ENABLED: 'true',
89+
DD_FEATURE_FLAGS_ENABLED: 'true',
9090
DD_FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_BASE_URL: backendUrl,
9191
DD_FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_POLL_INTERVAL_SECONDS: '5',
9292
DD_FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_REQUEST_TIMEOUT_SECONDS: '1',

integration-tests/openfeature/openfeature-exposure-events.spec.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ describe('OpenFeature Remote Config and Exposure Events Integration', () => {
6060
env: {
6161
DD_TRACE_AGENT_PORT: agent.port,
6262
DD_REMOTE_CONFIG_POLL_INTERVAL_SECONDS: '0.1',
63-
DD_FEATURE_FLAGGING_PROVIDER_ENABLED: 'true',
63+
DD_FEATURE_FLAGS_ENABLED: 'true',
6464
// Preserve the existing RC exposure path until agentless emission is supported.
6565
DD_FEATURE_FLAGS_CONFIGURATION_SOURCE: 'remote_config',
6666
},
@@ -161,7 +161,7 @@ describe('OpenFeature Remote Config and Exposure Events Integration', () => {
161161
env: {
162162
DD_TRACE_AGENT_PORT: agent.port,
163163
DD_REMOTE_CONFIG_POLL_INTERVAL_SECONDS: '0.1',
164-
DD_FEATURE_FLAGGING_PROVIDER_ENABLED: 'true',
164+
DD_FEATURE_FLAGS_ENABLED: 'true',
165165
DD_FEATURE_FLAGS_CONFIGURATION_SOURCE: 'remote_config',
166166
},
167167
})
@@ -245,7 +245,7 @@ describe('OpenFeature Remote Config and Exposure Events Integration', () => {
245245
env: {
246246
DD_TRACE_AGENT_PORT: agent.port,
247247
DD_REMOTE_CONFIG_POLL_INTERVAL_SECONDS: '0.1',
248-
DD_FEATURE_FLAGGING_PROVIDER_ENABLED: 'true',
248+
DD_FEATURE_FLAGS_ENABLED: 'true',
249249
DD_FEATURE_FLAGS_CONFIGURATION_SOURCE: 'remote_config',
250250
},
251251
})
@@ -307,7 +307,7 @@ describe('OpenFeature Remote Config and Exposure Events Integration', () => {
307307
cwd,
308308
env: {
309309
DD_TRACE_AGENT_PORT: agent.port,
310-
DD_FEATURE_FLAGGING_PROVIDER_ENABLED: 'false',
310+
DD_FEATURE_FLAGS_ENABLED: 'false',
311311
},
312312
})
313313
})

packages/dd-trace/src/config/generated-config-types.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,11 @@ export interface GeneratedConfig {
8383
DD_EXPERIMENTAL_TEST_OPT_VITEST_NO_WORKER_INIT: boolean | undefined;
8484
DD_EXPERIMENTAL_TEST_REQUESTS_FS_CACHE: boolean;
8585
DD_EXTERNAL_ENV: string | undefined;
86-
DD_FEATURE_FLAGGING_PROVIDER_ENABLED: boolean;
8786
DD_FEATURE_FLAGS_CONFIGURATION_SOURCE: string;
8887
DD_FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_BASE_URL: string | undefined;
8988
DD_FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_POLL_INTERVAL_SECONDS: number;
9089
DD_FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_REQUEST_TIMEOUT_SECONDS: number;
90+
DD_FEATURE_FLAGS_ENABLED: boolean;
9191
DD_GIT_BRANCH: string | undefined;
9292
DD_GIT_COMMIT_AUTHOR_DATE: string | undefined;
9393
DD_GIT_COMMIT_AUTHOR_EMAIL: string | undefined;
@@ -693,11 +693,11 @@ export interface GeneratedEnvVarConfig {
693693
DD_EXPERIMENTAL_TEST_OPT_VITEST_NO_WORKER_INIT: boolean | undefined;
694694
DD_EXPERIMENTAL_TEST_REQUESTS_FS_CACHE: boolean;
695695
DD_EXTERNAL_ENV: string | undefined;
696-
DD_FEATURE_FLAGGING_PROVIDER_ENABLED: boolean;
697696
DD_FEATURE_FLAGS_CONFIGURATION_SOURCE: string;
698697
DD_FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_BASE_URL: string | undefined;
699698
DD_FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_POLL_INTERVAL_SECONDS: number;
700699
DD_FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_REQUEST_TIMEOUT_SECONDS: number;
700+
DD_FEATURE_FLAGS_ENABLED: boolean;
701701
DD_GIT_BRANCH: string | undefined;
702702
DD_GIT_COMMIT_AUTHOR_DATE: string | undefined;
703703
DD_GIT_COMMIT_AUTHOR_EMAIL: string | undefined;

packages/dd-trace/src/config/supported-configurations.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -817,7 +817,7 @@
817817
"default": "false"
818818
}
819819
],
820-
"DD_FEATURE_FLAGGING_PROVIDER_ENABLED": [
820+
"DD_FEATURE_FLAGS_ENABLED": [
821821
{
822822
"implementation": "A",
823823
"type": "boolean",

packages/dd-trace/src/openfeature/configuration_source.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ function isEnabled (config) {
112112
* @returns {string} Selected configuration-source mode.
113113
*/
114114
function resolveMode (config) {
115-
if (config.DD_FEATURE_FLAGGING_PROVIDER_ENABLED === false) return CONFIGURATION_SOURCE_DISABLED
115+
if (config.DD_FEATURE_FLAGS_ENABLED === false) return CONFIGURATION_SOURCE_DISABLED
116116

117117
const value = config.DD_FEATURE_FLAGS_CONFIGURATION_SOURCE
118118
const origin = config.getOrigin?.('DD_FEATURE_FLAGS_CONFIGURATION_SOURCE')

packages/dd-trace/test/config/index.spec.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4943,7 +4943,7 @@ rules:
49434943
const config = getConfig()
49444944

49454945
assertObjectContains(config, {
4946-
DD_FEATURE_FLAGGING_PROVIDER_ENABLED: true,
4946+
DD_FEATURE_FLAGS_ENABLED: true,
49474947
DD_FEATURE_FLAGS_CONFIGURATION_SOURCE: 'agentless',
49484948
DD_FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_BASE_URL: undefined,
49494949
DD_FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_POLL_INTERVAL_SECONDS: 30,
@@ -4953,11 +4953,11 @@ rules:
49534953
})
49544954

49554955
it('reads the stable provider kill switch', () => {
4956-
process.env.DD_FEATURE_FLAGGING_PROVIDER_ENABLED = 'false'
4956+
process.env.DD_FEATURE_FLAGS_ENABLED = 'false'
49574957

49584958
const config = getConfig()
49594959

4960-
assert.strictEqual(config.DD_FEATURE_FLAGGING_PROVIDER_ENABLED, false)
4960+
assert.strictEqual(config.DD_FEATURE_FLAGS_ENABLED, false)
49614961
})
49624962

49634963
for (const value of ['true', 'false']) {
@@ -4966,7 +4966,7 @@ rules:
49664966

49674967
const config = getConfig()
49684968

4969-
assert.strictEqual(config.DD_FEATURE_FLAGGING_PROVIDER_ENABLED, true)
4969+
assert.strictEqual(config.DD_FEATURE_FLAGS_ENABLED, true)
49704970
assert.strictEqual(config.experimental.flaggingProvider.enabled, value === 'true')
49714971
})
49724972
}

packages/dd-trace/test/openfeature/configuration_source.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ describe('OpenFeature configuration source', () => {
1616
beforeEach(() => {
1717
config = {
1818
DD_API_KEY: 'test-api-key',
19-
DD_FEATURE_FLAGGING_PROVIDER_ENABLED: true,
19+
DD_FEATURE_FLAGS_ENABLED: true,
2020
DD_FEATURE_FLAGS_CONFIGURATION_SOURCE: 'agentless',
2121
DD_FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_BASE_URL: undefined,
2222
DD_FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_POLL_INTERVAL_SECONDS: 30,
@@ -88,7 +88,7 @@ describe('OpenFeature configuration source', () => {
8888
})
8989

9090
it('lets the stable kill switch override every configuration source', () => {
91-
config.DD_FEATURE_FLAGGING_PROVIDER_ENABLED = false
91+
config.DD_FEATURE_FLAGS_ENABLED = false
9292
config.DD_FEATURE_FLAGS_CONFIGURATION_SOURCE = 'remote_config'
9393
config.experimental.flaggingProvider.enabled = true
9494
config.getOrigin.returns('env_var')

0 commit comments

Comments
 (0)