From 92e5026aacbe36690891bcadf82d206ec698a5b6 Mon Sep 17 00:00:00 2001 From: joegoldman2 <147369450+joegoldman@users.noreply.github.com> Date: Thu, 3 Oct 2024 06:59:59 +0000 Subject: [PATCH 1/4] [Instrumentation.AspNetCore] Remove .NET 6 target --- ...nstrumentation.AspNet.TelemetryHttpModule.csproj | 6 ++++-- .../OpenTelemetry.Instrumentation.AspNet.csproj | 7 ++++--- .../OpenTelemetry.Instrumentation.AspNetCore.csproj | 5 +++-- ...entation.AspNet.TelemetryHttpModule.Tests.csproj | 4 +++- ...penTelemetry.Instrumentation.AspNet.Tests.csproj | 3 ++- ...try.Instrumentation.AspNetCore.Benchmarks.csproj | 7 +++++-- ...elemetry.Instrumentation.AspNetCore.Tests.csproj | 13 +++++-------- 7 files changed, 26 insertions(+), 19 deletions(-) diff --git a/src/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.csproj b/src/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.csproj index 01cfa35bb3..753152a182 100644 --- a/src/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.csproj +++ b/src/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.csproj @@ -1,4 +1,5 @@ + $(NetFrameworkMinimumSupportedVersion) @@ -7,8 +8,8 @@ Instrumentation.AspNet- - + true @@ -31,4 +32,5 @@ + diff --git a/src/OpenTelemetry.Instrumentation.AspNet/OpenTelemetry.Instrumentation.AspNet.csproj b/src/OpenTelemetry.Instrumentation.AspNet/OpenTelemetry.Instrumentation.AspNet.csproj index db66f84a14..c21ef4a406 100644 --- a/src/OpenTelemetry.Instrumentation.AspNet/OpenTelemetry.Instrumentation.AspNet.csproj +++ b/src/OpenTelemetry.Instrumentation.AspNet/OpenTelemetry.Instrumentation.AspNet.csproj @@ -1,15 +1,16 @@ + $(NetFrameworkMinimumSupportedVersion) - ASP.NET instrumentation for OpenTelemetry .NET + ASP.NET instrumentation for OpenTelemetry .NET. $(PackageTags);distributed-tracing;AspNet;MVC;WebAPI true Instrumentation.AspNet- - + true diff --git a/src/OpenTelemetry.Instrumentation.AspNetCore/OpenTelemetry.Instrumentation.AspNetCore.csproj b/src/OpenTelemetry.Instrumentation.AspNetCore/OpenTelemetry.Instrumentation.AspNetCore.csproj index a95693ee5a..e6286de058 100644 --- a/src/OpenTelemetry.Instrumentation.AspNetCore/OpenTelemetry.Instrumentation.AspNetCore.csproj +++ b/src/OpenTelemetry.Instrumentation.AspNetCore/OpenTelemetry.Instrumentation.AspNetCore.csproj @@ -1,8 +1,9 @@ + - net8.0;net6.0;netstandard2.0 - ASP.NET Core instrumentation for OpenTelemetry .NET + net8.0;$(NetStandardMinimumSupportedVersion) + ASP.NET Core instrumentation for OpenTelemetry .NET< $(PackageTags);distributed-tracing;AspNetCore Instrumentation.AspNetCore- 1.9.0 diff --git a/test/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests.csproj b/test/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests.csproj index 88d63d331b..526236c90d 100644 --- a/test/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests.csproj @@ -1,8 +1,9 @@ + - Unit test project for ASP.NET HttpModule $(NetFrameworkMinimumSupportedVersion) + Unit test project for ASP.NET HttpModule. @@ -26,4 +27,5 @@ Resources\web.config.uninstall.xdt + diff --git a/test/OpenTelemetry.Instrumentation.AspNet.Tests/OpenTelemetry.Instrumentation.AspNet.Tests.csproj b/test/OpenTelemetry.Instrumentation.AspNet.Tests/OpenTelemetry.Instrumentation.AspNet.Tests.csproj index bb0d66597d..e0fd3fe7a6 100644 --- a/test/OpenTelemetry.Instrumentation.AspNet.Tests/OpenTelemetry.Instrumentation.AspNet.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.AspNet.Tests/OpenTelemetry.Instrumentation.AspNet.Tests.csproj @@ -1,8 +1,9 @@ + - Unit test project for OpenTelemetry ASP.NET instrumentation $(NetFrameworkMinimumSupportedVersion) + Unit test project for OpenTelemetry ASP.NET instrumentation. diff --git a/test/OpenTelemetry.Instrumentation.AspNetCore.Benchmarks/OpenTelemetry.Instrumentation.AspNetCore.Benchmarks.csproj b/test/OpenTelemetry.Instrumentation.AspNetCore.Benchmarks/OpenTelemetry.Instrumentation.AspNetCore.Benchmarks.csproj index 23c4731175..7d0cb435f8 100644 --- a/test/OpenTelemetry.Instrumentation.AspNetCore.Benchmarks/OpenTelemetry.Instrumentation.AspNetCore.Benchmarks.csproj +++ b/test/OpenTelemetry.Instrumentation.AspNetCore.Benchmarks/OpenTelemetry.Instrumentation.AspNetCore.Benchmarks.csproj @@ -1,13 +1,16 @@ + - Exe - $(SupportedNetTargets) + $(SupportedNetTargetsWithoutNet6) + Exe + + 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 004daa67a8..ccd6f83f50 100644 --- a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/OpenTelemetry.Instrumentation.AspNetCore.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/OpenTelemetry.Instrumentation.AspNetCore.Tests.csproj @@ -1,15 +1,11 @@ + - Unit test project for OpenTelemetry ASP.NET Core instrumentation - $(SupportedNetTargets) + $(SupportedNetTargetsWithoutNet6) + Unit test project for OpenTelemetry ASP.NET Core instrumentation. - - - - - - + @@ -37,4 +33,5 @@ Always + From 63347319c535d27f915a14263d289a787b59bcbf Mon Sep 17 00:00:00 2001 From: joegoldman2 <147369450+joegoldman@users.noreply.github.com> Date: Thu, 3 Oct 2024 07:01:53 +0000 Subject: [PATCH 2/4] Add changelog entry --- src/OpenTelemetry.Instrumentation.AspNetCore/CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/OpenTelemetry.Instrumentation.AspNetCore/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.AspNetCore/CHANGELOG.md index 1567f79401..be111b2388 100644 --- a/src/OpenTelemetry.Instrumentation.AspNetCore/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.AspNetCore/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +* Drop support for .NET 6 as this target is no longer supported. + ([#2138](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2138)) + ## 1.9.0 Released 2024-Jun-17 From ce386f0dcfb161c5d7641f805d13fd647e058db4 Mon Sep 17 00:00:00 2001 From: joegoldman2 <147369450+joegoldman@users.noreply.github.com> Date: Thu, 3 Oct 2024 07:11:55 +0000 Subject: [PATCH 3/4] Fix typo --- .../OpenTelemetry.Instrumentation.AspNetCore.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OpenTelemetry.Instrumentation.AspNetCore/OpenTelemetry.Instrumentation.AspNetCore.csproj b/src/OpenTelemetry.Instrumentation.AspNetCore/OpenTelemetry.Instrumentation.AspNetCore.csproj index e6286de058..0f5087d0f1 100644 --- a/src/OpenTelemetry.Instrumentation.AspNetCore/OpenTelemetry.Instrumentation.AspNetCore.csproj +++ b/src/OpenTelemetry.Instrumentation.AspNetCore/OpenTelemetry.Instrumentation.AspNetCore.csproj @@ -3,7 +3,7 @@ net8.0;$(NetStandardMinimumSupportedVersion) - ASP.NET Core instrumentation for OpenTelemetry .NET< + ASP.NET Core instrumentation for OpenTelemetry .NET $(PackageTags);distributed-tracing;AspNetCore Instrumentation.AspNetCore- 1.9.0 From 463924ecb537a3a6c24c719573cfc1a489666462 Mon Sep 17 00:00:00 2001 From: joegoldman2 <147369450+joegoldman2@users.noreply.github.com> Date: Thu, 3 Oct 2024 07:24:02 +0000 Subject: [PATCH 4/4] Update test/OpenTelemetry.Instrumentation.AspNetCore.Tests/OpenTelemetry.Instrumentation.AspNetCore.Tests.csproj MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Piotr Kiełkowicz --- .../OpenTelemetry.Instrumentation.AspNetCore.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ccd6f83f50..dd8ec60246 100644 --- a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/OpenTelemetry.Instrumentation.AspNetCore.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/OpenTelemetry.Instrumentation.AspNetCore.Tests.csproj @@ -5,7 +5,7 @@ Unit test project for OpenTelemetry ASP.NET Core instrumentation. - +