diff --git a/build/LibraryVersions.g.cs b/build/LibraryVersions.g.cs index ab0f277dd..742d3ac97 100644 --- a/build/LibraryVersions.g.cs +++ b/build/LibraryVersions.g.cs @@ -37,6 +37,14 @@ public static class LibraryVersion "2.4.0", } }, + { + "TestApplication.GrpcNetClient", + new List + { + "2.43.0", + "2.52.0", + } + }, { "TestApplication.MassTransit", new List diff --git a/test/Directory.Packages.props b/test/Directory.Packages.props index beb4019b9..a63d7e272 100644 --- a/test/Directory.Packages.props +++ b/test/Directory.Packages.props @@ -9,8 +9,8 @@ - - + + diff --git a/test/IntegrationTests/GrpcNetClientTests.cs b/test/IntegrationTests/GrpcNetClientTests.cs index 0e1098e64..d8de96e92 100644 --- a/test/IntegrationTests/GrpcNetClientTests.cs +++ b/test/IntegrationTests/GrpcNetClientTests.cs @@ -26,9 +26,10 @@ public class GrpcNetClientTests : TestHelper { } - [Fact] + [Theory] [Trait("Category", "EndToEnd")] - public void SubmitsTraces() + [MemberData(nameof(LibraryVersion.GrpcNetClient), MemberType = typeof(LibraryVersion))] + public void SubmitsTraces(string packageVersion) { using var collector = new MockSpansCollector(Output); SetExporter(collector); @@ -38,7 +39,7 @@ public class GrpcNetClientTests : TestHelper // Enabling only GrpcNetClient instrumentation to have consistent set of spans. SetEnvironmentVariable("OTEL_DOTNET_AUTO_TRACES_INSTRUMENTATION_ENABLED", "false"); SetEnvironmentVariable("OTEL_DOTNET_AUTO_TRACES_GRPCNETCLIENT_INSTRUMENTATION_ENABLED", "true"); - RunTestApplication(); + RunTestApplication(new TestSettings { PackageVersion = packageVersion }); collector.AssertExpectations(); } diff --git a/test/IntegrationTests/LibraryVersions.g.cs b/test/IntegrationTests/LibraryVersions.g.cs index 9daa3980a..ab45865a4 100644 --- a/test/IntegrationTests/LibraryVersions.g.cs +++ b/test/IntegrationTests/LibraryVersions.g.cs @@ -38,6 +38,15 @@ public static class LibraryVersion #else new object[] { "2.3.0" }, new object[] { "2.4.0" }, +#endif + }; + public static readonly IReadOnlyCollection GrpcNetClient = new List + { +#if DEFAULT_TEST_PACKAGE_VERSIONS + new object[] { string.Empty } +#else + new object[] { "2.43.0" }, + new object[] { "2.52.0" }, #endif }; public static readonly IReadOnlyCollection MassTransit = new List diff --git a/test/test-applications/integrations/TestApplication.GrpcNetClient/TestApplication.GrpcNetClient.csproj b/test/test-applications/integrations/TestApplication.GrpcNetClient/TestApplication.GrpcNetClient.csproj index c44f41860..1e3b603d3 100644 --- a/test/test-applications/integrations/TestApplication.GrpcNetClient/TestApplication.GrpcNetClient.csproj +++ b/test/test-applications/integrations/TestApplication.GrpcNetClient/TestApplication.GrpcNetClient.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/tools/LibraryVersionsGenerator/PackageVersionDefinitions.cs b/tools/LibraryVersionsGenerator/PackageVersionDefinitions.cs index 940890791..2b9a2d03c 100644 --- a/tools/LibraryVersionsGenerator/PackageVersionDefinitions.cs +++ b/tools/LibraryVersionsGenerator/PackageVersionDefinitions.cs @@ -54,6 +54,17 @@ internal static class PackageVersionDefinitions } }, new() + { + IntegrationName = "GrpcNetClient", + NugetPackageName = "Grpc.Net.Client", + TestApplicationName = "TestApplication.GrpcNetClient", + Versions = new List + { + "2.43.0", + "*" + } + }, + new() { IntegrationName = "MassTransit", NugetPackageName = "MassTransit",