buildgrid 0.3.2__py3-none-any.whl → 0.3.4__py3-none-any.whl

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",
@@ -2460,14 +2464,16 @@ class Scheduler:
         action_result.execution_metadata.worker_completed_timestamp.FromDatetime(job.worker_completed_timestamp or now)
         response = ExecuteResponse(result=action_result, cached_result=False, status=status)
 
-        job.result = digest_to_string(self.storage.put_message(response))
+        with instance_context(job.instance_name):
+            job.result = digest_to_string(self.storage.put_message(response))
 
         self._update_job_timestamps(session, job, action_result.execution_metadata)
 
         if self.action_cache and result and not job.do_not_cache:
             action_digest = string_to_digest(job.action_digest)
             try:
-                self.action_cache.update_action_result(action_digest, action_result)
+                with instance_context(job.instance_name):
+                    self.action_cache.update_action_result(action_digest, action_result)
                 LOGGER.debug(
                     "Stored action result in ActionCache.",
                     tags=dict(action_result=action_result, digest=action_digest),
@@ -2527,7 +2533,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:
@@ -2653,7 +2664,9 @@ class Scheduler:
         return metadata
 
     def _fetch_execution_stats(
-        self, auxiliary_metadata: RepeatedCompositeFieldContainer[ProtoAny]
+        self,
+        auxiliary_metadata: RepeatedCompositeFieldContainer[ProtoAny],
+        instance_name: str,
     ) -> ExecutionStatistics | None:
         """Fetch ExecutionStatistics from Storage
         ProtoAny[Digest] -> ProtoAny[ExecutionStatistics]
@@ -2666,7 +2679,8 @@ class Scheduler:
             try:
                 aux_metadata_any.Unpack(aux_metadata_digest)
                 # Get the blob from CAS
-                execution_stats_any = self.storage.get_message(aux_metadata_digest, ProtoAny)
+                with instance_context(instance_name):
+                    execution_stats_any = self.storage.get_message(aux_metadata_digest, ProtoAny)
                 # Get the wrapped ExecutionStatistics
                 if execution_stats_any and execution_stats_any.Is(ExecutionStatistics.DESCRIPTOR):
                     execution_stats = ExecutionStatistics()
@@ -2684,17 +2698,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,17 +2728,23 @@ 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
 
-        execution_stats = self._fetch_execution_stats(execution_metadata.auxiliary_metadata)
+        execution_stats = self._fetch_execution_stats(execution_metadata.auxiliary_metadata, instance_name)
         if execution_stats is None:
             return
         usage = Usage(
@@ -2790,7 +2814,8 @@ class Scheduler:
         try:
             # BuildGrid doesn't store action_result in CAS, but if we push it as an asset
             # we need it to be accessible
-            digest = self.storage.put_message(action_result)
+            with instance_context(instance_name):
+                digest = self.storage.put_message(action_result)
 
             uri = DIGEST_URI_TEMPLATE.format(digest_hash=digest.hash)
             qualifier = {"resource_type": PROTOBUF_MEDIA_TYPE}

buildgrid/server/version.py

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

{buildgrid-0.3.2.dist-info → buildgrid-0.3.4.dist-info}/METADATA

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

{buildgrid-0.3.2.dist-info → buildgrid-0.3.4.dist-info}/RECORD

@@ -208,7 +208,7 @@ buildgrid/server/servicer.py,sha256=oqU9MaSxxHTDmSxobFTo9YmJctaUCklE2Dj-vfYWKkc,
 buildgrid/server/settings.py,sha256=I1UK-g4_GwkX0nGC3hdGS3Cc0Rh1HTYDv2aHU2sq_eU,5604
 buildgrid/server/threading.py,sha256=4QKQYev2KoO2Q-S_OyaoR9qpWyDTVzGMWVe9o2a1yIU,4743
 buildgrid/server/types.py,sha256=xG3bx64pbWMuEwXLuI0o8c2unt2rU2C4zsmUfmMT12c,1323
-buildgrid/server/version.py,sha256=9hszMRmtGUkZbKKAfeEActwnrXaZkxNudCeHQb8v_8o,603
+buildgrid/server/version.py,sha256=4k5OkV-7Atvya4h3lD2iv9J9jKDYco6vdVsLmuievhM,603
 buildgrid/server/actioncache/__init__.py,sha256=g9lb8Sn7NY5KOjkMr9GQoJovCVDEg_Fxz_EhdDbhP1I,579
 buildgrid/server/actioncache/instance.py,sha256=UCR7ZGkv4fJOXjeIILMAdTSFWcGgBSYlBg8fMaPJpaI,3139
 buildgrid/server/actioncache/service.py,sha256=WcikJAzFYOYX-tgiOfGGcOnPoubrCd4yP-EhKCHEW0c,2021
@@ -331,7 +331,7 @@ buildgrid/server/scheduler/__init__.py,sha256=arCg8LWFATeX1tj-s0keVYP8p3wwrrUlCV
 buildgrid/server/scheduler/assigner.py,sha256=wHPAhyiQxYABZJXaUc2g5yFzM78Z0U5nvGV3X9h5pCM,10512
 buildgrid/server/scheduler/cohorts.py,sha256=L_5YZRiVOwPPGStfqnnQXknO5Ja-SC0vq0xjw4XgP-I,1426
 buildgrid/server/scheduler/events.py,sha256=cM7Z7Htr2pYKhltJxfg1YRo0q524yZaGm8yXvRehivk,1453
-buildgrid/server/scheduler/impl.py,sha256=NsZwiSQcQAdWgqh-Y6G0BPhtwJgbEbBa8UnmllsyFWE,135759
+buildgrid/server/scheduler/impl.py,sha256=BOeR89gJfZ1L9BPzaUoxCUmWqvJGBYauIbphMprrs3U,136516
 buildgrid/server/scheduler/notifier.py,sha256=22ZsKwyf2oQirAjrwROkvgvr4C_TMUNyhOmtro4uM4I,7121
 buildgrid/server/scheduler/properties.py,sha256=2GydX8KUy9MFv1_JznIkGfWE_wOS0m_XapSv6Gp4pCM,11260
 buildgrid/server/sql/__init__.py,sha256=zbeeRP9BEeDzR-Mx2Ip6SUr49J8eeXsuREgljJTrHkk,579
@@ -366,9 +366,9 @@ buildgrid/server/utils/async_lru_cache.py,sha256=iLKeRPoZtZb1wC5AtcyQm8Wt0Bx-KZm
 buildgrid/server/utils/bots.py,sha256=c8hn7tbCecru-m2wicRmtKU5v5rSZPGlk97Yc6eUHgQ,1729
 buildgrid/server/utils/cancellation.py,sha256=pNETzKNoXg0AsXOXKCcLWlFl7SVKdkKinlqWl7MesRA,1703
 buildgrid/server/utils/digests.py,sha256=YNrWeHdbNp7OVTcsInjs30C33z_t9GQ_noMd14bpqPQ,2424
-buildgrid-0.3.2.dist-info/licenses/LICENSE,sha256=swa3Vs7GgALaG9p-e05M-WLkhd_U9QknacNkyVZ85xA,11338
-buildgrid-0.3.2.dist-info/METADATA,sha256=ZbSgvpI9ItnWHDwTIWVew6XYP-4OnV42Y9NFBo9slhE,7086
-buildgrid-0.3.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-buildgrid-0.3.2.dist-info/entry_points.txt,sha256=uyFAXiR9d6EDfSA5vWT8xskz6xalt4PdTuRruT6Q8rk,49
-buildgrid-0.3.2.dist-info/top_level.txt,sha256=T6TYhI_k6NTm2871tIxGCyBIqzlKxylgF9KDLU0Hi7o,10
-buildgrid-0.3.2.dist-info/RECORD,,
+buildgrid-0.3.4.dist-info/licenses/LICENSE,sha256=swa3Vs7GgALaG9p-e05M-WLkhd_U9QknacNkyVZ85xA,11338
+buildgrid-0.3.4.dist-info/METADATA,sha256=YkM4cIQyoDCPVLbBqsCh5DdB6shR2WJ1863d2XZUtwQ,7086
+buildgrid-0.3.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+buildgrid-0.3.4.dist-info/entry_points.txt,sha256=uyFAXiR9d6EDfSA5vWT8xskz6xalt4PdTuRruT6Q8rk,49
+buildgrid-0.3.4.dist-info/top_level.txt,sha256=T6TYhI_k6NTm2871tIxGCyBIqzlKxylgF9KDLU0Hi7o,10
+buildgrid-0.3.4.dist-info/RECORD,,