@agoric/telemetry 0.6.3-upgrade-18-dev-d7c994b.0 → 0.6.3-upgrade-18-dev-a0f4883.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/telemetry",
-  "version": "0.6.3-upgrade-18-dev-d7c994b.0+d7c994b",
+  "version": "0.6.3-upgrade-18-dev-a0f4883.0+a0f4883",
   "description": "Agoric's telemetry implementation",
   "type": "module",
   "repository": "https://github.com/Agoric/agoric-sdk",
@@ -22,8 +22,8 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/internal": "0.3.3-upgrade-18-dev-d7c994b.0+d7c994b",
-    "@agoric/store": "0.9.3-upgrade-18-dev-d7c994b.0+d7c994b",
+    "@agoric/internal": "0.3.3-upgrade-18-dev-a0f4883.0+a0f4883",
+    "@agoric/store": "0.9.3-upgrade-18-dev-a0f4883.0+a0f4883",
     "@endo/errors": "^1.2.7",
     "@endo/init": "^1.1.6",
     "@endo/marshal": "^1.6.1",
@@ -68,5 +68,5 @@
   "typeCoverage": {
     "atLeast": 87.03
   },
-  "gitHead": "d7c994b8d33c0cd22b257f3e33b579588ab6c6d8"
+  "gitHead": "a0f4883edbdc9809543c6f63a6a49d5390b40902"
 }

package/src/context-aware-slog.js

@@ -16,6 +16,7 @@
  *    'run.trigger.msgIdx': number;
  *    'run.trigger.sender': Slog['sender'];
  *    'run.trigger.source': Slog['source'];
+ *    'run.trigger.bundleHash': Slog['endoZipBase64Sha512'];
  *    'run.trigger.time': Slog['blockTime'];
  *    'run.trigger.txHash': string;
  *    'run.trigger.type': string;
@@ -40,6 +41,7 @@
  *  runNum?: number;
  *  sender?: string;
  *  source?: string;
+ *  endoZipBase64Sha512?: string;
  *  syscallNum?: number;
  *  time: number;
  *  type: string;
@@ -57,12 +59,10 @@ const SLOG_TYPES = {
       FINISH: 'cosmic-swingset-bootstrap-block-finish',
       START: 'cosmic-swingset-bootstrap-block-start',
     },
-    BRIDGE_INBOUND: 'cosmic-swingset-bridge-inbound',
     COMMIT: {
       FINISH: 'cosmic-swingset-commit-finish',
       START: 'cosmic-swingset-commit-start',
     },
-    DELIVER_INBOUND: 'cosmic-swingset-deliver-inbound',
     END_BLOCK: {
       FINISH: 'cosmic-swingset-end-block-finish',
       START: 'cosmic-swingset-end-block-start',
@@ -73,6 +73,12 @@ const SLOG_TYPES = {
       START: 'cosmic-swingset-run-start',
     },
   },
+  COSMIC_SWINGSET_TRIGGERS: {
+    BRIDGE_INBOUND: 'cosmic-swingset-bridge-inbound',
+    DELIVER_INBOUND: 'cosmic-swingset-deliver-inbound',
+    TIMER_POLL: 'cosmic-swingset-timer-poll',
+    INSTALL_BUNDLE: 'cosmic-swingset-install-bundle',
+  },
   CRANK: {
     FINISH: 'crank-finish',
     START: 'crank-start',
@@ -169,8 +175,8 @@ export const makeContextualSlogProcessor = (
         assert(!!blockContext && !triggerContext);
         break;
       }
-      case SLOG_TYPES.COSMIC_SWINGSET.BRIDGE_INBOUND:
-      case SLOG_TYPES.COSMIC_SWINGSET.DELIVER_INBOUND: {
+      case SLOG_TYPES.COSMIC_SWINGSET_TRIGGERS.BRIDGE_INBOUND:
+      case SLOG_TYPES.COSMIC_SWINGSET_TRIGGERS.DELIVER_INBOUND: {
         const [blockHeight, txHash, msgIdx] = (
           finalBody.inboundNum || ''
         ).split('-');
@@ -189,6 +195,38 @@ export const makeContextualSlogProcessor = (
         };
         break;
       }
+      case SLOG_TYPES.COSMIC_SWINGSET_TRIGGERS.INSTALL_BUNDLE: {
+        const [blockHeight, txHash, msgIdx] = (
+          finalBody.inboundNum || ''
+        ).split('-');
+
+        const triggerType = 'install-bundle';
+
+        triggerContext = {
+          'run.num': undefined,
+          'run.id': `${triggerType}-${finalBody.inboundNum}`,
+          'run.trigger.type': triggerType,
+          'run.trigger.bundleHash': finalBody.endoZipBase64Sha512,
+          'run.trigger.blockHeight': Number(blockHeight),
+          'run.trigger.txHash': txHash,
+          'run.trigger.msgIdx': Number(msgIdx),
+        };
+
+        break;
+      }
+      case SLOG_TYPES.COSMIC_SWINGSET_TRIGGERS.TIMER_POLL: {
+        const triggerType = 'timer-poll';
+
+        triggerContext = {
+          'run.num': undefined,
+          'run.id': `${triggerType}-${finalBody.inboundNum}`,
+          'run.trigger.type': triggerType,
+          'run.trigger.time': finalBody.blockTime,
+          'run.trigger.blockHeight': finalBody.blockHeight,
+        };
+
+        break;
+      }
       // eslint-disable-next-line no-restricted-syntax
       case SLOG_TYPES.COSMIC_SWINGSET.RUN.START: {
         if (!finalBody.runNum) {

package/src/slog-to-otel.js

@@ -915,7 +915,7 @@ export const makeSlogToOtelKit = (tracer, overrideAttrs = {}) => {
         break;
       }
       case 'cosmic-swingset-upgrade-finish': {
-        spans.pop(['slogAttrs.blockHeight', slogAttrs.blockHeight]);
+        spans.pop(['upgrade', slogAttrs.blockHeight]);
         dbTransactionManager.end();
         break;
       }
@@ -971,6 +971,16 @@ export const makeSlogToOtelKit = (tracer, overrideAttrs = {}) => {
         spans.pop('bridge-inbound');
         break;
       }
+      case 'cosmic-swingset-timer-poll': {
+        spans.push(['timer-poll', slogAttrs.blockTime]);
+        spans.pop('timer-poll');
+        break;
+      }
+      case 'cosmic-swingset-install-bundle': {
+        spans.push(['install-bundle', slogAttrs.endoZipBase64Sha512]);
+        spans.pop('install-bundle');
+        break;
+      }
       case 'cosmic-swingset-end-block-start': {
         // Add `end-block` as an event onto the encompassing `block` span
         spans.top()?.addEvent('end-block-action', cleanAttrs(slogAttrs), now);