OTel SDK removed dependency for `Microsoft.Extensions.Configuration.E…

…nvironmentVariables`: open-telemetry/opentelemetry-dotnet#4092
xiang17 · Feb 2, 2023 · 07788fa · 07788fa
1 parent 3ab0d94
commit 07788fa
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 20 deletions.
diff --git a/LICENSE b/LICENSE
@@ -263,7 +263,6 @@ Libraries
 - Microsoft.Extensions.Configuration,
 - Microsoft.Extensions.Configuration.Abstractions,
 - Microsoft.Extensions.Configuration.Binder,
-- Microsoft.Extensions.Configuration.EnvironmentVariables,
 - Microsoft.Extensions.DependencyInjection,
 - Microsoft.Extensions.DependencyInjection.Abstractions,
 - Microsoft.Extensions.Logging,

diff --git a/src/OpenTelemetry.AutoInstrumentation.AdditionalDeps/Directory.Build.props b/src/OpenTelemetry.AutoInstrumentation.AdditionalDeps/Directory.Build.props
@@ -3,7 +3,6 @@
     <PackageReference Include="System.Diagnostics.DiagnosticSource" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
     <PackageReference Include="Microsoft.Extensions.Logging.Configuration" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
     <PackageReference Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" />
   </ItemGroup>
 </Project>
diff --git a/src/OpenTelemetry.AutoInstrumentation.AdditionalDeps/Directory.Packages.props b/src/OpenTelemetry.AutoInstrumentation.AdditionalDeps/Directory.Packages.props
@@ -6,7 +6,6 @@
     <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="7.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Configuration" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
     <PackageVersion Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" Version="1.3.0" />
   </ItemGroup>
 </Project>
diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt
@@ -47,7 +47,6 @@
   /store/x64/net6.0/dnsclient/1.4.0/lib/netstandard2.1/DnsClient.dll,
   /store/x64/net6.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.Abstractions.dll,
   /store/x64/net6.0/microsoft.extensions.configuration.binder/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.Binder.dll,
-  /store/x64/net6.0/microsoft.extensions.configuration.environmentvariables/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.EnvironmentVariables.dll,
   /store/x64/net6.0/microsoft.extensions.configuration/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.dll,
   /store/x64/net6.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
   /store/x64/net6.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.dll,
@@ -72,7 +71,6 @@
   /store/x64/net7.0/dnsclient/1.4.0/lib/netstandard2.1/DnsClient.dll,
   /store/x64/net7.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll,
   /store/x64/net7.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll,
-  /store/x64/net7.0/microsoft.extensions.configuration.environmentvariables/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.EnvironmentVariables.dll,
   /store/x64/net7.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
   /store/x64/net7.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
   /store/x64/net7.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll,
@@ -96,7 +94,6 @@
   /store/x86/net6.0/dnsclient/1.4.0/lib/netstandard2.1/DnsClient.dll,
   /store/x86/net6.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.Abstractions.dll,
   /store/x86/net6.0/microsoft.extensions.configuration.binder/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.Binder.dll,
-  /store/x86/net6.0/microsoft.extensions.configuration.environmentvariables/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.EnvironmentVariables.dll,
   /store/x86/net6.0/microsoft.extensions.configuration/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.dll,
   /store/x86/net6.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
   /store/x86/net6.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.dll,
@@ -121,7 +118,6 @@
   /store/x86/net7.0/dnsclient/1.4.0/lib/netstandard2.1/DnsClient.dll,
   /store/x86/net7.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll,
   /store/x86/net7.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll,
-  /store/x86/net7.0/microsoft.extensions.configuration.environmentvariables/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.EnvironmentVariables.dll,
   /store/x86/net7.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
   /store/x86/net7.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
   /store/x86/net7.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll,

diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt
@@ -47,7 +47,6 @@
   /store/x64/net6.0/dnsclient/1.4.0/lib/netstandard2.1/DnsClient.dll,
   /store/x64/net6.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.Abstractions.dll,
   /store/x64/net6.0/microsoft.extensions.configuration.binder/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.Binder.dll,
-  /store/x64/net6.0/microsoft.extensions.configuration.environmentvariables/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.EnvironmentVariables.dll,
   /store/x64/net6.0/microsoft.extensions.configuration/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.dll,
   /store/x64/net6.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
   /store/x64/net6.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.dll,
@@ -72,7 +71,6 @@
   /store/x64/net7.0/dnsclient/1.4.0/lib/netstandard2.1/DnsClient.dll,
   /store/x64/net7.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll,
   /store/x64/net7.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll,
-  /store/x64/net7.0/microsoft.extensions.configuration.environmentvariables/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.EnvironmentVariables.dll,
   /store/x64/net7.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
   /store/x64/net7.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
   /store/x64/net7.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll,
@@ -96,7 +94,6 @@
   /store/x86/net6.0/dnsclient/1.4.0/lib/netstandard2.1/DnsClient.dll,
   /store/x86/net6.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.Abstractions.dll,
   /store/x86/net6.0/microsoft.extensions.configuration.binder/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.Binder.dll,
-  /store/x86/net6.0/microsoft.extensions.configuration.environmentvariables/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.EnvironmentVariables.dll,
   /store/x86/net6.0/microsoft.extensions.configuration/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.dll,
   /store/x86/net6.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
   /store/x86/net6.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.dll,
@@ -121,7 +118,6 @@
   /store/x86/net7.0/dnsclient/1.4.0/lib/netstandard2.1/DnsClient.dll,
   /store/x86/net7.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll,
   /store/x86/net7.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll,
-  /store/x86/net7.0/microsoft.extensions.configuration.environmentvariables/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.EnvironmentVariables.dll,
   /store/x86/net7.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
   /store/x86/net7.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
   /store/x86/net7.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll,

diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt
@@ -47,7 +47,6 @@
   /store/x64/net6.0/dnsclient/1.4.0/lib/netstandard2.1/DnsClient.dll,
   /store/x64/net6.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.Abstractions.dll,
   /store/x64/net6.0/microsoft.extensions.configuration.binder/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.Binder.dll,
-  /store/x64/net6.0/microsoft.extensions.configuration.environmentvariables/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.EnvironmentVariables.dll,
   /store/x64/net6.0/microsoft.extensions.configuration/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.dll,
   /store/x64/net6.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
   /store/x64/net6.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.dll,
@@ -72,7 +71,6 @@
   /store/x64/net7.0/dnsclient/1.4.0/lib/netstandard2.1/DnsClient.dll,
   /store/x64/net7.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll,
   /store/x64/net7.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll,
-  /store/x64/net7.0/microsoft.extensions.configuration.environmentvariables/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.EnvironmentVariables.dll,
   /store/x64/net7.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
   /store/x64/net7.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
   /store/x64/net7.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll,
@@ -96,7 +94,6 @@
   /store/x86/net6.0/dnsclient/1.4.0/lib/netstandard2.1/DnsClient.dll,
   /store/x86/net6.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.Abstractions.dll,
   /store/x86/net6.0/microsoft.extensions.configuration.binder/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.Binder.dll,
-  /store/x86/net6.0/microsoft.extensions.configuration.environmentvariables/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.EnvironmentVariables.dll,
   /store/x86/net6.0/microsoft.extensions.configuration/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.dll,
   /store/x86/net6.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
   /store/x86/net6.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.dll,
@@ -121,7 +118,6 @@
   /store/x86/net7.0/dnsclient/1.4.0/lib/netstandard2.1/DnsClient.dll,
   /store/x86/net7.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll,
   /store/x86/net7.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll,
-  /store/x86/net7.0/microsoft.extensions.configuration.environmentvariables/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.EnvironmentVariables.dll,
   /store/x86/net7.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
   /store/x86/net7.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
   /store/x86/net7.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll,

diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt
@@ -49,7 +49,6 @@
   \netfx\Microsoft.Bcl.AsyncInterfaces.dll,
   \netfx\Microsoft.Extensions.Configuration.Abstractions.dll,
   \netfx\Microsoft.Extensions.Configuration.Binder.dll,
-  \netfx\Microsoft.Extensions.Configuration.EnvironmentVariables.dll,
   \netfx\Microsoft.Extensions.Configuration.dll,
   \netfx\Microsoft.Extensions.DependencyInjection.Abstractions.dll,
   \netfx\Microsoft.Extensions.DependencyInjection.dll,
@@ -87,6 +86,7 @@
   \netfx\System.Collections.NonGeneric.dll,
   \netfx\System.Collections.Specialized.dll,
   \netfx\System.Collections.dll,
+  \netfx\System.ComponentModel.Annotations.dll,
   \netfx\System.ComponentModel.EventBasedAsync.dll,
   \netfx\System.ComponentModel.Primitives.dll,
   \netfx\System.ComponentModel.TypeConverter.dll,
@@ -191,7 +191,6 @@
   \store\x64\net6.0\dnsclient\1.4.0\lib\netstandard2.1\DnsClient.dll,
   \store\x64\net6.0\microsoft.extensions.configuration.abstractions\7.0.0\lib\net6.0\Microsoft.Extensions.Configuration.Abstractions.dll,
   \store\x64\net6.0\microsoft.extensions.configuration.binder\7.0.0\lib\net6.0\Microsoft.Extensions.Configuration.Binder.dll,
-  \store\x64\net6.0\microsoft.extensions.configuration.environmentvariables\7.0.0\lib\net6.0\Microsoft.Extensions.Configuration.EnvironmentVariables.dll,
   \store\x64\net6.0\microsoft.extensions.configuration\7.0.0\lib\net6.0\Microsoft.Extensions.Configuration.dll,
   \store\x64\net6.0\microsoft.extensions.dependencyinjection.abstractions\7.0.0\lib\net6.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll,
   \store\x64\net6.0\microsoft.extensions.dependencyinjection\7.0.0\lib\net6.0\Microsoft.Extensions.DependencyInjection.dll,
@@ -216,7 +215,6 @@
   \store\x64\net7.0\dnsclient\1.4.0\lib\netstandard2.1\DnsClient.dll,
   \store\x64\net7.0\microsoft.extensions.configuration.abstractions\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.Abstractions.dll,
   \store\x64\net7.0\microsoft.extensions.configuration.binder\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.Binder.dll,
-  \store\x64\net7.0\microsoft.extensions.configuration.environmentvariables\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.EnvironmentVariables.dll,
   \store\x64\net7.0\microsoft.extensions.configuration\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.dll,
   \store\x64\net7.0\microsoft.extensions.dependencyinjection.abstractions\7.0.0\lib\net7.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll,
   \store\x64\net7.0\microsoft.extensions.dependencyinjection\7.0.0\lib\net7.0\Microsoft.Extensions.DependencyInjection.dll,
@@ -240,7 +238,6 @@
   \store\x86\net6.0\dnsclient\1.4.0\lib\netstandard2.1\DnsClient.dll,
   \store\x86\net6.0\microsoft.extensions.configuration.abstractions\7.0.0\lib\net6.0\Microsoft.Extensions.Configuration.Abstractions.dll,
   \store\x86\net6.0\microsoft.extensions.configuration.binder\7.0.0\lib\net6.0\Microsoft.Extensions.Configuration.Binder.dll,
-  \store\x86\net6.0\microsoft.extensions.configuration.environmentvariables\7.0.0\lib\net6.0\Microsoft.Extensions.Configuration.EnvironmentVariables.dll,
   \store\x86\net6.0\microsoft.extensions.configuration\7.0.0\lib\net6.0\Microsoft.Extensions.Configuration.dll,
   \store\x86\net6.0\microsoft.extensions.dependencyinjection.abstractions\7.0.0\lib\net6.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll,
   \store\x86\net6.0\microsoft.extensions.dependencyinjection\7.0.0\lib\net6.0\Microsoft.Extensions.DependencyInjection.dll,
@@ -265,7 +262,6 @@
   \store\x86\net7.0\dnsclient\1.4.0\lib\netstandard2.1\DnsClient.dll,
   \store\x86\net7.0\microsoft.extensions.configuration.abstractions\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.Abstractions.dll,
   \store\x86\net7.0\microsoft.extensions.configuration.binder\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.Binder.dll,
-  \store\x86\net7.0\microsoft.extensions.configuration.environmentvariables\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.EnvironmentVariables.dll,
   \store\x86\net7.0\microsoft.extensions.configuration\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.dll,
   \store\x86\net7.0\microsoft.extensions.dependencyinjection.abstractions\7.0.0\lib\net7.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll,
   \store\x86\net7.0\microsoft.extensions.dependencyinjection\7.0.0\lib\net7.0\Microsoft.Extensions.DependencyInjection.dll,