Add fallback logic for DD_INTEGRATIONS and DD_DOTNET_TRACER_HOME

Datadog.Trace.sln

@@ -284,6 +284,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssemblyResolveMscorlibReso
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Performance.StackExchange.Redis", "performance\Performance.StackExchange.Redis\Performance.StackExchange.Redis.csproj", "{E41C87E9-7339-4FC0-8791-D57752C5BC12}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.HttpClient.MissingDotnetTracerHomeEnv", "samples\Samples.HttpClient.MissingDotnetTracerHomeEnv\Samples.HttpClient.MissingDotnetTracerHomeEnv.csproj", "{082BEBF8-2BCA-402C-AE2B-E058149B787D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -942,6 +944,16 @@ Global
 		{E41C87E9-7339-4FC0-8791-D57752C5BC12}.Release|x64.Build.0 = Release|x64
 		{E41C87E9-7339-4FC0-8791-D57752C5BC12}.Release|x86.ActiveCfg = Release|x86
 		{E41C87E9-7339-4FC0-8791-D57752C5BC12}.Release|x86.Build.0 = Release|x86
+		{082BEBF8-2BCA-402C-AE2B-E058149B787D}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{082BEBF8-2BCA-402C-AE2B-E058149B787D}.Debug|x64.ActiveCfg = Debug|x64
+		{082BEBF8-2BCA-402C-AE2B-E058149B787D}.Debug|x64.Build.0 = Debug|x64
+		{082BEBF8-2BCA-402C-AE2B-E058149B787D}.Debug|x86.ActiveCfg = Debug|x86
+		{082BEBF8-2BCA-402C-AE2B-E058149B787D}.Debug|x86.Build.0 = Debug|x86
+		{082BEBF8-2BCA-402C-AE2B-E058149B787D}.Release|Any CPU.ActiveCfg = Release|x86
+		{082BEBF8-2BCA-402C-AE2B-E058149B787D}.Release|x64.ActiveCfg = Release|x64
+		{082BEBF8-2BCA-402C-AE2B-E058149B787D}.Release|x64.Build.0 = Release|x64
+		{082BEBF8-2BCA-402C-AE2B-E058149B787D}.Release|x86.ActiveCfg = Release|x86
+		{082BEBF8-2BCA-402C-AE2B-E058149B787D}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1009,6 +1021,7 @@ Global
 		{64235C59-8EAB-401A-86B0-C41E513F0AE8} = {AA6F5582-3B71-49AC-AA39-8F7815AC46BE}
 		{EEA89ACD-CFBB-4F60-A150-74F0A84DF028} = {550AE553-2BBB-4021-B55A-137EF31A6B1F}
 		{E41C87E9-7339-4FC0-8791-D57752C5BC12} = {CD9D9813-A195-464A-A0F1-59E02D16E181}
+		{082BEBF8-2BCA-402C-AE2B-E058149B787D} = {AA6F5582-3B71-49AC-AA39-8F7815AC46BE}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {160A1D00-1F5B-40F8-A155-621B4459D78F}

Test.Common.props

@@ -19,8 +19,7 @@
     <DefineConstants Condition="'$(PerformComprehensiveTesting)'=='true'">$(DefineConstants);COMPREHENSIVE_TESTS</DefineConstants>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(ExcludeManagedProfiler)' != 'true' and
-                        '$(LoadManagedProfilerFromProfilerDirectory)' != 'true' ">
+  <ItemGroup Condition="'$(ExcludeManagedProfiler)' != 'true'">
     <ProjectReference Include="$(MSBuildThisFileDirectory)\src\Datadog.Trace.ClrProfiler.Managed\Datadog.Trace.ClrProfiler.Managed.csproj" />
   </ItemGroup>
 
@@ -35,7 +34,7 @@
              Link="profiler-lib\integrations.json" />
   </ItemGroup>
 
-  <Target Name="AfterBuildCopyManagedProfiler" AfterTargets="AfterBuild" Condition=" '$(LoadManagedProfilerFromProfilerDirectory)' == 'true'">
+  <Target Name="AfterBuildCopyManagedProfiler" AfterTargets="AfterBuild">
     <ItemGroup>
       <!-- Subfolders of the output directory should each be a target framework -->
       <ManagedProfilerFiles Include="$(ManagedProfilerOutputDirectory)\**\*.dll" Exclude="$(ManagedProfilerOutputDirectory)\*\runtimes\**\*.dll" />

deploy/Datadog.Trace.ClrProfiler.WindowsInstaller/Product.wxs

@@ -151,7 +151,6 @@
     <ComponentGroup Id="EnvironmentVariables.Machine" Directory="INSTALLFOLDER">
       <Component Id="EnvironmentVariablesShared" Guid="{C314A305-9C24-4E46-9ECF-E5EEA703BDEA}" Win64="$(var.Win64)">
         <CreateFolder/>
-        <Environment Id="DD_INTEGRATIONS" Name="DD_INTEGRATIONS" Action="set" Permanent="no" System="yes" Value="[INSTALLFOLDER]integrations.json" Part="all" />
         <Environment Id="DD_DOTNET_TRACER_HOME" Name="DD_DOTNET_TRACER_HOME" Action="set" Permanent="no" System="yes" Value="[INSTALLFOLDER]" Part="all" />
       </Component>
     </ComponentGroup>

devenv.bat

@@ -52,7 +52,6 @@ SET DD_PROFILER_EXCLUDE_PROCESSES=devenv.exe;Microsoft.ServiceHub.Controller.exe
 
 rem Set dotnet tracer home path
 SET DD_DOTNET_TRACER_HOME=%~dp0
-SET DD_INTEGRATIONS=%DD_DOTNET_TRACER_HOME%\integrations.json
 
 if "%start_visual_studio%" == "true" (
     echo Starting Visual Studio...

docker/build.sh

@@ -28,7 +28,7 @@ then
     dotnet publish -f $publishTargetFramework -c $buildConfiguration samples/Samples.AspNetCoreMvc.Netcore3/Samples.AspNetCoreMvc.Netcore3.csproj -p:Configuration=$buildConfiguration -p:ManagedProfilerOutputDirectory="$PUBLISH_OUTPUT"
 fi
 
-for sample in Samples.Elasticsearch Samples.Elasticsearch.V5 Samples.ServiceStack.Redis Samples.StackExchange.Redis Samples.SqlServer Samples.MongoDB Samples.HttpMessageHandler Samples.Npgsql Samples.MySql Samples.GraphQL ; do
+for sample in Samples.Elasticsearch Samples.Elasticsearch.V5 Samples.ServiceStack.Redis Samples.StackExchange.Redis Samples.SqlServer Samples.MongoDB Samples.HttpMessageHandler Samples.Npgsql Samples.MySql Samples.GraphQL Samples.HttpClient.MissingDotnetTracerHomeEnv ; do
     dotnet publish -f $publishTargetFramework -c $buildConfiguration samples/$sample/$sample.csproj -p:Configuration=$buildConfiguration -p:ManagedProfilerOutputDirectory="$PUBLISH_OUTPUT"
 done
 

docker/with-profiler.bash

@@ -7,6 +7,5 @@ export CORECLR_ENABLE_PROFILING="1"
 export CORECLR_PROFILER="{846F5F1C-F9AE-4B07-969E-05C26BC060D8}"
 export CORECLR_PROFILER_PATH="${DIR}/src/Datadog.Trace.ClrProfiler.Native/obj/Debug/x64/Datadog.Trace.ClrProfiler.Native.so"
 export DD_DOTNET_TRACER_HOME="${DIR}"
-export DD_INTEGRATIONS="${DD_DOTNET_TRACER_HOME}/integrations.json"
 
 eval "$@"

reproduction-dependencies/AppDomain.Instance/AppDomain.Instance.csproj

@@ -6,7 +6,6 @@
     <Platforms>x64;x86</Platforms>
     <PlatformTarget>$(Platform)</PlatformTarget>
     <IsPackable>false</IsPackable>
-    <LoadManagedProfilerFromProfilerDirectory>true</LoadManagedProfilerFromProfilerDirectory>
   </PropertyGroup>
 
   <ItemGroup>

reproduction-dependencies/AppDomain.Instance/Properties/launchSettings.json

@@ -12,7 +12,6 @@
         "CORECLR_PROFILER_PATH": "$(ProjectDir)$(OutputPath)profiler-lib\\Datadog.Trace.ClrProfiler.Native.dll",
 
         "DD_DOTNET_TRACER_HOME": "$(ProjectDir)$(OutputPath)profiler-lib",
-        "DD_INTEGRATIONS": "$(ProjectDir)$(OutputPath)profiler-lib\\integrations.json"
       },
       "nativeDebugging": true
     }

reproductions/AssemblyLoad.FileNotFoundException/Properties/launchSettings.json

@@ -12,7 +12,6 @@
           "CORECLR_PROFILER_PATH": "$(ProjectDir)$(OutputPath)profiler-lib\\Datadog.Trace.ClrProfiler.Native.dll",
 
           "DD_DOTNET_TRACER_HOME": "$(ProjectDir)$(OutputPath)profiler-lib",
-          "DD_INTEGRATIONS": "$(ProjectDir)$(OutputPath)profiler-lib\\integrations.json"
         },
         "nativeDebugging": true
       }

reproductions/AssemblyResolveMscorlibResources.InfiniteRecursionCrash/Properties/launchSettings.json

@@ -12,7 +12,6 @@
         "CORECLR_PROFILER_PATH": "$(ProjectDir)$(OutputPath)profiler-lib\\Datadog.Trace.ClrProfiler.Native.dll",
 
         "DD_DOTNET_TRACER_HOME": "$(ProjectDir)$(OutputPath)profiler-lib",
-        "DD_INTEGRATIONS": "$(ProjectDir)$(OutputPath)profiler-lib\\integrations.json"
       },
       "nativeDebugging": true
     }

reproductions/AutomapperTest/Dockerfile

@@ -8,7 +8,6 @@ ENV CORECLR_ENABLE_PROFILING=1
 ENV CORECLR_PROFILER={846F5F1C-F9AE-4B07-969E-05C26BC060D8}
 ENV CORECLR_PROFILER_PATH=/opt/datadog/Datadog.Trace.ClrProfiler.Native.so
 ENV DD_DOTNET_TRACER_HOME=/opt/datadog
-ENV DD_INTEGRATIONS=/opt/datadog/integrations.json
 ENV DD_TRACE_ENABLED=true
 
 FROM mcr.microsoft.com/dotnet/core/sdk:2.1-stretch AS build

reproductions/AutomapperTest/Properties/launchSettings.json

@@ -13,7 +13,6 @@
         "CORECLR_PROFILER_PATH": "$(ProjectDir)$(OutputPath)profiler-lib\\Datadog.Trace.ClrProfiler.Native.dll",
 
         "DD_DOTNET_TRACER_HOME": "$(ProjectDir)$(OutputPath)profiler-lib",
-        "DD_INTEGRATIONS": "$(ProjectDir)$(OutputPath)profiler-lib\\integrations.json"
       }
     },
     "Docker": {

reproductions/EntityFramework6x.MdTokenLookupFailure/EntityFramework6x.MdTokenLookupFailure.csproj

@@ -12,7 +12,6 @@
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
-    <LoadManagedProfilerFromProfilerDirectory>true</LoadManagedProfilerFromProfilerDirectory>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

reproductions/HttpMessageHandler.StackOverflowException/Properties/launchSettings.json

@@ -12,7 +12,6 @@
         "CORECLR_PROFILER_PATH": "$(ProjectDir)$(OutputPath)profiler-lib\\Datadog.Trace.ClrProfiler.Native.dll",
 
         "DD_DOTNET_TRACER_HOME": "$(ProjectDir)$(OutputPath)profiler-lib",
-        "DD_INTEGRATIONS": "$(ProjectDir)$(OutputPath)profiler-lib\\integrations.json"
       },
       "nativeDebugging": true
     }

reproductions/NugetProfilerVersionMismatch.TypeLoadException/NugetProfilerVersionMismatch.TypeLoadException.csproj

@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="Current">
 
-  <PropertyGroup>
-    <LoadManagedProfilerFromProfilerDirectory>true</LoadManagedProfilerFromProfilerDirectory>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="Datadog.Trace.ClrProfiler.Managed" Version="1.8.0" />
     <PackageReference Include="Npgsql" Version="4.0.4" />

reproductions/NugetProfilerVersionMismatch.TypeLoadException/Properties/launchSettings.json

@@ -12,7 +12,6 @@
         "CORECLR_PROFILER_PATH": "$(ProjectDir)$(OutputPath)profiler-lib\\Datadog.Trace.ClrProfiler.Native.dll",
 
         "DD_DOTNET_TRACER_HOME": "$(ProjectDir)$(OutputPath)profiler-lib",
-        "DD_INTEGRATIONS": "$(ProjectDir)$(OutputPath)profiler-lib\\integrations.json"
       },
       "nativeDebugging": true
     }

reproductions/OrleansCrash/Properties/launchSettings.json

@@ -12,7 +12,6 @@
         "CORECLR_PROFILER_PATH": "$(ProjectDir)$(OutputPath)profiler-lib\\Datadog.Trace.ClrProfiler.Native.dll",
 
         "DD_DOTNET_TRACER_HOME": "$(ProjectDir)$(OutputPath)profiler-lib",
-        "DD_INTEGRATIONS": "$(ProjectDir)$(OutputPath)profiler-lib\\integrations.json"
       },
       "nativeDebugging": true
     }

reproductions/SecurityGrant.FileNotFoundException/Properties/launchSettings.json

@@ -12,7 +12,6 @@
         "CORECLR_PROFILER_PATH": "$(ProjectDir)$(OutputPath)profiler-lib\\Datadog.Trace.ClrProfiler.Native.dll",
 
         "DD_DOTNET_TRACER_HOME": "$(ProjectDir)$(OutputPath)profiler-lib",
-        "DD_INTEGRATIONS": "$(ProjectDir)$(OutputPath)profiler-lib\\integrations.json"
       },
       "nativeDebugging": true
     }

reproductions/StackExchange.Redis.StackOverflowException/Properties/launchSettings.json

@@ -12,7 +12,6 @@
         "CORECLR_PROFILER_PATH": "$(ProjectDir)$(OutputPath)profiler-lib\\Datadog.Trace.ClrProfiler.Native.dll",
 
         "DD_DOTNET_TRACER_HOME": "$(ProjectDir)$(OutputPath)profiler-lib",
-        "DD_INTEGRATIONS": "$(ProjectDir)$(OutputPath)profiler-lib\\integrations.json"
       },
       "nativeDebugging": true
     }

samples/Samples.AspNetCoreMvc.Netcore3/Properties/launchSettings.json

@@ -23,9 +23,6 @@
         "CORECLR_PROFILER_PATH": "$(ProjectDir)$(OutputPath)profiler-lib\\Datadog.Trace.ClrProfiler.Native.dll",
 
         "DD_DOTNET_TRACER_HOME": "$(ProjectDir)$(OutputPath)profiler-lib",
-        "DD_INTEGRATIONS": "$(ProjectDir)$(OutputPath)profiler-lib\\integrations.json",
-
-        "DD_TRACE_DEBUG": "false"
       },
       "use64Bit": true,
       "nativeDebugging": true
@@ -45,9 +42,6 @@
         "CORECLR_PROFILER_PATH": "$(ProjectDir)$(OutputPath)profiler-lib\\Datadog.Trace.ClrProfiler.Native.dll",
 
         "DD_DOTNET_TRACER_HOME": "$(ProjectDir)$(OutputPath)profiler-lib",
-        "DD_INTEGRATIONS": "$(ProjectDir)$(OutputPath)profiler-lib\\integrations.json",
-
-        "DD_TRACE_DEBUG": "false"
       },
       "applicationUrl": "http://localhost:54567/",
       "nativeDebugging": true

samples/Samples.AspNetCoreMvc2/Properties/launchSettings.json

@@ -23,7 +23,6 @@
         "CORECLR_PROFILER_PATH": "$(ProjectDir)$(OutputPath)profiler-lib\\Datadog.Trace.ClrProfiler.Native.dll",
 
         "DD_DOTNET_TRACER_HOME": "$(ProjectDir)$(OutputPath)profiler-lib",
-        "DD_INTEGRATIONS": "$(ProjectDir)$(OutputPath)profiler-lib\\integrations.json"
       },
       "use64Bit": true,
       "nativeDebugging": true
@@ -43,7 +42,6 @@
         "CORECLR_PROFILER_PATH": "$(ProjectDir)$(OutputPath)profiler-lib\\Datadog.Trace.ClrProfiler.Native.dll",
 
         "DD_DOTNET_TRACER_HOME": "$(ProjectDir)$(OutputPath)profiler-lib",
-        "DD_INTEGRATIONS": "$(ProjectDir)$(OutputPath)profiler-lib\\integrations.json"
       },
       "applicationUrl": "http://localhost:54566/",
       "nativeDebugging": true

samples/Samples.Elasticsearch.MultipleAppDomains/Properties/launchSettings.json

@@ -12,7 +12,6 @@
         "CORECLR_PROFILER_PATH": "$(ProjectDir)$(OutputPath)profiler-lib\\Datadog.Trace.ClrProfiler.Native.dll",
 
         "DD_DOTNET_TRACER_HOME": "$(ProjectDir)$(OutputPath)profiler-lib",
-        "DD_INTEGRATIONS": "$(ProjectDir)$(OutputPath)profiler-lib\\integrations.json"
       },
       "nativeDebugging": true
     }

samples/Samples.Elasticsearch.MultipleAppDomains/Samples.Elasticsearch.MultipleAppDomains.csproj

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <!-- override to remove net452 -->
     <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net461</TargetFrameworks>
-    <LoadManagedProfilerFromProfilerDirectory>true</LoadManagedProfilerFromProfilerDirectory>
   </PropertyGroup>
 
   <ItemGroup>

samples/Samples.Elasticsearch.V5/Properties/launchSettings.json

@@ -12,7 +12,6 @@
         "CORECLR_PROFILER_PATH": "$(ProjectDir)$(OutputPath)profiler-lib\\Datadog.Trace.ClrProfiler.Native.dll",
 
         "DD_DOTNET_TRACER_HOME": "$(ProjectDir)$(OutputPath)profiler-lib",
-        "DD_INTEGRATIONS": "$(ProjectDir)$(OutputPath)profiler-lib\\integrations.json"
       },
       "nativeDebugging": true
     }

samples/Samples.Elasticsearch.V5/Samples.Elasticsearch.V5.csproj

@@ -7,7 +7,6 @@
 
     <!-- Required to build multiple projects with the same Configuration|Platform, which is needed for the CI library/version matrix -->
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <LoadManagedProfilerFromProfilerDirectory>true</LoadManagedProfilerFromProfilerDirectory>
   </PropertyGroup>
 
   <ItemGroup>

samples/Samples.Elasticsearch/Properties/launchSettings.json

@@ -12,7 +12,6 @@
         "CORECLR_PROFILER_PATH": "$(ProjectDir)$(OutputPath)profiler-lib\\Datadog.Trace.ClrProfiler.Native.dll",
 
         "DD_DOTNET_TRACER_HOME": "$(ProjectDir)$(OutputPath)profiler-lib",
-        "DD_INTEGRATIONS": "$(ProjectDir)$(OutputPath)profiler-lib\\integrations.json"
       },
       "nativeDebugging": true
     }

samples/Samples.Elasticsearch/Samples.Elasticsearch.csproj

@@ -9,7 +9,6 @@
 
     <!-- Required to build multiple projects with the same Configuration|Platform, which is needed for the CI library/version matrix -->
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <LoadManagedProfilerFromProfilerDirectory>true</LoadManagedProfilerFromProfilerDirectory>
   </PropertyGroup>
 
   <ItemGroup>

samples/Samples.GraphQL/Properties/launchSettings.json

@@ -23,7 +23,6 @@
         "CORECLR_PROFILER_PATH": "$(ProjectDir)$(OutputPath)profiler-lib\\Datadog.Trace.ClrProfiler.Native.dll",
 
         "DD_DOTNET_TRACER_HOME": "$(ProjectDir)$(OutputPath)profiler-lib",
-        "DD_INTEGRATIONS": "$(ProjectDir)$(OutputPath)profiler-lib\\integrations.json"
       },
       "use64Bit": true,
       "nativeDebugging": true
@@ -43,7 +42,6 @@
         "CORECLR_PROFILER_PATH": "$(ProjectDir)$(OutputPath)profiler-lib\\Datadog.Trace.ClrProfiler.Native.dll",
 
         "DD_DOTNET_TRACER_HOME": "$(ProjectDir)$(OutputPath)profiler-lib",
-        "DD_INTEGRATIONS": "$(ProjectDir)$(OutputPath)profiler-lib\\integrations.json"
       },
       "applicationUrl": "http://localhost:54568/",
       "nativeDebugging": true

samples/Samples.HttpClient.MissingDotnetTracerHomeEnv/Program.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Net.Http;
+using System.Threading.Tasks;
+
+namespace MissingDotnetTracerHomeEnv
+{
+    internal class Program
+    {
+        private static async Task<int> Main()
+        {
+            try
+            {
+                var baseAddress = new Uri("https://www.example.com/");
+                var regularHttpClient = new HttpClient { BaseAddress = baseAddress };
+                await regularHttpClient.GetAsync("default-handler");
+                Console.WriteLine("All is well!");
+            }
+            catch (Exception ex)
+            {
+                Console.Error.WriteLine(ex);
+                return (int)ExitCode.UnknownError;
+            }
+
+            return (int)ExitCode.Success;
+        }
+    }
+
+    enum ExitCode : int
+    {
+        Success = 0,
+        UnknownError = -10
+    }
+}

samples/Samples.HttpClient.MissingDotnetTracerHomeEnv/Properties/launchSettings.json

@@ -0,0 +1,19 @@
+{
+    "profiles": {
+      "Samples.HttpClient.MissingDotnetTracerHomeEnv": {
+        "commandName": "Project",
+        "environmentVariables": {
+          "COR_ENABLE_PROFILING": "1",
+          "COR_PROFILER": "{846F5F1C-F9AE-4B07-969E-05C26BC060D8}",
+          "COR_PROFILER_PATH": "$(ProjectDir)$(OutputPath)profiler-lib\\Datadog.Trace.ClrProfiler.Native.dll",
+
+          "CORECLR_ENABLE_PROFILING": "1",
+          "CORECLR_PROFILER": "{846F5F1C-F9AE-4B07-969E-05C26BC060D8}",
+          "CORECLR_PROFILER_PATH": "$(ProjectDir)$(OutputPath)profiler-lib\\Datadog.Trace.ClrProfiler.Native.dll",
+
+          "DD_INTEGRATIONS": "$(ProjectDir)$(OutputPath)profiler-lib\\integrations.json"
+        },
+        "nativeDebugging": true
+      }
+    }
+  }

samples/Samples.HttpClient.MissingDotnetTracerHomeEnv/Samples.HttpClient.MissingDotnetTracerHomeEnv.csproj

@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <ExcludeManagedProfiler>true</ExcludeManagedProfiler>
+  </PropertyGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' != 'netstandard2.0' ">
+    <Reference Include="System.Net.Http" />
+  </ItemGroup>
+</Project>

samples/Samples.HttpMessageHandler/Properties/launchSettings.json

@@ -13,7 +13,6 @@
         "CORECLR_PROFILER_PATH": "$(ProjectDir)$(OutputPath)profiler-lib\\Datadog.Trace.ClrProfiler.Native.dll",
 
         "DD_DOTNET_TRACER_HOME": "$(ProjectDir)$(OutputPath)profiler-lib",
-        "DD_INTEGRATIONS": "$(ProjectDir)$(OutputPath)profiler-lib\\integrations.json"
       },
       "nativeDebugging": true
     }

samples/Samples.HttpMessageHandler/Samples.HttpMessageHandler.csproj

@@ -1,8 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <LoadManagedProfilerFromProfilerDirectory>true</LoadManagedProfilerFromProfilerDirectory>
-  </PropertyGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\src\Datadog.Trace\Datadog.Trace.csproj" />
   </ItemGroup>

samples/Samples.MongoDB/Properties/launchSettings.json

@@ -12,7 +12,6 @@
         "CORECLR_PROFILER_PATH": "$(ProjectDir)$(OutputPath)profiler-lib\\Datadog.Trace.ClrProfiler.Native.dll",
 
         "DD_DOTNET_TRACER_HOME": "$(ProjectDir)$(OutputPath)profiler-lib",
-        "DD_INTEGRATIONS": "$(ProjectDir)$(OutputPath)profiler-lib\\integrations.json"
       },
       "nativeDebugging": true
     }

samples/Samples.MySql/Properties/launchSettings.json

@@ -12,7 +12,6 @@
         "CORECLR_PROFILER_PATH": "$(ProjectDir)$(OutputPath)profiler-lib\\Datadog.Trace.ClrProfiler.Native.dll",
 
         "DD_DOTNET_TRACER_HOME": "$(ProjectDir)$(OutputPath)profiler-lib",
-        "DD_INTEGRATIONS": "$(ProjectDir)$(OutputPath)profiler-lib\\integrations.json"
       },
       "nativeDebugging": true
     }

samples/Samples.Npgsql/Properties/launchSettings.json

@@ -12,7 +12,6 @@
         "CORECLR_PROFILER_PATH": "$(ProjectDir)$(OutputPath)profiler-lib\\Datadog.Trace.ClrProfiler.Native.dll",
 
         "DD_DOTNET_TRACER_HOME": "$(ProjectDir)$(OutputPath)profiler-lib",
-        "DD_INTEGRATIONS": "$(ProjectDir)$(OutputPath)profiler-lib\\integrations.json"
       },
       "nativeDebugging": true
     }