Merge pull request #1325 from mozilla/correct-unit-for-sleep

CHANGELOG.md

@@ -2,9 +2,15 @@
 
 [Full changelog](https://github.com/mozilla/glean/compare/v33.3.0...main)
 
+* General
+  * When Rkv's safe mode is enabled (`features = ["rkv-safe-mode"]` on the `glean-core` crate) LMDB data is migrated at first start ([#1322](https://github.com/mozilla/glean/pull/1322)).
 * Rust
   * Introduce the Counter metric type in the RLB.
   * Introduce the String metric type in the RLB.
+* Python
+  * BUGFIX: Fix too-long sleep time in uploader due to unit mismatch ([#1325](https://github.com/mozilla/glean/pull/1325)).
+* Swift
+  * BUGFIX: Fix too-long sleep time in uploader due to unit mismatch ([#1325](https://github.com/mozilla/glean/pull/1325)).
 
 # v33.3.0 (2020-11-12)
 
@@ -15,9 +21,6 @@
 * Rust
   * Implement the experiments API ([#1314](https://github.com/mozilla/glean/pull/1314))
 
-* General
-  * When Rkv's safe mode is enabled (`features = ["rkv-safe-mode"]` on the `glean-core` crate) LMDB data is migrated at first start ([#1322](https://github.com/mozilla/glean/pull/1322)).
-
 # v33.2.0 (2020-11-10)
 
 [Full changelog](https://github.com/mozilla/glean/compare/v33.1.2...v33.2.0)

bin/bootstrap.sh

@@ -6,7 +6,7 @@
 
 # Xcode 12 -- Carthage workaround
 # See https://github.com/Carthage/Carthage/issues/3019
-if xcodebuild -version | grep -q "Xcode 12.0"; then
+if xcodebuild -version | grep -q "Xcode 12."; then
   xcconfig="${PWD}/tmp.xcconfig"
   true > "$xcconfig"
   echo 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64=arm64 arm64e armv7 armv7s armv6 armv8' >> "$xcconfig"

glean-core/ios/Glean/Net/HttpPingUploader.swift

@@ -13,7 +13,7 @@ public class HttpPingUploader {
         // Since ping file names are UUIDs, this matches UUIDs for filtering purposes
         static let logTag = "glean/HttpPingUploader"
         static let connectionTimeout = 10000
-        static let throttleBackoffMs: UInt32 = 60_000
+        static let throttleBackoffS: UInt32 = 60
 
         // For this error, the ping will be retried later
         static let recoverableErrorStatusCode: UInt16 = 500
@@ -118,7 +118,7 @@ public class HttpPingUploader {
                     glean_process_ping_upload_response(&incomingTask, result.toFfi())
                 }
             case .wait:
-                sleep(Constants.throttleBackoffMs)
+                sleep(Constants.throttleBackoffS)
                 continue
             case .done:
                 return

glean-core/python/glean/glean.py

@@ -231,7 +231,7 @@ def _initialize_with_tempdir_for_testing(
         again or at process shutdown.
         """
         # Lower throttle backoff time for testing
-        PingUploadWorker._throttle_backoff_time = 1
+        PingUploadWorker._throttle_backoff_time_s = 1
 
         actual_data_dir = Path(tempfile.TemporaryDirectory().name)
         cls.initialize(

glean-core/python/glean/net/ping_upload_worker.py

@@ -23,7 +23,7 @@
 
 
 class PingUploadWorker:
-    _throttle_backoff_time = 60_000
+    _throttle_backoff_time_s = 60
 
     @classmethod
     def process(cls):
@@ -50,7 +50,7 @@ def _process(cls):
                 Glean._data_dir,
                 Glean._application_id,
                 Glean._configuration,
-                cls._throttle_backoff_time,
+                cls._throttle_backoff_time_s,
             ),
         )
 
@@ -103,7 +103,7 @@ def _parse_ping_headers(
 
 
 def _process(
-    data_dir: Path, application_id: str, configuration, throttle_backoff_time: int
+    data_dir: Path, application_id: str, configuration, throttle_backoff_time_s: int
 ) -> bool:
 
     # Import here to avoid cyclical import
@@ -154,7 +154,7 @@ def _process(
                 incoming_task, upload_result.to_ffi()
             )
         elif tag == UploadTaskTag.WAIT:
-            time.sleep(throttle_backoff_time)
+            time.sleep(throttle_backoff_time_s)
         elif tag == UploadTaskTag.DONE:
             return True