refactor: wip

BioPhoton · BioPhoton · commit 5c644c2385aa · 2026-01-31T22:04:44.000+01:00
diff --git a/packages/utils/src/lib/performance-observer.ts b/packages/utils/src/lib/performance-observer.ts
@@ -316,11 +316,6 @@ export class PerformanceObserverSink<T> {
       this.processPerformanceEntries(list.getEntries());
     });
 
-    this.#observer.observe({
-      entryTypes: OBSERVED_TYPES,
-      buffered: this.#buffered,
-    });
-
     // When buffered mode is enabled, Node.js PerformanceObserver invokes
     // the callback synchronously with all buffered entries before observe() returns.
     // However, entries created before any observer existed may not be buffered by Node.js.
@@ -332,6 +327,12 @@ export class PerformanceObserverSink<T> {
       const allEntries = [...existingMarks, ...existingMeasures];
       this.processPerformanceEntries(allEntries);
     }
+
+    this.#observer.observe({
+      entryTypes: OBSERVED_TYPES,
+      // @NOTE: This is for unknown reasons not working, and we manually do it above
+      // buffered: this.#buffered,
+    });
   }
 
   /**
diff --git a/packages/utils/src/lib/profiler/profiler-node.ts b/packages/utils/src/lib/profiler/profiler-node.ts
@@ -39,11 +39,6 @@ export type PersistOptions<DomainEvents extends object> = {
    */
   outDir?: string;
 
-  /**
-   * File path for the WriteAheadLogFile sink.
-   * If not provided, defaults to `trace.json` in the current working directory.
-   */
-  filename?: string;
   /**
    * Override the base name for WAL files (overrides format.baseName).
    * If provided, this value will be merged into the format configuration.
@@ -127,7 +122,6 @@ export class NodejsProfiler<
       outDir = PROFILER_PERSIST_OUT_DIR,
       enabled,
       debug,
-      filename,
       ...profilerOptions
     } = allButBufferOptions;
 
@@ -141,7 +135,6 @@ export class NodejsProfiler<
       coordinatorIdEnvVar: SHARDED_WAL_COORDINATOR_ID_ENV_VAR,
       measureNameEnvVar: PROFILER_MEASURE_NAME_ENV_VAR,
       groupId: measureName,
-      filename,
     });
     this.#sharder.ensureCoordinator();
 
diff --git a/packages/utils/src/lib/profiler/profiler-node.unit.test.ts b/packages/utils/src/lib/profiler/profiler-node.unit.test.ts
@@ -368,21 +368,19 @@ describe('NodejsProfiler', () => {
       expect(profiler.stats.shardPath).toMatch(/\.jsonl$/);
     });
 
-    it('should use provided filename when specified', () => {
-      const customPath = path.join(process.cwd(), 'custom-trace.json');
+    it('should use measureName for final file path', () => {
       const profiler = createProfiler({
         measureName: 'custom-filename',
-        filename: customPath,
       });
       const shardPath = profiler.stats.shardPath;
       // shardPath uses the shard ID format: baseName.shardId.jsonl
       expect(shardPath).toContain('tmp/profiles/custom-filename');
       expect(shardPath).toMatch(
         /trace\.\d{8}-\d{6}-\d{3}\.\d+\.\d+\.\d+\.jsonl$/,
       );
-      // finalFilePath uses the custom filename
+      // finalFilePath uses measureName as the identifier
       expect(profiler.stats.finalFilePath).toBe(
-        `${PROFILER_PERSIST_OUT_DIR}/custom-filename/trace.custom-trace.json`,
+        `${PROFILER_PERSIST_OUT_DIR}/custom-filename/trace.custom-filename.json`,
       );
     });
 
@@ -420,7 +418,6 @@ describe('NodejsProfiler', () => {
     it('get stats() getter should return current stats', () => {
       const profiler = createProfiler({
         measureName: 'stats-getter',
-        filename: 'stats-getter-trace',
         enabled: false,
       });
 
@@ -438,7 +435,7 @@ describe('NodejsProfiler', () => {
         isCoordinator: true, // When no coordinator env var is set, this profiler becomes coordinator
         isFinalized: false,
         isCleaned: false,
-        finalFilePath: `${PROFILER_PERSIST_OUT_DIR}/stats-getter/trace.stats-getter-trace.json`,
+        finalFilePath: `${PROFILER_PERSIST_OUT_DIR}/stats-getter/trace.stats-getter.json`,
         shardFileCount: 0,
         shardFiles: [],
         shardOpen: false,
diff --git a/packages/utils/src/lib/profiler/trace-file.type.ts b/packages/utils/src/lib/profiler/trace-file.type.ts
@@ -1,6 +1,3 @@
-// ─────────────────────────────────────────────────────────────
-// Core trace event model
-// ─────────────────────────────────────────────────────────────
 import type {
   MarkerPayload,
   TrackEntryPayload,
diff --git a/packages/utils/src/lib/wal-sharded.ts b/packages/utils/src/lib/wal-sharded.ts
@@ -82,7 +82,6 @@ export class ShardedWal<T extends object = object> {
   readonly #dir: string = process.cwd();
   readonly #coordinatorIdEnvVar: string;
   #state: 'active' | 'finalized' | 'cleaned' = 'active';
-  #filename?: string;
 
   /**
    * Initialize the origin PID environment variable if not already set.
@@ -121,24 +120,16 @@ export class ShardedWal<T extends object = object> {
    * @param opt.groupId - Group ID for sharding (defaults to generated group ID)
    * @param opt.coordinatorIdEnvVar - Environment variable name for storing coordinator ID (defaults to CP_SHARDED_WAL_COORDINATOR_ID)
    * @param opt.measureNameEnvVar - Environment variable name for coordinating groupId across processes (optional)
-   * @param opt.filename - Filename to use for final output file (optional)
    */
   constructor(opt: {
     dir?: string;
     format: Partial<WalFormat<T>>;
     groupId?: string;
     coordinatorIdEnvVar: string;
     measureNameEnvVar?: string;
-    filename?: string;
   }) {
-    const {
-      dir,
-      format,
-      groupId,
-      coordinatorIdEnvVar,
-      measureNameEnvVar,
-      filename,
-    } = opt;
+    const { dir, format, groupId, coordinatorIdEnvVar, measureNameEnvVar } =
+      opt;
 
     // Determine groupId: use provided, then env var, or generate
     let resolvedGroupId: string;
@@ -165,7 +156,6 @@ export class ShardedWal<T extends object = object> {
     }
     this.#format = parseWalFormat<T>(format);
     this.#coordinatorIdEnvVar = coordinatorIdEnvVar;
-    this.#filename = filename;
   }
 
   /**
@@ -257,31 +247,24 @@ export class ShardedWal<T extends object = object> {
 
   /**
    * Generates a filename for the final merged output file.
-   * Uses the stored filename if available, otherwise falls back to groupId.
+   * Uses the groupId as the identifier in the final filename.
    *
    * Example with baseName "trace" and groupId "20240101-120000-000":
    * Filename: trace.20240101-120000-000.json
    *
-   * Example with baseName "trace" and filename "custom-trace.json":
-   * Filename: trace.custom-trace.json
+   * Example with baseName "trace" and groupId "measureName":
+   * Filename: trace.measureName.json
    *
    * @returns The filename for the final merged output file
    */
   getFinalFilePath() {
     const groupIdDir = path.join(this.#dir, this.groupId);
     const { baseName, finalExtension } = this.#format;
 
-    // Use stored filename if available, otherwise use groupId
-    let identifier: string;
-    if (this.#filename) {
-      // Extract basename if it's a full path, and remove extension
-      const basename = path.basename(this.#filename);
-      identifier = basename.replace(/\.[^.]*$/, ''); // Remove extension
-    } else {
-      identifier = this.groupId;
-    }
-
-    return path.join(groupIdDir, `${baseName}.${identifier}${finalExtension}`);
+    return path.join(
+      groupIdDir,
+      `${baseName}.${this.groupId}${finalExtension}`,
+    );
   }
 
   shard() {
diff --git a/packages/utils/src/lib/wal-sharded.unit.test.ts b/packages/utils/src/lib/wal-sharded.unit.test.ts
@@ -13,7 +13,6 @@ const getShardedWal = (overrides?: {
   format?: Partial<
     Parameters<typeof ShardedWal.prototype.constructor>[0]['format']
   >;
-  filename?: string;
 }) =>
   new ShardedWal({
     dir: '/test/shards',
@@ -41,20 +40,15 @@ describe('ShardedWal', () => {
     it('should create shard with correct file path', () => {
       const sw = getShardedWal({
         format: { baseName: 'trace', walExtension: '.log' },
-        filename: '20231114-221320-000.1.2.3',
       });
       const shard = sw.shard();
       expect(shard).toBeInstanceOf(WriteAheadLogFile);
       // Shard files use getShardId() format (timestamp.pid.threadId.counter)
-      // Filename is stored but not used in shard path
-      expect(shard.getPath()).toStartWithPath(
-        '/test/shards/20231114-221320-000/trace.20231114-221320-000.',
-      );
-      expect(shard.getPath()).toEndWithPath('.log');
-      // Verify it matches the getShardId() pattern: timestamp.pid.threadId.counter.log
+      // The groupId is auto-generated and used in the shard path
       expect(shard.getPath()).toMatch(
-        /^\/test\/shards\/20231114-221320-000\/trace\.20231114-221320-000\.\d+\.\d+\.\d+\.log$/,
+        /^\/test\/shards\/\d{8}-\d{6}-\d{3}\/trace\.\d{8}-\d{6}-\d{3}\.\d+\.\d+\.\d+\.log$/,
       );
+      expect(shard.getPath()).toEndWithPath('.log');
     });
 
     it('should create shard with default shardId when no argument provided', () => {
