Skip to content

SqlClient instrumentation to support Microsoft.Data.SqlClient EventSource #1599

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
cijothomas merged 17 commits into from
Nov 24, 2020
Merged

SqlClient instrumentation to support Microsoft.Data.SqlClient EventSource #1599

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
3cc6571
Listen to MDS EvenSource as well
mbakalov Nov 20, 2020
af46235
Use SqlEventSourceListener on NETFRAMEWORK only
mbakalov Nov 20, 2020
7437183
Better comments
mbakalov Nov 20, 2020
2ef7a4d
CHANGELOG updates + minor code clarity
mbakalov Nov 21, 2020
12b5c1e
Run EventSource tests for MDS source as well
mbakalov Nov 21, 2020
af7ca38
Default capture text to true
mbakalov Nov 21, 2020
3ec91f2
Update readme for new SetStatementText behavior
mbakalov Nov 21, 2020
4d90613
Minor md formatting fix
mbakalov Nov 21, 2020
db50f01
Merge branch 'master' into mds-netfx
mbakalov Nov 21, 2020
1d0b911
Merge branch 'master' into mds-netfx
cijothomas Nov 23, 2020
fc73c50
Merge branch 'master' into mds-netfx
cijothomas Nov 23, 2020
c2e5e69
Default command text capture to false
mbakalov Nov 23, 2020
6f5a2ac
Merge branch 'master' of https://github.com/open-telemetry/openteleme…
mbakalov Nov 23, 2020
4cb6823
Merge branch 'mds-netfx' of https://github.com/mbakalov/opentelemetry…
mbakalov Nov 23, 2020
3735142
Markdown cleanup
mbakalov Nov 23, 2020
9e975c8
Merge branch 'master' into mds-netfx
cijothomas Nov 24, 2020
6511d3b
Merge branch 'master' into mds-netfx
cijothomas Nov 24, 2020
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
22 changes: 18 additions & 4 deletions src/OpenTelemetry.Instrumentation.SqlClient/Implementation/SqlEventSourceListener.netfx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,14 @@ namespace OpenTelemetry.Instrumentation.SqlClient.Implementation
internal class SqlEventSourceListener : EventListener
{
internal const string AdoNetEventSourceName = "Microsoft-AdoNet-SystemData";
internal const string MdsEventSourceName = "Microsoft.Data.SqlClient.EventSource";

internal const int BeginExecuteEventId = 1;
internal const int EndExecuteEventId = 2;

private readonly SqlClientInstrumentationOptions options;
private EventSource eventSource;
private EventSource adoNetEventSource;
private EventSource mdsEventSource;

public SqlEventSourceListener(SqlClientInstrumentationOptions options = null)
{
Expand All @@ -43,9 +46,14 @@ public SqlEventSourceListener(SqlClientInstrumentationOptions options = null)

public override void Dispose()
{
if (this.eventSource != null)
if (this.adoNetEventSource != null)
{
this.DisableEvents(this.adoNetEventSource);
}

if (this.mdsEventSource != null)
{
this.DisableEvents(this.eventSource);
this.DisableEvents(this.mdsEventSource);
}

base.Dispose();
Expand All @@ -55,7 +63,13 @@ protected override void OnEventSourceCreated(EventSource eventSource)
{
if (eventSource?.Name.StartsWith(AdoNetEventSourceName, StringComparison.Ordinal) == true)
{
this.eventSource = eventSource;
this.adoNetEventSource = eventSource;
this.EnableEvents(eventSource, EventLevel.Informational, (EventKeywords)1);
}

if (eventSource?.Name.StartsWith(MdsEventSourceName, StringComparison.Ordinal) == true)
Comment thread
mbakalov marked this conversation as resolved.
Outdated
{
this.mdsEventSource = eventSource;
this.EnableEvents(eventSource, EventLevel.Informational, (EventKeywords)1);
}

Expand Down