Add metrics for datacollector.exe - provides information about profilers #2705
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jakubch1
changed the title
Haplois
approved these changes
Jan 21, 2021
I've changed communication between vstest.console.exe and datacollector.exe. This components are always installed together so I don't expect any issues with that. |
AbhitejJohn
reviewed
Jan 21, 2021
There was a problem hiding this comment.
Please check with @cvpoienaru for end-to-end scenarios that need validation with this change.
| /// Payload object that is used to exchange data between datacollector process and runner process. | ||
| /// </summary> | ||
| [DataContract] | ||
| public class AfterTestRunEndResult |
There was a problem hiding this comment.
Do we require this to be public?
There was a problem hiding this comment.
Yes. When tried internal than I got:
Severity Code Description Project File Line Suppression State
Error CS0050 Inconsistent accessibility: return type 'AfterTestRunEndResult' is less accessible than method 'DataCollectionRequestSender.SendAfterTestRunEndAndGetResult(ITestMessageEventHandler, bool)' Microsoft.TestPlatform.CommunicationUtilities (net451), Microsoft.TestPlatform.CommunicationUtilities (netstandard1.3), Microsoft.TestPlatform.CommunicationUtilities (netstandard2.0) D:\vstest\src\Microsoft.TestPlatform.CommunicationUtilities\DataCollectionRequestSender.cs 153 Active
SendAfterTestRunEndAndGetResult is part of interface so it cannot be done internal
There was a problem hiding this comment.
I see, that is sad. Adding @cvpoienaru to ensure that we aren't making/breaking any compat promises with this. From what I know, I think we are good.
There was a problem hiding this comment.
I've already discussed it with @cvpoienaru
src/Microsoft.TestPlatform.Common/DataCollection/DataCollectionManager.cs
Outdated
Show resolved
Hide resolved
src/Microsoft.TestPlatform.Common/DataCollection/DataCollectionTelemetryManager.cs
Outdated
Show resolved
Hide resolved
src/Microsoft.TestPlatform.Common/DataCollection/DataCollectionTelemetryManager.cs
Show resolved
Hide resolved
src/Microsoft.TestPlatform.Common/DataCollection/DataCollectionTelemetryManager.cs
Outdated
Show resolved
Hide resolved
| requestData.MetricsCollection.Add(string.Format(telemetryTemplateName, dataCollectorInformation.DataCollectorConfig?.TypeUri?.ToString()), GetProfilerName(value)); | ||
| } | ||
|
|
||
| private void AddProfilerMetricForConflictedVariable(string profilerVariable, string telemetryTemplateName, DataCollectorInformation dataCollectorInformation, string name, string existingValue) |
There was a problem hiding this comment.
Consider: Could we merge with the above and make this a for-loop over the environment variables of interest?
There was a problem hiding this comment.
In such case we need to copy logic which we already have to detect conflicts and so on. I would keep it like it is now. I want to keep this class making only simple metrics, nothing more
There was a problem hiding this comment.
I've made it a little bit simpler. We have 2 methods: RecordEnvVariableAddition and RecordEnvVariableConflict.
src/Microsoft.TestPlatform.Common/DataCollection/DataCollectionTelemetryManager.cs
Show resolved
Hide resolved
src/Microsoft.TestPlatform.Common/DataCollection/DataCollectionTelemetryManager.cs
Outdated
Show resolved
Hide resolved
AbhitejJohn
reviewed
Jan 25, 2021
src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj
Outdated
Show resolved
Hide resolved
AbhitejJohn
reviewed
Jan 25, 2021
src/Microsoft.TestPlatform.Common/DataCollection/AfterTestRunEndResult.cs
Outdated
Show resolved
Hide resolved
AbhitejJohn
reviewed
Jan 25, 2021
src/Microsoft.TestPlatform.Common/DataCollection/AfterTestRunEndResult.cs
Outdated
Show resolved
Hide resolved
AbhitejJohn
reviewed
Jan 25, 2021
src/Microsoft.TestPlatform.CommunicationUtilities/DataCollectionRequestHandler.cs
Outdated
Show resolved
Hide resolved
AbhitejJohn
reviewed
Jan 25, 2021
src/Microsoft.TestPlatform.CommunicationUtilities/DataCollectionRequestHandler.cs
Outdated
Show resolved
Hide resolved
AbhitejJohn
reviewed
Jan 25, 2021
src/Microsoft.TestPlatform.Common/Telemetry/TelemetryDataConstants.cs
Outdated
Show resolved
Hide resolved
AbhitejJohn
approved these changes
Jan 25, 2021
added 2 commits
January 25, 2021 16:10
jakubch1
added a commit
that referenced
this pull request
Feb 5, 2021
* Update dependencies from https://github.com/dotnet/arcade build 20201130.3 (#2659) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild From Version 1.0.0-beta.20570.10 -> To Version 1.0.0-beta.20580.3 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> * Updating Microsoft.VisualStudio.TraceDataCollector source (#2663) * Getting Microsoft.VisualStudio.TraceDataCollector from CodeCoverageExternals instead of TestPlatformExternals, * Signing TraceDataCollector from the right path, * Removing already signed dlls, * Not signing corelib.net, * Removing files from the list as they are not present, Co-authored-by: faisal <[email protected]> * Fixed "issue" pluralization in write-release-notes.ps1 (#2665) * Fixed "issue" pluralization in write-release-notes.ps1 Co-authored-by: Medeni Baykal <[email protected]> * Bumping Fakes TestRunnerHarness version (#2661) * Implement Workitem support in TRX logger (#2666) * Implemented Workitem support in TRX logger * Renamed Workitem to WorkItem Co-authored-by: Flepp Jann <[email protected]> * Do not merge logs from code coverage (#2671) * Early testhost startup performance work (#2584) * Removed TypesToLoadAttribute from ObjectModel. (#2674) * Removed TypesToLoadAttribute from ObjectModel, and moved the functionallity into adapters themselves. * Attribute refactoring (#2676) * Getting TraceDataCollector from nuget (#2678) * Removing TraceDataCollector project, * Getting tracedatacollector from nuget, * Removing signing of codecoverage libs as they are already signed, updating codecoverage version, * fixing path to tracedatacollector, * Fixing acceptance tests, Co-authored-by: faisal <[email protected]> * Adding environment variable used during build process, (#2679) * Removing TraceDataCollector project, * Getting tracedatacollector from nuget, * Removing signing of codecoverage libs as they are already signed, updating codecoverage version, * fixing path to tracedatacollector, * Fixing acceptance tests, * Setting TraceDataCollectorPackagesDir vairable which is used in pipeline, * Fixing environment variable, * Fixing path, once again, Co-authored-by: faisal <[email protected]> * Update dependencies from https://github.com/dotnet/arcade build 20201221.2 (#2680) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild From Version 1.0.0-beta.20580.3 -> To Version 1.0.0-beta.20621.2 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> * Upgrade CC and CLR IE versions (#2681) Co-authored-by: Jakub Chocholowicz <[email protected]> * Fixed assembly names of TestHost executables (#2682) * Upgrade fakes version (#2683) Co-authored-by: Jakub Chocholowicz <[email protected]> * Upgrade CC to 16.9.0-beta.20630.1 (#2684) Co-authored-by: Jakub Chocholowicz <[email protected]> * Loc Update (#2685) Co-authored-by: Cristiano Suzuki <[email protected]> * Create AzureDevOps.yml * Update AzureDevOps.yml * Update AzureDevOps.yml * Update AzureDevOps.yml * Delete AzureDevOps.yml * Fix nuget feed (#2697) * Removing deprecated mygets and adding new nuget sources * Upgrade CC components (#2698) * Upgrade CC components * Revert nuget changes * Refactor it Co-authored-by: Jakub Chocholowicz <[email protected]> * Update dependencies from https://github.com/dotnet/arcade build 20210113.4 (#2696) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild From Version 1.0.0-beta.20621.2 -> To Version 1.0.0-beta.21063.4 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> * Create AzureDevOps.yml * Update AzureDevOps.yml * Update AzureDevOps.yml * Update AzureDevOps.yml * Update AzureDevOps.yml * Update AzureDevOps.yml * Update AzureDevOps.yml changed to my repo * Update AzureDevOps.yml * Add integration tests for dotnet test (#2689) * Add integration tests for dotnet test * Use relative paths and correct proj * Update to latest .NET 6 * Install 5.0.1 runtime * Add parametrized project * Updated build status badge. (#2709) * Updated build status badge. * Update dependencies from https://github.com/dotnet/arcade build 20210121.4 (#2712) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild From Version 1.0.0-beta.21063.4 -> To Version 1.0.0-beta.21071.4 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> * Update dependencies from https://github.com/dotnet/arcade build 20210122.7 (#2713) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild From Version 1.0.0-beta.21063.4 -> To Version 1.0.0-beta.21072.7 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Medeni Baykal <[email protected]> * Update azure-pipelines.yml for Azure Pipelines (#2715) * Add metrics for datacollector.exe - provides information about profilers (#2705) * Initial version of metrics for DC profiling * Tests * Push fixes to make linux build * provide telemetry opted in flag * Small refactoring * Change name * Upgrade CC comp * Move to guids * Revert lang change * Fixing descriptions * Last changes Co-authored-by: Jakub Chocholowicz <[email protected]> * Added git branch and commit NuGet packages (#2716) * vstest.console: CommandLineOptions: preserve stacktrace on re-throw (CA2200) (#2606) * vstest.console: CommandLineOptions: preserve stacktrace on re-throw (CA2200) * Update AzureDevOps.yml * Update AzureDevOps.yml * Move FQN related code into a separate NuGet package (#2714) * Removed ManagedNameUtilities from ObjectModel in order to restore compatibility with older versions. * Added `Microsoft.TestPlatform.AdapterUtilities`. * Added `net20` and `net35` support to the code. * Including `Microsoft.TestPlatform.AdapterUtilities` in signing (#2719) * Included missing assemblies in signing. * Updating nuget Pdb2Pdb package (#2720) * Adding new Pdb2Pdb package and change to licence tag because of warning * Fixing license * Formating fixes Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: fhnaseer <[email protected]> Co-authored-by: faisal <[email protected]> Co-authored-by: Adam Ralph <[email protected]> Co-authored-by: Medeni Baykal <[email protected]> Co-authored-by: Vritant Bhardwaj <[email protected]> Co-authored-by: jflepp <[email protected]> Co-authored-by: Flepp Jann <[email protected]> Co-authored-by: Codrin-Victor Poienaru <[email protected]> Co-authored-by: Jakub Chocholowicz <[email protected]> Co-authored-by: Cristiano Suzuki <[email protected]> Co-authored-by: Cristiano Suzuki <[email protected]> Co-authored-by: Pavel Horak <[email protected]> Co-authored-by: Sanan Yuzbashiyev <[email protected]> Co-authored-by: Jakub Jareš <[email protected]> Co-authored-by: Tom Deseyn <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
PR adds logic to add data collectors metrics with information which profiler was used