Skip to content

[Instrumentation.EFCore] Support use with SqlClient Instrumentation #2829

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
alanwest merged 12 commits into from
Jun 25, 2025
Merged

[Instrumentation.EFCore] Support use with SqlClient Instrumentation #2829

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2f2425e
EF Core and SqlClient instrumentation enabled at the same time produc…
zivaninstana Oct 31, 2024
b4e2966
EF Core instrumentation fix - Trailing space fix
zivaninstana Oct 31, 2024
58d18e2
EF Core instrumentation fix - Update changelog
zivaninstana Oct 31, 2024
0ee81c1
Fix comment
martincostello Jun 9, 2025
02afbec
Add integration tests
martincostello Jun 10, 2025
46ccb5b
Fix tests
martincostello Jun 10, 2025
195b88e
Update CHANGELOG
martincostello Jun 10, 2025
48f49d0
Fix assertions
martincostello Jun 10, 2025
68a4780
Avoid ArgumentException when no DbContext
martincostello Jun 24, 2025
1786f60
Add more command hints
martincostello Jun 24, 2025
a99a3db
Update src/OpenTelemetry.Instrumentation.EntityFrameworkCore/CHANGELO…
alanwest Jun 24, 2025
9aeb4db
Merge branch 'main' into gh-1764
alanwest Jun 24, 2025
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
Prev Previous commit
Next Next commit
Add more command hints 
Add more `DbCommand` class names for if `DbContext` is not available.
  • Loading branch information
@martincostello
martincostello committed Jun 24, 2025
commit 1786f606bd384a2cb98f964c8c9a8740aa5e99dd
12 changes: 12 additions & 0 deletions ...y.Instrumentation.EntityFrameworkCore/Implementation/EntityFrameworkDiagnosticListener.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ public override void OnEventWritten(string name, object? payload)
switch (providerOrCommandName)
{
case "Microsoft.EntityFrameworkCore.SqlServer":
case "Microsoft.Data.SqlClient.SqlCommand":
activity.AddTag(AttributeDbSystem, "mssql");
break;
case "Microsoft.EntityFrameworkCore.Cosmos":
Expand All @@ -108,21 +109,28 @@ public override void OnEventWritten(string name, object? payload)
activity.AddTag(AttributeDbSystem, "sqlite");
break;
case "MySql.Data.EntityFrameworkCore":
case "MySql.Data.MySqlClient.MySqlCommand":
case "Pomelo.EntityFrameworkCore.MySql":
case "Devart.Data.MySql.Entity.EFCore":
case "Devart.Data.MySql.MySqlCommand":
activity.AddTag(AttributeDbSystem, "mysql");
break;
case "Npgsql.EntityFrameworkCore.PostgreSQL":
case "Npgsql.NpgsqlCommand":
case "Devart.Data.PostgreSql.Entity.EFCore":
case "Devart.Data.PostgreSql.PgSqlCommand":
activity.AddTag(AttributeDbSystem, "postgresql");
break;
case "Oracle.EntityFrameworkCore":
case "Oracle.ManagedDataAccess.Client.OracleCommand":
case "Devart.Data.Oracle.Entity.EFCore":
case "Devart.Data.Oracle.OracleCommand":
activity.AddTag(AttributeDbSystem, "oracle");
break;
case "Microsoft.EntityFrameworkCore.InMemory":
activity.AddTag(AttributeDbSystem, "efcoreinmemory");
break;
case "FirebirdSql.Data.FirebirdClient.FbCommand":
case "FirebirdSql.EntityFrameworkCore.Firebird":
activity.AddTag(AttributeDbSystem, "firebird");
break;
Expand All @@ -131,17 +139,21 @@ public override void OnEventWritten(string name, object? payload)
break;
case "EntityFrameworkCore.SqlServerCompact35":
case "EntityFrameworkCore.SqlServerCompact40":
case "System.Data.SqlServerCe.SqlCeCommand":
activity.AddTag(AttributeDbSystem, "mssqlcompact");
break;
case "EntityFrameworkCore.OpenEdge":
activity.AddTag(AttributeDbSystem, "openedge");
break;
case "EntityFrameworkCore.Jet":
case "EntityFrameworkCore.Jet.Data.JetCommand":
activity.AddTag(AttributeDbSystem, "jet");
break;
case "Google.Cloud.EntityFrameworkCore.Spanner":
case "Google.Cloud.Spanner.Data.SpannerCommand":
activity.AddTag(AttributeDbSystem, "spanner");
break;
case "Teradata.Client.Provider.TdCommand":
case "Teradata.EntityFrameworkCore":
activity.AddTag(AttributeDbSystem, "teradata");
break;
Expand Down
Loading