@livestore/livestore 0.2.0-dev.2 → 0.3.0-dev.10

package/dist/utils/dev.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/utils/dev.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,YAAY,SACjB,UAAU,GAAG,IAAI,GAAG,MAAM,YACtB,MAAM,4BAUjB,CAAA;AAED,eAAO,MAAM,WAAW,SAAU,MAAM,YAAY,MAAM,SAQzD,CAAA;AAED,eAAO,MAAM,gBAAgB,YAI5B,CAAA"}
+{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/utils/dev.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,YAAY,SACjB,UAAU,GAAG,IAAI,GAAG,MAAM,YACtB,MAAM,4BAUjB,CAAA;AAED,eAAO,MAAM,WAAW,SAAU,MAAM,YAAY,MAAM,SAQzD,CAAA;AAED,eAAO,MAAM,gBAAgB,YAI5B,CAAA"}

package/dist/utils/dev.js

@@ -1,3 +1,4 @@
+import { isDevEnv } from '@livestore/utils';
 /* eslint-disable unicorn/prefer-global-this */
 export const downloadBlob = (data, fileName, mimeType = 'application/octet-stream') => {
     const blob = data instanceof Blob ? data : new Blob([data], { type: mimeType });
@@ -15,8 +16,8 @@ export const downloadURL = (data, fileName) => {
     a.remove();
 };
 export const exposeDebugUtils = () => {
-    if (import.meta.env.DEV) {
-        globalThis.__debugDownloadBlob = downloadBlob;
+    if (isDevEnv()) {
+        globalThis.__debugLiveStoreUtils = { downloadBlob };
     }
 };
 //# sourceMappingURL=dev.js.map

package/dist/utils/dev.js.map

@@ -1 +1 @@
-{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../src/utils/dev.ts"],"names":[],"mappings":"AAAA,+CAA+C;AAC/C,MAAM,CAAC,MAAM,YAAY,GAAG,CAC1B,IAAgC,EAChC,QAAgB,EAChB,QAAQ,GAAG,0BAA0B,EACrC,EAAE;IACF,MAAM,IAAI,GAAG,IAAI,YAAY,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAA;IAE/E,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;IAE5C,WAAW,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;IAE1B,UAAU,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,CAAA;AACzD,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,QAAgB,EAAE,EAAE;IAC5D,MAAM,CAAC,GAAG,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,CAAA;IACrC,CAAC,CAAC,IAAI,GAAG,IAAI,CAAA;IACb,CAAC,CAAC,QAAQ,GAAG,QAAQ,CAAA;IACrB,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;IACvB,CAAC,CAAC,KAAK,CAAC,OAAO,GAAG,MAAM,CAAA;IACxB,CAAC,CAAC,KAAK,EAAE,CAAA;IACT,CAAC,CAAC,MAAM,EAAE,CAAA;AACZ,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAG,EAAE;IACnC,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;QACxB,UAAU,CAAC,mBAAmB,GAAG,YAAY,CAAA;IAC/C,CAAC;AACH,CAAC,CAAA"}
+{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../src/utils/dev.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAE3C,+CAA+C;AAC/C,MAAM,CAAC,MAAM,YAAY,GAAG,CAC1B,IAAgC,EAChC,QAAgB,EAChB,QAAQ,GAAG,0BAA0B,EACrC,EAAE;IACF,MAAM,IAAI,GAAG,IAAI,YAAY,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAA;IAE/E,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;IAE5C,WAAW,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;IAE1B,UAAU,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,CAAA;AACzD,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,QAAgB,EAAE,EAAE;IAC5D,MAAM,CAAC,GAAG,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,CAAA;IACrC,CAAC,CAAC,IAAI,GAAG,IAAI,CAAA;IACb,CAAC,CAAC,QAAQ,GAAG,QAAQ,CAAA;IACrB,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;IACvB,CAAC,CAAC,KAAK,CAAC,OAAO,GAAG,MAAM,CAAA;IACxB,CAAC,CAAC,KAAK,EAAE,CAAA;IACT,CAAC,CAAC,MAAM,EAAE,CAAA;AACZ,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAG,EAAE;IACnC,IAAI,QAAQ,EAAE,EAAE,CAAC;QACf,UAAU,CAAC,qBAAqB,GAAG,EAAE,YAAY,EAAE,CAAA;IACrD,CAAC;AACH,CAAC,CAAA"}

package/dist/utils/tests/fixture.d.ts

@@ -291,5 +291,5 @@ export declare const makeTodoMvc: ({ otelTracer, otelContext, useGlobalReactivit
 }) => Effect.Effect<{
     store: Store<any, FixtureSchema>;
     reactivityGraph: import("@livestore/livestore").ReactivityGraph;
-}, import("@livestore/common/dist/adapter-types.js").UnexpectedError, import("effect/Scope").Scope>;
+}, import("@livestore/common").UnexpectedError, import("effect/Scope").Scope>;
 //# sourceMappingURL=fixture.d.ts.map

package/dist/utils/tests/fixture.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fixture.d.ts","sourceRoot":"","sources":["../../../src/utils/tests/fixture.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAC/D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAe,QAAQ,EAA0D,MAAM,sBAAsB,CAAA;AACpH,OAAO,EAAE,MAAM,EAAY,MAAM,yBAAyB,CAAA;AAE1D,OAAO,KAAK,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAE/C,MAAM,MAAM,IAAI,GAAG;IACjB,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,WAAW,CAAA;AAEnD,MAAM,MAAM,QAAQ,GAAG;IACrB,WAAW,EAAE,MAAM,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,eAAO,MAAM,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAQjB,CAAA;AAED,eAAO,MAAM,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAQf,CAAA;AAED,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAAiB,CAAA;AACpC,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAAyB,CAAA;AAE5C,MAAM,WAAW,aAAc,SAAQ,eAAe,CAAC,YAAY,CAAC;IAAE,MAAM,EAAE,OAAO,MAAM,CAAA;CAAE,CAAC;CAAG;AAEjG,eAAO,MAAM,WAAW,4DAIrB;IACD,UAAU,CAAC,EAAE,IAAI,CAAC,MAAM,CAAA;IACxB,WAAW,CAAC,EAAE,IAAI,CAAC,OAAO,CAAA;IAC1B,wBAAwB,CAAC,EAAE,OAAO,CAAA;CACnC;;;mGAmBG,CAAA"}
+{"version":3,"file":"fixture.d.ts","sourceRoot":"","sources":["../../../src/utils/tests/fixture.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAC/D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAe,QAAQ,EAA0D,MAAM,sBAAsB,CAAA;AACpH,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,OAAO,KAAK,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAE/C,MAAM,MAAM,IAAI,GAAG;IACjB,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,WAAW,CAAA;AAEnD,MAAM,MAAM,QAAQ,GAAG;IACrB,WAAW,EAAE,MAAM,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,eAAO,MAAM,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAQjB,CAAA;AAED,eAAO,MAAM,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAQf,CAAA;AAED,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAAiB,CAAA;AACpC,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAAyB,CAAA;AAE5C,MAAM,WAAW,aAAc,SAAQ,eAAe,CAAC,YAAY,CAAC;IAAE,MAAM,EAAE,OAAO,MAAM,CAAA;CAAE,CAAC;CAAG;AAEjG,eAAO,MAAM,WAAW,4DAIrB;IACD,UAAU,CAAC,EAAE,IAAI,CAAC,MAAM,CAAA;IACxB,WAAW,CAAC,EAAE,IAAI,CAAC,OAAO,CAAA;IAC1B,wBAAwB,CAAC,EAAE,OAAO,CAAA;CACnC;;;6EAaiF,CAAA"}

package/dist/utils/tests/fixture.js

@@ -1,5 +1,6 @@
+import { provideOtel } from '@livestore/common';
 import { createStore, DbSchema, globalReactivityGraph, makeReactivityGraph, makeSchema } from '@livestore/livestore';
-import { Effect, FiberSet } from '@livestore/utils/effect';
+import { Effect } from '@livestore/utils/effect';
 import { makeInMemoryAdapter } from '@livestore/web';
 export const todos = DbSchema.table('todos', {
     id: DbSchema.text({ primaryKey: true }),
@@ -15,18 +16,13 @@ export const tables = { todos, app };
 export const schema = makeSchema({ tables });
 export const makeTodoMvc = ({ otelTracer, otelContext, useGlobalReactivityGraph = true, } = {}) => Effect.gen(function* () {
     const reactivityGraph = useGlobalReactivityGraph ? globalReactivityGraph : makeReactivityGraph();
-    const fiberSet = yield* FiberSet.make();
     const store = yield* createStore({
         schema,
         storeId: 'default',
         adapter: makeInMemoryAdapter(),
         reactivityGraph,
-        otelOptions: {
-            tracer: otelTracer,
-            rootSpanContext: otelContext,
-        },
-        fiberSet,
+        debug: { instanceId: 'test' },
     });
     return { store, reactivityGraph };
-});
+}).pipe(provideOtel({ parentSpanContext: otelContext, otelTracer: otelTracer }));
 //# sourceMappingURL=fixture.js.map

package/dist/utils/tests/fixture.js.map

@@ -1 +1 @@
-{"version":3,"file":"fixture.js","sourceRoot":"","sources":["../../../src/utils/tests/fixture.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACpH,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AAgBpD,MAAM,CAAC,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CACjC,OAAO,EACP;IACE,EAAE,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;IACvC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;IACrD,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;CACjE,EACD,EAAE,eAAe,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,CAC9C,CAAA;AAED,MAAM,CAAC,MAAM,GAAG,GAAG,QAAQ,CAAC,KAAK,CAC/B,KAAK,EACL;IACE,EAAE,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;IAC1D,WAAW,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC3D,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;CAC3D,EACD,EAAE,WAAW,EAAE,IAAI,EAAE,CACtB,CAAA;AAED,MAAM,CAAC,MAAM,MAAM,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,CAAA;AACpC,MAAM,CAAC,MAAM,MAAM,GAAG,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC,CAAA;AAI5C,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EAC1B,UAAU,EACV,WAAW,EACX,wBAAwB,GAAG,IAAI,MAK7B,EAAE,EAAE,EAAE,CACR,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,eAAe,GAAG,wBAAwB,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,mBAAmB,EAAE,CAAA;IAEhG,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAA;IAEvC,MAAM,KAAK,GAA8B,KAAK,CAAC,CAAC,WAAW,CAAC;QAC1D,MAAM;QACN,OAAO,EAAE,SAAS;QAClB,OAAO,EAAE,mBAAmB,EAAE;QAC9B,eAAe;QACf,WAAW,EAAE;YACX,MAAM,EAAE,UAAU;YAClB,eAAe,EAAE,WAAW;SAC7B;QACD,QAAQ;KACT,CAAC,CAAA;IAEF,OAAO,EAAE,KAAK,EAAE,eAAe,EAAE,CAAA;AACnC,CAAC,CAAC,CAAA"}
+{"version":3,"file":"fixture.js","sourceRoot":"","sources":["../../../src/utils/tests/fixture.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAG/C,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACpH,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAChD,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AAgBpD,MAAM,CAAC,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CACjC,OAAO,EACP;IACE,EAAE,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;IACvC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;IACrD,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;CACjE,EACD,EAAE,eAAe,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,CAC9C,CAAA;AAED,MAAM,CAAC,MAAM,GAAG,GAAG,QAAQ,CAAC,KAAK,CAC/B,KAAK,EACL;IACE,EAAE,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;IAC1D,WAAW,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC3D,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;CAC3D,EACD,EAAE,WAAW,EAAE,IAAI,EAAE,CACtB,CAAA;AAED,MAAM,CAAC,MAAM,MAAM,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,CAAA;AACpC,MAAM,CAAC,MAAM,MAAM,GAAG,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC,CAAA;AAI5C,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EAC1B,UAAU,EACV,WAAW,EACX,wBAAwB,GAAG,IAAI,MAK7B,EAAE,EAAE,EAAE,CACR,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,eAAe,GAAG,wBAAwB,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,mBAAmB,EAAE,CAAA;IAEhG,MAAM,KAAK,GAA8B,KAAK,CAAC,CAAC,WAAW,CAAC;QAC1D,MAAM;QACN,OAAO,EAAE,SAAS;QAClB,OAAO,EAAE,mBAAmB,EAAE;QAC9B,eAAe;QACf,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE;KAC9B,CAAC,CAAA;IAEF,OAAO,EAAE,KAAK,EAAE,eAAe,EAAE,CAAA;AACnC,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,iBAAiB,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC,CAAC,CAAA"}

package/dist/utils/tests/otel.d.ts

@@ -1,10 +1,69 @@
 import type { Attributes } from '@opentelemetry/api';
-import type { InMemorySpanExporter } from '@opentelemetry/sdk-trace-base';
+import type { InMemorySpanExporter, ReadableSpan } from '@opentelemetry/sdk-trace-base';
 type SimplifiedNestedSpan = {
     _name: string;
     attributes: any;
     children: SimplifiedNestedSpan[];
 };
 export declare const getSimplifiedRootSpan: (exporter: InMemorySpanExporter, mapAttributes?: (attributes: Attributes) => Attributes) => SimplifiedNestedSpan;
+export declare const toTraceFile: (spans: ReadableSpan[]) => {
+    batches: {
+        resource: {
+            attributes: {
+                key: string;
+                value: {
+                    stringValue: string;
+                };
+            }[];
+            droppedAttributesCount: number;
+        };
+        instrumentationLibrarySpans: {
+            spans: {
+                name: string;
+                kind: string;
+                startTimeUnixNano: string;
+                endTimeUnixNano: string;
+                attributes: {
+                    key: string;
+                    value: {
+                        stringValue: string;
+                        intValue?: undefined;
+                        doubleValue?: undefined;
+                        boolValue?: undefined;
+                    } | {
+                        intValue: number;
+                        stringValue?: undefined;
+                        doubleValue?: undefined;
+                        boolValue?: undefined;
+                    } | {
+                        doubleValue: number;
+                        stringValue?: undefined;
+                        intValue?: undefined;
+                        boolValue?: undefined;
+                    } | {
+                        boolValue: boolean;
+                        stringValue?: undefined;
+                        intValue?: undefined;
+                        doubleValue?: undefined;
+                    };
+                }[];
+                droppedAttributesCount: number;
+                droppedEventsCount: number;
+                droppedLinksCount: number;
+                status: {
+                    code: import("@opentelemetry/api").SpanStatusCode;
+                    message: string;
+                };
+                parentSpanId?: string | undefined;
+                traceId: string;
+                spanId: string;
+            }[];
+            instrumentationLibrary: {
+                name: string;
+                version: string;
+            };
+        }[];
+    }[];
+};
 export {};
 //# sourceMappingURL=otel.d.ts.map

package/dist/utils/tests/otel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"otel.d.ts","sourceRoot":"","sources":["../../../src/utils/tests/otel.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AACpD,OAAO,KAAK,EAAE,oBAAoB,EAAgB,MAAM,+BAA+B,CAAA;AAEvF,KAAK,oBAAoB,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,GAAG,CAAC;IAAC,QAAQ,EAAE,oBAAoB,EAAE,CAAA;CAAE,CAAA;AAEhG,eAAO,MAAM,qBAAqB,aACtB,oBAAoB,kBACd,CAAC,UAAU,EAAE,UAAU,KAAK,UAAU,KACrD,oBAgCF,CAAA"}
+{"version":3,"file":"otel.d.ts","sourceRoot":"","sources":["../../../src/utils/tests/otel.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AACpD,OAAO,KAAK,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AACvF,KAAK,oBAAoB,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,GAAG,CAAC;IAAC,QAAQ,EAAE,oBAAoB,EAAE,CAAA;CAAE,CAAA;AAEhG,eAAO,MAAM,qBAAqB,aACtB,oBAAoB,kBACd,CAAC,UAAU,EAAE,UAAU,KAAK,UAAU,KACrD,oBAwCF,CAAA;AAqBD,eAAO,MAAM,WAAW,UAAW,YAAY,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyDhD,CAAA"}

package/dist/utils/tests/otel.js

@@ -9,22 +9,26 @@ export const getSimplifiedRootSpan = (exporter, mapAttributes) => {
             parentSpan.children.push(nestedSpan);
         }
     });
-    const rootSpan = spansMap.get(spans.find((_) => _.name === 'test').spanContext().spanId);
+    const rootSpan = spansMap.get(spans.find((_) => _.name === 'createStore').spanContext().spanId);
     const simplifySpanRec = (span) => omitEmpty({
         _name: span.span.name,
         attributes: mapAttributesfn(span.span.attributes),
         children: span.children
-            .filter((_) => _.span.name !== 'createStore')
+            .filter((_) => _.span.name !== 'createStore:makeAdapter')
             // .sort((a, b) => compareHrTime(a.span.startTime, b.span.startTime))
             .map(simplifySpanRec),
     });
+    // console.log('rootSpan', rootSpan.span)
     // console.dir(
     //   spans.map((_) => [_.spanContext().spanId, _.name, _.attributes, _.parentSpanId]),
     //   { depth: 10 },
     // )
-    return simplifySpanRec(rootSpan);
+    const simplifiedRootSpan = simplifySpanRec(rootSpan);
+    // console.log('simplifiedRootSpan', simplifiedRootSpan)
+    // writeFileSync('tmp/trace.json', JSON.stringify(toTraceFile(spans), null, 2))
+    return simplifiedRootSpan;
 };
-// const compareHrTime = (a: [number, number], b: [number, number]) => {
+// const compareHrTime = (a: [number, numndber], b: [number, number]) => {
 //   if (a[0] !== b[0]) return a[0] - b[0]
 //   return a[1] - b[1]
 // }
@@ -39,4 +43,61 @@ const omitEmpty = (obj) => {
     }
     return result;
 };
+export const toTraceFile = (spans) => {
+    const hrTimeToBigInt = (hrTime) => (BigInt(hrTime[0]) * BigInt(1e9) + BigInt(hrTime[1])).toString();
+    return {
+        batches: [
+            {
+                resource: {
+                    attributes: [
+                        {
+                            key: 'service.name',
+                            value: {
+                                stringValue: 'test',
+                            },
+                        },
+                    ],
+                    droppedAttributesCount: 0,
+                },
+                instrumentationLibrarySpans: [
+                    {
+                        spans: spans.map((span) => ({
+                            traceId: span.spanContext().traceId,
+                            spanId: span.spanContext().spanId,
+                            ...(span.parentSpanId ? { parentSpanId: span.parentSpanId } : {}),
+                            // traceState: span.spanContext().traceState ?? '',
+                            name: span.name,
+                            kind: 'SPAN_KIND_INTERNAL',
+                            startTimeUnixNano: hrTimeToBigInt(span.startTime),
+                            endTimeUnixNano: hrTimeToBigInt(span.endTime),
+                            attributes: Object.entries(span.attributes).map(([key, value]) => ({
+                                key,
+                                value: typeof value === 'string'
+                                    ? { stringValue: value }
+                                    : typeof value === 'number'
+                                        ? Number.isInteger(value)
+                                            ? { intValue: value }
+                                            : { doubleValue: value }
+                                        : typeof value === 'boolean'
+                                            ? { boolValue: value }
+                                            : { stringValue: JSON.stringify(value) },
+                            })),
+                            droppedAttributesCount: span.droppedAttributesCount ?? 0,
+                            droppedEventsCount: span.droppedEventsCount ?? 0,
+                            droppedLinksCount: span.droppedLinksCount ?? 0,
+                            status: {
+                                code: span.status.code,
+                                message: span.status.message ?? '',
+                            },
+                        })),
+                        instrumentationLibrary: {
+                            name: 'livestore',
+                            version: '',
+                        },
+                    },
+                ],
+            },
+        ],
+    };
+};
 //# sourceMappingURL=otel.js.map

package/dist/utils/tests/otel.js.map

@@ -1 +1 @@
-{"version":3,"file":"otel.js","sourceRoot":"","sources":["../../../src/utils/tests/otel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAMlD,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,QAA8B,EAC9B,aAAsD,EAChC,EAAE;IACxB,MAAM,KAAK,GAAG,QAAQ,CAAC,gBAAgB,EAAE,CAAA;IACzC,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAqB,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,CAAA;IAEtH,MAAM,eAAe,GAAG,aAAa,IAAI,QAAQ,CAAA;IAEjD,QAAQ,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;QAC9B,MAAM,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;QACxG,IAAI,UAAU,EAAE,CAAC;YACf,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QACtC,CAAC;IACH,CAAC,CAAC,CAAA;IAGF,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAE,CAAC,WAAW,EAAE,CAAC,MAAM,CAAE,CAAA;IAE1F,MAAM,eAAe,GAAG,CAAC,IAAgB,EAAwB,EAAE,CACjE,SAAS,CAAC;QACR,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI;QACrB,UAAU,EAAE,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC;QACjD,QAAQ,EAAE,IAAI,CAAC,QAAQ;aACpB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa,CAAC;YAC7C,qEAAqE;aACpE,GAAG,CAAC,eAAe,CAAC;KACxB,CAAC,CAAA;IAEJ,eAAe;IACf,sFAAsF;IACtF,mBAAmB;IACnB,IAAI;IAEJ,OAAO,eAAe,CAAC,QAAQ,CAAC,CAAA;AAClC,CAAC,CAAA;AAED,wEAAwE;AACxE,0CAA0C;AAC1C,uBAAuB;AACvB,IAAI;AAEJ,MAAM,SAAS,GAAG,CAAC,GAAQ,EAAE,EAAE;IAC7B,MAAM,MAAM,GAAQ,EAAE,CAAA;IACtB,KAAK,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;QACtB,IACE,GAAG,CAAC,GAAG,CAAC,KAAK,SAAS;YACtB,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;YACnD,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,EAChC,CAAC;YACD,MAAM,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAA;QACxB,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC,CAAA"}
+{"version":3,"file":"otel.js","sourceRoot":"","sources":["../../../src/utils/tests/otel.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livestore/livestore",
-  "version": "0.2.0-dev.2",
+  "version": "0.3.0-dev.10",
   "type": "module",
   "sideEffects": false,
   "exports": {
@@ -29,22 +29,22 @@
     }
   },
   "dependencies": {
-    "@graphql-typed-document-node/core": "^3.2.0",
-    "@opentelemetry/api": "^1.9.0",
-    "@livestore/common": "0.2.0-dev.2",
-    "@livestore/db-schema": "0.2.0-dev.2",
-    "@livestore/utils": "0.2.0-dev.2"
+    "@graphql-typed-document-node/core": "3.2.0",
+    "@opentelemetry/api": "1.9.0",
+    "@livestore/common": "0.3.0-dev.10",
+    "@livestore/utils": "0.3.0-dev.10",
+    "@livestore/db-schema": "0.3.0-dev.10"
   },
   "devDependencies": {
-    "@opentelemetry/sdk-trace-base": "1.27.0",
-    "jsdom": "^25.0.1",
-    "typescript": "5.5.4",
-    "vite": "5.4.10",
+    "@opentelemetry/sdk-trace-base": "^1.30.1",
+    "jsdom": "^26.0.0",
+    "typescript": "^5.7.2",
+    "vite": "^6.0.11",
     "vitest": "^2.1.4",
-    "@livestore/web": "0.2.0-dev.2"
+    "@livestore/web": "0.3.0-dev.10"
   },
   "peerDependencies": {
-    "graphql": "16.x"
+    "graphql": "~16.0"
   },
   "peerDependenciesMeta": {
     "graphql": {

package/src/SynchronousDatabaseWrapper.ts

@@ -8,6 +8,7 @@ import type {
   SynchronousDatabase,
 } from '@livestore/common'
 import { BoundArray, BoundMap, sql } from '@livestore/common'
+import { isDevEnv } from '@livestore/utils'
 import type * as otel from '@opentelemetry/api'
 
 import QueryCache from './QueryCache.js'
@@ -75,6 +76,21 @@ export class SynchronousDatabaseWrapper {
     return result
   }
 
+  withChangeset<TRes>(callback: () => TRes): { result: TRes; changeset: Uint8Array | undefined } {
+    const session = this.db.session()
+    const result = callback()
+    const changeset = session.changeset()
+
+    session.finish()
+
+    return { result, changeset }
+  }
+
+  rollback(changeset: Uint8Array) {
+    const invertedChangeset = this.db.makeChangeset(changeset).invert()
+    invertedChangeset.apply()
+  }
+
   getTablesUsed(query: string) {
     // It seems that SQLite doesn't properly handle `DELETE FROM SOME_TABLE` queries without a WHERE clause
     // So we need to handle these queries separately
@@ -138,7 +154,7 @@ export class SynchronousDatabaseWrapper {
         this.debugInfo.queryFrameDuration += durationMs
         this.debugInfo.queryFrameCount++
 
-        if (durationMs > 5 && import.meta.env.DEV) {
+        if (durationMs > 5 && isDevEnv()) {
           this.debugInfo.slowQueries.push({
             queryStr,
             bindValues,
@@ -206,7 +222,7 @@ export class SynchronousDatabaseWrapper {
           this.debugInfo.queryFrameCount++
 
           // TODO also enable in non-dev mode
-          if (durationMs > 5 && import.meta.env.DEV) {
+          if (durationMs > 5 && isDevEnv()) {
             this.debugInfo.slowQueries.push({
               queryStr,
               bindValues,

package/src/ambient.d.ts

@@ -5,7 +5,7 @@ interface Window {
 }
 
 var __debugLiveStore: any
-var __debugDownloadBlob: any
+var __debugLiveStoreUtils: any
 
 interface ImportMeta {
   readonly env: ImportMetaEnv

package/src/effect/LiveStore.ts

@@ -1,8 +1,8 @@
 import type { Adapter, BootStatus, UnexpectedError } from '@livestore/common'
 import type { LiveStoreSchema } from '@livestore/common/schema'
-import type { Cause, Scope } from '@livestore/utils/effect'
-import { Context, Deferred, Duration, Effect, FiberSet, Layer, OtelTracer, pipe } from '@livestore/utils/effect'
-import * as otel from '@opentelemetry/api'
+import type { Cause, OtelTracer, Scope } from '@livestore/utils/effect'
+import { Context, Deferred, Duration, Effect, Layer, pipe } from '@livestore/utils/effect'
+import type * as otel from '@opentelemetry/api'
 import type { GraphQLSchema } from 'graphql'
 
 import { createStore } from '../store/create-store.js'
@@ -32,10 +32,10 @@ export type LiveStoreContextProps<GraphQLContext extends BaseGraphQLContext> = {
    */
   storeId?: string
   graphQLOptions?: {
-    schema: Effect.Effect<GraphQLSchema, never, otel.Tracer>
+    schema: Effect.Effect<GraphQLSchema, never, OtelTracer.OtelTracer>
     makeContext: (db: SynchronousDatabaseWrapper, tracer: otel.Tracer, sessionId: string) => GraphQLContext
   }
-  boot?: (store: Store<GraphQLContext, LiveStoreSchema>) => Effect.Effect<void, unknown, otel.Tracer>
+  boot?: (store: Store<GraphQLContext, LiveStoreSchema>) => Effect.Effect<void, unknown, OtelTracer.OtelTracer>
   adapter: Adapter
   disableDevtools?: boolean
   onBootStatus?: (status: BootStatus) => void
@@ -44,7 +44,7 @@ export type LiveStoreContextProps<GraphQLContext extends BaseGraphQLContext> = {
 
 export const LiveStoreContextLayer = <GraphQLContext extends BaseGraphQLContext>(
   props: LiveStoreContextProps<GraphQLContext>,
-): Layer.Layer<LiveStoreContextRunning, UnexpectedError | Cause.TimeoutException, otel.Tracer> =>
+): Layer.Layer<LiveStoreContextRunning, UnexpectedError | Cause.TimeoutException, OtelTracer.OtelTracer> =>
   Layer.scoped(LiveStoreContextRunning, makeLiveStoreContext(props)).pipe(
     Layer.withSpan('LiveStore'),
     Layer.provide(LiveStoreContextDeferred),
@@ -67,39 +67,30 @@ export const makeLiveStoreContext = <GraphQLContext extends BaseGraphQLContext>(
 }: LiveStoreContextProps<GraphQLContext>): Effect.Effect<
   LiveStoreContextRunning,
   UnexpectedError | Cause.TimeoutException,
-  DeferredStoreContext | Scope.Scope | otel.Tracer
+  DeferredStoreContext | Scope.Scope | OtelTracer.OtelTracer
 > =>
   pipe(
     Effect.gen(function* () {
-      const otelRootSpanContext = otel.context.active()
-
-      const otelTracer = yield* OtelTracer.Tracer
-
       const graphQLOptions = yield* graphQLOptions_
         ? Effect.all({ schema: graphQLOptions_.schema, makeContext: Effect.succeed(graphQLOptions_.makeContext) })
         : Effect.succeed(undefined)
 
-      // TODO join fiber set and close tear down parent scope in case of error (Needs refactor with Mike A)
-      const fiberSet = yield* FiberSet.make()
-
       const store = yield* createStore({
         schema,
         storeId,
         graphQLOptions,
-        otelOptions: {
-          tracer: otelTracer,
-          rootSpanContext: otelRootSpanContext,
-        },
         boot,
         adapter,
         disableDevtools,
-        fiberSet,
         onBootStatus,
         batchUpdates,
       })
 
       globalThis.__debugLiveStore ??= {}
-      // window.__debugLiveStore[schema.key] = store
+      if (Object.keys(globalThis.__debugLiveStore).length === 0) {
+        globalThis.__debugLiveStore['_'] = store
+      }
+      globalThis.__debugLiveStore[storeId] = store
 
       return { stage: 'running', store } satisfies LiveStoreContextRunning
     }),

package/src/index.ts

@@ -9,7 +9,7 @@ export type {
 } from './store/store-types.js'
 
 export type { LiveStoreContextRunning } from './effect/LiveStore.js'
-export { StoreAbort, StoreInterrupted, type LiveStoreContext } from './store/store-types.js'
+export { StoreAbort, StoreInterrupted, type LiveStoreContext, type ShutdownDeferred } from './store/store-types.js'
 
 export { SynchronousDatabaseWrapper, emptyDebugInfo } from './SynchronousDatabaseWrapper.js'
 

package/src/live-queries/__snapshots__/db.test.ts.snap

@@ -2,7 +2,11 @@
 
 exports[`otel > otel 3`] = `
 {
-  "_name": "test",
+  "_name": "createStore",
+  "attributes": {
+    "debugInstanceId": "test",
+    "storeId": "default",
+  },
   "children": [
     {
       "_name": "livestore.in-memory-db:execute",
@@ -17,6 +21,12 @@ exports[`otel > otel 3`] = `
     ",
       },
     },
+    {
+      "_name": "LiveStore:createStore",
+    },
+    {
+      "_name": "LiveStore:sync",
+    },
     {
       "_name": "LiveStore:mutations",
       "children": [
@@ -27,27 +37,16 @@ exports[`otel > otel 3`] = `
           },
           "children": [
             {
-              "_name": "LiveStore:processWrites",
+              "_name": "LiveStore:mutate:applyMutations",
               "attributes": {
                 "livestore.mutateLabel": "mutate",
               },
               "children": [
                 {
-                  "_name": "LiveStore:mutateWithoutRefresh",
+                  "_name": "livestore.in-memory-db:execute",
                   "attributes": {
-                    "livestore.args": "{
-  "sql": "INSERT INTO todos (id, text, completed) VALUES ('t1', 'buy milk', 0)"
-}",
-                    "livestore.mutation": "livestore.RawSql",
+                    "sql.query": "INSERT INTO todos (id, text, completed) VALUES ('t1', 'buy milk', 0)",
                   },
-                  "children": [
-                    {
-                      "_name": "livestore.in-memory-db:execute",
-                      "attributes": {
-                        "sql.query": "INSERT INTO todos (id, text, completed) VALUES ('t1', 'buy milk', 0)",
-                      },
-                    },
-                  ],
                 },
               ],
             },
@@ -100,7 +99,11 @@ exports[`otel > otel 3`] = `
 
 exports[`otel > with thunks 3`] = `
 {
-  "_name": "test",
+  "_name": "createStore",
+  "attributes": {
+    "debugInstanceId": "test",
+    "storeId": "default",
+  },
   "children": [
     {
       "_name": "livestore.in-memory-db:execute",
@@ -115,6 +118,12 @@ exports[`otel > with thunks 3`] = `
     ",
       },
     },
+    {
+      "_name": "LiveStore:createStore",
+    },
+    {
+      "_name": "LiveStore:sync",
+    },
     {
       "_name": "LiveStore:mutations",
       "children": [
@@ -125,27 +134,16 @@ exports[`otel > with thunks 3`] = `
           },
           "children": [
             {
-              "_name": "LiveStore:processWrites",
+              "_name": "LiveStore:mutate:applyMutations",
               "attributes": {
                 "livestore.mutateLabel": "mutate",
               },
               "children": [
                 {
-                  "_name": "LiveStore:mutateWithoutRefresh",
+                  "_name": "livestore.in-memory-db:execute",
                   "attributes": {
-                    "livestore.args": "{
-  "sql": "INSERT INTO todos (id, text, completed) VALUES ('t1', 'buy milk', 0)"
-}",
-                    "livestore.mutation": "livestore.RawSql",
+                    "sql.query": "INSERT INTO todos (id, text, completed) VALUES ('t1', 'buy milk', 0)",
                   },
-                  "children": [
-                    {
-                      "_name": "livestore.in-memory-db:execute",
-                      "attributes": {
-                        "sql.query": "INSERT INTO todos (id, text, completed) VALUES ('t1', 'buy milk', 0)",
-                      },
-                    },
-                  ],
                 },
               ],
             },
@@ -201,7 +199,11 @@ exports[`otel > with thunks 3`] = `
 
 exports[`otel > with thunks with query builder and without labels 3`] = `
 {
-  "_name": "test",
+  "_name": "createStore",
+  "attributes": {
+    "debugInstanceId": "test",
+    "storeId": "default",
+  },
   "children": [
     {
       "_name": "livestore.in-memory-db:execute",
@@ -216,6 +218,12 @@ exports[`otel > with thunks with query builder and without labels 3`] = `
     ",
       },
     },
+    {
+      "_name": "LiveStore:createStore",
+    },
+    {
+      "_name": "LiveStore:sync",
+    },
     {
       "_name": "LiveStore:mutations",
       "children": [
@@ -226,27 +234,16 @@ exports[`otel > with thunks with query builder and without labels 3`] = `
           },
           "children": [
             {
-              "_name": "LiveStore:processWrites",
+              "_name": "LiveStore:mutate:applyMutations",
               "attributes": {
                 "livestore.mutateLabel": "mutate",
               },
               "children": [
                 {
-                  "_name": "LiveStore:mutateWithoutRefresh",
+                  "_name": "livestore.in-memory-db:execute",
                   "attributes": {
-                    "livestore.args": "{
-  "sql": "INSERT INTO todos (id, text, completed) VALUES ('t1', 'buy milk', 0)"
-}",
-                    "livestore.mutation": "livestore.RawSql",
+                    "sql.query": "INSERT INTO todos (id, text, completed) VALUES ('t1', 'buy milk', 0)",
                   },
-                  "children": [
-                    {
-                      "_name": "livestore.in-memory-db:execute",
-                      "attributes": {
-                        "sql.query": "INSERT INTO todos (id, text, completed) VALUES ('t1', 'buy milk', 0)",
-                      },
-                    },
-                  ],
                 },
               ],
             },

package/src/live-queries/db.test.ts

@@ -20,6 +20,7 @@ describe('otel', () => {
   const makeQuery = Effect.gen(function* () {
     const exporter = new InMemorySpanExporter()
 
+    // const provider = cachedProvider ?? new BasicTracerProvider({ spanProcessors: [new SimpleSpanProcessor(exporter)] })
     const provider = cachedProvider ?? new BasicTracerProvider()
     cachedProvider = provider
     provider.addSpanProcessor(new SimpleSpanProcessor(exporter))
@@ -27,7 +28,7 @@ describe('otel', () => {
 
     const otelTracer = otel.trace.getTracer('test')
 
-    const span = otelTracer.startSpan('test')
+    const span = otelTracer.startSpan('test-root')
     const otelContext = otel.trace.setSpan(otel.context.active(), span)
 
     const { store } = yield* makeTodoMvc({ otelTracer, otelContext })