Skip to content

Commit b31141b

Browse files
authored
Remove dependency on Mysql.Data.OpenTelemetry (#131)
* remove dependency on Mysql.Data.OpenTelemetry
1 parent 57d594a commit b31141b

File tree

4 files changed

+22
-6
lines changed

4 files changed

+22
-6
lines changed

CHANGELOG.md

+12-1
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,26 @@
11
# Changelog
22

3-
## Unreleased
3+
## 1.1.0
44

55
### BREAKING CHANGES
66

7+
* Drop dependency on MySQL.Data.OpenTelemetry
8+
([#131](https://github.com/grafana/grafana-opentelemetry-dotnet/pull/131))
79
* Drop support for .NET 6. EOL was November 12 2024
10+
([#131](https://github.com/grafana/grafana-opentelemetry-dotnet/pull/131))
811

912
### New features
1013

14+
* Use 8.0.1 of Microsoft.Extensions.Logging
15+
([#128](https://github.com/grafana/grafana-opentelemetry-dotnet/pull/128))
1116
* Use 1.10.0-beta.1 of OpenTelemetry.Instrumentation.AWS
17+
([#127](https://github.com/grafana/grafana-opentelemetry-dotnet/pull/127))
1218
* Use 1.10.0-beta.1 of OpenTelemetry.Instrumentation.AWSLambda
19+
([#127](https://github.com/grafana/grafana-opentelemetry-dotnet/pull/127))
20+
* Use 0.5.0-beta.7 of OpenTelemetry.Instrumentation.Process
21+
([#128](https://github.com/grafana/grafana-opentelemetry-dotnet/pull/128))
22+
* Use 0.1.0-beta.3 of OpenTelemetry.Resources.Process
23+
([#128](https://github.com/grafana/grafana-opentelemetry-dotnet/pull/128))
1324

1425
## 1.0.1
1526

docs/supported-instrumentations.md

+5-3
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ and [minimal](./installation.md#install-the-base-package) dependencies:
2020
| `Hangfire` | :heavy_check_mark: | | [OpenTelemetry.Instrumentation.Hangfire](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Hangfire) |
2121
| `HttpClient` | :heavy_check_mark: | :heavy_check_mark: | [OpenTelemetry.Instrumentation.Http](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Http) |
2222
| `HostResource` | :heavy_check_mark: | :heavy_check_mark: | [OpenTelemetry.Resources.Host](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Resources.Host) |
23+
| `MySqlData` | :heavy_check_mark: | :heavy_check_mark: | [OpenTelemetry.Instrumentation.MySqlData](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.MySqlData) |
24+
| | | | [MySql.Data.OpenTelemetry](https://www.nuget.org/packages/MySql.Data.OpenTelemetry) |
2325
| `NetRuntime` | :heavy_check_mark: | :heavy_check_mark: | [OpenTelemetry.Instrumentation.Runtime](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Runtime) |
26+
| `Owin` | :heavy_check_mark: | | [OpenTelemetry.Instrumentation.Owin](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Owin) |
2427
| `Process` | :heavy_check_mark: | :heavy_check_mark: | [OpenTelemetry.Instrumentation.Process](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Process) |
2528
| `ProcessResource` | :heavy_check_mark: | :heavy_check_mark: | [OpenTelemetry.Resources.Process](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Resources.Process) |
2629
| `ProcessRuntimeResource`| :heavy_check_mark: | :heavy_check_mark: | [OpenTelemetry.Resources.ProcessRuntime](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Resources.ProcessRuntime) |
27-
| `MySqlData` | :heavy_check_mark: | :heavy_check_mark: | [OpenTelemetry.Instrumentation.MySqlData](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.MySqlData) |
28-
| | :heavy_check_mark: | | [MySql.Data.OpenTelemetry](https://www.nuget.org/packages/MySql.Data.OpenTelemetry) |
29-
| `Owin` | :heavy_check_mark: | | [OpenTelemetry.Instrumentation.Owin](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Owin) |
3030
| `Quartz` | :heavy_check_mark: | | [OpenTelemetry.Instrumentation.Quartz](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Quartz) |
3131
| `SqlClient` | :heavy_check_mark: | :heavy_check_mark: | [OpenTelemetry.Instrumentation.SqlClient](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.SqlClient) |
3232
| `StackExchangeRedis` | :heavy_check_mark: | | [OpenTelemetry.Instrumentation.StackExchangeRedis](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.StackExchangeRedis) |
@@ -37,3 +37,5 @@ and [minimal](./installation.md#install-the-base-package) dependencies:
3737
* The `ContainerResource` instrumentation is included but needs to be explicitly
3838
activated, as it currently adds container resource attributes for processes
3939
running not in containers.
40+
* The `MySqlData` instrumentation does not include the MySql.Data.OpenTelemetry
41+
package. Install separately if needed.

src/Grafana.OpenTelemetry.Base/Grafana.OpenTelemetry.Base.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333

3434
<!-- Stable instrumentation packages -->
3535
<ItemGroup>
36-
<PackageReference Include="MySql.Data.OpenTelemetry" Version="8.4.0" />
3736
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" />
3837
</ItemGroup>
3938

src/Grafana.OpenTelemetry.Base/Instrumentations/MySqlDataInitializer.cs

+5-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@ internal class MySqlDataInitializer : InstrumentationInitializer
1414
protected override void InitializeTracing(TracerProviderBuilder builder)
1515
{
1616
// MySQL.Data.OpenTelemetry
17-
builder.AddConnectorNet();
17+
ReflectionHelper.CallStaticMethod(
18+
"MySQL.Data.OpenTelemetry",
19+
"OpenTelemetry.Trace.TracerProviderBuilderExtensions",
20+
"AddConnectorNet",
21+
new object[] { builder });
1822

1923
// OpenTelemetry.Instrumentation.MySqlData
2024
ReflectionHelper.CallStaticMethod(

0 commit comments

Comments
 (0)