Add net6.0 target to grpc instrumentation tests (#3013)

This commit is contained in:
Cijo Thomas 2022-03-11 09:01:04 -08:00 committed by GitHub
parent f6b627134b
commit 00af7817fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 4 deletions

View File

@ -44,7 +44,7 @@ You can contribute to this project from a Windows, macOS or Linux machine.
On all platforms, the minimum requirements are: On all platforms, the minimum requirements are:
* Git client and command line tools. * Git client and command line tools.
* .NET Core 6.0+ * .NET 6.0+
### Linux or MacOS ### Linux or MacOS

View File

@ -49,7 +49,7 @@ namespace Examples.Console
* *
* dotnet run logs --useExporter otlp * dotnet run logs --useExporter otlp
* *
* The OpenTelemetry Collector will output all received metrics to the stdout of its terminal. * The OpenTelemetry Collector will output all received logs to the stdout of its terminal.
* *
*/ */

View File

@ -112,7 +112,11 @@ namespace OpenTelemetry.Instrumentation.Grpc.Tests
Assert.StartsWith("grpc-dotnet", activity.GetTagValue(SemanticConventions.AttributeHttpUserAgent) as string); Assert.StartsWith("grpc-dotnet", activity.GetTagValue(SemanticConventions.AttributeHttpUserAgent) as string);
} }
#if NET6_0_OR_GREATER
[Theory(Skip = "Skipping for .NET 6 and higher due to bug #3023")]
#else
[Theory] [Theory]
#endif
[InlineData(null)] [InlineData(null)]
[InlineData(true)] [InlineData(true)]
[InlineData(false)] [InlineData(false)]

View File

@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<Description>Unit test project for OpenTelemetry Grpc for .NET instrumentation</Description> <Description>Unit test project for OpenTelemetry Grpc for .NET instrumentation</Description>
<!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. --> <!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
<TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks> <TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>