From 9da55cfe7b8c5875a1a2b18dc74b9b187442d286 Mon Sep 17 00:00:00 2001 From: Matthew Hensley Date: Wed, 5 Feb 2025 15:20:39 -0500 Subject: [PATCH 1/4] remove dependency on Mysql.Data.OpenTelemetry --- .../Grafana.OpenTelemetry.Base.csproj | 1 - .../Instrumentations/MySqlDataInitializer.cs | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Grafana.OpenTelemetry.Base/Grafana.OpenTelemetry.Base.csproj b/src/Grafana.OpenTelemetry.Base/Grafana.OpenTelemetry.Base.csproj index c906c7e6..6056bd01 100644 --- a/src/Grafana.OpenTelemetry.Base/Grafana.OpenTelemetry.Base.csproj +++ b/src/Grafana.OpenTelemetry.Base/Grafana.OpenTelemetry.Base.csproj @@ -33,7 +33,6 @@ - diff --git a/src/Grafana.OpenTelemetry.Base/Instrumentations/MySqlDataInitializer.cs b/src/Grafana.OpenTelemetry.Base/Instrumentations/MySqlDataInitializer.cs index d951f047..a66946de 100644 --- a/src/Grafana.OpenTelemetry.Base/Instrumentations/MySqlDataInitializer.cs +++ b/src/Grafana.OpenTelemetry.Base/Instrumentations/MySqlDataInitializer.cs @@ -14,7 +14,11 @@ internal class MySqlDataInitializer : InstrumentationInitializer protected override void InitializeTracing(TracerProviderBuilder builder) { // MySQL.Data.OpenTelemetry - builder.AddConnectorNet(); + ReflectionHelper.CallStaticMethod( + "MySQL.Data.OpenTelemetry", + "OpenTelemetry.Trace.TracerProviderBuilderExtensions", + "AddConnectorNet", + new object[] { builder }); // OpenTelemetry.Instrumentation.MySqlData ReflectionHelper.CallStaticMethod( From f25445bbd0b83363c49108bdca984458df779b51 Mon Sep 17 00:00:00 2001 From: Matthew Hensley Date: Wed, 5 Feb 2025 18:12:34 -0500 Subject: [PATCH 2/4] CHANGELOG entry --- CHANGELOG.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a2e9322..e2f78c03 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,26 @@ # Changelog -## Unreleased +## 1.1.0 ### BREAKING CHANGES +* Drop dependency on MySQL.Data.OpenTelemetry + ([#131](https://github.com/grafana/grafana-opentelemetry-dotnet/pull/131)) * Drop support for .NET 6. EOL was November 12 2024 + ([#131](https://github.com/grafana/grafana-opentelemetry-dotnet/pull/131)) ### New features +* Use 8.0.1 of Microsoft.Extensions.Logging + ([#128](https://github.com/grafana/grafana-opentelemetry-dotnet/pull/128)) * Use 1.10.0-beta.1 of OpenTelemetry.Instrumentation.AWS + ([#127](https://github.com/grafana/grafana-opentelemetry-dotnet/pull/127)) * Use 1.10.0-beta.1 of OpenTelemetry.Instrumentation.AWSLambda + ([#127](https://github.com/grafana/grafana-opentelemetry-dotnet/pull/127)) +* Use 0.5.0-beta.7 of OpenTelemetry.Instrumentation.Process + ([#128](https://github.com/grafana/grafana-opentelemetry-dotnet/pull/128)) +* Use 0.1.0-beta.3 of OpenTelemetry.Resources.Process + ([#128](https://github.com/grafana/grafana-opentelemetry-dotnet/pull/128)) ## 1.0.1 From 054a312843c9e54a8e91f387f48891599b5c0626 Mon Sep 17 00:00:00 2001 From: Matthew Hensley Date: Wed, 5 Feb 2025 18:22:07 -0500 Subject: [PATCH 3/4] update supported instrumentations --- docs/supported-instrumentations.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/supported-instrumentations.md b/docs/supported-instrumentations.md index 852f7717..43a9aaa2 100644 --- a/docs/supported-instrumentations.md +++ b/docs/supported-instrumentations.md @@ -20,13 +20,13 @@ and [minimal](./installation.md#install-the-base-package) dependencies: | `Hangfire` | :heavy_check_mark: | | [OpenTelemetry.Instrumentation.Hangfire](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Hangfire) | | `HttpClient` | :heavy_check_mark: | :heavy_check_mark: | [OpenTelemetry.Instrumentation.Http](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Http) | | `HostResource` | :heavy_check_mark: | :heavy_check_mark: | [OpenTelemetry.Resources.Host](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Resources.Host) | +| `MySqlData` | :heavy_check_mark: | :heavy_check_mark: | [OpenTelemetry.Instrumentation.MySqlData](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.MySqlData) | +| | | | [MySql.Data.OpenTelemetry](https://www.nuget.org/packages/MySql.Data.OpenTelemetry) | | `NetRuntime` | :heavy_check_mark: | :heavy_check_mark: | [OpenTelemetry.Instrumentation.Runtime](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Runtime) | +| `Owin` | :heavy_check_mark: | | [OpenTelemetry.Instrumentation.Owin](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Owin) | | `Process` | :heavy_check_mark: | :heavy_check_mark: | [OpenTelemetry.Instrumentation.Process](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Process) | | `ProcessResource` | :heavy_check_mark: | :heavy_check_mark: | [OpenTelemetry.Resources.Process](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Resources.Process) | | `ProcessRuntimeResource`| :heavy_check_mark: | :heavy_check_mark: | [OpenTelemetry.Resources.ProcessRuntime](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Resources.ProcessRuntime) | -| `MySqlData` | :heavy_check_mark: | :heavy_check_mark: | [OpenTelemetry.Instrumentation.MySqlData](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.MySqlData) | -| | :heavy_check_mark: | | [MySql.Data.OpenTelemetry](https://www.nuget.org/packages/MySql.Data.OpenTelemetry) | -| `Owin` | :heavy_check_mark: | | [OpenTelemetry.Instrumentation.Owin](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Owin) | | `Quartz` | :heavy_check_mark: | | [OpenTelemetry.Instrumentation.Quartz](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Quartz) | | `SqlClient` | :heavy_check_mark: | :heavy_check_mark: | [OpenTelemetry.Instrumentation.SqlClient](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.SqlClient) | | `StackExchangeRedis` | :heavy_check_mark: | | [OpenTelemetry.Instrumentation.StackExchangeRedis](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.StackExchangeRedis) | @@ -37,3 +37,4 @@ and [minimal](./installation.md#install-the-base-package) dependencies: * The `ContainerResource` instrumentation is included but needs to be explicitly activated, as it currently adds container resource attributes for processes running not in containers. +* The `MySqlData` instrumentation does not include the MySql.Data.OpenTelemetry package. Install separately if needed. From ce343d3860f75ad3b2ef012d6df74fc4076d274c Mon Sep 17 00:00:00 2001 From: Matthew Hensley Date: Wed, 5 Feb 2025 18:26:36 -0500 Subject: [PATCH 4/4] lint --- docs/supported-instrumentations.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/supported-instrumentations.md b/docs/supported-instrumentations.md index 43a9aaa2..a67dde02 100644 --- a/docs/supported-instrumentations.md +++ b/docs/supported-instrumentations.md @@ -37,4 +37,5 @@ and [minimal](./installation.md#install-the-base-package) dependencies: * The `ContainerResource` instrumentation is included but needs to be explicitly activated, as it currently adds container resource attributes for processes running not in containers. -* The `MySqlData` instrumentation does not include the MySql.Data.OpenTelemetry package. Install separately if needed. +* The `MySqlData` instrumentation does not include the MySql.Data.OpenTelemetry + package. Install separately if needed.