@hozon/store-telemetry 0.1.0 → 0.2.1

package/README.md

@@ -13,4 +13,4 @@ db.register(telemetryStoreDefinition)
 const telemetry = await getTelemetryStore(db)
 ```
 
-See the [store reference](../../docs/reference/stores.md).
+See the [store reference](../../docs/reference/stores/telemetry.md).

package/lib/api.d.ts

@@ -1,5 +1,5 @@
 import type { Adapter } from '@hozon/adapter';
-import type { Kysely } from 'kysely';
+import type { Kysely } from '@hozon/db';
 import type { TelemetryTables } from './tables.js';
 import type { TelemetryStore } from './types.js';
 export declare function createTelemetryStoreAPI(db: Kysely<TelemetryTables>, adapter: Adapter): TelemetryStore;

package/lib/api.js

@@ -15,7 +15,7 @@ export function createTelemetryStoreAPI(db, adapter) {
                 let pairs = new Set();
                 const insertBatch = async ()=>{
                     if (batch.length === 0) return;
-                    await trx.insertInto('hozon_spans').values(batch).onConflict((conflict)=>conflict.columns([
+                    await trx.insertInto('spans').values(batch).onConflict((conflict)=>conflict.columns([
                             'trace_id',
                             'span_id'
                         ]).doUpdateSet((eb)=>({
@@ -39,7 +39,7 @@ export function createTelemetryStoreAPI(db, adapter) {
             });
         },
         async getSpans (traceID) {
-            const rows = await db.selectFrom('hozon_spans').select('data').where('trace_id', '=', traceID).orderBy('start_time').orderBy('seq').execute();
+            const rows = await db.selectFrom('spans').select('data').where('trace_id', '=', traceID).orderBy('start_time').orderBy('seq').execute();
             return rows.map((row)=>row.data);
         },
         async deleteByTrace (traceIDs) {
@@ -47,7 +47,7 @@ export function createTelemetryStoreAPI(db, adapter) {
             return withStoreTransaction(db, async (trx)=>{
                 let count = 0;
                 for (const ids of chunk(traceIDs)){
-                    const result = await trx.deleteFrom('hozon_spans').where('trace_id', 'in', ids).executeTakeFirstOrThrow();
+                    const result = await trx.deleteFrom('spans').where('trace_id', 'in', ids).executeTakeFirstOrThrow();
                     count += Number(result.numDeletedRows);
                 }
                 return count;
@@ -56,14 +56,14 @@ export function createTelemetryStoreAPI(db, adapter) {
         async deleteBefore (time, params) {
             return withStoreTransaction(db, async (trx)=>{
                 if (params?.keepTraceIDs === undefined || params.keepTraceIDs.length === 0) {
-                    const result = await trx.deleteFrom('hozon_spans').where('end_time', '<', time).executeTakeFirstOrThrow();
+                    const result = await trx.deleteFrom('spans').where('end_time', '<', time).executeTakeFirstOrThrow();
                     return Number(result.numDeletedRows);
                 }
                 return withKeepSet(trx, {
-                    table: 'hozon_keep_telemetry',
+                    table: 'keep_telemetry',
                     ids: params.keepTraceIDs
                 }, async (selectKeep)=>{
-                    const result = await trx.deleteFrom('hozon_spans').where('end_time', '<', time).where('trace_id', 'not in', selectKeep()).executeTakeFirstOrThrow();
+                    const result = await trx.deleteFrom('spans').where('end_time', '<', time).where('trace_id', 'not in', selectKeep()).executeTakeFirstOrThrow();
                     return Number(result.numDeletedRows);
                 });
             });

package/lib/migrations.d.ts

@@ -1,3 +1,2 @@
-import type { MigrationContext } from '@hozon/db';
-import type { Migration } from 'kysely/migration';
+import type { Migration, MigrationContext } from '@hozon/db';
 export declare function telemetryStoreMigrations(ctx: MigrationContext): Record<string, Migration>;

package/lib/migrations.js

@@ -2,22 +2,22 @@ export function telemetryStoreMigrations(ctx) {
     return {
         '0-init': {
             async up (db) {
-                await db.schema.createTable('hozon_spans').addColumn('seq', ctx.types.serial, (column)=>{
+                await db.schema.createTable('spans').addColumn('seq', ctx.types.serial, (column)=>{
                     const primary = column.primaryKey();
                     return ctx.kind === 'sqlite' ? primary.autoIncrement() : primary;
-                }).addColumn('trace_id', ctx.types.text, (column)=>column.notNull()).addColumn('span_id', ctx.types.text, (column)=>column.notNull()).addColumn('start_time', ctx.types.double, (column)=>column.notNull()).addColumn('end_time', ctx.types.double, (column)=>column.notNull()).addColumn('data', ctx.types.json, (column)=>column.notNull()).addUniqueConstraint('hozon_spans_trace_span', [
+                }).addColumn('trace_id', ctx.types.text, (column)=>column.notNull()).addColumn('span_id', ctx.types.text, (column)=>column.notNull()).addColumn('start_time', ctx.types.double, (column)=>column.notNull()).addColumn('end_time', ctx.types.double, (column)=>column.notNull()).addColumn('data', ctx.types.json, (column)=>column.notNull()).addUniqueConstraint(`${ctx.tablePrefix}_spans_trace_span`, [
                     'trace_id',
                     'span_id'
                 ]).execute();
-                await db.schema.createIndex('hozon_spans_trace_start_seq').on('hozon_spans').columns([
+                await db.schema.createIndex(`${ctx.tablePrefix}_spans_trace_start_seq`).on('spans').columns([
                     'trace_id',
                     'start_time',
                     'seq'
                 ]).execute();
-                await db.schema.createIndex('hozon_spans_end_time').on('hozon_spans').column('end_time').execute();
+                await db.schema.createIndex(`${ctx.tablePrefix}_spans_end_time`).on('spans').column('end_time').execute();
             },
             async down (db) {
-                await db.schema.dropTable('hozon_spans').execute();
+                await db.schema.dropTable('spans').execute();
             }
         }
     };

package/lib/tables.d.ts

@@ -1,7 +1,7 @@
-import type { ColumnType, Generated } from 'kysely';
+import type { ColumnType, Generated } from '@hozon/db';
 import type { StoredSpan } from './types.js';
 export type TelemetryTables = {
-    hozon_spans: {
+    spans: {
         seq: Generated<number>;
         trace_id: string;
         span_id: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hozon/store-telemetry",
-  "version": "0.1.0",
+  "version": "0.2.1",
   "description": "Portable span store for Hozon",
   "repository": {
     "type": "git",
@@ -18,9 +18,8 @@
   ],
   "dependencies": {
     "@hozon/adapter": "^0.1.0",
-    "@hozon/db": "^0.1.0",
-    "@sozai/json": "^0.3.0",
-    "kysely": "^0.29.6"
+    "@hozon/db": "^0.2.1",
+    "@sozai/json": "^0.3.0"
   },
   "devDependencies": {
     "@hozon/node-sqlite": "^0.1.0",