buildgrid 0.3.2__tar.gz → 0.3.3__tar.gz

{buildgrid-0.3.2 → buildgrid-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: buildgrid
-Version: 0.3.2
+Version: 0.3.3
 Summary: A remote execution service
 License: Apache License, Version 2.0
 Project-URL: Homepage, https://buildgrid.build

{buildgrid-0.3.2 → buildgrid-0.3.3}/buildgrid/server/scheduler/impl.py

@@ -1907,6 +1907,7 @@ class Scheduler:
 
     def _publish_job_duration(
         self,
+        instance_name: str,
         start: Timestamp | None,
         end: Timestamp | None,
         state: str,
@@ -1920,6 +1921,7 @@ class Scheduler:
             publish_timer_metric(
                 METRIC.JOB.DURATION,
                 end.ToDatetime() - start.ToDatetime(),  # type: ignore[union-attr]
+                instanceName=instance_name,
                 state=state,
                 propertyLabel=property_label,
                 schedulerName=assigner_name or "none",
@@ -1965,6 +1967,7 @@ class Scheduler:
                 now_timestamp = Timestamp()
                 now_timestamp.FromDatetime(datetime.utcnow())
                 self._publish_job_duration(
+                    next_job.instance_name,
                     start_timestamp,
                     now_timestamp,
                     "Queued",
@@ -2227,6 +2230,7 @@ class Scheduler:
                 now_timestamp = Timestamp()
                 now_timestamp.FromDatetime(datetime.utcnow())
                 self._publish_job_duration(
+                    job.instance_name,
                     start_timestamp,
                     now_timestamp,
                     "Queued",
@@ -2527,7 +2531,12 @@ class Scheduler:
             )
         )
         self._publish_execution_stats(
-            session, job.name, action_result.execution_metadata, job.property_label, job.assigner_name
+            session,
+            job.name,
+            job.instance_name,
+            action_result.execution_metadata,
+            job.property_label,
+            job.assigner_name,
         )
 
     def get_bot_status_metrics(self) -> BotMetrics:
@@ -2684,17 +2693,21 @@ class Scheduler:
     def publish_execution_stats(
         self,
         job_name: str,
+        instance_name: str,
         execution_metadata: ExecutedActionMetadata,
         property_label: str = "unknown",
         assigner_name: str | None = None,
     ) -> None:
         with self._sql_ro.session(expire_on_commit=False) as session:
-            self._publish_execution_stats(session, job_name, execution_metadata, property_label, assigner_name)
+            self._publish_execution_stats(
+                session, job_name, instance_name, execution_metadata, property_label, assigner_name
+            )
 
     def _publish_execution_stats(
         self,
         session: Session,
         job_name: str,
+        instance_name: str,
         execution_metadata: ExecutedActionMetadata,
         property_label: str,
         assigner_name: str | None,
@@ -2710,12 +2723,18 @@ class Scheduler:
         upload_start = execution_metadata.output_upload_start_timestamp
         upload_completed = execution_metadata.output_upload_completed_timestamp
 
-        self._publish_job_duration(queued, worker_completed, "Total", property_label, assigner_name)
+        self._publish_job_duration(instance_name, queued, worker_completed, "Total", property_label, assigner_name)
         # The Queued time is missing here as it's posted as soon as worker has accepted the job.
-        self._publish_job_duration(worker_start, worker_completed, "Worker", property_label, assigner_name)
-        self._publish_job_duration(fetch_start, fetch_completed, "Fetch", property_label, assigner_name)
-        self._publish_job_duration(execution_start, execution_completed, "Execution", property_label, assigner_name)
-        self._publish_job_duration(upload_start, upload_completed, "Upload", property_label, assigner_name)
+        self._publish_job_duration(
+            instance_name, worker_start, worker_completed, "Worker", property_label, assigner_name
+        )
+        self._publish_job_duration(instance_name, fetch_start, fetch_completed, "Fetch", property_label, assigner_name)
+        self._publish_job_duration(
+            instance_name, execution_start, execution_completed, "Execution", property_label, assigner_name
+        )
+        self._publish_job_duration(
+            instance_name, upload_start, upload_completed, "Upload", property_label, assigner_name
+        )
 
         if self.metering_client is None or len(execution_metadata.auxiliary_metadata) == 0:
             return

{buildgrid-0.3.2 → buildgrid-0.3.3}/buildgrid/server/version.py

@@ -13,4 +13,4 @@
 # limitations under the License.
 
 
-__version__ = "0.3.2"
+__version__ = "0.3.3"

{buildgrid-0.3.2 → buildgrid-0.3.3}/buildgrid.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: buildgrid
-Version: 0.3.2
+Version: 0.3.3
 Summary: A remote execution service
 License: Apache License, Version 2.0
 Project-URL: Homepage, https://buildgrid.build

{buildgrid-0.3.2 → buildgrid-0.3.3}/pyproject.toml

@@ -21,7 +21,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = "buildgrid"
-version = "0.3.2"
+version = "0.3.3"
 requires-python = ">=3.11"
 description = "A remote execution service"
 readme = "README.rst"

{buildgrid-0.3.2 → buildgrid-0.3.3}/tests/test_scheduler.py

@@ -882,7 +882,7 @@ def test_publish_execution_stats(controller, mock_metering_client, mock_executio
     scheduler.metering_client = mock_metering_client
 
     with instance_context("sql"):
-        scheduler.publish_execution_stats("job", mock_execution_metadata, "linux")
+        scheduler.publish_execution_stats("job", "", mock_execution_metadata, "linux")
     assert len(mock_metering_client.sink) == 2
 
 
@@ -892,7 +892,7 @@ def test_publish_execution_stats_fetch_fails_no_throw(controller, mock_metering_
     mock_metering_client.put_usage.side_effect = MeteringServiceHTTPError(503, "big bang")
 
     with instance_context("sql"):
-        scheduler.publish_execution_stats("job", mock_execution_metadata)
+        scheduler.publish_execution_stats("job", "", mock_execution_metadata)
     assert len(mock_metering_client.sink) == 0
 
 
@@ -907,7 +907,7 @@ def test_publish_execution_stats_invalid_execution_stats(controller, mock_meteri
     mock_execution_metadata.auxiliary_metadata.append(some_digest_any)
 
     with instance_context("sql"):
-        scheduler.publish_execution_stats("job", mock_execution_metadata, "linux")
+        scheduler.publish_execution_stats("job", "", mock_execution_metadata, "linux")
     assert len(mock_metering_client.sink) == 0
 
 
@@ -916,7 +916,7 @@ def test_publish_execution_stats_no_client(controller, mock_metering_client, moc
     # Just dont assign a client?? Weird test
 
     with instance_context("sql"):
-        scheduler.publish_execution_stats("job", mock_execution_metadata, "linux")
+        scheduler.publish_execution_stats("job", "", mock_execution_metadata, "linux")
     assert len(mock_metering_client.sink) == 0