mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-08 19:04:45 +00:00
bug 1507175 - Don't expire dynamic builtin scalars this way. r=janerik
This reverts "bug 1501659 - Expire expired dynamic builtin scalars and events r=janerik" Differential Revision: https://phabricator.services.mozilla.com/D11908 --HG-- extra : moz-landing-system : lando
This commit is contained in:
parent
2e78f7f1a1
commit
b4e99947d0
@ -1110,16 +1110,6 @@ var Impl = {
|
||||
|
||||
// Register the builtin probes.
|
||||
for (let category in scalarJSProbes) {
|
||||
// Expire the expired scalars
|
||||
for (let name in scalarJSProbes[category]) {
|
||||
let def = scalarJSProbes[category][name];
|
||||
if (!def || !def.expires || def.expires == "never" || def.expires == "default") {
|
||||
continue;
|
||||
}
|
||||
if (Services.vc.compare(AppConstants.MOZ_APP_VERSION, def.expires) >= 0) {
|
||||
def.expired = true;
|
||||
}
|
||||
}
|
||||
Telemetry.registerBuiltinScalars(category, scalarJSProbes[category]);
|
||||
}
|
||||
},
|
||||
@ -1140,15 +1130,6 @@ var Impl = {
|
||||
|
||||
// Register the builtin probes.
|
||||
for (let category in eventJSProbes) {
|
||||
for (let name in eventJSProbes[category]) {
|
||||
let def = eventJSProbes[category][name];
|
||||
if (!def || !def.expires || def.expires == "never" || def.expires == "default") {
|
||||
continue;
|
||||
}
|
||||
if (Services.vc.compare(AppConstants.MOZ_APP_VERSION, def.expires) >= 0) {
|
||||
def.expired = true;
|
||||
}
|
||||
}
|
||||
Telemetry.registerBuiltinEvents(category, eventJSProbes[category]);
|
||||
}
|
||||
},
|
||||
|
@ -160,7 +160,6 @@ def generate_JSON_definitions(output, *filenames):
|
||||
'record_on_release': True if event.dataset_short == 'opt-out' else False,
|
||||
# We don't expire dynamic-builtin scalars: they're only meant for
|
||||
# use in local developer builds anyway. They will expire when rebuilding.
|
||||
'expires': event.expiry_version,
|
||||
'expired': False,
|
||||
})
|
||||
|
||||
|
@ -147,7 +147,6 @@ def generate_JSON_definitions(output, *filenames):
|
||||
# We don't expire dynamic-builtin scalars: they're only meant for
|
||||
# use in local developer builds anyway. They will expire when rebuilding.
|
||||
'expired': False,
|
||||
'expires': scalar.expires,
|
||||
})
|
||||
|
||||
json.dump(scalar_definitions, output)
|
||||
|
@ -52,7 +52,6 @@ with.optin:
|
||||
"testme1": {
|
||||
"objects": ["test1"],
|
||||
"expired": False,
|
||||
"expires": "never",
|
||||
"methods": ["testme1"],
|
||||
"extra_keys": ["message"],
|
||||
"record_on_release": True
|
||||
@ -62,7 +61,6 @@ with.optin:
|
||||
"testme2": {
|
||||
"objects": ["test2"],
|
||||
"expired": False,
|
||||
"expires": "never",
|
||||
"methods": ["testme2"],
|
||||
"extra_keys": ["message"],
|
||||
"record_on_release": False
|
||||
|
@ -50,14 +50,12 @@ newscalar:
|
||||
"withoptout": {
|
||||
"kind": "nsITelemetry::SCALAR_TYPE_STRING",
|
||||
"expired": False,
|
||||
"expires": "never",
|
||||
"record_on_release": True,
|
||||
"keyed": False
|
||||
},
|
||||
"withoptin": {
|
||||
"kind": "nsITelemetry::SCALAR_TYPE_COUNT",
|
||||
"expired": False,
|
||||
"expires": "never",
|
||||
"record_on_release": False,
|
||||
"keyed": False
|
||||
}
|
||||
|
@ -56,11 +56,6 @@ add_task(async function test_setup() {
|
||||
methods: ["dynamic", "child"],
|
||||
objects: ["builtin", "anotherone"],
|
||||
},
|
||||
"dynamic_expired": {
|
||||
methods: ["check"],
|
||||
objects: ["expiry"],
|
||||
expired: true,
|
||||
},
|
||||
});
|
||||
Telemetry.setEventRecordingEnabled(TEST_STATIC_EVENT_NAME, true);
|
||||
Telemetry.setEventRecordingEnabled(TEST_EVENT_NAME, true);
|
||||
@ -68,7 +63,6 @@ add_task(async function test_setup() {
|
||||
Telemetry.recordEvent(TEST_EVENT_NAME, "dynamic", "builtin");
|
||||
Telemetry.recordEvent(TEST_STATIC_EVENT_NAME, "main_and_content", "object1");
|
||||
Telemetry.recordEvent(TEST_EVENT_NAME, "dynamic", "anotherone");
|
||||
Telemetry.recordEvent(TEST_EVENT_NAME, "check", "expiry");
|
||||
|
||||
// Run test in child, don't wait for it to finish: just wait for the
|
||||
// MESSAGE_CHILD_TEST_DONE.
|
||||
|
@ -51,7 +51,7 @@ add_task({
|
||||
"object1",
|
||||
"object2",
|
||||
],
|
||||
"expires": "never",
|
||||
"expired": false,
|
||||
"methods": [
|
||||
"test1",
|
||||
"test2",
|
||||
@ -63,30 +63,6 @@ add_task({
|
||||
"record_on_release": false,
|
||||
},
|
||||
},
|
||||
// Test a new, expired event
|
||||
"telemetry.test.expired": {
|
||||
"expired": {
|
||||
"objects": ["object1"],
|
||||
"methods": ["method1"],
|
||||
"expires": AppConstants.MOZ_APP_VERSION,
|
||||
"record_on_release": false,
|
||||
},
|
||||
},
|
||||
// Test overwriting static expiries
|
||||
"telemetry.test": {
|
||||
"expired_version": {
|
||||
"objects": ["object1"],
|
||||
"methods": ["expired_version"],
|
||||
"expires": "never",
|
||||
"record_on_release": false,
|
||||
},
|
||||
"not_expired_optout": {
|
||||
"objects": ["object1"],
|
||||
"methods": ["not_expired_optout"],
|
||||
"expires": AppConstants.MOZ_APP_VERSION,
|
||||
"record_on_release": true,
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
Telemetry.clearEvents();
|
||||
@ -102,19 +78,12 @@ add_task({
|
||||
|
||||
// Record the events
|
||||
const TEST_EVENT_NAME = "telemetry.test.builtin";
|
||||
const DYNAMIC_EVENT_CATEGORY = "telemetry.test.expired";
|
||||
const STATIC_EVENT_CATEGORY = "telemetry.test";
|
||||
Telemetry.setEventRecordingEnabled(TEST_EVENT_NAME, true);
|
||||
Telemetry.setEventRecordingEnabled(DYNAMIC_EVENT_CATEGORY, true);
|
||||
Telemetry.setEventRecordingEnabled(STATIC_EVENT_CATEGORY, true);
|
||||
Telemetry.recordEvent(TEST_EVENT_NAME, "test1", "object1");
|
||||
Telemetry.recordEvent(TEST_EVENT_NAME, "test2", "object1", null,
|
||||
{"key1": "foo", "key2": "bar"});
|
||||
Telemetry.recordEvent(TEST_EVENT_NAME, "test2", "object2", null,
|
||||
{"key2": "bar"});
|
||||
Telemetry.recordEvent(DYNAMIC_EVENT_CATEGORY, "method1", "object1");
|
||||
Telemetry.recordEvent(STATIC_EVENT_CATEGORY, "expired_version", "object1");
|
||||
Telemetry.recordEvent(STATIC_EVENT_CATEGORY, "not_expired_optout", "object1");
|
||||
|
||||
// Check the values we tried to store.
|
||||
const snapshot =
|
||||
@ -125,7 +94,6 @@ add_task({
|
||||
[TEST_EVENT_NAME, "test1", "object1"],
|
||||
[TEST_EVENT_NAME, "test2", "object1", null, {key1: "foo", key2: "bar"}],
|
||||
[TEST_EVENT_NAME, "test2", "object2", null, {key2: "bar"}],
|
||||
[STATIC_EVENT_CATEGORY, "expired_version", "object1"],
|
||||
];
|
||||
let events = snapshot.parent;
|
||||
Assert.equal(events.length, expected.length, "Should have recorded the right amount of events.");
|
||||
|
@ -53,19 +53,13 @@ add_task({
|
||||
"telemetry.test": {
|
||||
"builtin_dynamic": {
|
||||
"kind": "nsITelemetry::SCALAR_TYPE_COUNT",
|
||||
"expires": "never",
|
||||
"expired": false,
|
||||
"record_on_release": false,
|
||||
"keyed": false,
|
||||
},
|
||||
"builtin_dynamic_other": {
|
||||
"kind": "nsITelemetry::SCALAR_TYPE_BOOLEAN",
|
||||
"expires": "never",
|
||||
"record_on_release": false,
|
||||
"keyed": false,
|
||||
},
|
||||
"builtin_dynamic_expired": {
|
||||
"kind": "nsITelemetry::SCALAR_TYPE_BOOLEAN",
|
||||
"expires": AppConstants.MOZ_APP_VERSION,
|
||||
"expired": false,
|
||||
"record_on_release": false,
|
||||
"keyed": false,
|
||||
},
|
||||
@ -86,10 +80,8 @@ add_task({
|
||||
// Store to that scalar.
|
||||
const TEST_SCALAR1 = "telemetry.test.builtin_dynamic";
|
||||
const TEST_SCALAR2 = "telemetry.test.builtin_dynamic_other";
|
||||
const TEST_SCALAR3 = "telemetry.test.builtin_dynamic_expired";
|
||||
Telemetry.scalarSet(TEST_SCALAR1, 3785);
|
||||
Telemetry.scalarSet(TEST_SCALAR2, true);
|
||||
Telemetry.scalarSet(TEST_SCALAR3, true);
|
||||
|
||||
// Check the values we tried to store.
|
||||
const scalars = Telemetry.getSnapshotForScalars("main", false).parent;
|
||||
|
Loading…
Reference in New Issue
Block a user