Ensure only empty pings triggers logging of "empty ping" message (#279) (#279)

Author: ChinYing-Li

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 [Full changelog](https://github.com/mozilla/glean.js/compare/v0.11.0...main)
 
+* [#279](https://github.com/mozilla/glean.js/pull/279): BUGFIX: Ensure only empty pings triggers logging of "empty ping" messages.
+
 # v0.11.0 (2021-05-03)
 
 [Full changelog](https://github.com/mozilla/glean.js/compare/v0.10.2...v0.11.0)

glean/src/core/pings/maker.ts

@@ -195,10 +195,11 @@ export function getPingHeaders(debugOptions?: DebugOptions): Record<string, stri
 export async function collectPing(metricsDatabase: MetricsDatabase, eventsDatabase: EventsDatabase, ping: CommonPingData, reason?: string): Promise<PingPayload | undefined> {
   const metricsData = await metricsDatabase.getPingMetrics(ping.name, true);
   const eventsData = await eventsDatabase.getPingEvents(ping.name, true);
-  if (!metricsData && !eventsData && !ping.sendIfEmpty) {
-    console.info(`Storage for ${ping.name} empty. Bailing out.`);
-    return;
-  } else if (!metricsData) {
+  if (!metricsData && !eventsData) {
+    if (!ping.sendIfEmpty) {
+      console.info(`Storage for ${ping.name} empty. Bailing out.`);
+      return;
+    }
     console.info(`Storage for ${ping.name} empty. Ping will still be sent.`);
   }