@powersync/service-core 1.10.3 → 1.11.1

package/src/system/ServiceContext.ts

@@ -1,7 +1,7 @@
 import { LifeCycledSystem, MigrationManager, ServiceIdentifier, container } from '@powersync/lib-services-framework';
 
 import { framework } from '../index.js';
-import * as metrics from '../metrics/Metrics.js';
+import * as metrics from '../metrics/MetricsEngine.js';
 import { PowerSyncMigrationManager } from '../migrations/PowerSyncMigrationManager.js';
 import * as replication from '../replication/replication-index.js';
 import * as routes from '../routes/routes-index.js';
@@ -12,7 +12,7 @@ import { SyncContext } from '../sync/SyncContext.js';
 export interface ServiceContext {
   configuration: utils.ResolvedPowerSyncConfig;
   lifeCycleEngine: LifeCycledSystem;
-  metrics: metrics.Metrics | null;
+  metricsEngine: metrics.MetricsEngine;
   replicationEngine: replication.ReplicationEngine | null;
   routerEngine: routes.RouterEngine | null;
   storageEngine: storage.StorageEngine;
@@ -37,6 +37,11 @@ export class ServiceContextContainer implements ServiceContext {
       configuration
     });
 
+    this.lifeCycleEngine.withLifecycle(this.storageEngine, {
+      start: (storageEngine) => storageEngine.start(),
+      stop: (storageEngine) => storageEngine.shutDown()
+    });
+
     this.syncContext = new SyncContext({
       maxDataFetchConcurrency: configuration.api_parameters.max_data_fetch_concurrency,
       maxBuckets: configuration.api_parameters.max_buckets_per_connection,
@@ -65,8 +70,8 @@ export class ServiceContextContainer implements ServiceContext {
     return container.getOptional(routes.RouterEngine);
   }
 
-  get metrics(): metrics.Metrics | null {
-    return container.getOptional(metrics.Metrics);
+  get metricsEngine(): metrics.MetricsEngine {
+    return container.getImplementation(metrics.MetricsEngine);
   }
 
   get migrations(): PowerSyncMigrationManager {

package/src/util/config/compound-config-collector.ts

@@ -154,6 +154,7 @@ export class CompoundConfigCollector {
       metadata: baseConfig.metadata ?? {},
       migrations: baseConfig.migrations,
       telemetry: {
+        prometheus_port: baseConfig.telemetry?.prometheus_port,
         disable_telemetry_sharing: baseConfig.telemetry?.disable_telemetry_sharing ?? false,
         internal_service_endpoint:
           baseConfig.telemetry?.internal_service_endpoint ?? 'https://pulse.journeyapps.com/v1/metrics'

package/src/util/config/types.ts

@@ -55,6 +55,7 @@ export type ResolvedPowerSyncConfig = {
   };
 
   telemetry: {
+    prometheus_port?: number;
     disable_telemetry_sharing: boolean;
     internal_service_endpoint: string;
   };

package/src/util/env.ts

@@ -19,10 +19,6 @@ export const env = utils.collectEnvironmentVariables({
    * Runner to be started in this process
    */
   PS_RUNNER_TYPE: utils.type.string.default(ServiceRunner.UNIFIED),
-  /**
-   * Port for metrics
-   */
-  METRICS_PORT: utils.type.number.optional(),
 
   NODE_ENV: utils.type.string.optional()
 });