open-telemetry
/
opentelemetry-dotnet-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix ILogger instrumentation for non-host console app (#1300)

This commit is contained in:
Rajkumar Rangaraj 2022-09-29 10:40:53 -07:00 committed by GitHub
parent 2a41de1a39
commit 31adafea2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 152 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/OpenTelemetry.AutoInstrumentation.AdditionalDeps/Directory.Build.props
View File

@ -2,6 +2,7 @@
<ItemGroup>
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="6.0.0" />
<PackageReference Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" Version="1.1.0" />
</ItemGroup>
</Project>

40
test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt
View File

@ -58,12 +58,32 @@
/netcoreapp3.1/runtimes/win/lib/netcoreapp2.0/System.Diagnostics.PerformanceCounter.dll,
/netcoreapp3.1/runtimes/win/lib/netstandard2.0/System.Security.Cryptography.ProtectedData.dll,
/store/x64/net6.0/artifact.xml,
/store/x64/net6.0/microsoft.extensions.configuration.abstractions/6.0.0/lib/netstandard2.0/Microsoft.Extensions.Configuration.Abstractions.dll,
/store/x64/net6.0/microsoft.extensions.configuration.binder/6.0.0/lib/netstandard2.0/Microsoft.Extensions.Configuration.Binder.dll,
/store/x64/net6.0/microsoft.extensions.configuration/6.0.0/lib/netstandard2.0/Microsoft.Extensions.Configuration.dll,
/store/x64/net6.0/microsoft.extensions.dependencyinjection.abstractions/6.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
/store/x64/net6.0/microsoft.extensions.dependencyinjection/6.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.dll,
/store/x64/net6.0/microsoft.extensions.logging.abstractions/6.0.0/lib/net6.0/Microsoft.Extensions.Logging.Abstractions.dll,
/store/x64/net6.0/microsoft.extensions.logging.configuration/6.0.0/lib/netstandard2.0/Microsoft.Extensions.Logging.Configuration.dll,
/store/x64/net6.0/microsoft.extensions.logging/6.0.0/lib/netstandard2.1/Microsoft.Extensions.Logging.dll,
/store/x64/net6.0/microsoft.extensions.options.configurationextensions/6.0.0/lib/netstandard2.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
/store/x64/net6.0/microsoft.extensions.options/6.0.0/lib/netstandard2.1/Microsoft.Extensions.Options.dll,
/store/x64/net6.0/microsoft.extensions.primitives/6.0.0/lib/net6.0/Microsoft.Extensions.Primitives.dll,
/store/x64/net6.0/mongodb.bson/2.3.0/lib/netstandard1.5/MongoDB.Bson.dll,
/store/x64/net6.0/mongodb.driver.core.extensions.diagnosticsources/1.1.0/lib/netstandard2.0/MongoDB.Driver.Core.Extensions.DiagnosticSources.dll,
/store/x64/net6.0/mongodb.driver.core/2.3.0/lib/netstandard1.5/MongoDB.Driver.Core.dll,
/store/x64/netcoreapp3.1/artifact.xml,
/store/x64/netcoreapp3.1/microsoft.extensions.configuration.abstractions/6.0.0/lib/netstandard2.0/Microsoft.Extensions.Configuration.Abstractions.dll,
/store/x64/netcoreapp3.1/microsoft.extensions.configuration.binder/6.0.0/lib/netstandard2.0/Microsoft.Extensions.Configuration.Binder.dll,
/store/x64/netcoreapp3.1/microsoft.extensions.configuration/6.0.0/lib/netstandard2.0/Microsoft.Extensions.Configuration.dll,
/store/x64/netcoreapp3.1/microsoft.extensions.dependencyinjection.abstractions/6.0.0/lib/netstandard2.1/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
/store/x64/netcoreapp3.1/microsoft.extensions.dependencyinjection/6.0.0/lib/netstandard2.1/Microsoft.Extensions.DependencyInjection.dll,
/store/x64/netcoreapp3.1/microsoft.extensions.logging.abstractions/6.0.0/lib/netstandard2.0/Microsoft.Extensions.Logging.Abstractions.dll,
/store/x64/netcoreapp3.1/microsoft.extensions.logging.configuration/6.0.0/lib/netstandard2.0/Microsoft.Extensions.Logging.Configuration.dll,
/store/x64/netcoreapp3.1/microsoft.extensions.logging/6.0.0/lib/netstandard2.1/Microsoft.Extensions.Logging.dll,
/store/x64/netcoreapp3.1/microsoft.extensions.options.configurationextensions/6.0.0/lib/netstandard2.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
/store/x64/netcoreapp3.1/microsoft.extensions.options/6.0.0/lib/netstandard2.1/Microsoft.Extensions.Options.dll,
/store/x64/netcoreapp3.1/microsoft.extensions.primitives/6.0.0/lib/netcoreapp3.1/Microsoft.Extensions.Primitives.dll,
/store/x64/netcoreapp3.1/mongodb.bson/2.3.0/lib/netstandard1.5/MongoDB.Bson.dll,
/store/x64/netcoreapp3.1/mongodb.driver.core.extensions.diagnosticsources/1.1.0/lib/netstandard2.0/MongoDB.Driver.Core.Extensions.DiagnosticSources.dll,
/store/x64/netcoreapp3.1/mongodb.driver.core/2.3.0/lib/netstandard1.5/MongoDB.Driver.Core.dll,
@ -71,12 +91,32 @@
/store/x64/netcoreapp3.1/system.diagnostics.diagnosticsource/6.0.0/lib/netstandard2.0/System.Diagnostics.DiagnosticSource.dll,
/store/x64/netcoreapp3.1/system.runtime.compilerservices.unsafe/6.0.0/lib/netcoreapp3.1/System.Runtime.CompilerServices.Unsafe.dll,
/store/x86/net6.0/artifact.xml,
/store/x86/net6.0/microsoft.extensions.configuration.abstractions/6.0.0/lib/netstandard2.0/Microsoft.Extensions.Configuration.Abstractions.dll,
/store/x86/net6.0/microsoft.extensions.configuration.binder/6.0.0/lib/netstandard2.0/Microsoft.Extensions.Configuration.Binder.dll,
/store/x86/net6.0/microsoft.extensions.configuration/6.0.0/lib/netstandard2.0/Microsoft.Extensions.Configuration.dll,
/store/x86/net6.0/microsoft.extensions.dependencyinjection.abstractions/6.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
/store/x86/net6.0/microsoft.extensions.dependencyinjection/6.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.dll,
/store/x86/net6.0/microsoft.extensions.logging.abstractions/6.0.0/lib/net6.0/Microsoft.Extensions.Logging.Abstractions.dll,
/store/x86/net6.0/microsoft.extensions.logging.configuration/6.0.0/lib/netstandard2.0/Microsoft.Extensions.Logging.Configuration.dll,
/store/x86/net6.0/microsoft.extensions.logging/6.0.0/lib/netstandard2.1/Microsoft.Extensions.Logging.dll,
/store/x86/net6.0/microsoft.extensions.options.configurationextensions/6.0.0/lib/netstandard2.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
/store/x86/net6.0/microsoft.extensions.options/6.0.0/lib/netstandard2.1/Microsoft.Extensions.Options.dll,
/store/x86/net6.0/microsoft.extensions.primitives/6.0.0/lib/net6.0/Microsoft.Extensions.Primitives.dll,
/store/x86/net6.0/mongodb.bson/2.3.0/lib/netstandard1.5/MongoDB.Bson.dll,
/store/x86/net6.0/mongodb.driver.core.extensions.diagnosticsources/1.1.0/lib/netstandard2.0/MongoDB.Driver.Core.Extensions.DiagnosticSources.dll,
/store/x86/net6.0/mongodb.driver.core/2.3.0/lib/netstandard1.5/MongoDB.Driver.Core.dll,
/store/x86/netcoreapp3.1/artifact.xml,
/store/x86/netcoreapp3.1/microsoft.extensions.configuration.abstractions/6.0.0/lib/netstandard2.0/Microsoft.Extensions.Configuration.Abstractions.dll,
/store/x86/netcoreapp3.1/microsoft.extensions.configuration.binder/6.0.0/lib/netstandard2.0/Microsoft.Extensions.Configuration.Binder.dll,
/store/x86/netcoreapp3.1/microsoft.extensions.configuration/6.0.0/lib/netstandard2.0/Microsoft.Extensions.Configuration.dll,
/store/x86/netcoreapp3.1/microsoft.extensions.dependencyinjection.abstractions/6.0.0/lib/netstandard2.1/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
/store/x86/netcoreapp3.1/microsoft.extensions.dependencyinjection/6.0.0/lib/netstandard2.1/Microsoft.Extensions.DependencyInjection.dll,
/store/x86/netcoreapp3.1/microsoft.extensions.logging.abstractions/6.0.0/lib/netstandard2.0/Microsoft.Extensions.Logging.Abstractions.dll,
/store/x86/netcoreapp3.1/microsoft.extensions.logging.configuration/6.0.0/lib/netstandard2.0/Microsoft.Extensions.Logging.Configuration.dll,
/store/x86/netcoreapp3.1/microsoft.extensions.logging/6.0.0/lib/netstandard2.1/Microsoft.Extensions.Logging.dll,
/store/x86/netcoreapp3.1/microsoft.extensions.options.configurationextensions/6.0.0/lib/netstandard2.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
/store/x86/netcoreapp3.1/microsoft.extensions.options/6.0.0/lib/netstandard2.1/Microsoft.Extensions.Options.dll,
/store/x86/netcoreapp3.1/microsoft.extensions.primitives/6.0.0/lib/netcoreapp3.1/Microsoft.Extensions.Primitives.dll,
/store/x86/netcoreapp3.1/mongodb.bson/2.3.0/lib/netstandard1.5/MongoDB.Bson.dll,
/store/x86/netcoreapp3.1/mongodb.driver.core.extensions.diagnosticsources/1.1.0/lib/netstandard2.0/MongoDB.Driver.Core.Extensions.DiagnosticSources.dll,
/store/x86/netcoreapp3.1/mongodb.driver.core/2.3.0/lib/netstandard1.5/MongoDB.Driver.Core.dll,

40
test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt
View File

@ -58,12 +58,32 @@
/netcoreapp3.1/runtimes/win/lib/netcoreapp2.0/System.Diagnostics.PerformanceCounter.dll,
/netcoreapp3.1/runtimes/win/lib/netstandard2.0/System.Security.Cryptography.ProtectedData.dll,
/store/x64/net6.0/artifact.xml,
/store/x64/net6.0/microsoft.extensions.configuration.abstractions/6.0.0/lib/netstandard2.0/Microsoft.Extensions.Configuration.Abstractions.dll,
/store/x64/net6.0/microsoft.extensions.configuration.binder/6.0.0/lib/netstandard2.0/Microsoft.Extensions.Configuration.Binder.dll,
/store/x64/net6.0/microsoft.extensions.configuration/6.0.0/lib/netstandard2.0/Microsoft.Extensions.Configuration.dll,
/store/x64/net6.0/microsoft.extensions.dependencyinjection.abstractions/6.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
/store/x64/net6.0/microsoft.extensions.dependencyinjection/6.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.dll,
/store/x64/net6.0/microsoft.extensions.logging.abstractions/6.0.0/lib/net6.0/Microsoft.Extensions.Logging.Abstractions.dll,
/store/x64/net6.0/microsoft.extensions.logging.configuration/6.0.0/lib/netstandard2.0/Microsoft.Extensions.Logging.Configuration.dll,
/store/x64/net6.0/microsoft.extensions.logging/6.0.0/lib/netstandard2.1/Microsoft.Extensions.Logging.dll,
/store/x64/net6.0/microsoft.extensions.options.configurationextensions/6.0.0/lib/netstandard2.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
/store/x64/net6.0/microsoft.extensions.options/6.0.0/lib/netstandard2.1/Microsoft.Extensions.Options.dll,
/store/x64/net6.0/microsoft.extensions.primitives/6.0.0/lib/net6.0/Microsoft.Extensions.Primitives.dll,
/store/x64/net6.0/mongodb.bson/2.3.0/lib/netstandard1.5/MongoDB.Bson.dll,
/store/x64/net6.0/mongodb.driver.core.extensions.diagnosticsources/1.1.0/lib/netstandard2.0/MongoDB.Driver.Core.Extensions.DiagnosticSources.dll,
/store/x64/net6.0/mongodb.driver.core/2.3.0/lib/netstandard1.5/MongoDB.Driver.Core.dll,
/store/x64/netcoreapp3.1/artifact.xml,
/store/x64/netcoreapp3.1/microsoft.extensions.configuration.abstractions/6.0.0/lib/netstandard2.0/Microsoft.Extensions.Configuration.Abstractions.dll,
/store/x64/netcoreapp3.1/microsoft.extensions.configuration.binder/6.0.0/lib/netstandard2.0/Microsoft.Extensions.Configuration.Binder.dll,
/store/x64/netcoreapp3.1/microsoft.extensions.configuration/6.0.0/lib/netstandard2.0/Microsoft.Extensions.Configuration.dll,
/store/x64/netcoreapp3.1/microsoft.extensions.dependencyinjection.abstractions/6.0.0/lib/netstandard2.1/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
/store/x64/netcoreapp3.1/microsoft.extensions.dependencyinjection/6.0.0/lib/netstandard2.1/Microsoft.Extensions.DependencyInjection.dll,
/store/x64/netcoreapp3.1/microsoft.extensions.logging.abstractions/6.0.0/lib/netstandard2.0/Microsoft.Extensions.Logging.Abstractions.dll,
/store/x64/netcoreapp3.1/microsoft.extensions.logging.configuration/6.0.0/lib/netstandard2.0/Microsoft.Extensions.Logging.Configuration.dll,
/store/x64/netcoreapp3.1/microsoft.extensions.logging/6.0.0/lib/netstandard2.1/Microsoft.Extensions.Logging.dll,
/store/x64/netcoreapp3.1/microsoft.extensions.options.configurationextensions/6.0.0/lib/netstandard2.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
/store/x64/netcoreapp3.1/microsoft.extensions.options/6.0.0/lib/netstandard2.1/Microsoft.Extensions.Options.dll,
/store/x64/netcoreapp3.1/microsoft.extensions.primitives/6.0.0/lib/netcoreapp3.1/Microsoft.Extensions.Primitives.dll,
/store/x64/netcoreapp3.1/mongodb.bson/2.3.0/lib/netstandard1.5/MongoDB.Bson.dll,
/store/x64/netcoreapp3.1/mongodb.driver.core.extensions.diagnosticsources/1.1.0/lib/netstandard2.0/MongoDB.Driver.Core.Extensions.DiagnosticSources.dll,
/store/x64/netcoreapp3.1/mongodb.driver.core/2.3.0/lib/netstandard1.5/MongoDB.Driver.Core.dll,
@ -71,12 +91,32 @@
/store/x64/netcoreapp3.1/system.diagnostics.diagnosticsource/6.0.0/lib/netstandard2.0/System.Diagnostics.DiagnosticSource.dll,
/store/x64/netcoreapp3.1/system.runtime.compilerservices.unsafe/6.0.0/lib/netcoreapp3.1/System.Runtime.CompilerServices.Unsafe.dll,
/store/x86/net6.0/artifact.xml,
/store/x86/net6.0/microsoft.extensions.configuration.abstractions/6.0.0/lib/netstandard2.0/Microsoft.Extensions.Configuration.Abstractions.dll,
/store/x86/net6.0/microsoft.extensions.configuration.binder/6.0.0/lib/netstandard2.0/Microsoft.Extensions.Configuration.Binder.dll,
/store/x86/net6.0/microsoft.extensions.configuration/6.0.0/lib/netstandard2.0/Microsoft.Extensions.Configuration.dll,
/store/x86/net6.0/microsoft.extensions.dependencyinjection.abstractions/6.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
/store/x86/net6.0/microsoft.extensions.dependencyinjection/6.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.dll,
/store/x86/net6.0/microsoft.extensions.logging.abstractions/6.0.0/lib/net6.0/Microsoft.Extensions.Logging.Abstractions.dll,
/store/x86/net6.0/microsoft.extensions.logging.configuration/6.0.0/lib/netstandard2.0/Microsoft.Extensions.Logging.Configuration.dll,
/store/x86/net6.0/microsoft.extensions.logging/6.0.0/lib/netstandard2.1/Microsoft.Extensions.Logging.dll,
/store/x86/net6.0/microsoft.extensions.options.configurationextensions/6.0.0/lib/netstandard2.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
/store/x86/net6.0/microsoft.extensions.options/6.0.0/lib/netstandard2.1/Microsoft.Extensions.Options.dll,
/store/x86/net6.0/microsoft.extensions.primitives/6.0.0/lib/net6.0/Microsoft.Extensions.Primitives.dll,
/store/x86/net6.0/mongodb.bson/2.3.0/lib/netstandard1.5/MongoDB.Bson.dll,
/store/x86/net6.0/mongodb.driver.core.extensions.diagnosticsources/1.1.0/lib/netstandard2.0/MongoDB.Driver.Core.Extensions.DiagnosticSources.dll,
/store/x86/net6.0/mongodb.driver.core/2.3.0/lib/netstandard1.5/MongoDB.Driver.Core.dll,
/store/x86/netcoreapp3.1/artifact.xml,
/store/x86/netcoreapp3.1/microsoft.extensions.configuration.abstractions/6.0.0/lib/netstandard2.0/Microsoft.Extensions.Configuration.Abstractions.dll,
/store/x86/netcoreapp3.1/microsoft.extensions.configuration.binder/6.0.0/lib/netstandard2.0/Microsoft.Extensions.Configuration.Binder.dll,
/store/x86/netcoreapp3.1/microsoft.extensions.configuration/6.0.0/lib/netstandard2.0/Microsoft.Extensions.Configuration.dll,
/store/x86/netcoreapp3.1/microsoft.extensions.dependencyinjection.abstractions/6.0.0/lib/netstandard2.1/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
/store/x86/netcoreapp3.1/microsoft.extensions.dependencyinjection/6.0.0/lib/netstandard2.1/Microsoft.Extensions.DependencyInjection.dll,
/store/x86/netcoreapp3.1/microsoft.extensions.logging.abstractions/6.0.0/lib/netstandard2.0/Microsoft.Extensions.Logging.Abstractions.dll,
/store/x86/netcoreapp3.1/microsoft.extensions.logging.configuration/6.0.0/lib/netstandard2.0/Microsoft.Extensions.Logging.Configuration.dll,
/store/x86/netcoreapp3.1/microsoft.extensions.logging/6.0.0/lib/netstandard2.1/Microsoft.Extensions.Logging.dll,
/store/x86/netcoreapp3.1/microsoft.extensions.options.configurationextensions/6.0.0/lib/netstandard2.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
/store/x86/netcoreapp3.1/microsoft.extensions.options/6.0.0/lib/netstandard2.1/Microsoft.Extensions.Options.dll,
/store/x86/netcoreapp3.1/microsoft.extensions.primitives/6.0.0/lib/netcoreapp3.1/Microsoft.Extensions.Primitives.dll,
/store/x86/netcoreapp3.1/mongodb.bson/2.3.0/lib/netstandard1.5/MongoDB.Bson.dll,
/store/x86/netcoreapp3.1/mongodb.driver.core.extensions.diagnosticsources/1.1.0/lib/netstandard2.0/MongoDB.Driver.Core.Extensions.DiagnosticSources.dll,
/store/x86/netcoreapp3.1/mongodb.driver.core/2.3.0/lib/netstandard1.5/MongoDB.Driver.Core.dll,

40
test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt
View File

@ -202,12 +202,32 @@
\netcoreapp3.1\runtimes\win\lib\netcoreapp2.0\System.Diagnostics.PerformanceCounter.dll,
\netcoreapp3.1\runtimes\win\lib\netstandard2.0\System.Security.Cryptography.ProtectedData.dll,
\store\x64\net6.0\artifact.xml,
\store\x64\net6.0\microsoft.extensions.configuration.abstractions\6.0.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll,
\store\x64\net6.0\microsoft.extensions.configuration.binder\6.0.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll,
\store\x64\net6.0\microsoft.extensions.configuration\6.0.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll,
\store\x64\net6.0\microsoft.extensions.dependencyinjection.abstractions\6.0.0\lib\net6.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll,
\store\x64\net6.0\microsoft.extensions.dependencyinjection\6.0.0\lib\net6.0\Microsoft.Extensions.DependencyInjection.dll,
\store\x64\net6.0\microsoft.extensions.logging.abstractions\6.0.0\lib\net6.0\Microsoft.Extensions.Logging.Abstractions.dll,
\store\x64\net6.0\microsoft.extensions.logging.configuration\6.0.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Configuration.dll,
\store\x64\net6.0\microsoft.extensions.logging\6.0.0\lib\netstandard2.1\Microsoft.Extensions.Logging.dll,
\store\x64\net6.0\microsoft.extensions.options.configurationextensions\6.0.0\lib\netstandard2.0\Microsoft.Extensions.Options.ConfigurationExtensions.dll,
\store\x64\net6.0\microsoft.extensions.options\6.0.0\lib\netstandard2.1\Microsoft.Extensions.Options.dll,
\store\x64\net6.0\microsoft.extensions.primitives\6.0.0\lib\net6.0\Microsoft.Extensions.Primitives.dll,
\store\x64\net6.0\mongodb.bson\2.3.0\lib\netstandard1.5\MongoDB.Bson.dll,
\store\x64\net6.0\mongodb.driver.core.extensions.diagnosticsources\1.1.0\lib\netstandard2.0\MongoDB.Driver.Core.Extensions.DiagnosticSources.dll,
\store\x64\net6.0\mongodb.driver.core\2.3.0\lib\netstandard1.5\MongoDB.Driver.Core.dll,
\store\x64\netcoreapp3.1\artifact.xml,
\store\x64\netcoreapp3.1\microsoft.extensions.configuration.abstractions\6.0.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll,
\store\x64\netcoreapp3.1\microsoft.extensions.configuration.binder\6.0.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll,
\store\x64\netcoreapp3.1\microsoft.extensions.configuration\6.0.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll,
\store\x64\netcoreapp3.1\microsoft.extensions.dependencyinjection.abstractions\6.0.0\lib\netstandard2.1\Microsoft.Extensions.DependencyInjection.Abstractions.dll,
\store\x64\netcoreapp3.1\microsoft.extensions.dependencyinjection\6.0.0\lib\netstandard2.1\Microsoft.Extensions.DependencyInjection.dll,
\store\x64\netcoreapp3.1\microsoft.extensions.logging.abstractions\6.0.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll,
\store\x64\netcoreapp3.1\microsoft.extensions.logging.configuration\6.0.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Configuration.dll,
\store\x64\netcoreapp3.1\microsoft.extensions.logging\6.0.0\lib\netstandard2.1\Microsoft.Extensions.Logging.dll,
\store\x64\netcoreapp3.1\microsoft.extensions.options.configurationextensions\6.0.0\lib\netstandard2.0\Microsoft.Extensions.Options.ConfigurationExtensions.dll,
\store\x64\netcoreapp3.1\microsoft.extensions.options\6.0.0\lib\netstandard2.1\Microsoft.Extensions.Options.dll,
\store\x64\netcoreapp3.1\microsoft.extensions.primitives\6.0.0\lib\netcoreapp3.1\Microsoft.Extensions.Primitives.dll,
\store\x64\netcoreapp3.1\mongodb.bson\2.3.0\lib\netstandard1.5\MongoDB.Bson.dll,
\store\x64\netcoreapp3.1\mongodb.driver.core.extensions.diagnosticsources\1.1.0\lib\netstandard2.0\MongoDB.Driver.Core.Extensions.DiagnosticSources.dll,
\store\x64\netcoreapp3.1\mongodb.driver.core\2.3.0\lib\netstandard1.5\MongoDB.Driver.Core.dll,
@ -215,12 +235,32 @@
\store\x64\netcoreapp3.1\system.diagnostics.diagnosticsource\6.0.0\lib\netstandard2.0\System.Diagnostics.DiagnosticSource.dll,
\store\x64\netcoreapp3.1\system.runtime.compilerservices.unsafe\6.0.0\lib\netcoreapp3.1\System.Runtime.CompilerServices.Unsafe.dll,
\store\x86\net6.0\artifact.xml,
\store\x86\net6.0\microsoft.extensions.configuration.abstractions\6.0.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll,
\store\x86\net6.0\microsoft.extensions.configuration.binder\6.0.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll,
\store\x86\net6.0\microsoft.extensions.configuration\6.0.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll,
\store\x86\net6.0\microsoft.extensions.dependencyinjection.abstractions\6.0.0\lib\net6.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll,
\store\x86\net6.0\microsoft.extensions.dependencyinjection\6.0.0\lib\net6.0\Microsoft.Extensions.DependencyInjection.dll,
\store\x86\net6.0\microsoft.extensions.logging.abstractions\6.0.0\lib\net6.0\Microsoft.Extensions.Logging.Abstractions.dll,
\store\x86\net6.0\microsoft.extensions.logging.configuration\6.0.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Configuration.dll,
\store\x86\net6.0\microsoft.extensions.logging\6.0.0\lib\netstandard2.1\Microsoft.Extensions.Logging.dll,
\store\x86\net6.0\microsoft.extensions.options.configurationextensions\6.0.0\lib\netstandard2.0\Microsoft.Extensions.Options.ConfigurationExtensions.dll,
\store\x86\net6.0\microsoft.extensions.options\6.0.0\lib\netstandard2.1\Microsoft.Extensions.Options.dll,
\store\x86\net6.0\microsoft.extensions.primitives\6.0.0\lib\net6.0\Microsoft.Extensions.Primitives.dll,
\store\x86\net6.0\mongodb.bson\2.3.0\lib\netstandard1.5\MongoDB.Bson.dll,
\store\x86\net6.0\mongodb.driver.core.extensions.diagnosticsources\1.1.0\lib\netstandard2.0\MongoDB.Driver.Core.Extensions.DiagnosticSources.dll,
\store\x86\net6.0\mongodb.driver.core\2.3.0\lib\netstandard1.5\MongoDB.Driver.Core.dll,
\store\x86\netcoreapp3.1\artifact.xml,
\store\x86\netcoreapp3.1\microsoft.extensions.configuration.abstractions\6.0.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll,
\store\x86\netcoreapp3.1\microsoft.extensions.configuration.binder\6.0.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll,
\store\x86\netcoreapp3.1\microsoft.extensions.configuration\6.0.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll,
\store\x86\netcoreapp3.1\microsoft.extensions.dependencyinjection.abstractions\6.0.0\lib\netstandard2.1\Microsoft.Extensions.DependencyInjection.Abstractions.dll,
\store\x86\netcoreapp3.1\microsoft.extensions.dependencyinjection\6.0.0\lib\netstandard2.1\Microsoft.Extensions.DependencyInjection.dll,
\store\x86\netcoreapp3.1\microsoft.extensions.logging.abstractions\6.0.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll,
\store\x86\netcoreapp3.1\microsoft.extensions.logging.configuration\6.0.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Configuration.dll,
\store\x86\netcoreapp3.1\microsoft.extensions.logging\6.0.0\lib\netstandard2.1\Microsoft.Extensions.Logging.dll,
\store\x86\netcoreapp3.1\microsoft.extensions.options.configurationextensions\6.0.0\lib\netstandard2.0\Microsoft.Extensions.Options.ConfigurationExtensions.dll,
\store\x86\netcoreapp3.1\microsoft.extensions.options\6.0.0\lib\netstandard2.1\Microsoft.Extensions.Options.dll,
\store\x86\netcoreapp3.1\microsoft.extensions.primitives\6.0.0\lib\netcoreapp3.1\Microsoft.Extensions.Primitives.dll,
\store\x86\netcoreapp3.1\mongodb.bson\2.3.0\lib\netstandard1.5\MongoDB.Bson.dll,
\store\x86\netcoreapp3.1\mongodb.driver.core.extensions.diagnosticsources\1.1.0\lib\netstandard2.0\MongoDB.Driver.Core.Extensions.DiagnosticSources.dll,
\store\x86\netcoreapp3.1\mongodb.driver.core\2.3.0\lib\netstandard1.5\MongoDB.Driver.Core.dll,

16
test/IntegrationTests/SmokeTests.cs
View File

@ -14,6 +14,7 @@
// limitations under the License.
// </copyright>
using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Linq;
@ -191,6 +192,21 @@ public class SmokeTests : TestHelper
}
}
#if !NETFRAMEWORK
[Fact]
[Trait("Category", "EndToEnd")]
public async Task SubmitLogs()
{
using var collector = await MockLogsCollector.Start(Output);
collector.Expect(logRecord => Convert.ToString(logRecord.Body) == "{ \"stringValue\": \"Example log message\" }");
SetEnvironmentVariable("OTEL_DOTNET_AUTO_LOGS_INCLUDE_FORMATTED_MESSAGE", "true");
RunTestApplication(logsAgentPort: collector.Port, enableClrProfiler: true);
collector.AssertExpectations();
}
#endif
private static void AssertNoSpansReceived(IImmutableList<IMockSpan> spans)
{
Assert.True(spans.Count == 0, $"Expecting no spans, received {spans.Count}");

15
test/test-applications/integrations/TestApplication.Smoke/Program.cs
View File

@ -19,6 +19,7 @@ using System.Collections.Generic;
using System.Diagnostics;
using System.Diagnostics.Metrics;
using System.Net.Http;
using Microsoft.Extensions.Logging;
using TestApplication.Shared;
namespace TestApplication.Smoke;
@ -30,9 +31,9 @@ public class Program
public static void Main(string[] args)
{
ConsoleHelper.WriteSplashScreen(args);
EmitTraces();
EmitMetrics();
EmitLogs();
// The "LONG_RUNNING" environment variable is used by tests that access/receive
// data that takes time to be produced.
@ -77,4 +78,16 @@ public class Program
myFruitCounter.Add(1, new KeyValuePair<string, object>("name", "apple"));
}
private static void EmitLogs()
{
using var loggerFactory = LoggerFactory.Create(builder =>
{
builder
.AddFilter("Microsoft", LogLevel.Warning);
});
ILogger logger = loggerFactory.CreateLogger<Program>();
logger.LogInformation("Example log message");
}
}

1
test/test-applications/integrations/TestApplication.Smoke/TestApplication.Smoke.csproj
View File

@ -5,6 +5,7 @@
<ItemGroup>
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
</ItemGroup>
<ItemGroup>