Skip to content

Bug 1707581 - Check if there are ping data before attempting to delete it #399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 8, 2021
Merged

Bug 1707581 - Check if there are ping data before attempting to delete it #399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c4da2a
Check if there are ping data before attempting to delete it
brizental Jun 7, 2021
29bc9c9
Fix linter issues
brizental Jun 7, 2021
ebc0d86
Add changelog entry
brizental Jun 8, 2021
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

[Full changelog](https://github.com/mozilla/glean.js/compare/v0.15.0...main)

* [#399](https://github.com/mozilla/glean.js/pull/399): Check if there are ping data before attempting to delete it.
* This change lowers the amount of log messages related to attempting to delete inexistent data.

# v0.15.0 (2021-06-03)

[Full changelog](https://github.com/mozilla/glean.js/compare/v0.14.1...v0.15.0)
Expand Down
1 change: 1 addition & 0 deletions glean/.eslintignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ dist
venv
node_modules
qt.js
tests/integration/schema/generated
2 changes: 1 addition & 1 deletion glean/src/core/metrics/database.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ class MetricsDatabase {
const pingData = await this.getAndValidatePingData(ping, Lifetime.Ping);
const appData = await this.getAndValidatePingData(ping, Lifetime.Application);

if (clearPingLifetimeData) {
if (clearPingLifetimeData && Object.keys(pingData).length > 0) {
await this.clear(Lifetime.Ping, ping);
}

Expand Down
2 changes: 1 addition & 1 deletion glean/src/core/metrics/events_database.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ class EventsDatabase {
async getPingEvents(ping: string, clearPingLifetimeData: boolean): Promise<JSONArray | undefined> {
const pingData = await this.getAndValidatePingData(ping);

if (clearPingLifetimeData) {
if (clearPingLifetimeData && Object.keys(pingData).length > 0) {
await this.eventsStore.delete([ping]);
}

Expand Down
2 changes: 1 addition & 1 deletion glean/src/core/storage/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ export function deleteKeyFromNestedObject(obj: JSONObject, index: StorageIndex):
for (const key of index.slice(0, index.length - 1)) {
const value = target[key];
if (!isObject(value)) {
throw Error("Attempted to delete an entry from an invalid index.");
throw Error(`Attempted to delete an entry from an inexistent index: ${JSON.stringify(index)}.`);
} else {
target = value;
}
Expand Down