feat: support for scheduled task via Cloud Logging

Author: regeter

README.md

@@ -46,8 +46,6 @@ Click on any empty "Load Dataset" button to open the data loading interface.
 1.  **Configure Parameters:** Input your Project ID, Vehicle ID(s) or Trip/Task ID(s), and the selected time range within the UI.
 2.  **Connect to Cloud Logging:** Click the "Sign in and Fetch Logs" button and follow the prompts to authenticate with your Google Account and grant access. You'll need appropriate IAM permissions (e.g., `roles/logging.viewer`) to read logs.
 
-**Note:** The direct Cloud Logging import feature is fully supported for `On-demand trips`. `Scheduled tasks` support is limited ([tracking issue](https://github.com/googlemaps/fleet-debugger/issues/278)).
-
 ### 2. Import from Log Files
 
 You can load log data from JSON or ZIP files using the "Load JSON or ZIP file instead" button. This is useful for:
@@ -92,6 +90,7 @@ To reload the original demo data:
     ```bash
     npm install
     ```
+4.  Add Maps Javascript API Key to src/constants.js
 
 ### Start development server
 

src/CloudLogging.js

@@ -22,24 +22,53 @@ export function buildQueryFilter(params) {
   const startDate = params.startTime || new Date(0).toISOString();
   const endDate = params.endTime || new Date(Date.now() + 86400000).toISOString();
 
-  // Build vehicle/trip filter part
-  let entityFilter = "";
+  /*
+   * Query for both On-demand Trips (Fleet) AND Scheduled Tasks (DeliveryFleet)
+   *
+   * We use "resource.type" OR logic because a single log entry has only one resource type.
+   *
+   * Structure:
+   * (
+   *   (On-demand Trips (ODRD) Conditions) OR (Scheduled Tasks (LMFS) Conditions)
+   * )
+   * AND timestamp...
+   * AND logName...
+   */
+
+  let vehicleFilter = "";
   if (params.vehicleId?.trim()) {
-    entityFilter += `labels.vehicle_id="${params.vehicleId.trim()}"`;
+    const vId = params.vehicleId.trim();
+    vehicleFilter = `(labels.vehicle_id="${vId}" OR labels.delivery_vehicle_id="${vId}")`;
   }
+
+  let tripTaskFilter = "";
   if (params.tripIds?.trim()) {
-    const trips = params.tripIds
+    const ids = params.tripIds
       .split(",")
       .map((t) => t.trim())
       .filter(Boolean);
-    if (trips.length > 0) {
-      const tripFilter = trips.length === 1 ? `labels.trip_id="${trips[0]}"` : `labels.trip_id=~"(${trips.join("|")})"`;
-      entityFilter = entityFilter ? `(${entityFilter} OR ${tripFilter})` : tripFilter;
+
+    if (ids.length > 0) {
+      if (ids.length === 1) {
+        const id = ids[0];
+        tripTaskFilter = `(labels.trip_id="${id}" OR labels.task_id="${id}")`;
+      } else {
+        const joined = ids.join("|");
+        tripTaskFilter = `(labels.trip_id=~"(${joined})" OR labels.task_id=~"(${joined})")`;
+      }
     }
   }
 
+  // If both present: (vehicleFilter OR tripTaskFilter)
+  let entityFilter = "";
+  if (vehicleFilter && tripTaskFilter) {
+    entityFilter = `(${vehicleFilter} OR ${tripTaskFilter})`;
+  } else {
+    entityFilter = vehicleFilter || tripTaskFilter;
+  }
+
   const filter = `
-    resource.type="fleetengine.googleapis.com/Fleet"
+    (resource.type="fleetengine.googleapis.com/Fleet" OR resource.type="fleetengine.googleapis.com/DeliveryFleet")
     AND ${entityFilter}
     AND timestamp >= "${startDate}"
     AND timestamp <= "${endDate}"
@@ -48,7 +77,12 @@ export function buildQueryFilter(params) {
       logName:"logs/fleetengine.googleapis.com%2Fupdate_vehicle" OR
       logName:"logs/fleetengine.googleapis.com%2Fcreate_trip" OR
       logName:"logs/fleetengine.googleapis.com%2Fupdate_trip" OR
-      logName:"logs/fleetengine.googleapis.com%2Fget_trip"
+      logName:"logs/fleetengine.googleapis.com%2Fget_trip" OR
+      logName:"logs/fleetengine.googleapis.com%2Fcreate_delivery_vehicle" OR
+      logName:"logs/fleetengine.googleapis.com%2Fupdate_delivery_vehicle" OR
+      logName:"logs/fleetengine.googleapis.com%2Fcreate_task" OR
+      logName:"logs/fleetengine.googleapis.com%2Fupdate_task" OR
+      logName:"logs/fleetengine.googleapis.com%2Fget_task"
     )
   `;
 

src/CloudLogging.test.js

@@ -14,8 +14,10 @@ describe("buildQueryFilter", () => {
     const filter = buildQueryFilter(params);
 
     // Check for key components in the filter
-    expect(filter).toContain('resource.type="fleetengine.googleapis.com/Fleet"');
-    expect(filter).toContain('labels.vehicle_id="vehicle1"');
+    expect(filter).toContain(
+      '(resource.type="fleetengine.googleapis.com/Fleet" OR resource.type="fleetengine.googleapis.com/DeliveryFleet")'
+    );
+    expect(filter).toContain('(labels.vehicle_id="vehicle1" OR labels.delivery_vehicle_id="vehicle1")');
     expect(filter).toContain("2023-01-01T01:00:00");
     expect(filter).toContain("2023-01-02T02:00:00");
   });
@@ -31,8 +33,8 @@ describe("buildQueryFilter", () => {
 
     const filter = buildQueryFilter(params);
 
-    // Should include regex for multiple trip IDs
-    expect(filter).toContain('labels.trip_id=~"(trip1|trip2)"');
+    // Should include regex for multiple trip IDs and verify task_id is included
+    expect(filter).toContain('(labels.trip_id=~"(trip1|trip2)" OR labels.task_id=~"(trip1|trip2)")');
   });
 
   test("builds filter with single trip ID", () => {
@@ -46,8 +48,8 @@ describe("buildQueryFilter", () => {
 
     const filter = buildQueryFilter(params);
 
-    // Should use exact match for single trip ID
-    expect(filter).toContain('labels.trip_id="trip1"');
+    // Should use exact match for single trip ID and verify task_id is included
+    expect(filter).toContain('(labels.trip_id="trip1" OR labels.task_id="trip1")');
   });
 
   test("builds filter with both vehicle and trip IDs", () => {
@@ -62,7 +64,9 @@ describe("buildQueryFilter", () => {
     const filter = buildQueryFilter(params);
 
     // Should combine vehicle and trip filters with OR
-    expect(filter).toContain('(labels.vehicle_id="vehicle1" OR labels.trip_id=~"(trip1|trip2)")');
+    expect(filter).toContain(
+      '((labels.vehicle_id="vehicle1" OR labels.delivery_vehicle_id="vehicle1") OR (labels.trip_id=~"(trip1|trip2)" OR labels.task_id=~"(trip1|trip2)"))'
+    );
   });
 
   test("throws error for missing project ID", () => {

src/DatasetLoading.js

@@ -101,14 +101,14 @@ const CloudLoggingFormComponent = ({ onLogsReceived, onFileUpload }) => {
       </div>
       <div className="form-field">
         <label className="form-label">
-          Trip IDs (comma-separated):
+          Trip/Task IDs (comma-separated):
           <input
             type="text"
             name="tripIds"
             value={queryParams.tripIds}
             onChange={(e) => setQueryParams({ ...queryParams, tripIds: e.target.value })}
             className="form-input"
-            placeholder="TRIP_ID_1,TRIP_ID_2"
+            placeholder="TRIP_ID, TASK_ID"
             autoComplete="on"
           />
         </label>

src/Task.js

@@ -40,7 +40,13 @@ class Task {
       taskInfo.taskoutcomelocation = lastUpdate.taskResp.taskoutcomelocation;
       taskInfo.taskoutcometime = lastUpdate.taskResp.taskoutcometime;
       taskInfo.trackingid = lastUpdate.taskResp.trackingid || lastUpdate.taskReq.task.trackingid;
-      if (taskInfo.taskoutcomelocationsource && taskInfo.plannedlocation && taskInfo.taskoutcomelocation) {
+      if (
+        taskInfo.taskoutcomelocationsource &&
+        taskInfo.plannedlocation &&
+        taskInfo.plannedlocation.point &&
+        taskInfo.taskoutcomelocation &&
+        taskInfo.taskoutcomelocation.point
+      ) {
         taskInfo.plannedVsActualDeltaMeters = window.google.maps.geometry.spherical.computeDistanceBetween(
           {
             lat: taskInfo.plannedlocation.point.latitude,