diff --git a/package.json b/package.json index 3aebd80219e..ab73adb8deb 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "nsfw": "^2.1.1", "spdlog": "^0.11.1", "sudo-prompt": "9.1.1", - "tas-client-umd": "0.1.2", + "tas-client-umd": "0.1.4", "v8-inspect-profiler": "^0.0.20", "vscode-oniguruma": "1.3.1", "vscode-proxy-agent": "^0.8.1", diff --git a/remote/package.json b/remote/package.json index 8be08ac6479..fd69fc737f5 100644 --- a/remote/package.json +++ b/remote/package.json @@ -16,7 +16,7 @@ "node-pty": "0.10.0-beta19", "nsfw": "^2.1.1", "spdlog": "^0.11.1", - "tas-client-umd": "0.1.2", + "tas-client-umd": "0.1.4", "vscode-oniguruma": "1.3.1", "vscode-proxy-agent": "^0.8.1", "vscode-regexpp": "^3.1.0", diff --git a/remote/web/package.json b/remote/web/package.json index d7f2eb55c1e..362c0b4997d 100644 --- a/remote/web/package.json +++ b/remote/web/package.json @@ -5,7 +5,7 @@ "dependencies": { "iconv-lite-umd": "0.6.8", "jschardet": "2.2.1", - "tas-client-umd": "0.1.2", + "tas-client-umd": "0.1.4", "vscode-oniguruma": "1.3.1", "vscode-textmate": "5.2.0", "xterm": "4.12.0-beta.3", diff --git a/remote/web/yarn.lock b/remote/web/yarn.lock index ac55515db25..8377719ac17 100644 --- a/remote/web/yarn.lock +++ b/remote/web/yarn.lock @@ -12,10 +12,10 @@ jschardet@2.2.1: resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-2.2.1.tgz#03b0264669a90c7a5c436a68c5a7d4e4cb0c9823" integrity sha512-Ks2JNuUJoc7PGaZ7bVFtSEvOcr0rBq6Q1J5/7+zKWLT+g+4zziL63O0jg7y2jxhzIa1LVsHUbPXrbaWmz9iwDw== -tas-client-umd@0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/tas-client-umd/-/tas-client-umd-0.1.2.tgz#fe93ae085f65424292ac79feff4f1add3e50e624" - integrity sha512-rT9BdDCejckqOTQL2ShX67QtTiAUGbmPm5ZTC8giXobBvZC6JuvBVy5G32hoGZ3Q0dpTvMfgpf3iVFNN2F7wzg== +tas-client-umd@0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/tas-client-umd/-/tas-client-umd-0.1.4.tgz#49db4130dd63a8342fabf77185a740fc6a7bea80" + integrity sha512-1hFqJeLD3ryNikniIaO7TItlXhS5vx7bJ+wbPDf8o+IifgwwOWK2ARisdEM9SnJd0ccfcwNPG6Po+RiKn5L2hg== vscode-oniguruma@1.3.1: version "1.3.1" diff --git a/remote/yarn.lock b/remote/yarn.lock index 16e8fc41105..1999d9958c4 100644 --- a/remote/yarn.lock +++ b/remote/yarn.lock @@ -359,10 +359,10 @@ spdlog@^0.11.1: mkdirp "^0.5.1" nan "^2.14.0" -tas-client-umd@0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/tas-client-umd/-/tas-client-umd-0.1.2.tgz#fe93ae085f65424292ac79feff4f1add3e50e624" - integrity sha512-rT9BdDCejckqOTQL2ShX67QtTiAUGbmPm5ZTC8giXobBvZC6JuvBVy5G32hoGZ3Q0dpTvMfgpf3iVFNN2F7wzg== +tas-client-umd@0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/tas-client-umd/-/tas-client-umd-0.1.4.tgz#49db4130dd63a8342fabf77185a740fc6a7bea80" + integrity sha512-1hFqJeLD3ryNikniIaO7TItlXhS5vx7bJ+wbPDf8o+IifgwwOWK2ARisdEM9SnJd0ccfcwNPG6Po+RiKn5L2hg== to-regex-range@^5.0.1: version "5.0.1" diff --git a/src/vs/workbench/services/experiment/common/experimentService.ts b/src/vs/workbench/services/experiment/common/experimentService.ts index 86888e949b9..57758e9e580 100644 --- a/src/vs/workbench/services/experiment/common/experimentService.ts +++ b/src/vs/workbench/services/experiment/common/experimentService.ts @@ -184,6 +184,7 @@ export class ExperimentService implements ITASExperimentService { private tasClient: Promise | undefined; private telemetry: ExperimentServiceTelemetry | undefined; private static MEMENTO_ID = 'experiment.service.memento'; + private networkInitialized = false; private overrideInitDelay: Promise; @@ -228,7 +229,13 @@ export class ExperimentService implements ITASExperimentService { return undefined; } - const result = (await this.tasClient).getTreatmentVariable('vscode', name); + let result: T | undefined; + const client = await this.tasClient; + if (this.networkInitialized) { + result = client.getTreatmentVariable('vscode', name); + } else { + result = await client.getTreatmentVariableAsync('vscode', name, true); + } type TAASClientReadTreatmentData = { treatmentName: string; @@ -291,7 +298,8 @@ export class ExperimentService implements ITASExperimentService { }); await tasClient.initializePromise; - await tasClient.getTreatmentVariableAsync('vscode', 'initialize'); + + tasClient.initialFetch.then(() => this.networkInitialized = true); type TAASClientSetupData = { setupTime: number; }; type TAASClientSetupCalssification = { setupTime: { classification: 'SystemMetaData', purpose: 'PerformanceAndHealth', isMeasurement: true }; }; diff --git a/yarn.lock b/yarn.lock index 8447b7dad24..992f0ecf1f5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9320,10 +9320,10 @@ tar@^6.0.1, tar@^6.0.2: mkdirp "^1.0.3" yallist "^4.0.0" -tas-client-umd@0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/tas-client-umd/-/tas-client-umd-0.1.2.tgz#fe93ae085f65424292ac79feff4f1add3e50e624" - integrity sha512-rT9BdDCejckqOTQL2ShX67QtTiAUGbmPm5ZTC8giXobBvZC6JuvBVy5G32hoGZ3Q0dpTvMfgpf3iVFNN2F7wzg== +tas-client-umd@0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/tas-client-umd/-/tas-client-umd-0.1.4.tgz#49db4130dd63a8342fabf77185a740fc6a7bea80" + integrity sha512-1hFqJeLD3ryNikniIaO7TItlXhS5vx7bJ+wbPDf8o+IifgwwOWK2ARisdEM9SnJd0ccfcwNPG6Po+RiKn5L2hg== temp@^0.8.3: version "0.8.4"