Merge branch 'main' into upstream-dogstatsd-refactors

alexgallotta · web-flow · commit 17576b4fdbfe · 2024-09-23T14:06:31.000-04:00
diff --git a/.gitlab/benchmarks.yml b/.gitlab/benchmarks.yml
@@ -18,6 +18,7 @@ benchmarks:
     - ./steps/run-benchmarks.sh
     - ./steps/analyze-results.sh
     - "./steps/upload-results-to-s3.sh || :"
+    - "./steps/upload-results-to-benchmarking-api.sh || :"
     - "./steps/post-pr-comment.sh || :"
   artifacts:
     name: "reports"
diff --git a/data-pipeline/src/stats_exporter.rs b/data-pipeline/src/stats_exporter.rs
@@ -342,15 +342,12 @@ mod tests {
             cancellation_token.clone(),
         );
 
-        tokio::time::pause();
         tokio::spawn(async move {
             stats_exporter.run().await;
         });
         // Cancel token to trigger force flush
         cancellation_token.cancel();
-        // Resume time to sleep while the stats are being sent
-        tokio::time::resume();
-        tokio::time::sleep(Duration::from_millis(10)).await;
+        tokio::time::sleep(Duration::from_millis(500)).await;
 
         mock.assert_async().await;
     }
diff --git a/profiling/src/collections/string_table/mod.rs b/profiling/src/collections/string_table/mod.rs
@@ -184,7 +184,10 @@ impl StringTableIter {
 }
 
 impl LendingIterator for StringTableIter {
-    type Item<'a> = &'a str where Self: 'a;
+    type Item<'a>
+        = &'a str
+    where
+        Self: 'a;
 
     fn next(&mut self) -> Option<Self::Item<'_>> {
         self.iter.next()
