Remove dependency from OpenTelemetry.Instrumentation.StackExchangeRedis

[sebastienros]

Microsoft Reviewers: Open in CodeFlow

[sebastienros]

Since the /Shared files from open-telemetry and open-telemetry-contrib are different each library has its own in their vendoring folder.

[sebastienros]

Tests are broken by the change at await notifier.ActivityReceived.WaitAsync(TimeSpan.FromSeconds(10));

Update:
Solved, this is because the OTel library are computing the ActivitySourceName from the assembly name. I am now checking other vendor-copy PRs for the same problem.

[eerhardt]

What's your thoughts on putting these versions in? As a way to document which version we are currently on? How do we plan on keeping it up to date?

[sebastienros]

Just to show which versions are used right now. When there is a new release this has to be updated. Otherwise there is no way to know which is currently used and if work needs to be done. Also the way the otel repos is done each lib is release individually which doesn't help.

[sebastienros]

/backport to release/8.0-preview5

[github-actions]

Started backporting to release/8.0-preview5: https://github.com/dotnet/aspire/actions/runs/8442856355

[github-actions]

@sebastienros backporting to release/8.0-preview5 failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: Remove dependency from OpenTelemetry.Instrumentation.StackExchangeRedis
Using index info to reconstruct a base tree...
M	Directory.Packages.props
M	src/Components/Aspire.Microsoft.Data.SqlClient/Aspire.Microsoft.Data.SqlClient.csproj
M	src/Components/Aspire.Microsoft.EntityFrameworkCore.SqlServer/Aspire.Microsoft.EntityFrameworkCore.SqlServer.csproj
M	src/Vendoring/.editorconfig
M	src/Vendoring/README.md
Falling back to patching base and 3-way merge...
Auto-merging src/Vendoring/README.md
CONFLICT (content): Merge conflict in src/Vendoring/README.md
Auto-merging src/Components/Aspire.Microsoft.EntityFrameworkCore.SqlServer/Aspire.Microsoft.EntityFrameworkCore.SqlServer.csproj
Auto-merging src/Components/Aspire.Microsoft.Data.SqlClient/Aspire.Microsoft.Data.SqlClient.csproj
Auto-merging Directory.Packages.props
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Remove dependency from OpenTelemetry.Instrumentation.StackExchangeRedis
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

[github-actions]

@sebastienros an error occurred while backporting to release/8.0-preview5, please check the run log for details!

Error: git am failed, most likely due to a merge conflict.