Skip to content

Remove vendored OpenTelemetry.Instrumentation.SqlClient code#14621

Merged
eerhardt merged 1 commit into
microsoft:mainfrom
eerhardt:RemoveSqlInstrumentation
Feb 23, 2026
Merged

Remove vendored OpenTelemetry.Instrumentation.SqlClient code#14621
eerhardt merged 1 commit into
microsoft:mainfrom
eerhardt:RemoveSqlInstrumentation

Conversation

@eerhardt
Copy link
Copy Markdown
Member

The package has now shipped stable, so we can take a dependency on the official package.

I purposefully targeted this to main to not cause any instability in the release/13.2 branch.

The package has now shipped stable, so we can take a dependency on the official package.
@eerhardt eerhardt requested a review from radical as a code owner February 23, 2026 16:32
Copilot AI review requested due to automatic review settings February 23, 2026 16:32
@github-actions
Copy link
Copy Markdown
Contributor

🚀 Dogfood this PR with:

⚠️ WARNING: Do not do this without first carefully reviewing the code of this PR to satisfy yourself it is safe.

curl -fsSL https://raw.githubusercontent.com/dotnet/aspire/main/eng/scripts/get-aspire-cli-pr.sh | bash -s -- 14621

Or

  • Run remotely in PowerShell:
iex "& { $(irm https://raw.githubusercontent.com/dotnet/aspire/main/eng/scripts/get-aspire-cli-pr.ps1) } 14621"

Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR removes the vendored OpenTelemetry.Instrumentation.SqlClient code (previously at version 1.7.0-beta.1) and replaces it with a dependency on the official stable package (version 1.15.0). The vendored code was temporarily included in the repository while waiting for the official package to ship stable.

Changes:

  • Removed all vendored OpenTelemetry.Instrumentation.SqlClient source files from src/Vendoring/
  • Updated project files to reference the official NuGet package instead of vendored code
  • Removed vendoring instructions from README.md

Reviewed changes

Copilot reviewed 18 out of 18 changed files in this pull request and generated no comments.

Show a summary per file
File Description
src/Vendoring/README.md Removed vendoring instructions for OpenTelemetry.Instrumentation.SqlClient
src/Vendoring/OpenTelemetry.Instrumentation.SqlClient/* Deleted 14 vendored source files (TracerProviderBuilderExtensions.cs, SqlClientTraceInstrumentationOptions.cs, SqlClientInstrumentation.cs, etc.)
src/Components/Aspire.Microsoft.EntityFrameworkCore.SqlServer/Aspire.Microsoft.EntityFrameworkCore.SqlServer.csproj Removed vendored code compilation, added official package reference
src/Components/Aspire.Microsoft.Data.SqlClient/Aspire.Microsoft.Data.SqlClient.csproj Removed vendored code compilation, added official package reference
Directory.Packages.props Added OpenTelemetry.Instrumentation.SqlClient version 1.15.0 to package versions

@eerhardt eerhardt enabled auto-merge (squash) February 23, 2026 17:08
@eerhardt eerhardt merged commit 1de5e43 into microsoft:main Feb 23, 2026
683 of 686 checks passed
@eerhardt eerhardt deleted the RemoveSqlInstrumentation branch February 23, 2026 17:38
@dotnet-policy-service dotnet-policy-service Bot added this to the 13.3 milestone Feb 23, 2026
@github-actions github-actions Bot locked and limited conversation to collaborators Mar 26, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants