Skip to content

Commit 07788fa

Browse files
committed
OTel SDK removed dependency for Microsoft.Extensions.Configuration.EnvironmentVariables: open-telemetry/opentelemetry-dotnet#4092
1 parent 3ab0d94 commit 07788fa

7 files changed

Lines changed: 1 addition & 20 deletions

LICENSE

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,6 @@ Libraries
263263
- Microsoft.Extensions.Configuration,
264264
- Microsoft.Extensions.Configuration.Abstractions,
265265
- Microsoft.Extensions.Configuration.Binder,
266-
- Microsoft.Extensions.Configuration.EnvironmentVariables,
267266
- Microsoft.Extensions.DependencyInjection,
268267
- Microsoft.Extensions.DependencyInjection.Abstractions,
269268
- Microsoft.Extensions.Logging,

src/OpenTelemetry.AutoInstrumentation.AdditionalDeps/Directory.Build.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<PackageReference Include="System.Diagnostics.DiagnosticSource" />
44
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
55
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" />
6-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
76
<PackageReference Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" />
87
</ItemGroup>
98
</Project>

src/OpenTelemetry.AutoInstrumentation.AdditionalDeps/Directory.Packages.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="7.0.0" />
77
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
88
<PackageVersion Include="Microsoft.Extensions.Logging.Configuration" Version="7.0.0" />
9-
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
109
<PackageVersion Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" Version="1.3.0" />
1110
</ItemGroup>
1211
</Project>

test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
/store/x64/net6.0/dnsclient/1.4.0/lib/netstandard2.1/DnsClient.dll,
4848
/store/x64/net6.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.Abstractions.dll,
4949
/store/x64/net6.0/microsoft.extensions.configuration.binder/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.Binder.dll,
50-
/store/x64/net6.0/microsoft.extensions.configuration.environmentvariables/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.EnvironmentVariables.dll,
5150
/store/x64/net6.0/microsoft.extensions.configuration/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.dll,
5251
/store/x64/net6.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
5352
/store/x64/net6.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.dll,
@@ -72,7 +71,6 @@
7271
/store/x64/net7.0/dnsclient/1.4.0/lib/netstandard2.1/DnsClient.dll,
7372
/store/x64/net7.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll,
7473
/store/x64/net7.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll,
75-
/store/x64/net7.0/microsoft.extensions.configuration.environmentvariables/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.EnvironmentVariables.dll,
7674
/store/x64/net7.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
7775
/store/x64/net7.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
7876
/store/x64/net7.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll,
@@ -96,7 +94,6 @@
9694
/store/x86/net6.0/dnsclient/1.4.0/lib/netstandard2.1/DnsClient.dll,
9795
/store/x86/net6.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.Abstractions.dll,
9896
/store/x86/net6.0/microsoft.extensions.configuration.binder/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.Binder.dll,
99-
/store/x86/net6.0/microsoft.extensions.configuration.environmentvariables/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.EnvironmentVariables.dll,
10097
/store/x86/net6.0/microsoft.extensions.configuration/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.dll,
10198
/store/x86/net6.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
10299
/store/x86/net6.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.dll,
@@ -121,7 +118,6 @@
121118
/store/x86/net7.0/dnsclient/1.4.0/lib/netstandard2.1/DnsClient.dll,
122119
/store/x86/net7.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll,
123120
/store/x86/net7.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll,
124-
/store/x86/net7.0/microsoft.extensions.configuration.environmentvariables/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.EnvironmentVariables.dll,
125121
/store/x86/net7.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
126122
/store/x86/net7.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
127123
/store/x86/net7.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll,

test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
/store/x64/net6.0/dnsclient/1.4.0/lib/netstandard2.1/DnsClient.dll,
4848
/store/x64/net6.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.Abstractions.dll,
4949
/store/x64/net6.0/microsoft.extensions.configuration.binder/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.Binder.dll,
50-
/store/x64/net6.0/microsoft.extensions.configuration.environmentvariables/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.EnvironmentVariables.dll,
5150
/store/x64/net6.0/microsoft.extensions.configuration/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.dll,
5251
/store/x64/net6.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
5352
/store/x64/net6.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.dll,
@@ -72,7 +71,6 @@
7271
/store/x64/net7.0/dnsclient/1.4.0/lib/netstandard2.1/DnsClient.dll,
7372
/store/x64/net7.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll,
7473
/store/x64/net7.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll,
75-
/store/x64/net7.0/microsoft.extensions.configuration.environmentvariables/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.EnvironmentVariables.dll,
7674
/store/x64/net7.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
7775
/store/x64/net7.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
7876
/store/x64/net7.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll,
@@ -96,7 +94,6 @@
9694
/store/x86/net6.0/dnsclient/1.4.0/lib/netstandard2.1/DnsClient.dll,
9795
/store/x86/net6.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.Abstractions.dll,
9896
/store/x86/net6.0/microsoft.extensions.configuration.binder/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.Binder.dll,
99-
/store/x86/net6.0/microsoft.extensions.configuration.environmentvariables/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.EnvironmentVariables.dll,
10097
/store/x86/net6.0/microsoft.extensions.configuration/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.dll,
10198
/store/x86/net6.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
10299
/store/x86/net6.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.dll,
@@ -121,7 +118,6 @@
121118
/store/x86/net7.0/dnsclient/1.4.0/lib/netstandard2.1/DnsClient.dll,
122119
/store/x86/net7.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll,
123120
/store/x86/net7.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll,
124-
/store/x86/net7.0/microsoft.extensions.configuration.environmentvariables/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.EnvironmentVariables.dll,
125121
/store/x86/net7.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
126122
/store/x86/net7.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
127123
/store/x86/net7.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll,

test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
/store/x64/net6.0/dnsclient/1.4.0/lib/netstandard2.1/DnsClient.dll,
4848
/store/x64/net6.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.Abstractions.dll,
4949
/store/x64/net6.0/microsoft.extensions.configuration.binder/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.Binder.dll,
50-
/store/x64/net6.0/microsoft.extensions.configuration.environmentvariables/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.EnvironmentVariables.dll,
5150
/store/x64/net6.0/microsoft.extensions.configuration/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.dll,
5251
/store/x64/net6.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
5352
/store/x64/net6.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.dll,
@@ -72,7 +71,6 @@
7271
/store/x64/net7.0/dnsclient/1.4.0/lib/netstandard2.1/DnsClient.dll,
7372
/store/x64/net7.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll,
7473
/store/x64/net7.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll,
75-
/store/x64/net7.0/microsoft.extensions.configuration.environmentvariables/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.EnvironmentVariables.dll,
7674
/store/x64/net7.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
7775
/store/x64/net7.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
7876
/store/x64/net7.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll,
@@ -96,7 +94,6 @@
9694
/store/x86/net6.0/dnsclient/1.4.0/lib/netstandard2.1/DnsClient.dll,
9795
/store/x86/net6.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.Abstractions.dll,
9896
/store/x86/net6.0/microsoft.extensions.configuration.binder/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.Binder.dll,
99-
/store/x86/net6.0/microsoft.extensions.configuration.environmentvariables/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.EnvironmentVariables.dll,
10097
/store/x86/net6.0/microsoft.extensions.configuration/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.dll,
10198
/store/x86/net6.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
10299
/store/x86/net6.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.dll,
@@ -121,7 +118,6 @@
121118
/store/x86/net7.0/dnsclient/1.4.0/lib/netstandard2.1/DnsClient.dll,
122119
/store/x86/net7.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll,
123120
/store/x86/net7.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll,
124-
/store/x86/net7.0/microsoft.extensions.configuration.environmentvariables/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.EnvironmentVariables.dll,
125121
/store/x86/net7.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll,
126122
/store/x86/net7.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
127123
/store/x86/net7.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll,

test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
\netfx\Microsoft.Bcl.AsyncInterfaces.dll,
5050
\netfx\Microsoft.Extensions.Configuration.Abstractions.dll,
5151
\netfx\Microsoft.Extensions.Configuration.Binder.dll,
52-
\netfx\Microsoft.Extensions.Configuration.EnvironmentVariables.dll,
5352
\netfx\Microsoft.Extensions.Configuration.dll,
5453
\netfx\Microsoft.Extensions.DependencyInjection.Abstractions.dll,
5554
\netfx\Microsoft.Extensions.DependencyInjection.dll,
@@ -87,6 +86,7 @@
8786
\netfx\System.Collections.NonGeneric.dll,
8887
\netfx\System.Collections.Specialized.dll,
8988
\netfx\System.Collections.dll,
89+
\netfx\System.ComponentModel.Annotations.dll,
9090
\netfx\System.ComponentModel.EventBasedAsync.dll,
9191
\netfx\System.ComponentModel.Primitives.dll,
9292
\netfx\System.ComponentModel.TypeConverter.dll,
@@ -191,7 +191,6 @@
191191
\store\x64\net6.0\dnsclient\1.4.0\lib\netstandard2.1\DnsClient.dll,
192192
\store\x64\net6.0\microsoft.extensions.configuration.abstractions\7.0.0\lib\net6.0\Microsoft.Extensions.Configuration.Abstractions.dll,
193193
\store\x64\net6.0\microsoft.extensions.configuration.binder\7.0.0\lib\net6.0\Microsoft.Extensions.Configuration.Binder.dll,
194-
\store\x64\net6.0\microsoft.extensions.configuration.environmentvariables\7.0.0\lib\net6.0\Microsoft.Extensions.Configuration.EnvironmentVariables.dll,
195194
\store\x64\net6.0\microsoft.extensions.configuration\7.0.0\lib\net6.0\Microsoft.Extensions.Configuration.dll,
196195
\store\x64\net6.0\microsoft.extensions.dependencyinjection.abstractions\7.0.0\lib\net6.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll,
197196
\store\x64\net6.0\microsoft.extensions.dependencyinjection\7.0.0\lib\net6.0\Microsoft.Extensions.DependencyInjection.dll,
@@ -216,7 +215,6 @@
216215
\store\x64\net7.0\dnsclient\1.4.0\lib\netstandard2.1\DnsClient.dll,
217216
\store\x64\net7.0\microsoft.extensions.configuration.abstractions\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.Abstractions.dll,
218217
\store\x64\net7.0\microsoft.extensions.configuration.binder\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.Binder.dll,
219-
\store\x64\net7.0\microsoft.extensions.configuration.environmentvariables\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.EnvironmentVariables.dll,
220218
\store\x64\net7.0\microsoft.extensions.configuration\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.dll,
221219
\store\x64\net7.0\microsoft.extensions.dependencyinjection.abstractions\7.0.0\lib\net7.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll,
222220
\store\x64\net7.0\microsoft.extensions.dependencyinjection\7.0.0\lib\net7.0\Microsoft.Extensions.DependencyInjection.dll,
@@ -240,7 +238,6 @@
240238
\store\x86\net6.0\dnsclient\1.4.0\lib\netstandard2.1\DnsClient.dll,
241239
\store\x86\net6.0\microsoft.extensions.configuration.abstractions\7.0.0\lib\net6.0\Microsoft.Extensions.Configuration.Abstractions.dll,
242240
\store\x86\net6.0\microsoft.extensions.configuration.binder\7.0.0\lib\net6.0\Microsoft.Extensions.Configuration.Binder.dll,
243-
\store\x86\net6.0\microsoft.extensions.configuration.environmentvariables\7.0.0\lib\net6.0\Microsoft.Extensions.Configuration.EnvironmentVariables.dll,
244241
\store\x86\net6.0\microsoft.extensions.configuration\7.0.0\lib\net6.0\Microsoft.Extensions.Configuration.dll,
245242
\store\x86\net6.0\microsoft.extensions.dependencyinjection.abstractions\7.0.0\lib\net6.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll,
246243
\store\x86\net6.0\microsoft.extensions.dependencyinjection\7.0.0\lib\net6.0\Microsoft.Extensions.DependencyInjection.dll,
@@ -265,7 +262,6 @@
265262
\store\x86\net7.0\dnsclient\1.4.0\lib\netstandard2.1\DnsClient.dll,
266263
\store\x86\net7.0\microsoft.extensions.configuration.abstractions\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.Abstractions.dll,
267264
\store\x86\net7.0\microsoft.extensions.configuration.binder\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.Binder.dll,
268-
\store\x86\net7.0\microsoft.extensions.configuration.environmentvariables\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.EnvironmentVariables.dll,
269265
\store\x86\net7.0\microsoft.extensions.configuration\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.dll,
270266
\store\x86\net7.0\microsoft.extensions.dependencyinjection.abstractions\7.0.0\lib\net7.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll,
271267
\store\x86\net7.0\microsoft.extensions.dependencyinjection\7.0.0\lib\net7.0\Microsoft.Extensions.DependencyInjection.dll,

0 commit comments

Comments
 (0)