@agoric/cosmic-swingset 0.41.4-dev-7b1656c.0 → 0.41.4-dev-fd22e4a.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/cosmic-swingset",
-  "version": "0.41.4-dev-7b1656c.0+7b1656c",
+  "version": "0.41.4-dev-fd22e4a.0+fd22e4a",
   "description": "Agoric's Cosmos blockchain integration",
   "type": "module",
   "bin": {
@@ -22,15 +22,15 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/builders": "0.1.1-dev-7b1656c.0+7b1656c",
-    "@agoric/cosmos": "0.34.2-dev-7b1656c.0+7b1656c",
-    "@agoric/deploy-script-support": "0.10.4-dev-7b1656c.0+7b1656c",
-    "@agoric/internal": "0.3.3-dev-7b1656c.0+7b1656c",
-    "@agoric/store": "0.9.3-dev-7b1656c.0+7b1656c",
-    "@agoric/swing-store": "0.9.2-dev-7b1656c.0+7b1656c",
-    "@agoric/swingset-vat": "0.32.3-dev-7b1656c.0+7b1656c",
-    "@agoric/telemetry": "0.6.3-dev-7b1656c.0+7b1656c",
-    "@agoric/vm-config": "0.1.1-dev-7b1656c.0+7b1656c",
+    "@agoric/builders": "0.1.1-dev-fd22e4a.0+fd22e4a",
+    "@agoric/cosmos": "0.34.2-dev-fd22e4a.0+fd22e4a",
+    "@agoric/deploy-script-support": "0.10.4-dev-fd22e4a.0+fd22e4a",
+    "@agoric/internal": "0.3.3-dev-fd22e4a.0+fd22e4a",
+    "@agoric/store": "0.9.3-dev-fd22e4a.0+fd22e4a",
+    "@agoric/swing-store": "0.9.2-dev-fd22e4a.0+fd22e4a",
+    "@agoric/swingset-vat": "0.32.3-dev-fd22e4a.0+fd22e4a",
+    "@agoric/telemetry": "0.6.3-dev-fd22e4a.0+fd22e4a",
+    "@agoric/vm-config": "0.1.1-dev-fd22e4a.0+fd22e4a",
     "@endo/bundle-source": "^3.5.1",
     "@endo/env-options": "^1.1.8",
     "@endo/errors": "^1.2.9",
@@ -42,8 +42,8 @@
     "@endo/patterns": "^1.4.8",
     "@endo/promise-kit": "^1.1.9",
     "@iarna/toml": "^2.2.3",
-    "@opentelemetry/api": "~1.3.0",
-    "@opentelemetry/sdk-metrics": "~1.9.0",
+    "@opentelemetry/api": "~1.9.0",
+    "@opentelemetry/sdk-metrics": "~1.30.1",
     "anylogger": "^0.21.0",
     "deterministic-json": "^1.0.5",
     "import-meta-resolve": "^2.2.1",
@@ -71,5 +71,5 @@
   "typeCoverage": {
     "atLeast": 83.4
   },
-  "gitHead": "7b1656cec7213946b554f751cf4a489fb32b7952"
+  "gitHead": "fd22e4a8df77c14efdb448db797773ffdfab4ea2"
 }

package/src/chain-main.js

@@ -22,7 +22,11 @@ import {
   exportMailbox,
 } from '@agoric/swingset-vat/src/devices/mailbox/mailbox.js';
 
-import { makeSlogSender, tryFlushSlogSender } from '@agoric/telemetry';
+import {
+  getTelemetryProviders,
+  makeSlogSender,
+  tryFlushSlogSender,
+} from '@agoric/telemetry';
 
 import {
   makeChainStorageRoot,
@@ -44,7 +48,6 @@ import {
 } from './helpers/bufferedStorage.js';
 import stringify from './helpers/json-stable-stringify.js';
 import { launch } from './launch-chain.js';
-import { getTelemetryProviders } from './kernel-stats.js';
 import { makeProcessValue } from './helpers/process-value.js';
 import {
   spawnSwingStoreExport,

package/src/kernel-stats.js

@@ -1,9 +1,5 @@
 // @ts-check
-import {
-  ExplicitBucketHistogramAggregation,
-  MeterProvider,
-  View,
-} from '@opentelemetry/sdk-metrics';
+import { MeterProvider } from '@opentelemetry/sdk-metrics';
 
 import { Fail } from '@endo/errors';
 import { isNat } from '@endo/nat';
@@ -15,8 +11,6 @@ import {
   KERNEL_STATS_UPDOWN_METRICS,
 } from '@agoric/swingset-vat/src/kernel/metrics.js';
 
-import { getTelemetryProviders as getTelemetryProvidersOriginal } from '@agoric/telemetry';
-
 import v8 from 'node:v8';
 import process from 'node:process';
 
@@ -132,33 +126,8 @@ const recordToKey = record =>
     Object.entries(record).sort(([ka], [kb]) => (ka < kb ? -1 : 1)),
   );
 
-/**
- * Return an array of Views defining explicit buckets for Histogram instruments
- * to which we record measurements.
- */
-export function getMetricsProviderViews() {
-  return Object.entries(HISTOGRAM_METRICS).map(
-    ([instrumentName, { boundaries }]) =>
-      // TODO: Add `instrumentType: InstrumentType.HISTOGRAM` and `meterName`
-      // filters (the latter of which should be a parameter of the exported
-      // function).
-      new View({
-        instrumentName,
-        aggregation: new ExplicitBucketHistogramAggregation([...boundaries]),
-      }),
-  );
-}
-
 export function makeDefaultMeterProvider() {
-  return new MeterProvider({ views: getMetricsProviderViews() });
-}
-
-/** @param {Omit<NonNullable<Parameters<typeof getTelemetryProvidersOriginal>[0]>, 'views'>} [powers] */
-export function getTelemetryProviders(powers = {}) {
-  return getTelemetryProvidersOriginal({
-    ...powers,
-    views: getMetricsProviderViews(),
-  });
+  return new MeterProvider();
 }
 
 /**
@@ -166,8 +135,9 @@ export function getTelemetryProviders(powers = {}) {
  * @param {string} name
  */
 function createHistogram(metricMeter, name) {
-  const { description } = HISTOGRAM_METRICS[name] || {};
-  return metricMeter.createHistogram(name, { description });
+  const { description, boundaries } = HISTOGRAM_METRICS[name] || {};
+  const advice = boundaries && { explicitBucketBoundaries: boundaries };
+  return metricMeter.createHistogram(name, { description, advice });
 }
 
 /**

package/src/sim-chain.js

@@ -9,14 +9,13 @@ import {
 
 import anylogger from 'anylogger';
 
-import { makeSlogSender } from '@agoric/telemetry';
+import { getTelemetryProviders, makeSlogSender } from '@agoric/telemetry';
 
 import { resolve as importMetaResolve } from 'import-meta-resolve';
 import { makeWithQueue } from '@agoric/internal/src/queue.js';
 import { makeBatchedDeliver } from '@agoric/internal/src/batched-deliver.js';
 import stringify from './helpers/json-stable-stringify.js';
 import { launch } from './launch-chain.js';
-import { getTelemetryProviders } from './kernel-stats.js';
 import { DEFAULT_SIM_SWINGSET_PARAMS, QueueInbound } from './sim-params.js';
 import { parseQueueSizes } from './params.js';
 import { makeKVStoreFromMap } from './helpers/bufferedStorage.js';