From 986200756afdf0ca0ccc365623aab290a9b9ded6 Mon Sep 17 00:00:00 2001 From: Martin Costello Date: Wed, 30 Jul 2025 19:43:33 +0100 Subject: [PATCH 1/3] Bump OpenTelemetry.Instrumentation.ElasticsearchClient Bump OpenTelemetry.Instrumentation.ElasticsearchClient to the latest version. --- src/Grafana.OpenTelemetry/Grafana.OpenTelemetry.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Grafana.OpenTelemetry/Grafana.OpenTelemetry.csproj b/src/Grafana.OpenTelemetry/Grafana.OpenTelemetry.csproj index 5a127736..d2d747e0 100644 --- a/src/Grafana.OpenTelemetry/Grafana.OpenTelemetry.csproj +++ b/src/Grafana.OpenTelemetry/Grafana.OpenTelemetry.csproj @@ -39,7 +39,7 @@ - + From e81f1a00a5d3691f766cc541ac3d6b9c048e74ac Mon Sep 17 00:00:00 2001 From: Martin Costello Date: Wed, 30 Jul 2025 19:48:12 +0100 Subject: [PATCH 2/3] Update CHANGELOG Add ElasticSearch changes. --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cf2d3906..c3364ff9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -93,6 +93,14 @@ * Support use with SqlClient instrumentation. ([#2280](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2280), [#2829](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2829)) +* Use 1.12.0-beta.1 of OpenTelemetry.Instrumentation.ElasticsearchClient ([#208](https://github.com/grafana/grafana-opentelemetry-dotnet/pull/208)) + * Span status is set based on semantic convention for client spans. + ([#1538](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1538)) + * ActivitySource.Version is set to NuGet package version. + ([#1624](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1624)) + * Replace `db.url` attribute with `url.full` to comply with semantic conventions. + Redact `username` and `password` part of `url.full`. + ([#1684](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1684)) * Use 1.12.0-beta.1 of OpenTelemetry.Instrumentation.GrpcNetClient ([#145](https://github.com/grafana/grafana-opentelemetry-dotnet/pull/145)) * Use 1.12.0-beta.1 of OpenTelemetry.Instrumentation.Hangfire ([#145](https://github.com/grafana/grafana-opentelemetry-dotnet/pull/145)) * `ActivitySource.Version` is set to NuGet package version. ([#1624](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1624)) From aa2184d2b8ac332c608cd7ecd44df6cb45aa5664 Mon Sep 17 00:00:00 2001 From: Matt Hensley <130569+matt-hensley@users.noreply.github.com> Date: Thu, 31 Jul 2025 10:55:10 -0400 Subject: [PATCH 3/3] mark elasticsearch change as breaking (#210) --- CHANGELOG.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c3364ff9..ad911046 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,10 @@ * Use 1.12.0 of OpenTelemetry.Instrumentation.AWS ([#145](https://github.com/grafana/grafana-opentelemetry-dotnet/pull/145)) * Change default Semantic Convention to 1.28. * Update AWSSDK dependencies to v4. ([#2720](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2720)) +* Use 1.12.0-beta.1 of OpenTelemetry.Instrumentation.ElasticsearchClient ([#208](https://github.com/grafana/grafana-opentelemetry-dotnet/pull/208)) + * Replace `db.url` attribute with `url.full` to comply with semantic conventions. + Redact `username` and `password` part of `url.full`. + ([#1684](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1684)) * Use 1.12.0-beta.2 of OpenTelemetry.Instrumentation.SqlClient ([#145](https://github.com/grafana/grafana-opentelemetry-dotnet/pull/145)) * The `peer.service` and `server.socket.address` attributes are no longer emitted. Users should rely on the `server.address` attribute for the same information. @@ -98,9 +102,6 @@ ([#1538](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1538)) * ActivitySource.Version is set to NuGet package version. ([#1624](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1624)) - * Replace `db.url` attribute with `url.full` to comply with semantic conventions. - Redact `username` and `password` part of `url.full`. - ([#1684](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1684)) * Use 1.12.0-beta.1 of OpenTelemetry.Instrumentation.GrpcNetClient ([#145](https://github.com/grafana/grafana-opentelemetry-dotnet/pull/145)) * Use 1.12.0-beta.1 of OpenTelemetry.Instrumentation.Hangfire ([#145](https://github.com/grafana/grafana-opentelemetry-dotnet/pull/145)) * `ActivitySource.Version` is set to NuGet package version. ([#1624](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1624))