Skip to content

Commit 8d53eea

Browse files
committed
fix: address comments
1 parent 678beee commit 8d53eea

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

src/telemetry/telemetry.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ async function isContainerized(): Promise<boolean> {
4949

5050
export class Telemetry {
5151
/** Resolves when the device ID is retrieved or timeout occurs */
52-
private bufferingEvents: number = 2;
52+
private pendingPromises: number = 2;
5353
public deviceIdPromise: Promise<string> | undefined;
5454
public containerEnvPromise: Promise<boolean> | undefined;
5555
private deviceIdAbortController = new AbortController();
@@ -123,10 +123,10 @@ export class Telemetry {
123123
},
124124
abortSignal: this.deviceIdAbortController.signal,
125125
}).finally(() => {
126-
this.bufferingEvents--;
126+
this.pendingPromises--;
127127
});
128128
this.containerEnvPromise = this.getContainerEnv().finally(() => {
129-
this.bufferingEvents--;
129+
this.pendingPromises--;
130130
});
131131
}
132132

@@ -192,16 +192,16 @@ export class Telemetry {
192192
return !doNotTrack;
193193
}
194194

195-
public isBufferingEvents(): boolean {
196-
return this.bufferingEvents > 0;
195+
public hasPendingPromises(): boolean {
196+
return this.pendingPromises > 0;
197197
}
198198

199199
/**
200200
* Attempts to emit events through authenticated and unauthenticated clients
201201
* Falls back to caching if both attempts fail
202202
*/
203203
private async emit(events: BaseEvent[]): Promise<void> {
204-
if (this.isBufferingEvents()) {
204+
if (this.hasPendingPromises()) {
205205
this.eventCache.appendEvents(events);
206206
return;
207207
}

tests/integration/telemetry.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ describe("Telemetry", () => {
1313
getContainerEnv: () => new Promise((resolve) => resolve(false)),
1414
});
1515

16-
expect(telemetry.isBufferingEvents()).toBe(true);
16+
expect(telemetry.hasPendingPromises()).toBe(true);
1717
const commonProps = await telemetry.getAsyncCommonProperties();
1818

1919
expect(commonProps.device_id).toBe(actualHashedId);
20-
expect(telemetry.isBufferingEvents()).toBe(false);
20+
expect(telemetry.hasPendingPromises()).toBe(false);
2121
});
2222
});

tests/unit/telemetry.test.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -220,9 +220,9 @@ describe("Telemetry", () => {
220220
getContainerEnv: () => Promise.resolve(false),
221221
});
222222

223-
expect(telemetry.isBufferingEvents()).toBe(true);
223+
expect(telemetry.hasPendingPromises()).toBe(true);
224224
const commonProps = await telemetry.getAsyncCommonProperties();
225-
expect(telemetry.isBufferingEvents()).toBe(false);
225+
expect(telemetry.hasPendingPromises()).toBe(false);
226226
expect(commonProps.device_id).toBe(hashedMachineId);
227227
});
228228

@@ -234,9 +234,9 @@ describe("Telemetry", () => {
234234
getContainerEnv: () => Promise.resolve(false),
235235
});
236236

237-
expect(telemetry.isBufferingEvents()).toBe(true);
237+
expect(telemetry.hasPendingPromises()).toBe(true);
238238
const commonProps = await telemetry.getAsyncCommonProperties();
239-
expect(telemetry.isBufferingEvents()).toBe(false);
239+
expect(telemetry.hasPendingPromises()).toBe(false);
240240
expect(commonProps.device_id).toBe("unknown");
241241

242242
expect(loggerSpy).toHaveBeenCalledWith(
@@ -254,7 +254,7 @@ describe("Telemetry", () => {
254254
getRawMachineId: () => new Promise(() => {}),
255255
getContainerEnv: () => Promise.resolve(false),
256256
});
257-
expect(telemetry.isBufferingEvents()).toBe(true);
257+
expect(telemetry.hasPendingPromises()).toBe(true);
258258
jest.advanceTimersByTime(DEVICE_ID_TIMEOUT);
259259
const commonProps = await telemetry.getAsyncCommonProperties();
260260
expect(commonProps.device_id).toBe("unknown");

0 commit comments

Comments
 (0)