use @david-crespo's lovely timestamp pagination from #7842

Author: hawkw

nexus/db-model/src/webhook_delivery.rs

@@ -77,7 +77,6 @@ impl WebhookDelivery {
         trigger: WebhookDeliveryTrigger,
     ) -> Self {
         Self {
-            // N.B.: perhaps we ought to use timestamp-based UUIDs for these?
             id: WebhookDeliveryUuid::new_v4().into(),
             event_id: event.id().into(),
             rx_id: (*rx_id).into(),
@@ -134,6 +133,7 @@ impl WebhookDelivery {
                 .iter()
                 .map(views::WebhookDeliveryAttempt::from)
                 .collect(),
+            time_started: self.time_created,
         };
         // Make sure attempts are in order; each attempt entry also includes an
         // attempt number, which should be used authoritatively to determine the

nexus/db-queries/src/db/datastore/webhook_delivery.rs

@@ -17,7 +17,7 @@ use crate::db::model::WebhookDeliveryState;
 use crate::db::model::WebhookDeliveryTrigger;
 use crate::db::model::WebhookEvent;
 use crate::db::model::WebhookEventClass;
-use crate::db::pagination::paginated;
+use crate::db::pagination::paginated_multicolumn;
 use crate::db::schema;
 use crate::db::schema::webhook_delivery::dsl;
 use crate::db::schema::webhook_delivery_attempt::dsl as attempt_dsl;
@@ -140,28 +140,32 @@ impl DataStore {
         rx_id: &WebhookReceiverUuid,
         triggers: &'static [WebhookDeliveryTrigger],
         only_states: Vec<WebhookDeliveryState>,
-        pagparams: &DataPageParams<'_, Uuid>,
+        pagparams: &DataPageParams<'_, (DateTime<Utc>, Uuid)>,
     ) -> ListResultVec<(
         WebhookDelivery,
         WebhookEventClass,
         Vec<WebhookDeliveryAttempt>,
     )> {
         let conn = self.pool_connection_authorized(opctx).await?;
         // Paginate the query, ordered by delivery UUID.
-        let mut query = paginated(dsl::webhook_delivery, dsl::id, pagparams)
-            // Select only deliveries that are to the receiver we're interested in,
-            // and were initiated by the triggers we're interested in.
-            .filter(
-                dsl::rx_id
-                    .eq(rx_id.into_untyped_uuid())
-                    .and(dsl::trigger.eq_any(triggers)),
-            )
-            // Join with the event table on the delivery's event ID,
-            // so that we can grab the event class of the event that initiated
-            // this delivery.
-            .inner_join(
-                event_dsl::webhook_event.on(dsl::event_id.eq(event_dsl::id)),
-            );
+        let mut query = paginated_multicolumn(
+            dsl::webhook_delivery,
+            (dsl::time_created, dsl::id),
+            pagparams,
+        )
+        // Select only deliveries that are to the receiver we're interested in,
+        // and were initiated by the triggers we're interested in.
+        .filter(
+            dsl::rx_id
+                .eq(rx_id.into_untyped_uuid())
+                .and(dsl::trigger.eq_any(triggers)),
+        )
+        // Join with the event table on the delivery's event ID,
+        // so that we can grab the event class of the event that initiated
+        // this delivery.
+        .inner_join(
+            event_dsl::webhook_event.on(dsl::event_id.eq(event_dsl::id)),
+        );
         if !only_states.is_empty() {
             query = query.filter(dsl::state.eq_any(only_states));
         }
@@ -531,8 +535,9 @@ mod test {
                 )
                 .await
                 .unwrap();
-            paginator = p
-                .found_batch(&deliveries, &|(d, _, _)| *d.id.as_untyped_uuid());
+            paginator = p.found_batch(&deliveries, &|(d, _, _)| {
+                (d.time_created, *d.id.as_untyped_uuid())
+            });
             all_deliveries
                 .extend(deliveries.into_iter().map(|(d, _, _)| dbg!(d).id));
         }

nexus/external-api/src/lib.rs

@@ -17,7 +17,10 @@ use nexus_types::{
     external_api::{params, shared, views},
 };
 use omicron_common::api::external::{
-    http_pagination::{PaginatedById, PaginatedByName, PaginatedByNameOrId},
+    http_pagination::{
+        PaginatedById, PaginatedByName, PaginatedByNameOrId,
+        PaginatedByTimeAndId,
+    },
     *,
 };
 use openapi_manager_types::ValidationContext;
@@ -3659,7 +3662,7 @@ pub trait NexusExternalApi {
         rqctx: RequestContext<Self::Context>,
         receiver: Query<params::WebhookReceiverSelector>,
         state_filter: Query<params::WebhookDeliveryStateFilter>,
-        pagination: Query<PaginatedById>,
+        pagination: Query<PaginatedByTimeAndId>,
     ) -> Result<HttpResponseOk<ResultsPage<views::WebhookDelivery>>, HttpError>;
 
     /// Request re-delivery of webhook event

nexus/src/app/background/tasks/webhook_dispatcher.rs

@@ -483,8 +483,9 @@ mod test {
                 )
                 .await
                 .unwrap();
-            paginator =
-                p.found_batch(&batch, &|(d, _, _)| d.id.into_untyped_uuid());
+            paginator = p.found_batch(&batch, &|(d, _, _)| {
+                (d.time_created, d.id.into_untyped_uuid())
+            });
             deliveries.extend(batch);
         }
         let event =

nexus/src/app/webhook.rs

@@ -133,6 +133,7 @@
 use crate::Nexus;
 use crate::app::external_dns;
 use anyhow::Context;
+use chrono::DateTime;
 use chrono::TimeDelta;
 use chrono::Utc;
 use hmac::{Hmac, Mac};
@@ -634,7 +635,7 @@ impl Nexus {
         opctx: &OpContext,
         rx: lookup::WebhookReceiver<'_>,
         filter: params::WebhookDeliveryStateFilter,
-        pagparams: &DataPageParams<'_, Uuid>,
+        pagparams: &DataPageParams<'_, (DateTime<Utc>, Uuid)>,
     ) -> ListResultVec<views::WebhookDelivery> {
         let (authz_rx,) = rx.lookup_for(authz::Action::ListChildren).await?;
         let only_states = if filter.include_all() {

nexus/src/external_api/http_entrypoints.rs

@@ -89,9 +89,11 @@ use omicron_common::api::external::http_pagination::PaginatedBy;
 use omicron_common::api::external::http_pagination::PaginatedById;
 use omicron_common::api::external::http_pagination::PaginatedByName;
 use omicron_common::api::external::http_pagination::PaginatedByNameOrId;
+use omicron_common::api::external::http_pagination::PaginatedByTimeAndId;
 use omicron_common::api::external::http_pagination::ScanById;
 use omicron_common::api::external::http_pagination::ScanByName;
 use omicron_common::api::external::http_pagination::ScanByNameOrId;
+use omicron_common::api::external::http_pagination::ScanByTimeAndId;
 use omicron_common::api::external::http_pagination::ScanParams;
 use omicron_common::api::external::http_pagination::data_page_params_for;
 use omicron_common::api::external::http_pagination::id_pagination;
@@ -7953,7 +7955,7 @@ impl NexusExternalApi for NexusExternalApiImpl {
         rqctx: RequestContext<Self::Context>,
         receiver: Query<params::WebhookReceiverSelector>,
         filter: Query<params::WebhookDeliveryStateFilter>,
-        query: Query<PaginatedById>,
+        query: Query<PaginatedByTimeAndId>,
     ) -> Result<HttpResponseOk<ResultsPage<views::WebhookDelivery>>, HttpError>
     {
         let apictx = rqctx.context();
@@ -7966,16 +7968,16 @@ impl NexusExternalApi for NexusExternalApiImpl {
             let webhook_selector = receiver.into_inner();
             let filter = filter.into_inner();
             let query = query.into_inner();
-            let pagparams = data_page_params_for(&rqctx, &query)?;
+            let pag_params = data_page_params_for(&rqctx, &query)?;
             let rx = nexus.webhook_receiver_lookup(&opctx, webhook_selector)?;
             let deliveries = nexus
-                .webhook_receiver_delivery_list(&opctx, rx, filter, &pagparams)
+                .webhook_receiver_delivery_list(&opctx, rx, filter, &pag_params)
                 .await?;
 
-            Ok(HttpResponseOk(ScanById::results_page(
+            Ok(HttpResponseOk(ScanByTimeAndId::results_page(
                 &query,
                 deliveries,
-                &|_, d| d.id,
+                &|_, d| (d.time_started, d.id),
             )?))
         };
         apictx

nexus/types/src/external_api/views.rs

@@ -1118,6 +1118,10 @@ pub struct WebhookDelivery {
 
     /// Individual attempts to deliver this webhook event, and their outcomes.
     pub attempts: Vec<WebhookDeliveryAttempt>,
+
+    /// The time at which this delivery began (i.e. the event was dispatched to
+    /// the receiver).
+    pub time_started: DateTime<Utc>,
 }
 
 /// The state of a webhook delivery attempt.

openapi/nexus.json

@@ -11999,7 +11999,7 @@
             "in": "query",
             "name": "sort_by",
             "schema": {
-              "$ref": "#/components/schemas/IdSortMode"
+              "$ref": "#/components/schemas/TimeAndIdSortMode"
             }
           }
         ],
@@ -25776,6 +25776,25 @@
             ]
           }
         ]
+      },
+      "TimeAndIdSortMode": {
+        "description": "Supported set of sort modes for scanning by timestamp and ID",
+        "oneOf": [
+          {
+            "description": "sort in increasing order of timestamp and ID, i.e., earliest first",
+            "type": "string",
+            "enum": [
+              "ascending"
+            ]
+          },
+          {
+            "description": "sort in increasing order of timestamp and ID, i.e., most recent first",
+            "type": "string",
+            "enum": [
+              "descending"
+            ]
+          }
+        ]
       }
     },
     "responses": {