Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge feature/triggers to main #868

Merged
merged 27 commits into from
Sep 17, 2021
+8,628 −440
Merged

Merge feature/triggers to main #868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
d1e450d
Merge main to feature/triggers (#672)
jander-msft Aug 2, 2021
e39cc95
Initial collection rule options, validation, and unit tests. (#688)
jander-msft Aug 9, 2021
3fc993f
Merge branch 'main' of https://github.com/dotnet/dotnet-monitor into …
jander-msft Aug 9, 2021
00db128
Merge main to feature/triggers (#699)
jander-msft Aug 10, 2021
c657b85
Merge branch 'main' of https://github.com/dotnet/dotnet-monitor into …
jander-msft Aug 10, 2021
f6c07d5
Merge pull request #705 from jander-msft/dev/jander/m2t
jander-msft Aug 11, 2021
9a41688
Generate action and trigger options in schema. (#706)
jander-msft Aug 13, 2021
e1a2cee
Create `Execute` collection rule action (#710)
kkeirstead Aug 17, 2021
f44b90c
Merge branch 'main' of https://github.com/dotnet/dotnet-monitor into …
jander-msft Aug 17, 2021
ca7dbd8
Merge main to feature/triggers (#731)
jander-msft Aug 18, 2021
c4fe406
Basic implementation and registration of actions and triggers (#736)
jander-msft Aug 19, 2021
9673941
Execute Action - Testing (#742)
kkeirstead Aug 20, 2021
e2c5533
Merge main to feature/triggers (#759)
jander-msft Aug 24, 2021
b94dbcf
Update trigger interfaces with callback, start, and stop notions. (#760)
jander-msft Aug 24, 2021
ebe5765
Refactor host building into helper method (#769)
jander-msft Aug 26, 2021
e743a8e
Merge main to feature/triggers (#775)
jander-msft Aug 26, 2021
753a50e
Triggers - Action List Executor (#768)
kkeirstead Aug 30, 2021
99cf8b2
Merge main to feature/triggers (#814)
jander-msft Sep 2, 2021
1b7a403
Merge main to feature/triggers (#817)
jander-msft Sep 3, 2021
6d32881
Merge main to feature/triggers (#826)
jander-msft Sep 3, 2021
b5b52af
Implement collection rule pipeline, event counter trigger, and tests.…
jander-msft Sep 8, 2021
2ad6b1d
Create CollectDump Collection Rule Action (#824)
kkeirstead Sep 14, 2021
6800215
Fix CollectionRulePipelineTests failure due to callback registration …
jander-msft Sep 16, 2021
3b14583
Merge branch 'main' of https://github.com/dotnet/dotnet-monitor into …
jander-msft Sep 16, 2021
e785e25
Merge main to feature/triggers (#863)
jander-msft Sep 17, 2021
4e9db7b
Collection rule service, logging, and some functional tests (#852)
jander-msft Sep 17, 2021
f734973
Replace TestCommon dependency with Xunit.Assert (#874)
jander-msft Sep 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
836 changes: 811 additions & 25 deletions documentation/schema.json
View file
Open in desktop

Large diffs are not rendered by default.

19 changes: 13 additions & 6 deletions dotnet-monitor.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.Monit
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.Monitoring.Options", "src\Microsoft.Diagnostics.Monitoring.Options\Microsoft.Diagnostics.Monitoring.Options.csproj", "{173F959B-231B-45D1-8328-9460D4C5BC71}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Diagnostics.Monitoring.Tool.UnitTests", "src\Tests\Microsoft.Diagnostics.Monitoring.Tool.UnitTests\Microsoft.Diagnostics.Monitoring.Tool.UnitTests.csproj", "{C5D14E28-DACA-4884-B513-9246B788BC22}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.Monitoring.Tool.UnitTests", "src\Tests\Microsoft.Diagnostics.Monitoring.Tool.UnitTests\Microsoft.Diagnostics.Monitoring.Tool.UnitTests.csproj", "{0DBE362D-82F1-4740-AE6A-40C1A82EDCDB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.Monitoring.ExecuteActionApp", "src\Tests\Microsoft.Diagnostics.Monitoring.ExecuteActionApp\Microsoft.Diagnostics.Monitoring.ExecuteActionApp.csproj", "{A5A0CAAB-C200-44D2-BC93-8445C6E748AD}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -88,10 +90,14 @@ Global
{173F959B-231B-45D1-8328-9460D4C5BC71}.Debug|Any CPU.Build.0 = Debug|Any CPU
{173F959B-231B-45D1-8328-9460D4C5BC71}.Release|Any CPU.ActiveCfg = Release|Any CPU
{173F959B-231B-45D1-8328-9460D4C5BC71}.Release|Any CPU.Build.0 = Release|Any CPU
{C5D14E28-DACA-4884-B513-9246B788BC22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C5D14E28-DACA-4884-B513-9246B788BC22}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C5D14E28-DACA-4884-B513-9246B788BC22}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C5D14E28-DACA-4884-B513-9246B788BC22}.Release|Any CPU.Build.0 = Release|Any CPU
{0DBE362D-82F1-4740-AE6A-40C1A82EDCDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0DBE362D-82F1-4740-AE6A-40C1A82EDCDB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0DBE362D-82F1-4740-AE6A-40C1A82EDCDB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0DBE362D-82F1-4740-AE6A-40C1A82EDCDB}.Release|Any CPU.Build.0 = Release|Any CPU
{A5A0CAAB-C200-44D2-BC93-8445C6E748AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A5A0CAAB-C200-44D2-BC93-8445C6E748AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A5A0CAAB-C200-44D2-BC93-8445C6E748AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A5A0CAAB-C200-44D2-BC93-8445C6E748AD}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -111,7 +117,8 @@ Global
{422ABBF6-6236-4042-AACA-09531DBDFBAA} = {C7568468-1C79-4944-8136-18812A7F9EA7}
{3AD0A40B-C569-4712-9764-7A788B9CD811} = {C7568468-1C79-4944-8136-18812A7F9EA7}
{173F959B-231B-45D1-8328-9460D4C5BC71} = {19FAB78C-3351-4911-8F0C-8C6056401740}
{C5D14E28-DACA-4884-B513-9246B788BC22} = {C7568468-1C79-4944-8136-18812A7F9EA7}
{0DBE362D-82F1-4740-AE6A-40C1A82EDCDB} = {C7568468-1C79-4944-8136-18812A7F9EA7}
{A5A0CAAB-C200-44D2-BC93-8445C6E748AD} = {C7568468-1C79-4944-8136-18812A7F9EA7}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {46465737-C938-44FC-BE1A-4CE139EBB5E0}
Expand Down
1 change: 1 addition & 0 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
<MicrosoftAspNetCoreMvcVersion>2.1.3</MicrosoftAspNetCoreMvcVersion>
<MicrosoftAspNetCoreServerKestrelCoreVersion>2.1.7</MicrosoftAspNetCoreServerKestrelCoreVersion>
<MicrosoftBclHashCodeVersion>1.1.0</MicrosoftBclHashCodeVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>5.0.0</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationKeyPerFileVersion>5.0.2</MicrosoftExtensionsConfigurationKeyPerFileVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>5.0.0</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingConsoleVersion>5.0.0</MicrosoftExtensionsLoggingConsoleVersion>
Expand Down
1 change: 1 addition & 0 deletions src/Microsoft.Diagnostics.Monitoring.Options/Microsoft.Diagnostics.Monitoring.Options.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<InternalsVisibleTo Include="Microsoft.Diagnostics.Monitoring.ConfigurationSchema" />
<InternalsVisibleTo Include="Microsoft.Diagnostics.Monitoring.OpenApiGen" />
<InternalsVisibleTo Include="Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests" />
<InternalsVisibleTo Include="Microsoft.Diagnostics.Monitoring.Tool.UnitTests" />
<InternalsVisibleTo Include="Microsoft.Diagnostics.Monitoring.WebApi" />
<InternalsVisibleTo Include="Microsoft.Diagnostics.Monitoring.WebApi.UnitTests" />
</ItemGroup>
Expand Down
433 changes: 433 additions & 0 deletions src/Microsoft.Diagnostics.Monitoring.Options/OptionsDisplayStrings.Designer.cs
View file
Open in desktop

Large diffs are not rendered by default.

Loading