microsoft
/
vscode-docker
зеркало из https://github.com/microsoft/vscode-docker.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Revert "telemetry changes for vscodespace (#1922)" (#1930) 

This reverts commit 3d93370059.
This commit is contained in:
Ravikumar Palanisamy 2020-04-29 10:29:11 -07:00 коммит произвёл GitHub
Родитель e6a91eb828
Коммит 2532058669
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
4 изменённых файлов: 16 добавлений и 37 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

24
package-lock.json сгенерированный
Просмотреть файл

@ -755,14 +755,14 @@
} }
}, },
"applicationinsights": { "applicationinsights": {
"version": "1.7.4", "version": "1.4.0",
"resolved": "https://registry.npmjs.org/applicationinsights/-/applicationinsights-1.7.4.tgz", "resolved": "https://registry.npmjs.org/applicationinsights/-/applicationinsights-1.4.0.tgz",
"integrity": "sha512-XFLsNlcanpjFhHNvVWEfcm6hr7lu9znnb6Le1Lk5RE03YUV9X2B2n2MfM4kJZRrUdV+C0hdHxvWyv+vWoLfY7A==", "integrity": "sha512-TV8MYb0Kw9uE2cdu4V/UvTKdOABkX2+Fga9iDz0zqV7FLrNXfmAugWZmmdTx4JoynYkln3d5CUHY3oVSUEbfFw==",
"requires": { "requires": {
"cls-hooked": "^4.2.2", "cls-hooked": "^4.2.2",
"continuation-local-storage": "^3.2.1", "continuation-local-storage": "^3.2.1",
"diagnostic-channel": "0.2.0", "diagnostic-channel": "0.2.0",
"diagnostic-channel-publishers": "^0.3.3" "diagnostic-channel-publishers": "^0.3.2"
} }
}, },
"aproba": { "aproba": {
@ -10869,9 +10869,9 @@
} }
}, },
"vscode-azureextensionui": { "vscode-azureextensionui": {
"version": "0.29.14", "version": "0.29.13",
"resolved": "https://registry.npmjs.org/vscode-azureextensionui/-/vscode-azureextensionui-0.29.14.tgz", "resolved": "https://registry.npmjs.org/vscode-azureextensionui/-/vscode-azureextensionui-0.29.13.tgz",
"integrity": "sha512-K6SKlqj489PiN9ZZCPKtN0je3mXETn+jJwUs9AVPZDuu69WjIpXqyN3WkPXR7r1JmhV1PbpRPvtB3VhlcmulLw==", "integrity": "sha512-Ko3nBlOgtR5xdMTuV+ty0WjZTtC5FaLMvslDSUK4T2FaIRGF6ScEP6UNSz/IdQ588FAgknfXdw4VNlHZCYBsbw==",
"requires": { "requires": {
"azure-arm-resource": "^3.0.0-preview", "azure-arm-resource": "^3.0.0-preview",
"azure-arm-storage": "^3.1.0", "azure-arm-storage": "^3.1.0",
@ -10882,7 +10882,7 @@
"ms-rest-azure": "^2.6.0", "ms-rest-azure": "^2.6.0",
"opn": "^6.0.0", "opn": "^6.0.0",
"semver": "^5.7.1", "semver": "^5.7.1",
"vscode-extension-telemetry": "^0.1.3", "vscode-extension-telemetry": "^0.1.2",
"vscode-nls": "^4.1.1" "vscode-nls": "^4.1.1"
}, },
"dependencies": { "dependencies": {
@ -10903,11 +10903,11 @@
} }
}, },
"vscode-extension-telemetry": { "vscode-extension-telemetry": {
"version": "0.1.4", "version": "0.1.2",
"resolved": "https://registry.npmjs.org/vscode-extension-telemetry/-/vscode-extension-telemetry-0.1.4.tgz", "resolved": "https://registry.npmjs.org/vscode-extension-telemetry/-/vscode-extension-telemetry-0.1.2.tgz",
"integrity": "sha512-9U2pUZ/YwZBfA8CkBrHwMxjnq9Ab+ng8daJWJzEQ6CAxlZyRhmck23bx2lqqpEwGWJCiuceQy4k0Me6llEB4zw==", "integrity": "sha512-FSbaZKlIH3VKvBJsKw7v5bESWHXzltji2rtjaJeJglpQH4tfClzwHMzlMXUZGiblV++djEzb1gW8mb5E+wxFsg==",
"requires": { "requires": {
"applicationinsights": "1.7.4" "applicationinsights": "1.4.0"
} }
}, },
"vscode-jsonrpc": { "vscode-jsonrpc": {

2
package.json
Просмотреть файл

@ -2650,7 +2650,7 @@
"semver": "^6.3.0", "semver": "^6.3.0",
"tar": "^6.0.1", "tar": "^6.0.1",
"vscode-azureappservice": "^0.57.6", "vscode-azureappservice": "^0.57.6",
"vscode-azureextensionui": "^0.29.14", "vscode-azureextensionui": "^0.29.13",
"vscode-languageclient": "^6.1.3", "vscode-languageclient": "^6.1.3",
"vscode-nls": "^4.1.2", "vscode-nls": "^4.1.2",
"xml2js": "^0.4.23" "xml2js": "^0.4.23"

11
src/telemetry/TelemetryReporterProxy.ts
Просмотреть файл

@ -21,15 +21,4 @@ export class TelemetryReporterProxy implements ITelemetryReporter {
properties properties
}); });
} }
public sendTelemetryErrorEvent(eventName: string, properties?: { [key: string]: string; }, measurements?: { [key: string]: number; }): void {
// eslint-disable-next-line @typescript-eslint/tslint/config
this.wrappedReporter.sendTelemetryErrorEvent(eventName, properties, measurements);
this.publisher.publishEvent({
eventName,
measurements,
properties
});
}
} }

16
test/telemetry/TelemetryReporterProxy.test.ts
Просмотреть файл

@ -15,9 +15,8 @@ suite('(unit) telemetry/TelemetryReporterProxy', () => {
const measurements = {}; const measurements = {};
const properties = {}; const properties = {};
let publishedCount = 0; let eventPublished = false;
let eventSent = false; let eventSent = false;
let errorEventSent = false;
const publisher: ITelemetryPublisher = { const publisher: ITelemetryPublisher = {
onEvent: undefined, onEvent: undefined,
@ -26,7 +25,7 @@ suite('(unit) telemetry/TelemetryReporterProxy', () => {
assert.equal(e.measurements, measurements); assert.equal(e.measurements, measurements);
assert.equal(e.properties, properties); assert.equal(e.properties, properties);
publishedCount++; eventPublished = true;
} }
}; };
@ -37,23 +36,14 @@ suite('(unit) telemetry/TelemetryReporterProxy', () => {
assert.equal(p, properties); assert.equal(p, properties);
eventSent = true; eventSent = true;
},
sendTelemetryErrorEvent: (e, p, m) => {
assert.equal(e, eventName);
assert.equal(m, measurements);
assert.equal(p, properties);
errorEventSent = true;
} }
}; };
const proxy = new TelemetryReporterProxy(publisher, wrappedReporter); const proxy = new TelemetryReporterProxy(publisher, wrappedReporter);
proxy.sendTelemetryEvent(eventName, properties, measurements); proxy.sendTelemetryEvent(eventName, properties, measurements);
proxy.sendTelemetryErrorEvent(eventName, properties, measurements);
assert.equal(publishedCount, 2); assert(eventPublished);
assert(eventSent); assert(eventSent);
assert(errorEventSent);
}); });
}); });