Skip to content

Commit

Permalink
Cleanup telemetry (#6940)
Browse files Browse the repository at this point in the history
  • Loading branch information
keithrob authored and b-barthel committed Apr 11, 2018
1 parent a213915 commit 81285d6
Show file tree
Hide file tree
Showing 12 changed files with 95 additions and 18 deletions.
2 changes: 0 additions & 2 deletions Tasks/Common/utility-common/telemetry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,8 @@ export function emitTelemetry(area: string, feature: string, taskSpecificTelemet
'BUILD_REASON': tl.getVariable('BUILD_REASON'),
'BUILD_REPOSITORY_CLEAN': tl.getVariable('BUILD_REPOSITORY_CLEAN'),
'BUILD_REPOSITORY_GIT_SUBMODULECHECKOUT': tl.getVariable('BUILD_REPOSITORY_GIT_SUBMODULECHECKOUT'),
'BUILD_REPOSITORY_ID': tl.getVariable('BUILD_REPOSITORY_ID'),
'BUILD_REPOSITORY_NAME': tl.getVariable('BUILD_REPOSITORY_NAME'),
'BUILD_REPOSITORY_PROVIDER': tl.getVariable('BUILD_REPOSITORY_PROVIDER'),
'BUILD_REPOSITORY_URI': tl.getVariable('BUILD_REPOSITORY_URI'),
'BUILD_SOURCEVERSION': tl.getVariable('BUILD_SOURCEVERSION'),
'agent.proxyurl': tl.getVariable("agent.proxyurl")
};
Expand Down
4 changes: 2 additions & 2 deletions Tasks/Npm/Tests/L0.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ describe('Npm Task', function () {

// npm failure dumps log
it('npm failure dumps debug log from npm cache', (done: MochaDone) => {
this.timeout(1000);
this.timeout(3000);
const debugLog = 'NPM_DEBUG_LOG';

let tp = path.join(__dirname, 'npm-failureDumpsLog-cacheDir.js');
Expand All @@ -51,7 +51,7 @@ describe('Npm Task', function () {
});

it('npm failure dumps debug log from working directory', (done: MochaDone) => {
this.timeout(1000);
this.timeout(3000);
const debugLog = 'NPM_DEBUG_LOG';

let tp = path.join(__dirname, 'npm-failureDumpsLog-workingDir.js');
Expand Down
1 change: 0 additions & 1 deletion Tasks/Npm/npm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ async function _logNpmStartupVariables() {

let npmTelem = {
'command': command,
'customCommand': tl.getInput(NpmTaskInput.CustomCommand),
'verbose': tl.getInput(NpmTaskInput.Verbose),
'customRegistry': tl.getInput(NpmTaskInput.CustomRegistry),
'customFeed': tl.getInput(NpmTaskInput.CustomFeed),
Expand Down
46 changes: 44 additions & 2 deletions Tasks/Npm/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Tasks/Npm/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vsts-npm-task",
"version": "1.0.14",
"version": "1.0.15",
"description": "VSTS NPM Task",
"main": "npmtask.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion Tasks/Npm/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"version": {
"Major": 1,
"Minor": 0,
"Patch": 14
"Patch": 15
},
"runsOn": [
"Agent",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/Npm/task.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"version": {
"Major": 1,
"Minor": 0,
"Patch": 14
"Patch": 15
},
"runsOn": [
"Agent",
Expand Down
1 change: 0 additions & 1 deletion Tasks/NuGetCommand/nugetcommandmain.ts
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ function _logNugetStartupVariables(nuGetPath: string, nugetVersion: string) {
}
let nugetTelem = {
'command': tl.getInput('command'),
'arguments': tl.getInput('arguments'),
'NUGET_EXE_TOOL_PATH_ENV_VAR': tl.getVariable(nuGetGetter.NUGET_EXE_TOOL_PATH_ENV_VAR),
'NUGET_EXE_CUSTOM_LOCATION': tl.getVariable(NUGET_EXE_CUSTOM_LOCATION),
'searchPatternPack': tl.getPathInput('searchPatternPack'),
Expand Down
45 changes: 42 additions & 3 deletions Tasks/NuGetCommand/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Tasks/NuGetCommand/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nugetcommand",
"version": "2.0.26",
"version": "2.0.27",
"description": "Restore, pack, or push NuGet packages, or run a NuGet command.",
"main": "nugetcommandmain.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion Tasks/NuGetCommand/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"version": {
"Major": 2,
"Minor": 0,
"Patch": 26
"Patch": 27
},
"runsOn": [
"Agent",
Expand Down
4 changes: 2 additions & 2 deletions Tasks/NuGetCommand/task.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"version": {
"Major": 2,
"Minor": 0,
"Patch": 26
"Patch": 27
},
"runsOn": [
"Agent",
Expand Down Expand Up @@ -524,4 +524,4 @@
"Warning_UpdatingNuGetVersion": "ms-resource:loc.messages.Warning_UpdatingNuGetVersion",
"Error_NugetFailedWithCodeAndErr": "ms-resource:loc.messages.Error_NugetFailedWithCodeAndErr"
}
}
}

0 comments on commit 81285d6

Please sign in to comment.