[Instrumentation.SqlClient] Adopt shared handle manager #2992
+31
−58
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
comp:instrumentation.aspnet.telemetryhttpmodule
|
@matt-hensley, blocking PR merged, could you please rebase/resolve conflicts? |
matt-hensley
force-pushed
the
sqlclient-handle-manager
branch
from
5fa9f38 to
42ed510
Compare
github-actions
bot
removed
the
comp:instrumentation.aspnet.telemetryhttpmodule
github-actions
bot
removed
the
comp:instrumentation.aspnet
martincostello
approved these changes
Aug 22, 2025
Kielek
approved these changes
Aug 26, 2025
Kielek
reviewed
Aug 26, 2025
There was a problem hiding this comment.
I have applied following changes locally and execute:
.\build\scripts\test-aot-compatibility.ps1 net8.0
.\build\scripts\test-aot-compatibility.ps1 net9.0
both returned
Actual warning count is: 0
Executing test App...
./OpenTelemetry.AotCompatibility.TestApp.exe
Finished executing test App
I know that you have just extracted the code from internal class to shared, but what is the reason to do it, if there is no issues in aot tests?
Diff:
index 2048fffd..85d4f531 100644
--- a/src/Shared/InstrumentationHandleManager.cs
+++ b/src/Shared/InstrumentationHandleManager.cs
@@ -3,18 +3,8 @@
namespace OpenTelemetry.Instrumentation;
-#if NET
-using System.Diagnostics.CodeAnalysis;
-#endif
-
-#if NET
-[RequiresUnreferencedCode(InstrumentationHandleManagerTrimmingUnsupportedMessage)]
-#endif
internal sealed class InstrumentationHandleManager
{
-#if NET
- internal const string InstrumentationHandleManagerTrimmingUnsupportedMessage = "Trimming is not yet supported for InstrumentationHandleManager.";
-#endif
private int metricHandles;
private int tracingHandles;
@@ -40,9 +30,6 @@ internal sealed class InstrumentationHandleManager
/// <returns>An IDisposable object.</returns>
public IDisposable AddTracingHandle() => new TracingHandle(this);
-#if NET
- [RequiresUnreferencedCode(InstrumentationHandleManagerTrimmingUnsupportedMessage)]
-#endif
private sealed class MetricHandle : IDisposable
{
private readonly InstrumentationHandleManager manager;
@@ -64,9 +51,6 @@ internal sealed class InstrumentationHandleManager
}
}
-#if NET
- [RequiresUnreferencedCode(InstrumentationHandleManagerTrimmingUnsupportedMessage)]
-#endif
private sealed class TracingHandle : IDisposable
{
private readonly InstrumentationHandleManager manager;
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes
Modifies SqlClient instrumentation to use shared handle implementation setup in #2970
Leaving in draft until #2970 lands, will rebase afterwards
Merge requirement checklist
CHANGELOG.mdfiles updated for non-trivial changes