Merge vscode source through 1.62 release (#19981)

* Build breaks 1

* Build breaks

* Build breaks

* Build breaks

* More build breaks

* Build breaks (#2512)

* Runtime breaks

* Build breaks

* Fix dialog location break

* Update typescript

* Fix ASAR break issue

* Unit test breaks

* Update distro

* Fix breaks in ADO builds (#2513)

* Bump to node 16

* Fix hygiene errors

* Bump distro

* Remove reference to node type

* Delete vscode specific extension

* Bump to node 16 in CI yaml

* Skip integration tests in CI builds (while fixing)

* yarn.lock update

* Bump moment dependency in remote yarn

* Fix drop-down chevron style

* Bump to node 16

* Remove playwrite from ci.yaml

* Skip building build scripts in hygine check
This commit is contained in:
Karl Burtram
2022-07-11 14:09:32 -07:00
committed by GitHub
parent fa0fcef303
commit 26455e9113
1876 changed files with 72050 additions and 37997 deletions

View File

@@ -6,7 +6,7 @@
import * as azdata from 'azdata';
import { IAdsTelemetryService, ITelemetryInfo, ITelemetryEvent, ITelemetryEventMeasures, ITelemetryEventProperties } from 'sql/platform/telemetry/common/telemetry';
import { ILogService } from 'vs/platform/log/common/log';
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import { ITelemetryService, TelemetryLevel } from 'vs/platform/telemetry/common/telemetry';
import { EventName } from 'sql/platform/telemetry/common/telemetryKeys';
@@ -90,11 +90,15 @@ export class AdsTelemetryService implements IAdsTelemetryService {
) { }
setEnabled(value: boolean): void {
return this.telemetryService.setEnabled(value);
if (value) {
this.telemetryService.telemetryLevel = TelemetryLevel.USAGE;
} else {
this.telemetryService.telemetryLevel = TelemetryLevel.NONE;
}
}
get isOptedIn(): boolean {
return this.telemetryService.isOptedIn;
return this.telemetryService.telemetryLevel !== TelemetryLevel.NONE;
}
getTelemetryInfo(): Promise<ITelemetryInfo> {