Skip to content

Commit 96ccaa9

Browse files
committed
refactor: wip
1 parent 5c644c2 commit 96ccaa9

File tree

6 files changed

+27
-34
lines changed

6 files changed

+27
-34
lines changed

packages/utils/src/lib/profiler/constants.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,13 @@ export const PROFILER_ENABLED_ENV_VAR = 'CP_PROFILING';
1717
export const PROFILER_DEBUG_ENV_VAR = 'DEBUG';
1818

1919
/**
20-
* Environment variable name for setting the Sharded WAL Coordinator ID.
20+
* Environment variable name for setting the Profiler Sharder ID.
2121
* This ID is used to identify the coordinator instance in a sharded Write-Ahead Logging setup.
2222
*
2323
* @example
24-
* CP_SHARDED_WAL_COORDINATOR_ID=coordinator-1 npm run dev
24+
* CP_PROFILER_SHARDER_ID=coordinator-1 npm run dev
2525
*/
26-
export const SHARDED_WAL_COORDINATOR_ID_ENV_VAR =
27-
'CP_SHARDED_WAL_COORDINATOR_ID';
26+
export const PROFILER_SHARDER_ID_ENV_VAR = 'CP_PROFILER_SHARDER_ID';
2827

2928
/**
3029
* Default output directory for persisted profiler data.

packages/utils/src/lib/profiler/profiler-node.int.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import {
2121
PROFILER_ENABLED_ENV_VAR,
2222
PROFILER_MEASURE_NAME_ENV_VAR,
2323
PROFILER_OUT_DIR_ENV_VAR,
24-
SHARDED_WAL_COORDINATOR_ID_ENV_VAR,
24+
PROFILER_SHARDER_ID_ENV_VAR,
2525
} from './constants.js';
2626
import { NodejsProfiler, type NodejsProfilerOptions } from './profiler-node.js';
2727
import { entryToTraceEvents } from './trace-file-utils.js';
@@ -187,7 +187,7 @@ describe('NodeJS Profiler Integration', () => {
187187
vi.stubEnv(PROFILER_ENABLED_ENV_VAR, undefined!);
188188
vi.stubEnv(PROFILER_DEBUG_ENV_VAR, undefined!);
189189
// eslint-disable-next-line functional/immutable-data
190-
delete process.env[SHARDED_WAL_COORDINATOR_ID_ENV_VAR];
190+
delete process.env[PROFILER_SHARDER_ID_ENV_VAR];
191191
});
192192

193193
afterEach(() => {
@@ -201,7 +201,7 @@ describe('NodeJS Profiler Integration', () => {
201201
vi.stubEnv(PROFILER_ENABLED_ENV_VAR, undefined!);
202202
vi.stubEnv(PROFILER_DEBUG_ENV_VAR, undefined!);
203203
// eslint-disable-next-line functional/immutable-data
204-
delete process.env[SHARDED_WAL_COORDINATOR_ID_ENV_VAR];
204+
delete process.env[PROFILER_SHARDER_ID_ENV_VAR];
205205
});
206206

207207
afterAll(async () => {
@@ -396,7 +396,7 @@ describe('NodeJS Profiler Integration', () => {
396396
const numProcesses = 3;
397397

398398
const {
399-
[SHARDED_WAL_COORDINATOR_ID_ENV_VAR]: _coordinatorId,
399+
[PROFILER_SHARDER_ID_ENV_VAR]: _coordinatorId,
400400
[PROFILER_MEASURE_NAME_ENV_VAR]: _measureName,
401401
...cleanEnv
402402
} = process.env;

packages/utils/src/lib/profiler/profiler-node.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import {
2020
PROFILER_MEASURE_NAME_ENV_VAR,
2121
PROFILER_OUT_DIR_ENV_VAR,
2222
PROFILER_PERSIST_OUT_DIR,
23-
SHARDED_WAL_COORDINATOR_ID_ENV_VAR,
23+
PROFILER_SHARDER_ID_ENV_VAR,
2424
} from './constants.js';
2525
import { Profiler, type ProfilerOptions } from './profiler.js';
2626

@@ -132,7 +132,7 @@ export class NodejsProfiler<
132132
this.#sharder = new ShardedWal<DomainEvents>({
133133
dir: process.env[PROFILER_OUT_DIR_ENV_VAR] ?? outDir,
134134
format,
135-
coordinatorIdEnvVar: SHARDED_WAL_COORDINATOR_ID_ENV_VAR,
135+
coordinatorIdEnvVar: PROFILER_SHARDER_ID_ENV_VAR,
136136
measureNameEnvVar: PROFILER_MEASURE_NAME_ENV_VAR,
137137
groupId: measureName,
138138
});

packages/utils/src/lib/profiler/profiler-node.unit.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import type {
1616
import * as WalModule from '../wal.js';
1717
import {
1818
PROFILER_PERSIST_OUT_DIR,
19-
SHARDED_WAL_COORDINATOR_ID_ENV_VAR,
19+
PROFILER_SHARDER_ID_ENV_VAR,
2020
} from './constants';
2121
import { NodejsProfiler, type NodejsProfilerOptions } from './profiler-node.js';
2222
import { Profiler, getProfilerId } from './profiler.js';
@@ -43,7 +43,7 @@ const resetEnv = () => {
4343
// eslint-disable-next-line functional/immutable-data
4444
delete process.env.CP_PROFILING;
4545
// eslint-disable-next-line functional/immutable-data
46-
delete process.env[SHARDED_WAL_COORDINATOR_ID_ENV_VAR];
46+
delete process.env[PROFILER_SHARDER_ID_ENV_VAR];
4747
};
4848

4949
const expectRunning = (p: NodejsProfiler<any>) => {
@@ -229,7 +229,7 @@ describe('NodejsProfiler', () => {
229229
});
230230

231231
it('should NOT initialize as coordinator if env vars is defined', async () => {
232-
vi.stubEnv(SHARDED_WAL_COORDINATOR_ID_ENV_VAR, getProfilerId());
232+
vi.stubEnv(PROFILER_SHARDER_ID_ENV_VAR, getProfilerId());
233233
const profiler = createProfiler('is-coordinator');
234234
expect(profiler.stats.isCoordinator).toBe(false);
235235
profiler.marker('special-marker');

packages/utils/src/lib/wal-sharded.int.test.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import fs from 'node:fs';
22
import path from 'node:path';
33
import { afterEach, beforeEach, describe, expect, it } from 'vitest';
4-
import { SHARDED_WAL_COORDINATOR_ID_ENV_VAR } from './profiler/constants.js';
4+
import { PROFILER_SHARDER_ID_ENV_VAR } from './profiler/constants.js';
55
import { ShardedWal } from './wal-sharded.js';
66
import { createTolerantCodec, stringCodec } from './wal.js';
77

@@ -40,7 +40,7 @@ describe('ShardedWal Integration', () => {
4040
finalExtension: '.json',
4141
finalizer: records => `${JSON.stringify(records)}\n`,
4242
},
43-
coordinatorIdEnvVar: SHARDED_WAL_COORDINATOR_ID_ENV_VAR,
43+
coordinatorIdEnvVar: PROFILER_SHARDER_ID_ENV_VAR,
4444
groupId: 'create-finalize',
4545
filename: 'test-shard-1',
4646
});
@@ -80,7 +80,7 @@ describe('ShardedWal Integration', () => {
8080
finalExtension: '.json',
8181
finalizer: records => `${JSON.stringify(records)}\n`,
8282
},
83-
coordinatorIdEnvVar: SHARDED_WAL_COORDINATOR_ID_ENV_VAR,
83+
coordinatorIdEnvVar: PROFILER_SHARDER_ID_ENV_VAR,
8484
groupId: 'merge-shards',
8585
filename: 'shard-1',
8686
});
@@ -126,7 +126,7 @@ describe('ShardedWal Integration', () => {
126126
codec: tolerantCodec,
127127
finalizer: records => `${JSON.stringify(records)}\n`,
128128
},
129-
coordinatorIdEnvVar: SHARDED_WAL_COORDINATOR_ID_ENV_VAR,
129+
coordinatorIdEnvVar: PROFILER_SHARDER_ID_ENV_VAR,
130130
groupId: 'invalid-entries',
131131
filename: 'test-shard',
132132
});
@@ -163,7 +163,7 @@ describe('ShardedWal Integration', () => {
163163
finalExtension: '.json',
164164
finalizer: records => `${JSON.stringify(records)}\n`,
165165
},
166-
coordinatorIdEnvVar: SHARDED_WAL_COORDINATOR_ID_ENV_VAR,
166+
coordinatorIdEnvVar: PROFILER_SHARDER_ID_ENV_VAR,
167167
groupId: 'cleanup-test',
168168
filename: 'shard-1',
169169
});
@@ -210,7 +210,7 @@ describe('ShardedWal Integration', () => {
210210
finalizer: (records, opt) =>
211211
`${JSON.stringify({ records, metadata: opt })}\n`,
212212
},
213-
coordinatorIdEnvVar: SHARDED_WAL_COORDINATOR_ID_ENV_VAR,
213+
coordinatorIdEnvVar: PROFILER_SHARDER_ID_ENV_VAR,
214214
groupId: 'custom-finalizer',
215215
filename: 'custom-shard',
216216
});
@@ -246,7 +246,7 @@ describe('ShardedWal Integration', () => {
246246
finalExtension: '.json',
247247
finalizer: records => `${JSON.stringify(records)}\n`,
248248
},
249-
coordinatorIdEnvVar: SHARDED_WAL_COORDINATOR_ID_ENV_VAR,
249+
coordinatorIdEnvVar: PROFILER_SHARDER_ID_ENV_VAR,
250250
groupId: 'empty-shards',
251251
});
252252

packages/utils/src/lib/wal-sharded.unit.test.ts

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { vol } from 'memfs';
22
import { beforeEach, describe, expect, it } from 'vitest';
33
import { MEMFS_VOLUME } from '@code-pushup/test-utils';
44
import { getUniqueInstanceId } from './process-id.js';
5-
import { SHARDED_WAL_COORDINATOR_ID_ENV_VAR } from './profiler/constants.js';
5+
import { PROFILER_SHARDER_ID_ENV_VAR } from './profiler/constants.js';
66
import { ShardedWal } from './wal-sharded.js';
77
import { WriteAheadLogFile, createTolerantCodec } from './wal.js';
88

@@ -17,7 +17,7 @@ const getShardedWal = (overrides?: {
1717
new ShardedWal({
1818
dir: '/test/shards',
1919
format: { baseName: 'test-wal' },
20-
coordinatorIdEnvVar: SHARDED_WAL_COORDINATOR_ID_ENV_VAR,
20+
coordinatorIdEnvVar: PROFILER_SHARDER_ID_ENV_VAR,
2121
...overrides,
2222
});
2323

@@ -26,7 +26,7 @@ describe('ShardedWal', () => {
2626
vol.reset();
2727
vol.fromJSON({}, MEMFS_VOLUME);
2828
// Clear coordinator env var for fresh state
29-
delete process.env[SHARDED_WAL_COORDINATOR_ID_ENV_VAR];
29+
delete process.env[PROFILER_SHARDER_ID_ENV_VAR];
3030
});
3131

3232
describe('initialization', () => {
@@ -226,7 +226,7 @@ describe('ShardedWal', () => {
226226
});
227227

228228
// Ensure no coordinator is set
229-
delete process.env[SHARDED_WAL_COORDINATOR_ID_ENV_VAR];
229+
delete process.env[PROFILER_SHARDER_ID_ENV_VAR];
230230

231231
const sw = getShardedWal({
232232
dir: '/shards',
@@ -246,7 +246,7 @@ describe('ShardedWal', () => {
246246
});
247247

248248
// Ensure no coordinator is set
249-
delete process.env[SHARDED_WAL_COORDINATOR_ID_ENV_VAR];
249+
delete process.env[PROFILER_SHARDER_ID_ENV_VAR];
250250

251251
const sw = getShardedWal({
252252
dir: '/shards',
@@ -364,10 +364,7 @@ describe('ShardedWal', () => {
364364
});
365365

366366
// Set coordinator BEFORE creating instance
367-
ShardedWal.setCoordinatorProcess(
368-
SHARDED_WAL_COORDINATOR_ID_ENV_VAR,
369-
instanceId,
370-
);
367+
ShardedWal.setCoordinatorProcess(PROFILER_SHARDER_ID_ENV_VAR, instanceId);
371368

372369
const sw = getShardedWal({
373370
dir: '/shards',
@@ -416,10 +413,7 @@ describe('ShardedWal', () => {
416413
});
417414

418415
// Set coordinator BEFORE creating instance
419-
ShardedWal.setCoordinatorProcess(
420-
SHARDED_WAL_COORDINATOR_ID_ENV_VAR,
421-
instanceId,
422-
);
416+
ShardedWal.setCoordinatorProcess(PROFILER_SHARDER_ID_ENV_VAR, instanceId);
423417

424418
const sw = getShardedWal({
425419
dir: '/shards',
@@ -451,7 +445,7 @@ describe('ShardedWal', () => {
451445
});
452446

453447
// Not coordinator - cleanupIfCoordinator should be no-op
454-
delete process.env[SHARDED_WAL_COORDINATOR_ID_ENV_VAR];
448+
delete process.env[PROFILER_SHARDER_ID_ENV_VAR];
455449
sw.cleanupIfCoordinator();
456450
expect(vol.toJSON()).not.toStrictEqual({});
457451
expect(sw.getState()).toBe('active');

0 commit comments

Comments
 (0)