Changeset 276545 in webkit

Timestamp:

Apr 23, 2021, 5:47:50 PM (5 years ago)

Author:

Kate Cheney

Message:

PCM: debug mode should send the second report on a 10 second delay after the first
​https://bugs.webkit.org/show_bug.cgi?id=225010
<rdar://problem/77092303>

Reviewed by John Wilander.

Fix a bug in PCM debug mode where we don't set the timer for 10_s
after sending the first report for an attribution.

No new tests, this is debug mode only. Non-debug mode behavior is
covered by existing tests, and I tested debug mode manually.

• NetworkProcess/PrivateClickMeasurementManager.cpp:

(WebKit::PrivateClickMeasurementManager::firePendingAttributionRequests):
If the attribution has been sent to only one endpoint, indicated by
a non-null laterTimeToSend value, we should set the timer to be 10
seconds if debug mode is enabled.

Also, change the interval time from 1 minute to 10 seconds, because
there was no good reason that it was 1 minute and we should be
consistent. Also 1 minute is a long time to wait during a test.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/PrivateClickMeasurementManager.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-04-23  Kate Cheney  <katherine_cheney@apple.com>
+
+        PCM: debug mode should send the second report on a 10 second delay after the first
+        https://bugs.webkit.org/show_bug.cgi?id=225010
+        <rdar://problem/77092303>
+
+        Reviewed by John Wilander.
+
+        Fix a bug in PCM debug mode where we don't set the timer for 10_s
+        after sending the first report for an attribution.
+
+        No new tests, this is debug mode only. Non-debug mode behavior is
+        covered by existing tests, and I tested debug mode manually.
+
+        * NetworkProcess/PrivateClickMeasurementManager.cpp:
+        (WebKit::PrivateClickMeasurementManager::firePendingAttributionRequests):
+        If the attribution has been sent to only one endpoint, indicated by
+        a non-null laterTimeToSend value, we should set the timer to be 10
+        seconds if debug mode is enabled.
+
+        Also, change the interval time from 1 minute to 10 seconds, because
+        there was no good reason that it was 1 minute and we should be
+        consistent. Also 1 minute is a long time to wait during a test.
+
 2021-04-23  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurementManager.cpp

@@ -396 +396 @@
                     // We've already sent an attribution this round. We should send additional overdue attributions at
                     // a random time between 15 and 30 minutes to avoid a burst of simultaneous attributions. If debug
-                    // mode is enabled, this should be every minute for easy testing.
-                    auto interval = debugModeEnabled() ? 1_min : 15_min + Seconds(cryptographicallyRandomNumber() % 900);
+                    // mode is enabled, this should be much shorter for easy testing.
+                    auto interval = debugModeEnabled() ? debugModeSecondsUntilSend : 15_min + Seconds(cryptographicallyRandomNumber() % 900);
                     startTimer(interval);
                     return;
@@ -408 +408 @@
 
                 // Update nextTimeToFire in case the later report time for this attribution is sooner than the scheduled next time to fire.
+                // Or, if debug mode is enabled, we should send the second report on a much shorter delay for easy testing.
                 if (laterTimeToSend)
-                    nextTimeToFire = std::min(nextTimeToFire, laterTimeToSend.value().secondsSinceEpoch());
+                    nextTimeToFire = debugModeEnabled() ? debugModeSecondsUntilSend : std::min(nextTimeToFire, laterTimeToSend.value().secondsSinceEpoch());
 
                 continue;