From db2de17341ddad818b3742b10cb115389889c77e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= Date: Thu, 13 Nov 2025 14:37:18 +0100 Subject: [PATCH 1/3] [EFCore/Process/Quartz] Add .NET8 and .NET10 TFM --- .../Implementation/EntityFrameworkDiagnosticListener.cs | 2 +- .../OpenTelemetry.Instrumentation.EntityFrameworkCore.csproj | 2 +- .../OpenTelemetry.Instrumentation.Process.csproj | 2 +- src/OpenTelemetry.Instrumentation.Process/ProcessMetrics.cs | 2 +- .../Implementation/QuartzDiagnosticListener.cs | 2 +- .../OpenTelemetry.Instrumentation.Quartz.csproj | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/OpenTelemetry.Instrumentation.EntityFrameworkCore/Implementation/EntityFrameworkDiagnosticListener.cs b/src/OpenTelemetry.Instrumentation.EntityFrameworkCore/Implementation/EntityFrameworkDiagnosticListener.cs index 3276388b96..41b5b1e9b4 100644 --- a/src/OpenTelemetry.Instrumentation.EntityFrameworkCore/Implementation/EntityFrameworkDiagnosticListener.cs +++ b/src/OpenTelemetry.Instrumentation.EntityFrameworkCore/Implementation/EntityFrameworkDiagnosticListener.cs @@ -19,7 +19,7 @@ internal sealed class EntityFrameworkDiagnosticListener : ListenerHandler internal const string EntityFrameworkCoreCommandError = "Microsoft.EntityFrameworkCore.Database.Command.CommandError"; internal static readonly Assembly Assembly = typeof(EntityFrameworkDiagnosticListener).Assembly; - internal static readonly string ActivitySourceName = Assembly.GetName().Name; + internal static readonly string ActivitySourceName = Assembly.GetName().Name!; internal static readonly string ActivityName = ActivitySourceName + ".Execute"; internal static readonly ActivitySource EntityFrameworkActivitySource = new(ActivitySourceName, Assembly.GetPackageVersion()); diff --git a/src/OpenTelemetry.Instrumentation.EntityFrameworkCore/OpenTelemetry.Instrumentation.EntityFrameworkCore.csproj b/src/OpenTelemetry.Instrumentation.EntityFrameworkCore/OpenTelemetry.Instrumentation.EntityFrameworkCore.csproj index da41e0acb4..f7992f5958 100644 --- a/src/OpenTelemetry.Instrumentation.EntityFrameworkCore/OpenTelemetry.Instrumentation.EntityFrameworkCore.csproj +++ b/src/OpenTelemetry.Instrumentation.EntityFrameworkCore/OpenTelemetry.Instrumentation.EntityFrameworkCore.csproj @@ -1,7 +1,7 @@  - $(NetStandardMinimumSupportedVersion) + $(TargetFrameworksForLibraries) Microsoft.EntityFrameworkCore instrumentation for OpenTelemetry .NET. $(PackageTags);distributed-tracing Instrumentation.EntityFrameworkCore- diff --git a/src/OpenTelemetry.Instrumentation.Process/OpenTelemetry.Instrumentation.Process.csproj b/src/OpenTelemetry.Instrumentation.Process/OpenTelemetry.Instrumentation.Process.csproj index 03f2f542cb..d5dd43e80b 100644 --- a/src/OpenTelemetry.Instrumentation.Process/OpenTelemetry.Instrumentation.Process.csproj +++ b/src/OpenTelemetry.Instrumentation.Process/OpenTelemetry.Instrumentation.Process.csproj @@ -1,7 +1,7 @@ - $(NetStandardMinimumSupportedVersion) + $(TargetFrameworksForLibraries) dotnet process instrumentation for OpenTelemetry .NET. $(PackageTags);process Instrumentation.Process- diff --git a/src/OpenTelemetry.Instrumentation.Process/ProcessMetrics.cs b/src/OpenTelemetry.Instrumentation.Process/ProcessMetrics.cs index de23bd4353..a6212cef01 100644 --- a/src/OpenTelemetry.Instrumentation.Process/ProcessMetrics.cs +++ b/src/OpenTelemetry.Instrumentation.Process/ProcessMetrics.cs @@ -12,7 +12,7 @@ internal sealed class ProcessMetrics { internal static readonly Assembly Assembly = typeof(ProcessMetrics).Assembly; internal static readonly AssemblyName AssemblyName = Assembly.GetName(); - internal static readonly string MeterName = AssemblyName.Name; + internal static readonly string MeterName = AssemblyName.Name!; private static readonly Meter MeterInstance = new(MeterName, Assembly.GetPackageVersion()); diff --git a/src/OpenTelemetry.Instrumentation.Quartz/Implementation/QuartzDiagnosticListener.cs b/src/OpenTelemetry.Instrumentation.Quartz/Implementation/QuartzDiagnosticListener.cs index cd940ba04b..b7a4e0cfe6 100644 --- a/src/OpenTelemetry.Instrumentation.Quartz/Implementation/QuartzDiagnosticListener.cs +++ b/src/OpenTelemetry.Instrumentation.Quartz/Implementation/QuartzDiagnosticListener.cs @@ -11,7 +11,7 @@ internal sealed class QuartzDiagnosticListener : ListenerHandler { internal static readonly Assembly Assembly = typeof(QuartzDiagnosticListener).Assembly; internal static readonly AssemblyName AssemblyName = Assembly.GetName(); - internal static readonly string ActivitySourceName = AssemblyName.Name; + internal static readonly string ActivitySourceName = AssemblyName.Name!; internal static readonly ActivitySource ActivitySource = new(ActivitySourceName, Assembly.GetPackageVersion()); internal readonly PropertyFetcher JobDetailsPropertyFetcher = new("JobDetail"); diff --git a/src/OpenTelemetry.Instrumentation.Quartz/OpenTelemetry.Instrumentation.Quartz.csproj b/src/OpenTelemetry.Instrumentation.Quartz/OpenTelemetry.Instrumentation.Quartz.csproj index 747ebaaa71..9696f894d9 100644 --- a/src/OpenTelemetry.Instrumentation.Quartz/OpenTelemetry.Instrumentation.Quartz.csproj +++ b/src/OpenTelemetry.Instrumentation.Quartz/OpenTelemetry.Instrumentation.Quartz.csproj @@ -1,7 +1,7 @@  - $(NetStandardMinimumSupportedVersion) + $(TargetFrameworksForLibraries) OpenTelemetry Quartz.NET Instrumentation. $(PackageTags);distributed-tracing Instrumentation.Quartz- From 61abee79abc7a0d5f127b86ec82d4af6dc4d8b76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= Date: Thu, 13 Nov 2025 14:38:09 +0100 Subject: [PATCH 2/3] CHANGELOGs --- .../CHANGELOG.md | 5 ++++- src/OpenTelemetry.Instrumentation.Process/CHANGELOG.md | 3 +++ src/OpenTelemetry.Instrumentation.Quartz/CHANGELOG.md | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/OpenTelemetry.Instrumentation.EntityFrameworkCore/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.EntityFrameworkCore/CHANGELOG.md index 62509aabae..94227d3184 100644 --- a/src/OpenTelemetry.Instrumentation.EntityFrameworkCore/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.EntityFrameworkCore/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +* Added `net10.0` and `net8.0` target frameworks. + ([#3519](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/3519)) + ## 1.14.0-beta.1 Released 2025-Nov-13 @@ -26,7 +29,7 @@ Released 2025-Oct-22 * Fix `db.system.name` values to follow new database semantic conventions when opted into using the `OTEL_SEMCONV_STABILITY_OPT_IN` environment variable. - ([#3004](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/3004)) + ([#3004](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/3004))V * Add the `server.port` resource attribute when following the new database semantic conventions when opted into using the `OTEL_SEMCONV_STABILITY_OPT_IN` environment diff --git a/src/OpenTelemetry.Instrumentation.Process/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.Process/CHANGELOG.md index 88049ffe29..472caac987 100644 --- a/src/OpenTelemetry.Instrumentation.Process/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.Process/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +* Added `net10.0` and `net8.0` target frameworks. + ([#3519](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/3519)) + ## 1.14.0-beta.1 Released 2025-Nov-13 diff --git a/src/OpenTelemetry.Instrumentation.Quartz/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.Quartz/CHANGELOG.md index 8ff277d495..8282dc3f11 100644 --- a/src/OpenTelemetry.Instrumentation.Quartz/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.Quartz/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +* Added `net10.0` and `net8.0` target frameworks. + ([#3519](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/3519)) + ## 1.14.0-beta.1 Released 2025-Nov-13 From 917e82bcaeb0a183a84c77ae90eea414e6786a9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= Date: Thu, 13 Nov 2025 14:40:10 +0100 Subject: [PATCH 3/3] Update src/OpenTelemetry.Instrumentation.EntityFrameworkCore/CHANGELOG.md Co-authored-by: Martin Costello --- .../CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OpenTelemetry.Instrumentation.EntityFrameworkCore/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.EntityFrameworkCore/CHANGELOG.md index 94227d3184..205a896de2 100644 --- a/src/OpenTelemetry.Instrumentation.EntityFrameworkCore/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.EntityFrameworkCore/CHANGELOG.md @@ -29,7 +29,7 @@ Released 2025-Oct-22 * Fix `db.system.name` values to follow new database semantic conventions when opted into using the `OTEL_SEMCONV_STABILITY_OPT_IN` environment variable. - ([#3004](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/3004))V + ([#3004](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/3004)) * Add the `server.port` resource attribute when following the new database semantic conventions when opted into using the `OTEL_SEMCONV_STABILITY_OPT_IN` environment