Skip to content

Add scope trace for GenerateSspiClientContext #2497

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JRahnama merged 6 commits into from
Jun 12, 2024
Merged

Add scope trace for GenerateSspiClientContext #2497

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3bb47fd
Add scope trace for GenerateSspiClientContext
David-Engel May 10, 2024
5782901
Missed some
David-Engel May 13, 2024
a85ad5f
Merge branch 'main' of https://github.com/dotnet/SqlClient into scope
David-Engel May 16, 2024
673f53f
Move event scope trace to SSPIContextProvider
David-Engel May 17, 2024
69c2fcb
Merge branch 'main' of https://github.com/dotnet/SqlClient into scope
David-Engel Jun 11, 2024
73fbd5c
Reapply changes after merge conflicts
David-Engel Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SNI/SNICommon.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ internal class SNICommon
/// <returns>True if certificate is valid</returns>
internal static bool ValidateSslServerCertificate(string targetServerName, X509Certificate cert, SslPolicyErrors policyErrors)
{
using (TrySNIEventScope.Create("SNICommon.ValidateSslServerCertificate | SNI | SCOPE | INFO | Entering Scope {0} "))
using (TrySNIEventScope.Create(nameof(SNICommon)))
{
if (policyErrors == SslPolicyErrors.None)
{
Expand Down Expand Up @@ -258,7 +258,7 @@ internal static bool ValidateSslServerCertificate(string targetServerName, X509C
/// <returns>True if certificate is valid</returns>
internal static bool ValidateSslServerCertificate(X509Certificate clientCert, X509Certificate serverCert, SslPolicyErrors policyErrors)
{
using (TrySNIEventScope.Create("SNICommon.ValidateSslServerCertificate | SNI | SCOPE | INFO | Entering Scope {0} "))
using (TrySNIEventScope.Create(nameof(SNICommon)))
{
if (policyErrors == SslPolicyErrors.None)
{
Expand Down Expand Up @@ -334,7 +334,7 @@ internal static bool ValidateSslServerCertificate(X509Certificate clientCert, X5

internal static IPAddress[] GetDnsIpAddresses(string serverName, TimeoutTimer timeout)
{
using (TrySNIEventScope.Create(nameof(GetDnsIpAddresses)))
using (TrySNIEventScope.Create(nameof(SNICommon)))
{
int remainingTimeout = timeout.MillisecondsRemainingInt;
SqlClientEventSource.Log.TrySNITraceEvent(nameof(SNICommon), EventType.INFO,
Expand All @@ -352,7 +352,7 @@ internal static IPAddress[] GetDnsIpAddresses(string serverName, TimeoutTimer ti

internal static IPAddress[] GetDnsIpAddresses(string serverName)
{
using (TrySNIEventScope.Create(nameof(GetDnsIpAddresses)))
using (TrySNIEventScope.Create(nameof(SNICommon)))
{
SqlClientEventSource.Log.TrySNITraceEvent(nameof(SNICommon), EventType.INFO, "Getting DNS host entries for serverName {0}.", args0: serverName);
return Dns.GetHostAddresses(serverName);
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SNI/SNIMarsHandle.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public SNIMarsHandle(SNIMarsConnection connection, ushort sessionId, object call
/// <param name="flags">SMUX header flags</param>
private void SendControlPacket(SNISMUXFlags flags)
{
using (TrySNIEventScope.Create("SNIMarsHandle.SendControlPacket | SNI | INFO | SCOPE | Entering Scope {0}"))
using (TrySNIEventScope.Create(nameof(SNIMarsHandle)))
{
SNIPacket packet = RentPacket(headerSize: SNISMUXHeader.HEADER_LENGTH, dataSize: 0);
#if DEBUG
Expand Down Expand Up @@ -195,7 +195,7 @@ public override uint Send(SNIPacket packet)
private uint InternalSendAsync(SNIPacket packet)
{
Debug.Assert(packet.ReservedHeaderSize == SNISMUXHeader.HEADER_LENGTH, "mars handle attempting to send muxed packet without smux reservation in InternalSendAsync");
using (TrySNIEventScope.Create("SNIMarsHandle.InternalSendAsync | SNI | INFO | SCOPE | Entering Scope {0}"))
using (TrySNIEventScope.Create(nameof(SNIMarsHandle)))
{
lock (this)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1448,7 +1448,7 @@ internal void ThrowExceptionAndWarning(TdsParserStateObject stateObj, SqlCommand

internal SqlError ProcessSNIError(TdsParserStateObject stateObj)
{
using (TryEventScope.Create("<sc.TdsParser.ProcessSNIError|ERR>"))
using (TryEventScope.Create(nameof(TdsParser)))
{
#if DEBUG
// There is an exception here for MARS as its possible that another thread has closed the connection just as we see an error
Expand Down
11 changes: 7 additions & 4 deletions src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SSPI/ManagedSSPIContextProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,14 @@ internal sealed class ManagedSSPIContextProvider : SSPIContextProvider

internal override void GenerateSspiClientContext(ReadOnlyMemory<byte> received, ref byte[] sendBuff, ref uint sendLength, byte[][] _sniSpnBuffer)
{
_sspiClientContextStatus ??= new SspiClientContextStatus();
using (TrySNIEventScope.Create(nameof(ManagedSSPIContextProvider)))
{
_sspiClientContextStatus ??= new SspiClientContextStatus();

SNIProxy.GenSspiClientContext(_sspiClientContextStatus, received, ref sendBuff, _sniSpnBuffer);
SqlClientEventSource.Log.TryTraceEvent("TdsParserStateObjectManaged.GenerateSspiClientContext | Info | Session Id {0}", _physicalStateObj.SessionId);
sendLength = (uint)(sendBuff != null ? sendBuff.Length : 0);
SNIProxy.GenSspiClientContext(_sspiClientContextStatus, received, ref sendBuff, _sniSpnBuffer);
SqlClientEventSource.Log.TryTraceEvent("TdsParserStateObjectManaged.GenerateSspiClientContext | Info | Session Id {0}", _physicalStateObj.SessionId);
sendLength = (uint)(sendBuff != null ? sendBuff.Length : 0);
}
}
}
}
Expand Down