From a541feec723c9f654787550b3cb8bc1e489419a3 Mon Sep 17 00:00:00 2001 From: David Coe Date: Fri, 30 Oct 2026 09:50:24 -0400 Subject: [PATCH 1/2] fix(csharp): update OpenTelemetry to remediate CVE-2026-40894 Require patched OpenTelemetry dependencies while retaining the core and listener DiagnosticSource minimums. Generated-by: GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- csharp/Directory.Packages.props | 4 ++-- csharp/README.md | 15 +++++++++++++++ .../Apache.Arrow.Adbc.Testing.csproj | 12 ++---------- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/csharp/Directory.Packages.props b/csharp/Directory.Packages.props index 2e32f899c0b..de7d0ac9a30 100644 --- a/csharp/Directory.Packages.props +++ b/csharp/Directory.Packages.props @@ -44,8 +44,8 @@ - - + + diff --git a/csharp/README.md b/csharp/README.md index 31c3575833d..44820e51c15 100644 --- a/csharp/README.md +++ b/csharp/README.md @@ -20,3 +20,18 @@ # Apache Arrow ADBC An implementation of Arrow ADBC targeting .NET Standard 2.0 and .NET 6 or later. + +## Telemetry dependencies + +The core and trace-listener packages retain a minimum dependency on +`System.Diagnostics.DiagnosticSource` 9.0.6. The OpenTelemetry-based Testing +helper and trace exporters use OpenTelemetry 1.15.3 or later and require +DiagnosticSource 10.0.0 or later. This avoids OpenTelemetry.Api versions affected +by [CVE-2026-40894](https://github.com/advisories/GHSA-g94r-2vxg-569j) without +raising the core driver's shared-contract minimum. + +Hosts that load managed drivers into the default assembly load context must +provide a single DiagnosticSource assembly satisfying all loaded components. +Consumers of `Apache.Arrow.Adbc.Testing` must update to a release containing +these dependency requirements; updating the core driver alone does not update +the Testing helper. diff --git a/csharp/test/Apache.Arrow.Adbc.Tests/Apache.Arrow.Adbc.Testing.csproj b/csharp/test/Apache.Arrow.Adbc.Tests/Apache.Arrow.Adbc.Testing.csproj index ea39d273bb1..bcd90b8cfa0 100644 --- a/csharp/test/Apache.Arrow.Adbc.Tests/Apache.Arrow.Adbc.Testing.csproj +++ b/csharp/test/Apache.Arrow.Adbc.Tests/Apache.Arrow.Adbc.Testing.csproj @@ -7,15 +7,6 @@ true true $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant()) - - $(NoWarn);NU1902 @@ -23,7 +14,8 @@ - + + From 86a75c729d2dc7a9ce4e03f498062255abe1094e Mon Sep 17 00:00:00 2001 From: David Coe Date: Fri, 30 Oct 2026 09:55:52 -0400 Subject: [PATCH 2/2] fix(csharp): scope OpenTelemetry remediation to the Testing helper Retain upstream production exporter dependency declarations and clarify the helper-specific DiagnosticSource requirement. Refs #4980 Generated-by: GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- csharp/Directory.Packages.props | 2 +- csharp/README.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/csharp/Directory.Packages.props b/csharp/Directory.Packages.props index de7d0ac9a30..0d2e41c3f14 100644 --- a/csharp/Directory.Packages.props +++ b/csharp/Directory.Packages.props @@ -45,7 +45,7 @@ - + diff --git a/csharp/README.md b/csharp/README.md index 44820e51c15..2c44f50f45a 100644 --- a/csharp/README.md +++ b/csharp/README.md @@ -24,9 +24,9 @@ An implementation of Arrow ADBC targeting .NET Standard 2.0 and .NET 6 or later. ## Telemetry dependencies The core and trace-listener packages retain a minimum dependency on -`System.Diagnostics.DiagnosticSource` 9.0.6. The OpenTelemetry-based Testing -helper and trace exporters use OpenTelemetry 1.15.3 or later and require -DiagnosticSource 10.0.0 or later. This avoids OpenTelemetry.Api versions affected +`System.Diagnostics.DiagnosticSource` 9.0.6. The published Testing helper uses +OpenTelemetry 1.15.3 or later and overrides its DiagnosticSource minimum to +10.0.0. This avoids OpenTelemetry.Api versions affected by [CVE-2026-40894](https://github.com/advisories/GHSA-g94r-2vxg-569j) without raising the core driver's shared-contract minimum.