From 5b34e3b3f8e04bfd77870aa632375426d5363155 Mon Sep 17 00:00:00 2001 From: Eddy Nakamura Date: Thu, 16 Jul 2020 03:31:57 -0300 Subject: [PATCH] Adding metapackages (#810) Adding IsPackable to test.props, updating test nuget versions updating projects, adding options parameter Applying suggestions Apply suggestions from code review Co-authored-by: Paulo Janotti code review - cijo removing aspnetcore "metapackage" Co-authored-by: Cijo Thomas --- build/Common.test.props | 1 + .../OpenTelemetry.Exporter.Jaeger.Tests.csproj | 2 +- ...penTelemetry.Exporter.OpenTelemetryProtocol.Tests.csproj | 4 ++-- .../OpenTelemetry.Exporter.Zipkin.Tests.csproj | 2 +- .../OpenTelemetry.Extensions.Hosting.Tests.csproj | 2 +- .../OpenTelemetry.Instrumentation.AspNet.Tests.Win.csproj | 2 +- .../BasicTests.cs | 4 ++-- .../OpenTelemetry.Instrumentation.AspNetCore.Tests.csproj | 2 +- .../OpenTelemetry.Instrumentation.Dependencies.Tests.csproj | 2 +- .../OpenTelemetry.Instrumentation.GrpcClient.Tests.csproj | 6 +++--- ...elemetry.Instrumentation.StackExchangeRedis.Tests.csproj | 2 +- .../OpenTelemetry.Shims.OpenTracing.Tests.csproj | 2 +- test/OpenTelemetry.Tests/OpenTelemetry.Tests.csproj | 2 +- 13 files changed, 17 insertions(+), 16 deletions(-) diff --git a/build/Common.test.props b/build/Common.test.props index 5b16a878a..3f059967d 100644 --- a/build/Common.test.props +++ b/build/Common.test.props @@ -6,6 +6,7 @@ $(DefineConstants);SIGNED true $(NoWarn),1574,1591 + false diff --git a/test/OpenTelemetry.Exporter.Jaeger.Tests/OpenTelemetry.Exporter.Jaeger.Tests.csproj b/test/OpenTelemetry.Exporter.Jaeger.Tests/OpenTelemetry.Exporter.Jaeger.Tests.csproj index 4cd2def9b..39d555e07 100644 --- a/test/OpenTelemetry.Exporter.Jaeger.Tests/OpenTelemetry.Exporter.Jaeger.Tests.csproj +++ b/test/OpenTelemetry.Exporter.Jaeger.Tests/OpenTelemetry.Exporter.Jaeger.Tests.csproj @@ -15,7 +15,7 @@ - + all diff --git a/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests.csproj b/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests.csproj index ebcc28ec9..8151ce8db 100644 --- a/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests.csproj +++ b/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests.csproj @@ -8,8 +8,8 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/OpenTelemetry.Exporter.Zipkin.Tests/OpenTelemetry.Exporter.Zipkin.Tests.csproj b/test/OpenTelemetry.Exporter.Zipkin.Tests/OpenTelemetry.Exporter.Zipkin.Tests.csproj index f439831e1..ccf0e7446 100644 --- a/test/OpenTelemetry.Exporter.Zipkin.Tests/OpenTelemetry.Exporter.Zipkin.Tests.csproj +++ b/test/OpenTelemetry.Exporter.Zipkin.Tests/OpenTelemetry.Exporter.Zipkin.Tests.csproj @@ -19,7 +19,7 @@ - + all diff --git a/test/OpenTelemetry.Extensions.Hosting.Tests/OpenTelemetry.Extensions.Hosting.Tests.csproj b/test/OpenTelemetry.Extensions.Hosting.Tests/OpenTelemetry.Extensions.Hosting.Tests.csproj index 27de7ddb3..5a6e84ce5 100644 --- a/test/OpenTelemetry.Extensions.Hosting.Tests/OpenTelemetry.Extensions.Hosting.Tests.csproj +++ b/test/OpenTelemetry.Extensions.Hosting.Tests/OpenTelemetry.Extensions.Hosting.Tests.csproj @@ -12,7 +12,7 @@ - + all diff --git a/test/OpenTelemetry.Instrumentation.AspNet.Tests.Win/OpenTelemetry.Instrumentation.AspNet.Tests.Win.csproj b/test/OpenTelemetry.Instrumentation.AspNet.Tests.Win/OpenTelemetry.Instrumentation.AspNet.Tests.Win.csproj index e2e908bb9..9053597b3 100644 --- a/test/OpenTelemetry.Instrumentation.AspNet.Tests.Win/OpenTelemetry.Instrumentation.AspNet.Tests.Win.csproj +++ b/test/OpenTelemetry.Instrumentation.AspNet.Tests.Win/OpenTelemetry.Instrumentation.AspNet.Tests.Win.csproj @@ -16,7 +16,7 @@ - + all diff --git a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/BasicTests.cs b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/BasicTests.cs index 852694d25..3bf1ba84d 100644 --- a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/BasicTests.cs +++ b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/BasicTests.cs @@ -164,7 +164,7 @@ namespace OpenTelemetry.Instrumentation.AspNetCore.Tests var response = await client.GetAsync("/api/values/2"); response.EnsureSuccessStatusCode(); // Status Code 200-299 - WaitForProcessorInvocations(spanProcessor, 4); + WaitForProcessorInvocations(spanProcessor, 2); } // begin and end was called once each. @@ -233,7 +233,7 @@ namespace OpenTelemetry.Instrumentation.AspNetCore.Tests () => { Thread.Sleep(10); - return spanProcessor.Invocations.Count >= 2; + return spanProcessor.Invocations.Count >= invocationCount; }, TimeSpan.FromSeconds(1))); } diff --git a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/OpenTelemetry.Instrumentation.AspNetCore.Tests.csproj b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/OpenTelemetry.Instrumentation.AspNetCore.Tests.csproj index 3a6f05f01..485202c70 100644 --- a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/OpenTelemetry.Instrumentation.AspNetCore.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/OpenTelemetry.Instrumentation.AspNetCore.Tests.csproj @@ -16,7 +16,7 @@ - + all diff --git a/test/OpenTelemetry.Instrumentation.Dependencies.Tests/OpenTelemetry.Instrumentation.Dependencies.Tests.csproj b/test/OpenTelemetry.Instrumentation.Dependencies.Tests/OpenTelemetry.Instrumentation.Dependencies.Tests.csproj index 11611f801..d08d8fe21 100644 --- a/test/OpenTelemetry.Instrumentation.Dependencies.Tests/OpenTelemetry.Instrumentation.Dependencies.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.Dependencies.Tests/OpenTelemetry.Instrumentation.Dependencies.Tests.csproj @@ -23,7 +23,7 @@ - + all diff --git a/test/OpenTelemetry.Instrumentation.GrpcClient.Tests/OpenTelemetry.Instrumentation.GrpcClient.Tests.csproj b/test/OpenTelemetry.Instrumentation.GrpcClient.Tests/OpenTelemetry.Instrumentation.GrpcClient.Tests.csproj index be2b9fcf3..e043aa6e7 100644 --- a/test/OpenTelemetry.Instrumentation.GrpcClient.Tests/OpenTelemetry.Instrumentation.GrpcClient.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.GrpcClient.Tests/OpenTelemetry.Instrumentation.GrpcClient.Tests.csproj @@ -9,10 +9,10 @@ - - + + - + all runtime; build; native; contentfiles; analyzers diff --git a/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests.csproj b/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests.csproj index d5e02d8f4..1ee8258b6 100644 --- a/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests.csproj @@ -16,7 +16,7 @@ - + all diff --git a/test/OpenTelemetry.Shims.OpenTracing.Tests/OpenTelemetry.Shims.OpenTracing.Tests.csproj b/test/OpenTelemetry.Shims.OpenTracing.Tests/OpenTelemetry.Shims.OpenTracing.Tests.csproj index 34349bce8..d1f05453d 100644 --- a/test/OpenTelemetry.Shims.OpenTracing.Tests/OpenTelemetry.Shims.OpenTracing.Tests.csproj +++ b/test/OpenTelemetry.Shims.OpenTracing.Tests/OpenTelemetry.Shims.OpenTracing.Tests.csproj @@ -6,7 +6,7 @@ - + all diff --git a/test/OpenTelemetry.Tests/OpenTelemetry.Tests.csproj b/test/OpenTelemetry.Tests/OpenTelemetry.Tests.csproj index c52da1cb7..6e4bee3ad 100644 --- a/test/OpenTelemetry.Tests/OpenTelemetry.Tests.csproj +++ b/test/OpenTelemetry.Tests/OpenTelemetry.Tests.csproj @@ -23,7 +23,7 @@ - + all