From da44deb057653119257a6679c8d6c0fe356418b1 Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Tue, 2 Nov 2021 13:40:13 -0700 Subject: [PATCH 01/37] add .net6.0 to ci --- .github/workflows/integration.yml | 8 ++++---- .github/workflows/linux-ci.yml | 2 +- .github/workflows/windows-ci.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index b752f10ae93..89eb58ea310 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: false matrix: - version: [netcoreapp3.1,net5.0] + version: [netcoreapp3.1,net5.0,net6.0] steps: - uses: actions/checkout@v2 - name: Run redis docker-compose.integration @@ -27,7 +27,7 @@ jobs: strategy: fail-fast: false matrix: - version: [netcoreapp3.1,net5.0] + version: [netcoreapp3.1,net5.0,net6.0] steps: - uses: actions/checkout@v2 - name: Run sql docker-compose.integration @@ -38,7 +38,7 @@ jobs: strategy: fail-fast: false matrix: - version: [netcoreapp3.1,net5.0] + version: [netcoreapp3.1,net5.0,net6.0] steps: - uses: actions/checkout@v2 - name: Run W3C Trace Context docker-compose.integration @@ -49,7 +49,7 @@ jobs: strategy: fail-fast: false matrix: - version: [netcoreapp3.1,net5.0] + version: [netcoreapp3.1,net5.0,net6.0] steps: - uses: actions/checkout@v2 - name: Run OTLP Exporter docker-compose.integration diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml index f66fb6dd966..aefe303dd90 100644 --- a/.github/workflows/linux-ci.yml +++ b/.github/workflows/linux-ci.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: - version: [netcoreapp3.1,net5.0] + version: [netcoreapp3.1,net5.0,net6.0] steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml index de5cdc95c81..b777abfba38 100644 --- a/.github/workflows/windows-ci.yml +++ b/.github/workflows/windows-ci.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: - version: [net461,netcoreapp3.1,net5.0] + version: [net461,netcoreapp3.1,net5.0,net6.0] steps: - uses: actions/checkout@v2 From 7cb7c61d73bd9f348417041e392412f2e84fc882 Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Tue, 2 Nov 2021 13:44:55 -0700 Subject: [PATCH 02/37] add docker compose for 6.0 --- build/docker-compose.net6.0.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 build/docker-compose.net6.0.yml diff --git a/build/docker-compose.net6.0.yml b/build/docker-compose.net6.0.yml new file mode 100644 index 00000000000..cb08be5b71a --- /dev/null +++ b/build/docker-compose.net6.0.yml @@ -0,0 +1,8 @@ +version: '3.7' + +services: + tests: + build: + args: + PUBLISH_FRAMEWORK: net6.0 + SDK_VERSION: 6.0 From 4bb1615d9829977ba3ad0444253e125a8380c8fd Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Tue, 2 Nov 2021 13:49:06 -0700 Subject: [PATCH 03/37] add dotnet 6 --- .github/workflows/linux-ci.yml | 3 +++ .github/workflows/windows-ci.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml index aefe303dd90..e5fbbb4d839 100644 --- a/.github/workflows/linux-ci.yml +++ b/.github/workflows/linux-ci.yml @@ -20,6 +20,9 @@ jobs: steps: - uses: actions/checkout@v2 + with: + dotnet-version: '6.0.x' + include-prerelease: true - name: Install dependencies run: dotnet restore diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml index b777abfba38..2ba13acd233 100644 --- a/.github/workflows/windows-ci.yml +++ b/.github/workflows/windows-ci.yml @@ -20,6 +20,9 @@ jobs: steps: - uses: actions/checkout@v2 + with: + dotnet-version: '6.0.x' + include-prerelease: true - name: Install dependencies run: dotnet restore From 95fe250fbb6e1004a97c34351c38a1055375defc Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Tue, 2 Nov 2021 13:52:54 -0700 Subject: [PATCH 04/37] add set up step --- .github/workflows/linux-ci.yml | 2 ++ .github/workflows/windows-ci.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml index e5fbbb4d839..c1a8c944d33 100644 --- a/.github/workflows/linux-ci.yml +++ b/.github/workflows/linux-ci.yml @@ -20,6 +20,8 @@ jobs: steps: - uses: actions/checkout@v2 + + - uses: actions/setup-dotnet@v1 with: dotnet-version: '6.0.x' include-prerelease: true diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml index 2ba13acd233..7c4719f40d7 100644 --- a/.github/workflows/windows-ci.yml +++ b/.github/workflows/windows-ci.yml @@ -20,6 +20,8 @@ jobs: steps: - uses: actions/checkout@v2 + + - uses: actions/setup-dotnet@v1 with: dotnet-version: '6.0.x' include-prerelease: true From ca7481b7b542fb84d9bf822b5adf12c02603df00 Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Tue, 2 Nov 2021 13:58:53 -0700 Subject: [PATCH 05/37] add net6.0 to sql client test --- .../OpenTelemetry.Instrumentation.SqlClient.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/OpenTelemetry.Instrumentation.SqlClient.Tests/OpenTelemetry.Instrumentation.SqlClient.Tests.csproj b/test/OpenTelemetry.Instrumentation.SqlClient.Tests/OpenTelemetry.Instrumentation.SqlClient.Tests.csproj index dcb9b2d8c6e..16e6f3d2b88 100644 --- a/test/OpenTelemetry.Instrumentation.SqlClient.Tests/OpenTelemetry.Instrumentation.SqlClient.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.SqlClient.Tests/OpenTelemetry.Instrumentation.SqlClient.Tests.csproj @@ -1,7 +1,7 @@  Unit test project for OpenTelemetry SqlClient instrumentations - netcoreapp3.1;net5.0 + netcoreapp3.1;net5.0;net6.0 $(TargetFrameworks);net461 $(TARGET_FRAMEWORK) From 539e1e89c9e0d87e6f8e82b5b8c3e35118ac4a2c Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Tue, 2 Nov 2021 14:06:26 -0700 Subject: [PATCH 06/37] rc sdk version --- build/docker-compose.net6.0.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/docker-compose.net6.0.yml b/build/docker-compose.net6.0.yml index cb08be5b71a..4178aaa964e 100644 --- a/build/docker-compose.net6.0.yml +++ b/build/docker-compose.net6.0.yml @@ -5,4 +5,4 @@ services: build: args: PUBLISH_FRAMEWORK: net6.0 - SDK_VERSION: 6.0 + SDK_VERSION: 6.0.100-rc.2.21505.57 From aee44ae89b21d9dda907f702c985e1a4513b067b Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Tue, 2 Nov 2021 14:13:17 -0700 Subject: [PATCH 07/37] revert dotnet set up --- .github/workflows/linux-ci.yml | 5 ----- .github/workflows/windows-ci.yml | 5 ----- build/docker-compose.net6.0.yml | 2 +- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml index c1a8c944d33..aefe303dd90 100644 --- a/.github/workflows/linux-ci.yml +++ b/.github/workflows/linux-ci.yml @@ -21,11 +21,6 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '6.0.x' - include-prerelease: true - - name: Install dependencies run: dotnet restore diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml index 7c4719f40d7..b777abfba38 100644 --- a/.github/workflows/windows-ci.yml +++ b/.github/workflows/windows-ci.yml @@ -21,11 +21,6 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '6.0.x' - include-prerelease: true - - name: Install dependencies run: dotnet restore diff --git a/build/docker-compose.net6.0.yml b/build/docker-compose.net6.0.yml index 4178aaa964e..cb08be5b71a 100644 --- a/build/docker-compose.net6.0.yml +++ b/build/docker-compose.net6.0.yml @@ -5,4 +5,4 @@ services: build: args: PUBLISH_FRAMEWORK: net6.0 - SDK_VERSION: 6.0.100-rc.2.21505.57 + SDK_VERSION: 6.0 From 04f9d0662975d280352b56b4d798f41e50c55638 Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Tue, 2 Nov 2021 14:18:14 -0700 Subject: [PATCH 08/37] add dotnet install --- .github/workflows/linux-ci.yml | 13 +++++++++++++ .github/workflows/windows-ci.yml | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml index aefe303dd90..ef89aa9ddfa 100644 --- a/.github/workflows/linux-ci.yml +++ b/.github/workflows/linux-ci.yml @@ -21,6 +21,19 @@ jobs: steps: - uses: actions/checkout@v2 + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: '3.1.x' + + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: '5.0.x' + + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.x' + include-prerelease: true + - name: Install dependencies run: dotnet restore diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml index b777abfba38..80338e6bd77 100644 --- a/.github/workflows/windows-ci.yml +++ b/.github/workflows/windows-ci.yml @@ -21,6 +21,19 @@ jobs: steps: - uses: actions/checkout@v2 + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: '3.1.x' + + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: '5.0.x' + + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.x' + include-prerelease: true + - name: Install dependencies run: dotnet restore From cdf0b7503926ef53b4c0ff24939f8a8b75080ad9 Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Tue, 2 Nov 2021 14:56:46 -0700 Subject: [PATCH 09/37] integration --- .github/workflows/integration.yml | 56 +++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 89eb58ea310..54452484077 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -19,6 +19,20 @@ jobs: version: [netcoreapp3.1,net5.0,net6.0] steps: - uses: actions/checkout@v2 + + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: '3.1.x' + + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: '5.0.x' + + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.x' + include-prerelease: true + - name: Run redis docker-compose.integration run: docker-compose --file=test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/docker-compose.yml --file=build/docker-compose.${{ matrix.version }}.yml --project-directory=. up --exit-code-from=tests --build @@ -30,6 +44,20 @@ jobs: version: [netcoreapp3.1,net5.0,net6.0] steps: - uses: actions/checkout@v2 + + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: '3.1.x' + + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: '5.0.x' + + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.x' + include-prerelease: true + - name: Run sql docker-compose.integration run: docker-compose --file=test/OpenTelemetry.Instrumentation.SqlClient.Tests/docker-compose.yml --file=build/docker-compose.${{ matrix.version }}.yml --project-directory=. up --exit-code-from=tests --build @@ -41,6 +69,20 @@ jobs: version: [netcoreapp3.1,net5.0,net6.0] steps: - uses: actions/checkout@v2 + + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: '3.1.x' + + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: '5.0.x' + + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.x' + include-prerelease: true + - name: Run W3C Trace Context docker-compose.integration run: docker-compose --file=test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/docker-compose.yml --file=build/docker-compose.${{ matrix.version }}.yml --project-directory=. up --exit-code-from=tests --build @@ -52,5 +94,19 @@ jobs: version: [netcoreapp3.1,net5.0,net6.0] steps: - uses: actions/checkout@v2 + + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: '3.1.x' + + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: '5.0.x' + + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.x' + include-prerelease: true + - name: Run OTLP Exporter docker-compose.integration run: docker-compose --file=test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/docker-compose.yml --file=build/docker-compose.${{ matrix.version }}.yml --project-directory=. up --exit-code-from=tests --build From 241302c650dd5b4d5ec7ccbaca0553322e146ff8 Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Tue, 2 Nov 2021 15:28:48 -0700 Subject: [PATCH 10/37] rc sdk version --- build/docker-compose.net6.0.yml | 2 +- .../AspNetCoreInstrumentationOptions.cs | 2 +- ...elemetry.Instrumentation.AspNetCore.csproj | 6 +- ...OpenTelemetry.Exporter.Jaeger.Tests.csproj | 2 +- ...xporter.OpenTelemetryProtocol.Tests.csproj | 2 +- ...Telemetry.Exporter.Prometheus.Tests.csproj | 4 ++ ...OpenTelemetry.Exporter.ZPages.Tests.csproj | 2 +- ...OpenTelemetry.Exporter.Zipkin.Tests.csproj | 2 +- ...nTelemetry.Extensions.Hosting.Tests.csproj | 2 +- .../BasicTests.cs | 7 +- .../DependencyInjectionConfigTests.cs | 6 +- ...stsCollectionsIsAccordingToTheSpecTests.cs | 6 +- .../MetricTests.cs | 6 +- ...ry.Instrumentation.AspNetCore.Tests.csproj | 7 +- ...elemetry.Instrumentation.Http.Tests.csproj | 2 +- ...umentation.StackExchangeRedis.Tests.csproj | 2 +- .../InProcessServer.cs | 4 +- ...strumentation.W3cTraceContext.Tests.csproj | 6 +- ...enTelemetry.Shims.OpenTracing.Tests.csproj | 2 +- .../OpenTelemetry.Tests.Stress.Metrics.csproj | 2 +- .../OpenTelemetry.Tests.Stress.csproj | 2 +- .../OpenTelemetry.Tests.csproj | 2 +- test/TestApp.AspNetCore.6.0/AssemblyInfo.cs | 24 +++++++ .../CallbackMiddleware.cs | 49 +++++++++++++ .../Controllers/ChildActivityController.cs | 46 ++++++++++++ .../Controllers/ForwardController.cs | 72 +++++++++++++++++++ .../Controllers/ValuesController.cs | 56 +++++++++++++++ test/TestApp.AspNetCore.6.0/Program.cs | 33 +++++++++ test/TestApp.AspNetCore.6.0/Startup.cs | 63 ++++++++++++++++ .../TestApp.AspNetCore.6.0.csproj | 25 +++++++ .../appsettings.Development.json | 10 +++ test/TestApp.AspNetCore.6.0/appsettings.json | 15 ++++ 32 files changed, 450 insertions(+), 21 deletions(-) create mode 100644 test/TestApp.AspNetCore.6.0/AssemblyInfo.cs create mode 100644 test/TestApp.AspNetCore.6.0/CallbackMiddleware.cs create mode 100644 test/TestApp.AspNetCore.6.0/Controllers/ChildActivityController.cs create mode 100644 test/TestApp.AspNetCore.6.0/Controllers/ForwardController.cs create mode 100644 test/TestApp.AspNetCore.6.0/Controllers/ValuesController.cs create mode 100644 test/TestApp.AspNetCore.6.0/Program.cs create mode 100644 test/TestApp.AspNetCore.6.0/Startup.cs create mode 100644 test/TestApp.AspNetCore.6.0/TestApp.AspNetCore.6.0.csproj create mode 100644 test/TestApp.AspNetCore.6.0/appsettings.Development.json create mode 100644 test/TestApp.AspNetCore.6.0/appsettings.json diff --git a/build/docker-compose.net6.0.yml b/build/docker-compose.net6.0.yml index cb08be5b71a..4178aaa964e 100644 --- a/build/docker-compose.net6.0.yml +++ b/build/docker-compose.net6.0.yml @@ -5,4 +5,4 @@ services: build: args: PUBLISH_FRAMEWORK: net6.0 - SDK_VERSION: 6.0 + SDK_VERSION: 6.0.100-rc.2.21505.57 diff --git a/src/OpenTelemetry.Instrumentation.AspNetCore/AspNetCoreInstrumentationOptions.cs b/src/OpenTelemetry.Instrumentation.AspNetCore/AspNetCoreInstrumentationOptions.cs index 8937e193b63..7bd2f7c1e4d 100644 --- a/src/OpenTelemetry.Instrumentation.AspNetCore/AspNetCoreInstrumentationOptions.cs +++ b/src/OpenTelemetry.Instrumentation.AspNetCore/AspNetCoreInstrumentationOptions.cs @@ -52,7 +52,7 @@ public class AspNetCoreInstrumentationOptions /// public bool RecordException { get; set; } -#if NETSTANDARD2_1 || NETCOREAPP3_1 || NET5_0 +#if NETSTANDARD2_1 || NETCOREAPP3_1 || NET5_0_OR_GREATER /// /// Gets or sets a value indicating whether RPC attributes are added to an Activity when using Grpc.AspNetCore. Default is true. /// diff --git a/src/OpenTelemetry.Instrumentation.AspNetCore/OpenTelemetry.Instrumentation.AspNetCore.csproj b/src/OpenTelemetry.Instrumentation.AspNetCore/OpenTelemetry.Instrumentation.AspNetCore.csproj index 26c13d6114f..ef84689e041 100644 --- a/src/OpenTelemetry.Instrumentation.AspNetCore/OpenTelemetry.Instrumentation.AspNetCore.csproj +++ b/src/OpenTelemetry.Instrumentation.AspNetCore/OpenTelemetry.Instrumentation.AspNetCore.csproj @@ -1,6 +1,6 @@  - netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0 + netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0;net6.0 ASP.NET Core instrumentation for OpenTelemetry .NET $(PackageTags);distributed-tracing;AspNetCore true @@ -34,4 +34,8 @@ + + + + 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 0caeb6bd025..ad24901557b 100644 --- a/test/OpenTelemetry.Exporter.Jaeger.Tests/OpenTelemetry.Exporter.Jaeger.Tests.csproj +++ b/test/OpenTelemetry.Exporter.Jaeger.Tests/OpenTelemetry.Exporter.Jaeger.Tests.csproj @@ -1,7 +1,7 @@  Unit test project for Jaeger Exporter for OpenTelemetry - netcoreapp3.1;net5.0 + netcoreapp3.1;net5.0;net6.0 $(TargetFrameworks);net461 false 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 76516e01b7a..5df09a86580 100644 --- a/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests.csproj +++ b/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1;net5.0 + netcoreapp3.1;net5.0;net6.0 $(TargetFrameworks);net461 $(TARGET_FRAMEWORK) false diff --git a/test/OpenTelemetry.Exporter.Prometheus.Tests/OpenTelemetry.Exporter.Prometheus.Tests.csproj b/test/OpenTelemetry.Exporter.Prometheus.Tests/OpenTelemetry.Exporter.Prometheus.Tests.csproj index 5618930e39d..4c55a2d4374 100644 --- a/test/OpenTelemetry.Exporter.Prometheus.Tests/OpenTelemetry.Exporter.Prometheus.Tests.csproj +++ b/test/OpenTelemetry.Exporter.Prometheus.Tests/OpenTelemetry.Exporter.Prometheus.Tests.csproj @@ -23,6 +23,10 @@ + + + + diff --git a/test/OpenTelemetry.Exporter.ZPages.Tests/OpenTelemetry.Exporter.ZPages.Tests.csproj b/test/OpenTelemetry.Exporter.ZPages.Tests/OpenTelemetry.Exporter.ZPages.Tests.csproj index 222c00b976e..5fb58e19000 100644 --- a/test/OpenTelemetry.Exporter.ZPages.Tests/OpenTelemetry.Exporter.ZPages.Tests.csproj +++ b/test/OpenTelemetry.Exporter.ZPages.Tests/OpenTelemetry.Exporter.ZPages.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1;net5.0 + netcoreapp3.1;net5.0;net6.0 $(TargetFrameworks);net461 false 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 b589ee66be0..b5316e3a46a 100644 --- a/test/OpenTelemetry.Exporter.Zipkin.Tests/OpenTelemetry.Exporter.Zipkin.Tests.csproj +++ b/test/OpenTelemetry.Exporter.Zipkin.Tests/OpenTelemetry.Exporter.Zipkin.Tests.csproj @@ -1,7 +1,7 @@  Unit test project for Zipkin Exporter for OpenTelemetry - netcoreapp3.1;net5.0 + netcoreapp3.1;net5.0;net6.0 $(TargetFrameworks);net461 false 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 8244def8a31..38401a508ed 100644 --- a/test/OpenTelemetry.Extensions.Hosting.Tests/OpenTelemetry.Extensions.Hosting.Tests.csproj +++ b/test/OpenTelemetry.Extensions.Hosting.Tests/OpenTelemetry.Extensions.Hosting.Tests.csproj @@ -1,7 +1,7 @@  Unit test project for OpenTelemetry .NET Core hosting library - netcoreapp3.1;net5.0 + netcoreapp3.1;net5.0;net6.0 $(TargetFrameworks);net461 diff --git a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/BasicTests.cs b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/BasicTests.cs index 04cbdd6a38b..425bce8a152 100644 --- a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/BasicTests.cs +++ b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/BasicTests.cs @@ -31,11 +31,16 @@ using OpenTelemetry.Instrumentation.AspNetCore.Implementation; using OpenTelemetry.Tests; using OpenTelemetry.Trace; + #if NETCOREAPP3_1 using TestApp.AspNetCore._3._1; -#else +#endif +#if NET5_0 using TestApp.AspNetCore._5._0; #endif +#if NET6_0 +using TestApp.AspNetCore._6._0; +#endif using Xunit; namespace OpenTelemetry.Instrumentation.AspNetCore.Tests diff --git a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/DependencyInjectionConfigTests.cs b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/DependencyInjectionConfigTests.cs index cce05338e77..9441adfebbd 100644 --- a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/DependencyInjectionConfigTests.cs +++ b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/DependencyInjectionConfigTests.cs @@ -20,9 +20,13 @@ using OpenTelemetry.Trace; #if NETCOREAPP3_1 using TestApp.AspNetCore._3._1; -#else +#endif +#if NET5_0 using TestApp.AspNetCore._5._0; #endif +#if NET6_0 +using TestApp.AspNetCore._6._0; +#endif using Xunit; namespace OpenTelemetry.Instrumentation.AspNetCore.Tests diff --git a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/IncomingRequestsCollectionsIsAccordingToTheSpecTests.cs b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/IncomingRequestsCollectionsIsAccordingToTheSpecTests.cs index f93e140b9ec..e13174041ff 100644 --- a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/IncomingRequestsCollectionsIsAccordingToTheSpecTests.cs +++ b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/IncomingRequestsCollectionsIsAccordingToTheSpecTests.cs @@ -27,9 +27,13 @@ using OpenTelemetry.Trace; #if NETCOREAPP3_1 using TestApp.AspNetCore._3._1; -#else +#endif +#if NET5_0 using TestApp.AspNetCore._5._0; #endif +#if NET6_0 +using TestApp.AspNetCore._6._0; +#endif using Xunit; namespace OpenTelemetry.Instrumentation.AspNetCore.Tests diff --git a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/MetricTests.cs b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/MetricTests.cs index c37be430980..3f9e0ec4012 100644 --- a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/MetricTests.cs +++ b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/MetricTests.cs @@ -24,9 +24,13 @@ using OpenTelemetry.Trace; #if NETCOREAPP3_1 using TestApp.AspNetCore._3._1; -#else +#endif +#if NET5_0 using TestApp.AspNetCore._5._0; #endif +#if NET6_0 +using TestApp.AspNetCore._6._0; +#endif using Xunit; namespace OpenTelemetry.Instrumentation.AspNetCore.Tests 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 a035f5da834..b4b1844a461 100644 --- a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/OpenTelemetry.Instrumentation.AspNetCore.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/OpenTelemetry.Instrumentation.AspNetCore.Tests.csproj @@ -1,7 +1,7 @@  Unit test project for OpenTelemetry ASP.NET Core instrumentation - netcoreapp3.1;net5.0 + netcoreapp3.1;net5.0;net6.0 @@ -23,6 +23,11 @@ + + + + + diff --git a/test/OpenTelemetry.Instrumentation.Http.Tests/OpenTelemetry.Instrumentation.Http.Tests.csproj b/test/OpenTelemetry.Instrumentation.Http.Tests/OpenTelemetry.Instrumentation.Http.Tests.csproj index ce177accfe2..c062b0f0b17 100644 --- a/test/OpenTelemetry.Instrumentation.Http.Tests/OpenTelemetry.Instrumentation.Http.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.Http.Tests/OpenTelemetry.Instrumentation.Http.Tests.csproj @@ -1,7 +1,7 @@  Unit test project for OpenTelemetry HTTP instrumentations - netcoreapp3.1;net5.0 + netcoreapp3.1;net5.0;net6.0 $(TargetFrameworks);net461 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 4fac60d2ced..9a74fca6ba4 100644 --- a/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests.csproj @@ -1,7 +1,7 @@  Unit test project for OpenTelemetry StackExchangeRedis instrumentation - netcoreapp3.1;net5.0 + netcoreapp3.1;net5.0;net6.0 $(TargetFrameworks);net461 $(TARGET_FRAMEWORK) diff --git a/test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/InProcessServer.cs b/test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/InProcessServer.cs index e510dc184be..3f55060aff1 100644 --- a/test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/InProcessServer.cs +++ b/test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/InProcessServer.cs @@ -22,8 +22,10 @@ using OpenTelemetry.Trace; #if NETCOREAPP3_1 using TestApp.AspNetCore._3._1; -#else +#elif NET5_0 using TestApp.AspNetCore._5._0; +#else +using TestApp.AspNetCore._6._0; #endif using Xunit.Abstractions; diff --git a/test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/OpenTelemetry.Instrumentation.W3cTraceContext.Tests.csproj b/test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/OpenTelemetry.Instrumentation.W3cTraceContext.Tests.csproj index edd45e8eb74..135e433c85f 100644 --- a/test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/OpenTelemetry.Instrumentation.W3cTraceContext.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/OpenTelemetry.Instrumentation.W3cTraceContext.Tests.csproj @@ -2,7 +2,7 @@ Unit test project for OpenTelemetry ASP.NET Core instrumentation for W3C Trace Context Trace - netcoreapp3.1;net5.0 + netcoreapp3.1;net5.0;net6.0 $(TARGET_FRAMEWORK) @@ -28,6 +28,10 @@ + + + + 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 ba27221aa47..880f3d7f1e7 100644 --- a/test/OpenTelemetry.Shims.OpenTracing.Tests/OpenTelemetry.Shims.OpenTracing.Tests.csproj +++ b/test/OpenTelemetry.Shims.OpenTracing.Tests/OpenTelemetry.Shims.OpenTracing.Tests.csproj @@ -1,7 +1,7 @@  Unit test project for OpenTelemetry.Shims.OpenTracing - netcoreapp3.1;net5.0 + netcoreapp3.1;net5.0;net6.0 diff --git a/test/OpenTelemetry.Tests.Stress.Metrics/OpenTelemetry.Tests.Stress.Metrics.csproj b/test/OpenTelemetry.Tests.Stress.Metrics/OpenTelemetry.Tests.Stress.Metrics.csproj index d3520b8f46d..b8deeeb0813 100644 --- a/test/OpenTelemetry.Tests.Stress.Metrics/OpenTelemetry.Tests.Stress.Metrics.csproj +++ b/test/OpenTelemetry.Tests.Stress.Metrics/OpenTelemetry.Tests.Stress.Metrics.csproj @@ -3,7 +3,7 @@ $(NoWarn),SA1000 Exe - netcoreapp3.1;net5.0;net462 + netcoreapp3.1;net5.0;net6.0;net462 false diff --git a/test/OpenTelemetry.Tests.Stress/OpenTelemetry.Tests.Stress.csproj b/test/OpenTelemetry.Tests.Stress/OpenTelemetry.Tests.Stress.csproj index 019a9cbe644..083ec9a07a1 100644 --- a/test/OpenTelemetry.Tests.Stress/OpenTelemetry.Tests.Stress.csproj +++ b/test/OpenTelemetry.Tests.Stress/OpenTelemetry.Tests.Stress.csproj @@ -1,7 +1,7 @@  Exe - netcoreapp3.1;net5.0;net462 + netcoreapp3.1;net5.0;net6.0;net462 false diff --git a/test/OpenTelemetry.Tests/OpenTelemetry.Tests.csproj b/test/OpenTelemetry.Tests/OpenTelemetry.Tests.csproj index b61e43c0417..1934c7df9dc 100644 --- a/test/OpenTelemetry.Tests/OpenTelemetry.Tests.csproj +++ b/test/OpenTelemetry.Tests/OpenTelemetry.Tests.csproj @@ -1,7 +1,7 @@  Unit test project for OpenTelemetry - netcoreapp3.1;net5.0 + netcoreapp3.1;net5.0;net6.0 $(TargetFrameworks);net461 $(NoWarn),CS0618 diff --git a/test/TestApp.AspNetCore.6.0/AssemblyInfo.cs b/test/TestApp.AspNetCore.6.0/AssemblyInfo.cs new file mode 100644 index 00000000000..e953a800309 --- /dev/null +++ b/test/TestApp.AspNetCore.6.0/AssemblyInfo.cs @@ -0,0 +1,24 @@ +// +// Copyright The OpenTelemetry Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +using System.Diagnostics.CodeAnalysis; + +[assembly: SuppressMessage( + "StyleCop.CSharp.NamingRules", + "SA1300", + Justification = "Reviewed.", + Scope = "namespaceanddescendants", + Target = "TestApp.AspNetCore._6._0")] diff --git a/test/TestApp.AspNetCore.6.0/CallbackMiddleware.cs b/test/TestApp.AspNetCore.6.0/CallbackMiddleware.cs new file mode 100644 index 00000000000..af1456e4dd7 --- /dev/null +++ b/test/TestApp.AspNetCore.6.0/CallbackMiddleware.cs @@ -0,0 +1,49 @@ +// +// Copyright The OpenTelemetry Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; + +namespace TestApp.AspNetCore._6._0 +{ + public class CallbackMiddleware + { + private readonly CallbackMiddlewareImpl impl; + private readonly RequestDelegate next; + + public CallbackMiddleware(RequestDelegate next, CallbackMiddlewareImpl impl) + { + this.next = next; + this.impl = impl; + } + + public async Task InvokeAsync(HttpContext context) + { + if (this.impl == null || await this.impl.ProcessAsync(context)) + { + await this.next(context); + } + } + + public class CallbackMiddlewareImpl + { + public virtual async Task ProcessAsync(HttpContext context) + { + return await Task.FromResult(true); + } + } + } +} diff --git a/test/TestApp.AspNetCore.6.0/Controllers/ChildActivityController.cs b/test/TestApp.AspNetCore.6.0/Controllers/ChildActivityController.cs new file mode 100644 index 00000000000..aa5cc96c878 --- /dev/null +++ b/test/TestApp.AspNetCore.6.0/Controllers/ChildActivityController.cs @@ -0,0 +1,46 @@ +// +// Copyright The OpenTelemetry Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +using System.Collections.Generic; +using System.Diagnostics; +using Microsoft.AspNetCore.Mvc; +using OpenTelemetry; + +namespace TestApp.AspNetCore._6._0.Controllers +{ + public class ChildActivityController : Controller + { + [Route("api/GetChildActivityTraceContext")] + public Dictionary GetChildActivityTraceContext() + { + var result = new Dictionary(); + var activity = new Activity("ActivityInsideHttpRequest"); + activity.Start(); + result["TraceId"] = activity.Context.TraceId.ToString(); + result["ParentSpanId"] = activity.ParentSpanId.ToString(); + result["TraceState"] = activity.Context.TraceState; + activity.Stop(); + return result; + } + + [Route("api/GetChildActivityBaggageContext")] + public IReadOnlyDictionary GetChildActivityBaggageContext() + { + var result = Baggage.Current.GetBaggage(); + return result; + } + } +} diff --git a/test/TestApp.AspNetCore.6.0/Controllers/ForwardController.cs b/test/TestApp.AspNetCore.6.0/Controllers/ForwardController.cs new file mode 100644 index 00000000000..36290e144c9 --- /dev/null +++ b/test/TestApp.AspNetCore.6.0/Controllers/ForwardController.cs @@ -0,0 +1,72 @@ +// +// Copyright The OpenTelemetry Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +using System.Net.Http; +using System.Text; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using Newtonsoft.Json; + +namespace TestApp.AspNetCore._6._0.Controllers +{ + [Route("api/[controller]")] + public class ForwardController : Controller + { + private readonly HttpClient httpClient; + + public ForwardController(HttpClient httpClient) + { + this.httpClient = httpClient; + } + + // POST api/test + [HttpPost] + public async Task Post([FromBody] Data[] data) + { + var result = string.Empty; + + if (data != null) + { + foreach (var argument in data) + { + var request = new HttpRequestMessage(HttpMethod.Post, argument.Url) + { + Content = new StringContent( + JsonConvert.SerializeObject(argument.Arguments), + Encoding.UTF8, + "application/json"), + }; + await this.httpClient.SendAsync(request); + } + } + else + { + result = "done"; + } + + return result; + } + + public class Data + { + [JsonProperty("url")] + public string Url { get; set; } + + [JsonProperty("arguments")] + public Data[] Arguments { get; set; } + } + } +} diff --git a/test/TestApp.AspNetCore.6.0/Controllers/ValuesController.cs b/test/TestApp.AspNetCore.6.0/Controllers/ValuesController.cs new file mode 100644 index 00000000000..2bb407a8134 --- /dev/null +++ b/test/TestApp.AspNetCore.6.0/Controllers/ValuesController.cs @@ -0,0 +1,56 @@ +// +// Copyright The OpenTelemetry Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +using System.Collections.Generic; +using Microsoft.AspNetCore.Mvc; + +namespace TestApp.AspNetCore._6._0.Controllers +{ + [Route("api/[controller]")] + public class ValuesController : Controller + { + // GET api/values + [HttpGet] + public IEnumerable Get() + { + return new string[] { "value1", "value2" }; + } + + // GET api/values/5 + [HttpGet("{id}")] + public string Get(int id) + { + return "value"; + } + + // POST api/values + [HttpPost] + public void Post([FromBody] string value) + { + } + + // PUT api/values/5 + [HttpPut("{id}")] + public void Put(int id, [FromBody] string value) + { + } + + // DELETE api/values/5 + [HttpDelete("{id}")] + public void Delete(int id) + { + } + } +} diff --git a/test/TestApp.AspNetCore.6.0/Program.cs b/test/TestApp.AspNetCore.6.0/Program.cs new file mode 100644 index 00000000000..73ce4974a7b --- /dev/null +++ b/test/TestApp.AspNetCore.6.0/Program.cs @@ -0,0 +1,33 @@ +// +// Copyright The OpenTelemetry Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +using Microsoft.AspNetCore; +using Microsoft.AspNetCore.Hosting; + +namespace TestApp.AspNetCore._6._0 +{ + public class Program + { + public static void Main(string[] args) + { + CreateWebHostBuilder(args).Build().Run(); + } + + public static IWebHostBuilder CreateWebHostBuilder(string[] args) => + WebHost.CreateDefaultBuilder(args) + .UseStartup(); + } +} diff --git a/test/TestApp.AspNetCore.6.0/Startup.cs b/test/TestApp.AspNetCore.6.0/Startup.cs new file mode 100644 index 00000000000..1da70536444 --- /dev/null +++ b/test/TestApp.AspNetCore.6.0/Startup.cs @@ -0,0 +1,63 @@ +// +// Copyright The OpenTelemetry Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +using System.Net.Http; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; + +namespace TestApp.AspNetCore._6._0 +{ + public class Startup + { + public Startup(IConfiguration configuration) + { + this.Configuration = configuration; + } + + public IConfiguration Configuration { get; } + + // This method gets called by the runtime. Use this method to add services to the container. + public void ConfigureServices(IServiceCollection services) + { + services.AddMvc(); + services.AddSingleton(); + services.AddSingleton( + new CallbackMiddleware.CallbackMiddlewareImpl()); + } + + // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. + public void Configure(IApplicationBuilder app, IWebHostEnvironment env) + { + if (env.IsDevelopment()) + { + app.UseDeveloperExceptionPage(); + } + + app.UseMiddleware(); + app.UseRouting(); + + app.UseAuthorization(); + + app.UseEndpoints(endpoints => + { + endpoints.MapControllers(); + }); + } + } +} diff --git a/test/TestApp.AspNetCore.6.0/TestApp.AspNetCore.6.0.csproj b/test/TestApp.AspNetCore.6.0/TestApp.AspNetCore.6.0.csproj new file mode 100644 index 00000000000..14b93114b53 --- /dev/null +++ b/test/TestApp.AspNetCore.6.0/TestApp.AspNetCore.6.0.csproj @@ -0,0 +1,25 @@ + + + + net6.0 + + + + + + + + + + + + + + + + + + + + + diff --git a/test/TestApp.AspNetCore.6.0/appsettings.Development.json b/test/TestApp.AspNetCore.6.0/appsettings.Development.json new file mode 100644 index 00000000000..fa8ce71a97a --- /dev/null +++ b/test/TestApp.AspNetCore.6.0/appsettings.Development.json @@ -0,0 +1,10 @@ +{ + "Logging": { + "IncludeScopes": false, + "LogLevel": { + "Default": "Debug", + "System": "Information", + "Microsoft": "Information" + } + } +} diff --git a/test/TestApp.AspNetCore.6.0/appsettings.json b/test/TestApp.AspNetCore.6.0/appsettings.json new file mode 100644 index 00000000000..26bb0ac7ac6 --- /dev/null +++ b/test/TestApp.AspNetCore.6.0/appsettings.json @@ -0,0 +1,15 @@ +{ + "Logging": { + "IncludeScopes": false, + "Debug": { + "LogLevel": { + "Default": "Warning" + } + }, + "Console": { + "LogLevel": { + "Default": "Warning" + } + } + } +} From de1282b5cd4e5308515fd9ff3ca2b3e424675426 Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Tue, 2 Nov 2021 15:35:21 -0700 Subject: [PATCH 11/37] update docker version --- build/docker-compose.net6.0.yml | 2 +- .../Dockerfile | 4 ++-- test/OpenTelemetry.Instrumentation.SqlClient.Tests/dockerfile | 4 ++-- .../dockerfile | 4 ++-- .../Dockerfile | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build/docker-compose.net6.0.yml b/build/docker-compose.net6.0.yml index 4178aaa964e..cb08be5b71a 100644 --- a/build/docker-compose.net6.0.yml +++ b/build/docker-compose.net6.0.yml @@ -5,4 +5,4 @@ services: build: args: PUBLISH_FRAMEWORK: net6.0 - SDK_VERSION: 6.0.100-rc.2.21505.57 + SDK_VERSION: 6.0 diff --git a/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/Dockerfile b/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/Dockerfile index 57c45f3cb55..1291b8d69d3 100644 --- a/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/Dockerfile +++ b/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/Dockerfile @@ -2,10 +2,10 @@ # This should be run from the root of the repo: # docker build --file test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/Dockerfile -ARG SDK_VERSION=5.0 +ARG SDK_VERSION=6.0 FROM mcr.microsoft.com/dotnet/sdk:5.0-focal AS build ARG PUBLISH_CONFIGURATION=Release -ARG PUBLISH_FRAMEWORK=net5.0 +ARG PUBLISH_FRAMEWORK=net6.0 WORKDIR /repo COPY . ./ WORKDIR "/repo/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests" diff --git a/test/OpenTelemetry.Instrumentation.SqlClient.Tests/dockerfile b/test/OpenTelemetry.Instrumentation.SqlClient.Tests/dockerfile index bff388e4847..77618e81532 100644 --- a/test/OpenTelemetry.Instrumentation.SqlClient.Tests/dockerfile +++ b/test/OpenTelemetry.Instrumentation.SqlClient.Tests/dockerfile @@ -2,10 +2,10 @@ # This should be run from the root of the repo: # docker build --file test/OpenTelemetry.Instrumentation.SqlClient.Tests/dockerfile . -ARG SDK_VERSION=5.0 +ARG SDK_VERSION=6.0 FROM mcr.microsoft.com/dotnet/sdk:5.0-focal AS build ARG PUBLISH_CONFIGURATION=Release -ARG PUBLISH_FRAMEWORK=net5.0 +ARG PUBLISH_FRAMEWORK=net6.0 WORKDIR /repo COPY . ./ RUN ls -la /repo diff --git a/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/dockerfile b/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/dockerfile index bc600583062..929ae4a12f0 100644 --- a/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/dockerfile +++ b/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/dockerfile @@ -2,10 +2,10 @@ # This should be run from the root of the repo: # docker build --file test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/dockerfile . -ARG SDK_VERSION=5.0 +ARG SDK_VERSION=6.0 FROM mcr.microsoft.com/dotnet/sdk:5.0-focal AS build ARG PUBLISH_CONFIGURATION=Release -ARG PUBLISH_FRAMEWORK=net5.0 +ARG PUBLISH_FRAMEWORK=net6.0 WORKDIR /repo COPY . ./ WORKDIR "/repo/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests" diff --git a/test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/Dockerfile b/test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/Dockerfile index aa0a0cf0026..eb565e3b529 100644 --- a/test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/Dockerfile +++ b/test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/Dockerfile @@ -2,7 +2,7 @@ # This should be run from the root of the repo: # docker build --file test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/Dockerfile . -ARG SDK_VERSION=5.0 +ARG SDK_VERSION=6.0 FROM ubuntu AS w3c #Install git WORKDIR /w3c @@ -11,7 +11,7 @@ RUN git clone https://github.com/w3c/trace-context.git FROM mcr.microsoft.com/dotnet/sdk:5.0-focal AS build ARG PUBLISH_CONFIGURATION=Release -ARG PUBLISH_FRAMEWORK=net5.0 +ARG PUBLISH_FRAMEWORK=net6.0 WORKDIR /repo COPY . ./ WORKDIR "/repo/test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests" From a7d0321ea6689eac681f21af37a48d75e20f5b87 Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Tue, 2 Nov 2021 15:44:27 -0700 Subject: [PATCH 12/37] update mcr --- test/OpenTelemetry.Instrumentation.SqlClient.Tests/dockerfile | 2 +- .../dockerfile | 2 +- .../Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/OpenTelemetry.Instrumentation.SqlClient.Tests/dockerfile b/test/OpenTelemetry.Instrumentation.SqlClient.Tests/dockerfile index 77618e81532..a001fbbb3eb 100644 --- a/test/OpenTelemetry.Instrumentation.SqlClient.Tests/dockerfile +++ b/test/OpenTelemetry.Instrumentation.SqlClient.Tests/dockerfile @@ -3,7 +3,7 @@ # docker build --file test/OpenTelemetry.Instrumentation.SqlClient.Tests/dockerfile . ARG SDK_VERSION=6.0 -FROM mcr.microsoft.com/dotnet/sdk:5.0-focal AS build +FROM mcr.microsoft.com/dotnet/sdk:6.0-focal AS build ARG PUBLISH_CONFIGURATION=Release ARG PUBLISH_FRAMEWORK=net6.0 WORKDIR /repo diff --git a/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/dockerfile b/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/dockerfile index 929ae4a12f0..20958dcfe5e 100644 --- a/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/dockerfile +++ b/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/dockerfile @@ -3,7 +3,7 @@ # docker build --file test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/dockerfile . ARG SDK_VERSION=6.0 -FROM mcr.microsoft.com/dotnet/sdk:5.0-focal AS build +FROM mcr.microsoft.com/dotnet/sdk:6.0-focal AS build ARG PUBLISH_CONFIGURATION=Release ARG PUBLISH_FRAMEWORK=net6.0 WORKDIR /repo diff --git a/test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/Dockerfile b/test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/Dockerfile index eb565e3b529..5f85fda1f94 100644 --- a/test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/Dockerfile +++ b/test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/Dockerfile @@ -9,7 +9,7 @@ WORKDIR /w3c RUN apt-get update && apt-get install -y git RUN git clone https://github.com/w3c/trace-context.git -FROM mcr.microsoft.com/dotnet/sdk:5.0-focal AS build +FROM mcr.microsoft.com/dotnet/sdk:6.0-focal AS build ARG PUBLISH_CONFIGURATION=Release ARG PUBLISH_FRAMEWORK=net6.0 WORKDIR /repo From 186d7f2c22c86386c3702bac4ca5712cf391130e Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Tue, 2 Nov 2021 15:50:46 -0700 Subject: [PATCH 13/37] fix otlp docker --- .../Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/Dockerfile b/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/Dockerfile index 1291b8d69d3..6ee25ab4a54 100644 --- a/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/Dockerfile +++ b/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/Dockerfile @@ -3,7 +3,7 @@ # docker build --file test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/Dockerfile ARG SDK_VERSION=6.0 -FROM mcr.microsoft.com/dotnet/sdk:5.0-focal AS build +FROM mcr.microsoft.com/dotnet/sdk:6.0-focal AS build ARG PUBLISH_CONFIGURATION=Release ARG PUBLISH_FRAMEWORK=net6.0 WORKDIR /repo From edfd114f5f2f21cdfcfc3106e5f73c6cc8b84316 Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Tue, 2 Nov 2021 16:42:21 -0700 Subject: [PATCH 14/37] add 6.0 to api compat --- .github/workflows/apicompatibility.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/apicompatibility.yml b/.github/workflows/apicompatibility.yml index 108a465b122..ccf9adf4fc7 100644 --- a/.github/workflows/apicompatibility.yml +++ b/.github/workflows/apicompatibility.yml @@ -14,6 +14,11 @@ jobs: steps: - uses: actions/checkout@v2 + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.x' + include-prerelease: true + - name: Install dependencies run: dotnet restore From 59d1e18837bebf7c68b77931efbcd8f951ee5f97 Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Tue, 2 Nov 2021 16:49:32 -0700 Subject: [PATCH 15/37] update sln --- OpenTelemetry.sln | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/OpenTelemetry.sln b/OpenTelemetry.sln index 5a9fe749683..cad9046b82d 100644 --- a/OpenTelemetry.sln +++ b/OpenTelemetry.sln @@ -222,6 +222,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Exporter.Prom EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Exporter.OpenTelemetryProtocol.Logs", "src\OpenTelemetry.Exporter.OpenTelemetryProtocol.Logs\OpenTelemetry.Exporter.OpenTelemetryProtocol.Logs.csproj", "{6E1A5FA3-E024-4972-9EDC-11E36C5A0D6F}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestApp.AspNetCore.6.0", "test\TestApp.AspNetCore.6.0\TestApp.AspNetCore.6.0.csproj", "{0076C657-564F-4787-9FFF-52D9D55166E8}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -460,6 +462,10 @@ Global {6E1A5FA3-E024-4972-9EDC-11E36C5A0D6F}.Debug|Any CPU.Build.0 = Debug|Any CPU {6E1A5FA3-E024-4972-9EDC-11E36C5A0D6F}.Release|Any CPU.ActiveCfg = Release|Any CPU {6E1A5FA3-E024-4972-9EDC-11E36C5A0D6F}.Release|Any CPU.Build.0 = Release|Any CPU + {0076C657-564F-4787-9FFF-52D9D55166E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0076C657-564F-4787-9FFF-52D9D55166E8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0076C657-564F-4787-9FFF-52D9D55166E8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0076C657-564F-4787-9FFF-52D9D55166E8}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -494,6 +500,7 @@ Global {EA60B549-F712-4ABE-8E44-FCA83B78C06E} = {3277B1C0-BDFE-4460-9B0D-D9A661FB48DB} {1F9D7748-D099-4E25-97F5-9C969D6FF969} = {3277B1C0-BDFE-4460-9B0D-D9A661FB48DB} {81234AFA-B4E7-4D0D-AB97-FD559C78EDA2} = {3277B1C0-BDFE-4460-9B0D-D9A661FB48DB} + {0076C657-564F-4787-9FFF-52D9D55166E8} = {77C7929A-2EED-4AA6-8705-B5C443C8AA0F} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {55639B5C-0770-4A22-AB56-859604650521} From 8968dc290bfd63c582b28717de3c1b851f060c9f Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Wed, 3 Nov 2021 10:51:33 -0700 Subject: [PATCH 16/37] consistent preprocessor dir --- .../InProcessServer.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/InProcessServer.cs b/test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/InProcessServer.cs index 3f55060aff1..94d46d294b3 100644 --- a/test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/InProcessServer.cs +++ b/test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/InProcessServer.cs @@ -22,9 +22,11 @@ using OpenTelemetry.Trace; #if NETCOREAPP3_1 using TestApp.AspNetCore._3._1; -#elif NET5_0 +#endif +#if NET5_0 using TestApp.AspNetCore._5._0; -#else +#endif +#if NET6_0 using TestApp.AspNetCore._6._0; #endif using Xunit.Abstractions; From 399c931ded4e5ab907c2eacd144141fad81a7072 Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Wed, 3 Nov 2021 10:57:29 -0700 Subject: [PATCH 17/37] add net6.0 to codcov --- .github/workflows/code-coverage.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml index 8228a7bd12a..10ccea4b195 100644 --- a/.github/workflows/code-coverage.yml +++ b/.github/workflows/code-coverage.yml @@ -26,6 +26,11 @@ jobs: with: fetch-depth: 0 # fetching all + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.x' + include-prerelease: true + - name: Install dependencies run: dotnet restore From 19ed12563c6e901a3af94b4a3796e86f62e2d967 Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Wed, 3 Nov 2021 11:37:32 -0700 Subject: [PATCH 18/37] resolve package conflicts --- test/TestApp.AspNetCore.6.0/TestApp.AspNetCore.6.0.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/TestApp.AspNetCore.6.0/TestApp.AspNetCore.6.0.csproj b/test/TestApp.AspNetCore.6.0/TestApp.AspNetCore.6.0.csproj index 14b93114b53..aa8f0d3576f 100644 --- a/test/TestApp.AspNetCore.6.0/TestApp.AspNetCore.6.0.csproj +++ b/test/TestApp.AspNetCore.6.0/TestApp.AspNetCore.6.0.csproj @@ -13,6 +13,10 @@ + + + + From ed12ef6e36fdb37bce64cf508e9de29805232428 Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Wed, 3 Nov 2021 11:57:45 -0700 Subject: [PATCH 19/37] doc fx fix --- .github/workflows/docfx.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docfx.yml b/.github/workflows/docfx.yml index a7a94fd508a..ff4f3fc548e 100644 --- a/.github/workflows/docfx.yml +++ b/.github/workflows/docfx.yml @@ -15,7 +15,7 @@ jobs: uses: actions/checkout@v2 - name: install docfx - run: choco install docfx -y + run: choco install docfx -y --version=2.58.5 - name: run .\build\docfx.cmd shell: cmd From 89c0b24a6f6a3e8afd087fd3bb23c47ca1c97aad Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Wed, 3 Nov 2021 14:12:36 -0700 Subject: [PATCH 20/37] revert linux and windows --- .github/workflows/linux-ci.yml | 24 ++++++++++++------------ .github/workflows/windows-ci.yml | 24 ++++++++++++------------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml index ef89aa9ddfa..fea90d174c3 100644 --- a/.github/workflows/linux-ci.yml +++ b/.github/workflows/linux-ci.yml @@ -18,21 +18,21 @@ jobs: matrix: version: [netcoreapp3.1,net5.0,net6.0] - steps: - - uses: actions/checkout@v2 + # steps: + # - uses: actions/checkout@v2 - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '3.1.x' + # - uses: actions/setup-dotnet@v1 + # with: + # dotnet-version: '3.1.x' - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '5.0.x' + # - uses: actions/setup-dotnet@v1 + # with: + # dotnet-version: '5.0.x' - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '6.0.x' - include-prerelease: true + # - uses: actions/setup-dotnet@v1 + # with: + # dotnet-version: '6.0.x' + # include-prerelease: true - name: Install dependencies run: dotnet restore diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml index 80338e6bd77..07f88e75e42 100644 --- a/.github/workflows/windows-ci.yml +++ b/.github/workflows/windows-ci.yml @@ -18,21 +18,21 @@ jobs: matrix: version: [net461,netcoreapp3.1,net5.0,net6.0] - steps: - - uses: actions/checkout@v2 + # steps: + # - uses: actions/checkout@v2 - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '3.1.x' + # - uses: actions/setup-dotnet@v1 + # with: + # dotnet-version: '3.1.x' - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '5.0.x' + # - uses: actions/setup-dotnet@v1 + # with: + # dotnet-version: '5.0.x' - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '6.0.x' - include-prerelease: true + # - uses: actions/setup-dotnet@v1 + # with: + # dotnet-version: '6.0.x' + # include-prerelease: true - name: Install dependencies run: dotnet restore From a80c37a12a417cf213ca96c780b358ec2fc1ec6b Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Wed, 3 Nov 2021 14:16:21 -0700 Subject: [PATCH 21/37] minor fix --- .github/workflows/linux-ci.yml | 4 ++-- .github/workflows/windows-ci.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml index fea90d174c3..e85e6a45153 100644 --- a/.github/workflows/linux-ci.yml +++ b/.github/workflows/linux-ci.yml @@ -18,8 +18,8 @@ jobs: matrix: version: [netcoreapp3.1,net5.0,net6.0] - # steps: - # - uses: actions/checkout@v2 + steps: + - uses: actions/checkout@v2 # - uses: actions/setup-dotnet@v1 # with: diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml index 07f88e75e42..025ced86e94 100644 --- a/.github/workflows/windows-ci.yml +++ b/.github/workflows/windows-ci.yml @@ -18,8 +18,8 @@ jobs: matrix: version: [net461,netcoreapp3.1,net5.0,net6.0] - # steps: - # - uses: actions/checkout@v2 + steps: + - uses: actions/checkout@v2 # - uses: actions/setup-dotnet@v1 # with: From 4bd2f42f2c1619a5c37d73e52c6064fd5656435c Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Wed, 3 Nov 2021 14:18:35 -0700 Subject: [PATCH 22/37] revert --- .github/workflows/linux-ci.yml | 24 ++++++++++++------------ .github/workflows/windows-ci.yml | 24 ++++++++++++------------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml index e85e6a45153..ef89aa9ddfa 100644 --- a/.github/workflows/linux-ci.yml +++ b/.github/workflows/linux-ci.yml @@ -21,18 +21,18 @@ jobs: steps: - uses: actions/checkout@v2 - # - uses: actions/setup-dotnet@v1 - # with: - # dotnet-version: '3.1.x' - - # - uses: actions/setup-dotnet@v1 - # with: - # dotnet-version: '5.0.x' - - # - uses: actions/setup-dotnet@v1 - # with: - # dotnet-version: '6.0.x' - # include-prerelease: true + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: '3.1.x' + + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: '5.0.x' + + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.x' + include-prerelease: true - name: Install dependencies run: dotnet restore diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml index 025ced86e94..80338e6bd77 100644 --- a/.github/workflows/windows-ci.yml +++ b/.github/workflows/windows-ci.yml @@ -21,18 +21,18 @@ jobs: steps: - uses: actions/checkout@v2 - # - uses: actions/setup-dotnet@v1 - # with: - # dotnet-version: '3.1.x' - - # - uses: actions/setup-dotnet@v1 - # with: - # dotnet-version: '5.0.x' - - # - uses: actions/setup-dotnet@v1 - # with: - # dotnet-version: '6.0.x' - # include-prerelease: true + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: '3.1.x' + + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: '5.0.x' + + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.x' + include-prerelease: true - name: Install dependencies run: dotnet restore From 107e0e2bd3720b5c322a6f233642ba2c089598f4 Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Wed, 3 Nov 2021 14:36:56 -0700 Subject: [PATCH 23/37] test with only net6 install --- .github/workflows/windows-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml index 80338e6bd77..4dd02229762 100644 --- a/.github/workflows/windows-ci.yml +++ b/.github/workflows/windows-ci.yml @@ -21,13 +21,13 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '3.1.x' + # - uses: actions/setup-dotnet@v1 + # with: + # dotnet-version: '3.1.x' - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '5.0.x' + # - uses: actions/setup-dotnet@v1 + # with: + # dotnet-version: '5.0.x' - uses: actions/setup-dotnet@v1 with: From 9c0a502321e8ccd0b210995fd21fb7d7d0ee5c58 Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Wed, 3 Nov 2021 14:42:11 -0700 Subject: [PATCH 24/37] revert --- .github/workflows/windows-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml index 4dd02229762..80338e6bd77 100644 --- a/.github/workflows/windows-ci.yml +++ b/.github/workflows/windows-ci.yml @@ -21,13 +21,13 @@ jobs: steps: - uses: actions/checkout@v2 - # - uses: actions/setup-dotnet@v1 - # with: - # dotnet-version: '3.1.x' + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: '3.1.x' - # - uses: actions/setup-dotnet@v1 - # with: - # dotnet-version: '5.0.x' + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: '5.0.x' - uses: actions/setup-dotnet@v1 with: From cf048c55f568fcfba1261718d4e860b4f81ef298 Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Wed, 3 Nov 2021 14:44:01 -0700 Subject: [PATCH 25/37] add 3.1 and 5 to codcov --- .github/workflows/code-coverage.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml index 10ccea4b195..ca96b90cfad 100644 --- a/.github/workflows/code-coverage.yml +++ b/.github/workflows/code-coverage.yml @@ -26,6 +26,14 @@ jobs: with: fetch-depth: 0 # fetching all + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: '3.1.x' + + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: '5.0.x' + - uses: actions/setup-dotnet@v1 with: dotnet-version: '6.0.x' From 9e0710bf5c8fd2c5165cd344d8153ea877da737b Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Wed, 3 Nov 2021 15:12:39 -0700 Subject: [PATCH 26/37] test codcov without install --- .github/workflows/code-coverage.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml index ca96b90cfad..415deb5f0dd 100644 --- a/.github/workflows/code-coverage.yml +++ b/.github/workflows/code-coverage.yml @@ -26,18 +26,18 @@ jobs: with: fetch-depth: 0 # fetching all - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '3.1.x' + # - uses: actions/setup-dotnet@v1 + # with: + # dotnet-version: '3.1.x' - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '5.0.x' + # - uses: actions/setup-dotnet@v1 + # with: + # dotnet-version: '5.0.x' - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '6.0.x' - include-prerelease: true + # - uses: actions/setup-dotnet@v1 + # with: + # dotnet-version: '6.0.x' + # include-prerelease: true - name: Install dependencies run: dotnet restore From eb600f36a4cb305f7c6863e6d36060982cc0d46f Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Wed, 3 Nov 2021 15:14:47 -0700 Subject: [PATCH 27/37] revert codecov --- .github/workflows/code-coverage.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml index 415deb5f0dd..ca96b90cfad 100644 --- a/.github/workflows/code-coverage.yml +++ b/.github/workflows/code-coverage.yml @@ -26,18 +26,18 @@ jobs: with: fetch-depth: 0 # fetching all - # - uses: actions/setup-dotnet@v1 - # with: - # dotnet-version: '3.1.x' + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: '3.1.x' - # - uses: actions/setup-dotnet@v1 - # with: - # dotnet-version: '5.0.x' + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: '5.0.x' - # - uses: actions/setup-dotnet@v1 - # with: - # dotnet-version: '6.0.x' - # include-prerelease: true + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.x' + include-prerelease: true - name: Install dependencies run: dotnet restore From 559bca4a3362aed34a25c1416b7ec59dfa71fc8c Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Wed, 3 Nov 2021 16:29:56 -0700 Subject: [PATCH 28/37] revert windows --- .github/workflows/windows-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml index 80338e6bd77..4dd02229762 100644 --- a/.github/workflows/windows-ci.yml +++ b/.github/workflows/windows-ci.yml @@ -21,13 +21,13 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '3.1.x' + # - uses: actions/setup-dotnet@v1 + # with: + # dotnet-version: '3.1.x' - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '5.0.x' + # - uses: actions/setup-dotnet@v1 + # with: + # dotnet-version: '5.0.x' - uses: actions/setup-dotnet@v1 with: From 7cdf850956b61d7aaaf3641ccc03dd399d162309 Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Wed, 3 Nov 2021 16:39:16 -0700 Subject: [PATCH 29/37] add back 3.1 and 5.0 --- .github/workflows/windows-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml index 4dd02229762..80338e6bd77 100644 --- a/.github/workflows/windows-ci.yml +++ b/.github/workflows/windows-ci.yml @@ -21,13 +21,13 @@ jobs: steps: - uses: actions/checkout@v2 - # - uses: actions/setup-dotnet@v1 - # with: - # dotnet-version: '3.1.x' + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: '3.1.x' - # - uses: actions/setup-dotnet@v1 - # with: - # dotnet-version: '5.0.x' + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: '5.0.x' - uses: actions/setup-dotnet@v1 with: From 68b2e465b2dd8ff303c68b8ee5902d8c860ae582 Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Wed, 3 Nov 2021 16:52:22 -0700 Subject: [PATCH 30/37] add comment for specifying docfx version --- .github/workflows/docfx.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/docfx.yml b/.github/workflows/docfx.yml index ff4f3fc548e..1e0b540dba9 100644 --- a/.github/workflows/docfx.yml +++ b/.github/workflows/docfx.yml @@ -15,6 +15,8 @@ jobs: uses: actions/checkout@v2 - name: install docfx + # specifying 2.58.5 version as latest release (2.58.8) has an issue + # https://github.com/dotnet/docfx/issues/7689 run: choco install docfx -y --version=2.58.5 - name: run .\build\docfx.cmd From 86f5658617a0b67f2a4f9fe81a176eb920d6ddde Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Wed, 3 Nov 2021 17:36:31 -0700 Subject: [PATCH 31/37] trying fix to avoid 3.1 and 5.0 install --- .github/workflows/windows-ci.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml index 80338e6bd77..77b527da943 100644 --- a/.github/workflows/windows-ci.yml +++ b/.github/workflows/windows-ci.yml @@ -13,6 +13,8 @@ on: jobs: build-test: runs-on: windows-latest + env: + DOTNET_MULTILEVEL_LOOKUP: 1 strategy: matrix: @@ -21,13 +23,13 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '3.1.x' + # - uses: actions/setup-dotnet@v1 + # with: + # dotnet-version: '3.1.x' - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '5.0.x' + # - uses: actions/setup-dotnet@v1 + # with: + # dotnet-version: '5.0.x' - uses: actions/setup-dotnet@v1 with: From 1fb2495cc1f0b2eab3c8dc99649ec726fd9056cf Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Wed, 3 Nov 2021 17:53:04 -0700 Subject: [PATCH 32/37] fix to avoid installing 3.1 and 5.0 --- .github/workflows/apicompatibility.yml | 3 ++ .github/workflows/code-coverage.yml | 11 ++----- .github/workflows/integration.yml | 44 +++++++------------------- .github/workflows/linux-ci.yml | 11 ++----- .github/workflows/windows-ci.yml | 9 +----- 5 files changed, 22 insertions(+), 56 deletions(-) diff --git a/.github/workflows/apicompatibility.yml b/.github/workflows/apicompatibility.yml index ccf9adf4fc7..f1984ccd918 100644 --- a/.github/workflows/apicompatibility.yml +++ b/.github/workflows/apicompatibility.yml @@ -9,6 +9,9 @@ on: jobs: build-test: runs-on: windows-latest + # https://github.com/actions/setup-dotnet/issues/122 + env: + DOTNET_MULTILEVEL_LOOKUP: 1 env: CheckAPICompatibility: true steps: diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml index ca96b90cfad..53fc8b0ff90 100644 --- a/.github/workflows/code-coverage.yml +++ b/.github/workflows/code-coverage.yml @@ -13,6 +13,9 @@ on: jobs: build-test-report: runs-on: ${{ matrix.os }} + # https://github.com/actions/setup-dotnet/issues/122 + env: + DOTNET_MULTILEVEL_LOOKUP: 1 strategy: fail-fast: false @@ -26,14 +29,6 @@ jobs: with: fetch-depth: 0 # fetching all - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '3.1.x' - - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '5.0.x' - - uses: actions/setup-dotnet@v1 with: dotnet-version: '6.0.x' diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 54452484077..a0970cb6a22 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -13,6 +13,9 @@ on: jobs: redis-test: runs-on: ubuntu-latest + # https://github.com/actions/setup-dotnet/issues/122 + env: + DOTNET_MULTILEVEL_LOOKUP: 1 strategy: fail-fast: false matrix: @@ -20,14 +23,6 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '3.1.x' - - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '5.0.x' - - uses: actions/setup-dotnet@v1 with: dotnet-version: '6.0.x' @@ -38,6 +33,9 @@ jobs: sql-test: runs-on: ubuntu-latest + # https://github.com/actions/setup-dotnet/issues/122 + env: + DOTNET_MULTILEVEL_LOOKUP: 1 strategy: fail-fast: false matrix: @@ -45,14 +43,6 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '3.1.x' - - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '5.0.x' - - uses: actions/setup-dotnet@v1 with: dotnet-version: '6.0.x' @@ -63,6 +53,9 @@ jobs: w3c-trace-context-test: runs-on: ubuntu-latest + # https://github.com/actions/setup-dotnet/issues/122 + env: + DOTNET_MULTILEVEL_LOOKUP: 1 strategy: fail-fast: false matrix: @@ -70,14 +63,6 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '3.1.x' - - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '5.0.x' - - uses: actions/setup-dotnet@v1 with: dotnet-version: '6.0.x' @@ -88,6 +73,9 @@ jobs: otlp-exporter-test: runs-on: ubuntu-latest + # https://github.com/actions/setup-dotnet/issues/122 + env: + DOTNET_MULTILEVEL_LOOKUP: 1 strategy: fail-fast: false matrix: @@ -95,14 +83,6 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '3.1.x' - - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '5.0.x' - - uses: actions/setup-dotnet@v1 with: dotnet-version: '6.0.x' diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml index ef89aa9ddfa..cfca1457121 100644 --- a/.github/workflows/linux-ci.yml +++ b/.github/workflows/linux-ci.yml @@ -13,6 +13,9 @@ on: jobs: build-test: runs-on: ubuntu-latest + # https://github.com/actions/setup-dotnet/issues/122 + env: + DOTNET_MULTILEVEL_LOOKUP: 1 strategy: matrix: @@ -21,14 +24,6 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '3.1.x' - - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '5.0.x' - - uses: actions/setup-dotnet@v1 with: dotnet-version: '6.0.x' diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml index 77b527da943..8f386330335 100644 --- a/.github/workflows/windows-ci.yml +++ b/.github/workflows/windows-ci.yml @@ -13,6 +13,7 @@ on: jobs: build-test: runs-on: windows-latest + # https://github.com/actions/setup-dotnet/issues/122 env: DOTNET_MULTILEVEL_LOOKUP: 1 @@ -23,14 +24,6 @@ jobs: steps: - uses: actions/checkout@v2 - # - uses: actions/setup-dotnet@v1 - # with: - # dotnet-version: '3.1.x' - - # - uses: actions/setup-dotnet@v1 - # with: - # dotnet-version: '5.0.x' - - uses: actions/setup-dotnet@v1 with: dotnet-version: '6.0.x' From 828f8a32bf6f040a341a3f23fbe3f090a312be8b Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Wed, 3 Nov 2021 18:07:53 -0700 Subject: [PATCH 33/37] fail-fast false --- .github/workflows/linux-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml index cfca1457121..ca2ef45168e 100644 --- a/.github/workflows/linux-ci.yml +++ b/.github/workflows/linux-ci.yml @@ -18,6 +18,7 @@ jobs: DOTNET_MULTILEVEL_LOOKUP: 1 strategy: + fail-fast: false matrix: version: [netcoreapp3.1,net5.0,net6.0] From e4b12ec189e8cbdd0110d4779eb84ad08ec016e0 Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Wed, 3 Nov 2021 18:17:10 -0700 Subject: [PATCH 34/37] minor --- .github/workflows/linux-ci.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml index ca2ef45168e..158d997e507 100644 --- a/.github/workflows/linux-ci.yml +++ b/.github/workflows/linux-ci.yml @@ -16,19 +16,17 @@ jobs: # https://github.com/actions/setup-dotnet/issues/122 env: DOTNET_MULTILEVEL_LOOKUP: 1 - strategy: fail-fast: false matrix: version: [netcoreapp3.1,net5.0,net6.0] - steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v2 - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '6.0.x' - include-prerelease: true + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.x' + include-prerelease: true - name: Install dependencies run: dotnet restore From 1e51043e9ac12b39cde14f8097d8927d0e28ba92 Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Wed, 3 Nov 2021 18:28:02 -0700 Subject: [PATCH 35/37] fix linux-ci formatting --- .github/workflows/linux-ci.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml index 158d997e507..cfca1457121 100644 --- a/.github/workflows/linux-ci.yml +++ b/.github/workflows/linux-ci.yml @@ -16,17 +16,18 @@ jobs: # https://github.com/actions/setup-dotnet/issues/122 env: DOTNET_MULTILEVEL_LOOKUP: 1 + strategy: - fail-fast: false matrix: version: [netcoreapp3.1,net5.0,net6.0] + steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v2 - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '6.0.x' - include-prerelease: true + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.x' + include-prerelease: true - name: Install dependencies run: dotnet restore From 2381758d592509588e32b3036f2cf1aba0ad0472 Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Wed, 3 Nov 2021 20:27:34 -0700 Subject: [PATCH 36/37] try setting env at test step --- .github/workflows/linux-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml index cfca1457121..8ba7360ee19 100644 --- a/.github/workflows/linux-ci.yml +++ b/.github/workflows/linux-ci.yml @@ -36,4 +36,6 @@ jobs: run: dotnet build --configuration Release --no-restore - name: Test ${{ matrix.version }} + env: + DOTNET_MULTILEVEL_LOOKUP: 1 run: dotnet test **/bin/**/${{ matrix.version }}/*.Tests.dll --configuration Release --no-build --logger:"console;verbosity=detailed" From 80f27e727bf56252a58f36942fe09fc7e80080d9 Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Wed, 3 Nov 2021 20:34:10 -0700 Subject: [PATCH 37/37] fix apicompat, codecov and linux --- .github/workflows/apicompatibility.yml | 3 +-- .github/workflows/code-coverage.yml | 3 +-- .github/workflows/linux-ci.yml | 8 ++++++++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/apicompatibility.yml b/.github/workflows/apicompatibility.yml index f1984ccd918..3efbecd4a18 100644 --- a/.github/workflows/apicompatibility.yml +++ b/.github/workflows/apicompatibility.yml @@ -10,10 +10,9 @@ jobs: build-test: runs-on: windows-latest # https://github.com/actions/setup-dotnet/issues/122 - env: - DOTNET_MULTILEVEL_LOOKUP: 1 env: CheckAPICompatibility: true + DOTNET_MULTILEVEL_LOOKUP: 1 steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml index 53fc8b0ff90..0bcc696a042 100644 --- a/.github/workflows/code-coverage.yml +++ b/.github/workflows/code-coverage.yml @@ -14,8 +14,6 @@ jobs: build-test-report: runs-on: ${{ matrix.os }} # https://github.com/actions/setup-dotnet/issues/122 - env: - DOTNET_MULTILEVEL_LOOKUP: 1 strategy: fail-fast: false @@ -23,6 +21,7 @@ jobs: os: [windows-latest] env: OS: ${{ matrix.os }} + DOTNET_MULTILEVEL_LOOKUP: 1 steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml index 8ba7360ee19..7f90e2e9b78 100644 --- a/.github/workflows/linux-ci.yml +++ b/.github/workflows/linux-ci.yml @@ -24,6 +24,14 @@ jobs: steps: - uses: actions/checkout@v2 + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: '3.1.x' + + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: '5.0.x' + - uses: actions/setup-dotnet@v1 with: dotnet-version: '6.0.x'