Skip to content

Load the managed profiler code as early as possible #462

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

Merged
merged 54 commits into from
Aug 12, 2019
Merged

Load the managed profiler code as early as possible #462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
2dcfb6b
App domain crash testing
colin-higgins Jul 22, 2019
bf181c4
More in depth-application for repro
colin-higgins Jul 23, 2019
77a64ff
Add Select from SQL for tracing
colin-higgins Jul 23, 2019
f223f03
Work in progress, can't get GetAssemblyReferences to be called :(
zacharycmontoya Jul 23, 2019
2caa582
Crash the program with a FileNotFoundException.
zacharycmontoya Jul 24, 2019
fa32787
Add a fix to the profiler to avoid the scenario of
zacharycmontoya Jul 26, 2019
99ddf31
WIP to load and execute a managed helper IL assembly.
zacharycmontoya Jul 31, 2019
a4aa487
With the LoadTheHelperType method enabled in AppDomainInstanceProgram…
zacharycmontoya Aug 1, 2019
9b7f27b
Get the dynamically-created method to be called but Assembly.Load doe…
zacharycmontoya Aug 1, 2019
6dcfa26
Successfully load an assembly from a byte[] with symbols
zacharycmontoya Aug 1, 2019
4635cf0
It works!!!
zacharycmontoya Aug 2, 2019
938507e
Long hang minidump repro.
zacharycmontoya Aug 2, 2019
e5e859c
Turn the new feature back on.
zacharycmontoya Aug 2, 2019
3626e67
Reduce some of the diff.
zacharycmontoya Aug 5, 2019
1c65c85
Additional diff reduction.
zacharycmontoya Aug 5, 2019
0e91481
Rename GetAssemblyBytes to GetAssemblyAndSymbolBytes
zacharycmontoya Aug 5, 2019
4552b38
Fix Datadog.Trace.proj BuildCpp target.
zacharycmontoya Aug 5, 2019
ac66acd
Fix cast warning.
zacharycmontoya Aug 5, 2019
f4564c7
Rename the startup hook Datadog.Trace.ClrProfiler.EntrypointManaged.L…
zacharycmontoya Aug 5, 2019
bbe0d62
Rename GetAssemblyAndSymbolBytes to GetAssemblyAndSymbolsBytes
zacharycmontoya Aug 5, 2019
976ced1
Refactoring.
zacharycmontoya Aug 5, 2019
9e8aba1
More fixes.
zacharycmontoya Aug 6, 2019
df39c21
Add GetAssemblyReferences callback.
zacharycmontoya Aug 6, 2019
ba9d4e1
Set the sample program SecurityGrant.FileNotFoundException to net452 …
zacharycmontoya Aug 6, 2019
6f38c83
Improve inline documentation of GenerateVoidILStartupMethod.
zacharycmontoya Aug 6, 2019
168f96f
Fix issues with creating method signatures.
zacharycmontoya Aug 6, 2019
ea8e835
Add a new smoke test called AssemblyLoad.FileNotFoundException.
zacharycmontoya Aug 6, 2019
d0367e6
Force AssemblyLoad.FileNotFoundException to crash with the expected e…
zacharycmontoya Aug 6, 2019
b909e4b
Actually provide a mitigation for the Assembly.Load FileNotFoundExcep…
zacharycmontoya Aug 6, 2019
4908280
Apply Lucas's suggestions from code review
zacharycmontoya Aug 7, 2019
f33e8ea
Fix BuildCpp target in Datadog.Trace.proj
zacharycmontoya Aug 7, 2019
442e273
Add AssemblyLoad.FileNotFoundException to CI integration tests.
zacharycmontoya Aug 7, 2019
fbd61c2
Attempt to fix DataDogThreadTest CI build failure.
zacharycmontoya Aug 7, 2019
5ac49b6
Refactor strings to appease the wchar_t size difference between Windo…
zacharycmontoya Aug 8, 2019
b70b95a
#ifdef the new functionality so it's only invoked on Windows
zacharycmontoya Aug 8, 2019
a90cf12
Revert "Add GetAssemblyReferences callback."
zacharycmontoya Aug 8, 2019
a7c307f
Apply Lucas's PR suggestions
zacharycmontoya Aug 8, 2019
9f0b44f
Edit smoke test projects and the integration test files.
zacharycmontoya Aug 8, 2019
f8eb6bf
Add more diagnostic info to GetSolutionDirectory in EnvironmentHelper.cs
zacharycmontoya Aug 8, 2019
26a4e8c
Remove unnecessary changes.
zacharycmontoya Aug 8, 2019
68d837f
Fix GetSolutionDirectory()
zacharycmontoya Aug 8, 2019
7522e34
Add a windows integration test job.
zacharycmontoya Aug 8, 2019
76099ce
Modify SecurityGrant.FileNotFoundException to run in a shorter amount…
zacharycmontoya Aug 8, 2019
9b0aa81
Extend the timeout once more for SecurityGrantFileNotFoundExceptionSm…
zacharycmontoya Aug 8, 2019
ffaa71f
Implement feedback to make the method signature array the exact size.
zacharycmontoya Aug 8, 2019
8fe2a3c
Fix the RuntimeIdentifiers for the builds of reproduction apps so the…
zacharycmontoya Aug 8, 2019
23d0ddd
Fix the reproduction build issues.
zacharycmontoya Aug 8, 2019
bb345d0
Add runtime information check to the app domain logic.
zacharycmontoya Aug 9, 2019
ebef1ec
Add E2E HttpClientTests for Windows integration tests
zacharycmontoya Aug 9, 2019
3288661
Set the "corlib" information on first load of mscorlib or System.Priv…
zacharycmontoya Aug 12, 2019
506180e
Build Datadog.Trace.ClrProfiler.Managed.Loader before the native prof…
zacharycmontoya Aug 12, 2019
233b82d
Add catch for ObjectDisposedException which is failing the Windows in…
zacharycmontoya Aug 12, 2019
86ed52a
Add catch for ObjectDisposedException in the MockTracerAgent
zacharycmontoya Aug 12, 2019
4fd78ba
Remove ObjectDisposedException clauses that were unrelated to the Win…
zacharycmontoya Aug 12, 2019
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
98 changes: 98 additions & 0 deletions .azure-pipelines/integration-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ trigger:
variables:
buildConfiguration: debug
packageFeed: /ffc32c57-3e0e-4e8f-8633-a7ad01df2e45
dotnetCoreSdkVersion: 2.2.300

jobs:

Expand Down Expand Up @@ -46,3 +47,100 @@ jobs:
testResultsFormat: VSTest
testResultsFiles: test/**/*.trx
condition: succeededOrFailed()

- job: windows

pool:
vmImage: windows-2019

variables:
buildPlatform: 'x64'

steps:
- task: DotNetCoreCLI@2
displayName: dotnet build src/**/*.csproj
inputs:
command: build
projects: |
src/**/*.csproj
arguments: --configuration $(buildConfiguration) -p:Platform=$(buildPlatform)

- task: NuGetCommand@2
displayName: nuget restore native
inputs:
restoreSolution: Datadog.Trace.Native.sln
vstsFeed: $(packageFeed)
verbosityRestore: Normal

- task: MSBuild@1
displayName: msbuild native
inputs:
solution: Datadog.Trace.proj
platform: $(buildPlatform)
configuration: $(buildConfiguration)
msbuildArguments: /t:BuildCpp
maximumCpuCount: true

- task: DotNetCoreInstaller@0
displayName: install dotnet core sdk
inputs:
version: $(dotnetCoreSdkVersion)

- task: DotNetCoreCLI@2
displayName: dotnet restore
inputs:
command: restore
projects: |
samples/Samples.HttpMessageHandler/Samples.HttpMessageHandler.csproj
test/Datadog.Trace.ClrProfiler.IntegrationTests/Datadog.Trace.ClrProfiler.IntegrationTests.csproj
reproductions/**/*.csproj
!reproductions/**/ExpenseItDemo*.csproj
vstsFeed: $(packageFeed)

- task: DotNetCoreCLI@2
displayName: dotnet build
inputs:
command: build
projects: |
samples/Samples.HttpMessageHandler/Samples.HttpMessageHandler.csproj
test/Datadog.Trace.ClrProfiler.IntegrationTests/Datadog.Trace.ClrProfiler.IntegrationTests.csproj
reproductions/**/*.csproj
!reproductions/**/ExpenseItDemo*.csproj
arguments: --configuration $(buildConfiguration) -p:Platform=$(buildPlatform)



# - task: MSBuild@1
# displayName: 'Build sample apps (x64 or x86)'
# inputs:
# solution: Datadog.Trace.proj
# platform: '$(buildPlatform)'
# configuration: '$(buildConfiguration)'
# msbuildArguments: '/t:BuildSamples'
# maximumCpuCount: true

# - script: |
# choco install redis-64
# redis-server --service-install
# redis-server --service-start
# displayName: 'Install Redis'

# - script: |
# choco install elasticsearch
# net start elasticsearch-service-x64
# displayName: 'Install Elasticsearch'

# - task: PowerShell@2
# displayName: 'PowerShell Script'
# inputs:
# targetType: filePath
# filePath: './ci/install-sqlserver.ps1'
# enabled: false

- task: DotNetCoreCLI@2
displayName: dotnet test
inputs:
command: test
configuration: $(buildConfiguration)
projects: test/Datadog.Trace.ClrProfiler.IntegrationTests/Datadog.Trace.ClrProfiler.IntegrationTests.csproj
arguments: '--filter "FullyQualifiedName~Datadog.Trace.ClrProfiler.IntegrationTests.HttpClientTests|Category=Smoke" -p:Platform=$(buildPlatform)'
18 changes: 18 additions & 0 deletions Datadog.Trace.Native.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,18 @@ EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Datadog.Trace.ClrProfiler.Native", "src\Datadog.Trace.ClrProfiler.Native\Datadog.Trace.ClrProfiler.Native.vcxproj", "{91B6272F-5780-4C94-8071-DBBA7B4F67F3}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Datadog.Trace.ClrProfiler.Native.DLL", "src\Datadog.Trace.ClrProfiler.Native\Datadog.Trace.ClrProfiler.Native.DLL.vcxproj", "{C0C8D381-D6B9-4C76-9428-F40F2FA93A9A}"
ProjectSection(ProjectDependencies) = postProject
{0686E907-996A-4D6D-A685-D9C0F932C405} = {0686E907-996A-4D6D-A685-D9C0F932C405}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sample-libs", "sample-libs", "{B9AA20A4-0F9A-47FB-B3BE-A5BDEA42EFF0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.ExampleLibrary", "sample-libs\Samples.ExampleLibrary\Samples.ExampleLibrary.csproj", "{901F02A8-8776-4D18-80C9-05C58262C1C7}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.ExampleLibraryTracer", "sample-libs\Samples.ExampleLibraryTracer\Samples.ExampleLibraryTracer.csproj", "{6CE95C50-9533-4650-8F11-BCE30908DCDF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Datadog.Trace.ClrProfiler.Managed.Loader", "src\Datadog.Trace.ClrProfiler.Managed.Loader\Datadog.Trace.ClrProfiler.Managed.Loader.csproj", "{0686E907-996A-4D6D-A685-D9C0F932C405}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -85,6 +90,18 @@ Global
{6CE95C50-9533-4650-8F11-BCE30908DCDF}.Release|x64.Build.0 = Release|Any CPU
{6CE95C50-9533-4650-8F11-BCE30908DCDF}.Release|x86.ActiveCfg = Release|Any CPU
{6CE95C50-9533-4650-8F11-BCE30908DCDF}.Release|x86.Build.0 = Release|Any CPU
{0686E907-996A-4D6D-A685-D9C0F932C405}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0686E907-996A-4D6D-A685-D9C0F932C405}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0686E907-996A-4D6D-A685-D9C0F932C405}.Debug|x64.ActiveCfg = Debug|Any CPU
{0686E907-996A-4D6D-A685-D9C0F932C405}.Debug|x64.Build.0 = Debug|Any CPU
{0686E907-996A-4D6D-A685-D9C0F932C405}.Debug|x86.ActiveCfg = Debug|Any CPU
{0686E907-996A-4D6D-A685-D9C0F932C405}.Debug|x86.Build.0 = Debug|Any CPU
{0686E907-996A-4D6D-A685-D9C0F932C405}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0686E907-996A-4D6D-A685-D9C0F932C405}.Release|Any CPU.Build.0 = Release|Any CPU
{0686E907-996A-4D6D-A685-D9C0F932C405}.Release|x64.ActiveCfg = Release|Any CPU
{0686E907-996A-4D6D-A685-D9C0F932C405}.Release|x64.Build.0 = Release|Any CPU
{0686E907-996A-4D6D-A685-D9C0F932C405}.Release|x86.ActiveCfg = Release|Any CPU
{0686E907-996A-4D6D-A685-D9C0F932C405}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -95,6 +112,7 @@ Global
{C0C8D381-D6B9-4C76-9428-F40F2FA93A9A} = {9E5F0022-0A50-40BF-AC6A-C3078585ECAB}
{901F02A8-8776-4D18-80C9-05C58262C1C7} = {B9AA20A4-0F9A-47FB-B3BE-A5BDEA42EFF0}
{6CE95C50-9533-4650-8F11-BCE30908DCDF} = {B9AA20A4-0F9A-47FB-B3BE-A5BDEA42EFF0}
{0686E907-996A-4D6D-A685-D9C0F932C405} = {9E5F0022-0A50-40BF-AC6A-C3078585ECAB}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {160A1D00-1F5B-40F8-A155-621B4459D78F}
Expand Down
3 changes: 2 additions & 1 deletion Datadog.Trace.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<CppTestProject Include="test\**\*.vcxproj"/>
<SampleProject Include="samples*\**\*.csproj"/>
<WindowsInstallerProject Include="deploy\**\*.wixproj"/>
<ClrProfilerManagedLoaderProject Include="src\**\Datadog.Trace.ClrProfiler.Managed.Loader.csproj" />
</ItemGroup>

<Import Project="PackageVersions.g.props" />
Expand Down Expand Up @@ -42,7 +43,7 @@
</Target>

<Target Name="BuildCpp">
<MSBuild Targets="Build" Projects="@(CppProject)">
<MSBuild Targets="Build" Projects="@(ClrProfilerManagedLoaderProject);@(CppProject)">
<Output TaskParameter="TargetOutputs" ItemName="CollectedBuildOutput"/>
</MSBuild>
</Target>
Expand Down
62 changes: 62 additions & 0 deletions Datadog.Trace.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ MinimumVisualStudioVersion = 15.0.26124.0
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Datadog.Trace.ClrProfiler.Native", "src\Datadog.Trace.ClrProfiler.Native\Datadog.Trace.ClrProfiler.Native.vcxproj", "{91B6272F-5780-4C94-8071-DBBA7B4F67F3}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Datadog.Trace.ClrProfiler.Native.DLL", "src\Datadog.Trace.ClrProfiler.Native\Datadog.Trace.ClrProfiler.Native.DLL.vcxproj", "{C0C8D381-D6B9-4C76-9428-F40F2FA93A9A}"
ProjectSection(ProjectDependencies) = postProject
{AB8596C1-CFDA-4A5E-9E9C-74A3DF9AED77} = {AB8596C1-CFDA-4A5E-9E9C-74A3DF9AED77}
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Datadog.Trace", "src\Datadog.Trace\Datadog.Trace.csproj", "{5DFDF781-F24C-45B1-82EF-9125875A80A4}"
EndProject
Expand Down Expand Up @@ -198,6 +201,19 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StackExchange.Redis.StackOv
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetMvcCorePerformance", "reproductions\AspNetMvcCorePerformance\AspNetMvcCorePerformance.csproj", "{191824FD-94CA-4FC6-9CA2-EC8DC322DB3E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "reproduction-dependencies", "reproduction-dependencies", "{641C9C61-53FD-4504-B8D9-84008BDB89D1}"
ProjectSection(SolutionItems) = preProject
reproduction-dependencies\Directory.Build.props = reproduction-dependencies\Directory.Build.props
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppDomain.Instance", "reproduction-dependencies\AppDomain.Instance\AppDomain.Instance.csproj", "{BB3F7D85-7E20-4AEB-A32A-8AF150CC37B2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecurityGrant.FileNotFoundException", "reproductions\SecurityGrant.FileNotFoundException\SecurityGrant.FileNotFoundException.csproj", "{B61F0405-F228-41CE-AC5B-28996C27DD64}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Datadog.Trace.ClrProfiler.Managed.Loader", "src\Datadog.Trace.ClrProfiler.Managed.Loader\Datadog.Trace.ClrProfiler.Managed.Loader.csproj", "{AB8596C1-CFDA-4A5E-9E9C-74A3DF9AED77}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssemblyLoad.FileNotFoundException", "reproductions\AssemblyLoad.FileNotFoundException\AssemblyLoad.FileNotFoundException.csproj", "{1A5E9F40-F3A5-4B59-9898-3DCD65C459C3}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -652,6 +668,48 @@ Global
{191824FD-94CA-4FC6-9CA2-EC8DC322DB3E}.Release|x64.Build.0 = Release|x64
{191824FD-94CA-4FC6-9CA2-EC8DC322DB3E}.Release|x86.ActiveCfg = Release|x86
{191824FD-94CA-4FC6-9CA2-EC8DC322DB3E}.Release|x86.Build.0 = Release|x86
{BB3F7D85-7E20-4AEB-A32A-8AF150CC37B2}.Debug|Any CPU.ActiveCfg = Debug|x86
{BB3F7D85-7E20-4AEB-A32A-8AF150CC37B2}.Debug|x64.ActiveCfg = Debug|x64
{BB3F7D85-7E20-4AEB-A32A-8AF150CC37B2}.Debug|x64.Build.0 = Debug|x64
{BB3F7D85-7E20-4AEB-A32A-8AF150CC37B2}.Debug|x86.ActiveCfg = Debug|x86
{BB3F7D85-7E20-4AEB-A32A-8AF150CC37B2}.Debug|x86.Build.0 = Debug|x86
{BB3F7D85-7E20-4AEB-A32A-8AF150CC37B2}.Release|Any CPU.ActiveCfg = Release|x86
{BB3F7D85-7E20-4AEB-A32A-8AF150CC37B2}.Release|x64.ActiveCfg = Release|x64
{BB3F7D85-7E20-4AEB-A32A-8AF150CC37B2}.Release|x64.Build.0 = Release|x64
{BB3F7D85-7E20-4AEB-A32A-8AF150CC37B2}.Release|x86.ActiveCfg = Release|x86
{BB3F7D85-7E20-4AEB-A32A-8AF150CC37B2}.Release|x86.Build.0 = Release|x86
{B61F0405-F228-41CE-AC5B-28996C27DD64}.Debug|Any CPU.ActiveCfg = Debug|x86
{B61F0405-F228-41CE-AC5B-28996C27DD64}.Debug|x64.ActiveCfg = Debug|x64
{B61F0405-F228-41CE-AC5B-28996C27DD64}.Debug|x64.Build.0 = Debug|x64
{B61F0405-F228-41CE-AC5B-28996C27DD64}.Debug|x86.ActiveCfg = Debug|x86
{B61F0405-F228-41CE-AC5B-28996C27DD64}.Debug|x86.Build.0 = Debug|x86
{B61F0405-F228-41CE-AC5B-28996C27DD64}.Release|Any CPU.ActiveCfg = Release|x86
{B61F0405-F228-41CE-AC5B-28996C27DD64}.Release|x64.ActiveCfg = Release|x64
{B61F0405-F228-41CE-AC5B-28996C27DD64}.Release|x64.Build.0 = Release|x64
{B61F0405-F228-41CE-AC5B-28996C27DD64}.Release|x86.ActiveCfg = Release|x86
{B61F0405-F228-41CE-AC5B-28996C27DD64}.Release|x86.Build.0 = Release|x86
{AB8596C1-CFDA-4A5E-9E9C-74A3DF9AED77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AB8596C1-CFDA-4A5E-9E9C-74A3DF9AED77}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AB8596C1-CFDA-4A5E-9E9C-74A3DF9AED77}.Debug|x64.ActiveCfg = Debug|Any CPU
{AB8596C1-CFDA-4A5E-9E9C-74A3DF9AED77}.Debug|x64.Build.0 = Debug|Any CPU
{AB8596C1-CFDA-4A5E-9E9C-74A3DF9AED77}.Debug|x86.ActiveCfg = Debug|Any CPU
{AB8596C1-CFDA-4A5E-9E9C-74A3DF9AED77}.Debug|x86.Build.0 = Debug|Any CPU
{AB8596C1-CFDA-4A5E-9E9C-74A3DF9AED77}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AB8596C1-CFDA-4A5E-9E9C-74A3DF9AED77}.Release|Any CPU.Build.0 = Release|Any CPU
{AB8596C1-CFDA-4A5E-9E9C-74A3DF9AED77}.Release|x64.ActiveCfg = Release|Any CPU
{AB8596C1-CFDA-4A5E-9E9C-74A3DF9AED77}.Release|x64.Build.0 = Release|Any CPU
{AB8596C1-CFDA-4A5E-9E9C-74A3DF9AED77}.Release|x86.ActiveCfg = Release|Any CPU
{AB8596C1-CFDA-4A5E-9E9C-74A3DF9AED77}.Release|x86.Build.0 = Release|Any CPU
{1A5E9F40-F3A5-4B59-9898-3DCD65C459C3}.Debug|Any CPU.ActiveCfg = Debug|x86
{1A5E9F40-F3A5-4B59-9898-3DCD65C459C3}.Debug|x64.ActiveCfg = Debug|x64
{1A5E9F40-F3A5-4B59-9898-3DCD65C459C3}.Debug|x64.Build.0 = Debug|x64
{1A5E9F40-F3A5-4B59-9898-3DCD65C459C3}.Debug|x86.ActiveCfg = Debug|x86
{1A5E9F40-F3A5-4B59-9898-3DCD65C459C3}.Debug|x86.Build.0 = Debug|x86
{1A5E9F40-F3A5-4B59-9898-3DCD65C459C3}.Release|Any CPU.ActiveCfg = Release|x86
{1A5E9F40-F3A5-4B59-9898-3DCD65C459C3}.Release|x64.ActiveCfg = Release|x64
{1A5E9F40-F3A5-4B59-9898-3DCD65C459C3}.Release|x64.Build.0 = Release|x64
{1A5E9F40-F3A5-4B59-9898-3DCD65C459C3}.Release|x86.ActiveCfg = Release|x86
{1A5E9F40-F3A5-4B59-9898-3DCD65C459C3}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -698,6 +756,10 @@ Global
{43782238-E7BB-49D0-9541-1121DACA6EB5} = {AA6F5582-3B71-49AC-AA39-8F7815AC46BE}
{FA487690-E88C-4A57-9187-B71CB70C1AAE} = {550AE553-2BBB-4021-B55A-137EF31A6B1F}
{191824FD-94CA-4FC6-9CA2-EC8DC322DB3E} = {550AE553-2BBB-4021-B55A-137EF31A6B1F}
{BB3F7D85-7E20-4AEB-A32A-8AF150CC37B2} = {641C9C61-53FD-4504-B8D9-84008BDB89D1}
{B61F0405-F228-41CE-AC5B-28996C27DD64} = {550AE553-2BBB-4021-B55A-137EF31A6B1F}
{AB8596C1-CFDA-4A5E-9E9C-74A3DF9AED77} = {9E5F0022-0A50-40BF-AC6A-C3078585ECAB}
{1A5E9F40-F3A5-4B59-9898-3DCD65C459C3} = {550AE553-2BBB-4021-B55A-137EF31A6B1F}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {160A1D00-1F5B-40F8-A155-621B4459D78F}
Expand Down
4 changes: 3 additions & 1 deletion docker/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
cd "$DIR/.."

for config in Debug Release ; do
dotnet build -c $config src/Datadog.Trace.ClrProfiler.Managed.Loader/Datadog.Trace.ClrProfiler.Managed.Loader.csproj

for proj in Datadog.Trace Datadog.Trace.ClrProfiler.Managed Datadog.Trace.OpenTracing ; do
dotnet publish -f netstandard2.0 -c $config src/$proj/$proj.csproj
done
Expand All @@ -14,7 +16,7 @@ for config in Debug Release ; do
dotnet publish -f netcoreapp2.1 -c $config samples/$sample/$sample.csproj
done

for sample in OrleansCrash DataDogThreadTest HttpMessageHandler.StackOverflowException StackExchange.Redis.StackOverflowException AspNetMvcCorePerformance ; do
for sample in OrleansCrash DataDogThreadTest HttpMessageHandler.StackOverflowException StackExchange.Redis.StackOverflowException AspNetMvcCorePerformance AssemblyLoad.FileNotFoundException ; do
dotnet publish -f netcoreapp2.1 -c $config reproductions/$sample/$sample.csproj
done

Expand Down
11 changes: 11 additions & 0 deletions reproduction-dependencies/AppDomain.Instance/AppDomain.Instance.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworks>net45</TargetFrameworks>
<Platforms>x64;x86</Platforms>
<PlatformTarget>$(Platform)</PlatformTarget>
<IsPackable>false</IsPackable>
</PropertyGroup>

</Project>
Loading