report error telemetry at one place

sandy081 · sandy081 · commit 99ff35b0ad76 · 2020-05-21T22:41:51.000+02:00
diff --git a/src/vs/platform/userDataSync/common/userDataSyncService.ts b/src/vs/platform/userDataSync/common/userDataSyncService.ts
@@ -374,7 +374,8 @@ export class UserDataSyncService extends Disposable implements IUserDataSyncServ
 					this.telemetryService.publicLog2<{ source: string }, SyncClassification>(`sync/error/${UserDataSyncErrorCode.TooLarge}`, { source });
 					break;
 				case UserDataSyncErrorCode.TooManyRequests:
-					this.telemetryService.publicLog2(`sync/error/${UserDataSyncErrorCode.TooManyRequests}`);
+				case UserDataSyncErrorCode.LocalTooManyRequests:
+					this.telemetryService.publicLog2(`sync/error/${e.code}`);
 					break;
 			}
 			throw e;
diff --git a/src/vs/platform/userDataSync/common/userDataSyncStoreService.ts b/src/vs/platform/userDataSync/common/userDataSyncStoreService.ts
@@ -61,7 +61,7 @@ export class UserDataSyncStoreService extends Disposable implements IUserDataSyn
 			});
 
 		/* A requests session that limits requests per sessions */
-		this.session = new RequestsSession(REQUEST_SESSION_LIMIT, REQUEST_SESSION_INTERVAL, this.requestService, telemetryService);
+		this.session = new RequestsSession(REQUEST_SESSION_LIMIT, REQUEST_SESSION_INTERVAL, this.requestService);
 	}
 
 	async getAllRefs(resource: ServerResource): Promise<IResourceRefHandle[]> {
@@ -306,7 +306,6 @@ export class RequestsSession {
 		private readonly limit: number,
 		private readonly interval: number, /* in ms */
 		private readonly requestService: IRequestService,
-		private readonly telemetryService: ITelemetryService
 	) { }
 
 	request(options: IRequestOptions, token: CancellationToken): Promise<IRequestContext> {
@@ -315,7 +314,7 @@ export class RequestsSession {
 		}
 
 		if (this.count >= this.limit) {
-			this.telemetryService.publicLog2(`sync/error/${UserDataSyncErrorCode.LocalTooManyRequests}`);
+
 			throw new UserDataSyncStoreError(`Too many requests. Allowed only ${this.limit} requests in ${this.interval / (1000 * 60)} minutes.`, UserDataSyncErrorCode.LocalTooManyRequests);
 		}
 
diff --git a/src/vs/platform/userDataSync/test/common/userDataSyncStoreService.test.ts b/src/vs/platform/userDataSync/test/common/userDataSyncStoreService.test.ts
@@ -10,7 +10,6 @@ import { DisposableStore } from 'vs/base/common/lifecycle';
 import { IProductService } from 'vs/platform/product/common/productService';
 import { isWeb } from 'vs/base/common/platform';
 import { RequestsSession } from 'vs/platform/userDataSync/common/userDataSyncStoreService';
-import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { IRequestService } from 'vs/platform/request/common/request';
 import { newWriteableBufferStream } from 'vs/base/common/buffer';
@@ -333,7 +332,7 @@ suite('UserDataSyncRequestsSession', () => {
 	};
 
 	test('too many requests are thrown when limit exceeded', async () => {
-		const testObject = new RequestsSession(1, 500, requestService, NullTelemetryService);
+		const testObject = new RequestsSession(1, 500, requestService);
 		await testObject.request({}, CancellationToken.None);
 
 		try {
@@ -347,14 +346,14 @@ suite('UserDataSyncRequestsSession', () => {
 	});
 
 	test('requests are handled after session is expired', async () => {
-		const testObject = new RequestsSession(1, 500, requestService, NullTelemetryService);
+		const testObject = new RequestsSession(1, 500, requestService);
 		await testObject.request({}, CancellationToken.None);
 		await timeout(600);
 		await testObject.request({}, CancellationToken.None);
 	});
 
 	test('too many requests are thrown after session is expired', async () => {
-		const testObject = new RequestsSession(1, 500, requestService, NullTelemetryService);
+		const testObject = new RequestsSession(1, 500, requestService);
 		await testObject.request({}, CancellationToken.None);
 		await timeout(600);
 		await testObject.request({}, CancellationToken.None);

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ export class UserDataSyncStoreService extends Disposable implements IUserDataSyn`
`61`	`61`	`});`
`62`	`62`
`63`	`63`	`/* A requests session that limits requests per sessions */`
`64`		`- this.session = new RequestsSession(REQUEST_SESSION_LIMIT, REQUEST_SESSION_INTERVAL, this.requestService, telemetryService);`
	`64`	`+ this.session = new RequestsSession(REQUEST_SESSION_LIMIT, REQUEST_SESSION_INTERVAL, this.requestService);`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`async getAllRefs(resource: ServerResource): Promise<IResourceRefHandle[]> {`
`@@ -306,7 +306,6 @@ export class RequestsSession {`
`306`	`306`	`private readonly limit: number,`
`307`	`307`	`private readonly interval: number, /* in ms */`
`308`	`308`	`private readonly requestService: IRequestService,`
`309`		`- private readonly telemetryService: ITelemetryService`
`310`	`309`	`) { }`
`311`	`310`
`312`	`311`	`request(options: IRequestOptions, token: CancellationToken): Promise<IRequestContext> {`
`@@ -315,7 +314,7 @@ export class RequestsSession {`
`315`	`314`	`}`
`316`	`315`
`317`	`316`	`if (this.count >= this.limit) {`
`318`		- this.telemetryService.publicLog2(`sync/error/${UserDataSyncErrorCode.LocalTooManyRequests}`);
	`317`	`+`
`319`	`318`	throw new UserDataSyncStoreError(`Too many requests. Allowed only ${this.limit} requests in ${this.interval / (1000 * 60)} minutes.`, UserDataSyncErrorCode.LocalTooManyRequests);
`320`	`319`	`}`
`321`	`320`