Branch update fixes

Author: Rentacookie

modules/module-mongodb/test/src/change_stream_utils.ts

@@ -1,7 +1,13 @@
 import { mongo } from '@powersync/lib-service-mongodb';
-import { BucketStorageFactory, OpId, createCoreReplicationMetrics,
-  initializeCoreReplicationMetrics, ReplicationCheckpoint, SyncRulesBucketStorage } from '@powersync/service-core';
-import { test_utils } from '@powersync/service-core-tests';
+import {
+  BucketStorageFactory,
+  OpId,
+  createCoreReplicationMetrics,
+  initializeCoreReplicationMetrics,
+  ReplicationCheckpoint,
+  SyncRulesBucketStorage
+} from '@powersync/service-core';
+import { METRICS_HELPER, test_utils } from '@powersync/service-core-tests';
 
 import { ChangeStream, ChangeStreamOptions } from '@module/replication/ChangeStream.js';
 import { MongoManager } from '@module/replication/MongoManager.js';

modules/module-postgres-storage/test/src/setup.ts

@@ -1,16 +1,10 @@
 import { container } from '@powersync/lib-services-framework';
-import { Metrics } from '@powersync/service-core';
 import { beforeAll } from 'vitest';
+import { METRICS_HELPER } from '@powersync/service-core-tests';
 
 beforeAll(async () => {
   // Executes for every test file
   container.registerDefaults();
 
-  // The metrics need to be initialized before they can be used
-  await Metrics.initialise({
-    disable_telemetry_sharing: true,
-    powersync_instance_id: 'test',
-    internal_metrics_endpoint: 'unused.for.tests.com'
-  });
-  Metrics.getInstance().resetCounters();
+  METRICS_HELPER.resetMetrics();
 });

packages/service-core/src/storage/storage-metrics.ts

@@ -1,6 +1,6 @@
 import { MetricsEngine } from '../metrics/MetricsEngine.js';
-import { BucketStorageFactory, StorageMetrics } from './BucketStorage.js';
 import { logger } from '@powersync/lib-services-framework';
+import { BucketStorageFactory, StorageMetrics } from './BucketStorageFactory.js';
 
 export enum StorageMetricType {
   // Size of current replication data stored in PowerSync