Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/client/resolvers.js
Original file line number Diff line number Diff line change
Expand Up @@ -202,10 +202,11 @@ async function resolveRelay(config, environment, entry, response) {
}

function isMetricDisabled(config, environment) {
if (config.disable_metrics) {
return config.disable_metrics[environment];
if (config.disable_metrics[environment] === undefined) {
return true;
}
return false;

return config.disable_metrics[environment];
}

function checkFlags(config, group, domain, environment) {
Expand Down
16 changes: 5 additions & 11 deletions src/external/switcher-api-facade.js
Original file line number Diff line number Diff line change
Expand Up @@ -152,21 +152,15 @@ export async function checkMetrics(config) {
}

const { owner } = await getDomainById(config.domain);
const response = await getFeatureFlag(SwitcherKeys.ELEMENT_CREATION)
const featureFlag = await getFeatureFlag(SwitcherKeys.ELEMENT_CREATION)
.checkPayload(JSON.stringify({
feature: 'metrics',
owner
})).isItOn();

if (!response.result) {
if (!config.disable_metrics) {
config.disable_metrics = new Map();
config.disable_metrics.set(EnvType.DEFAULT, true);
}

config.activated.forEach((value, key) => {
config.disable_metrics.set(key, true);
});

if (!featureFlag.result) {
config.disable_metrics = new Map();
config.disable_metrics.set(EnvType.DEFAULT, true);
}
}

Expand Down
4 changes: 3 additions & 1 deletion src/models/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,9 @@ const configSchema = new mongoose.Schema({
},
disable_metrics: {
type: Map,
of: Boolean
of: Boolean,
required: true,
default: new Map().set(EnvType.DEFAULT, false)
},
updatedBy: {
type: String
Expand Down