Skip to content

[Instrumentation.EntityFrameworkCore] Stop emitting db.statement_type attribute #1559

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
merged 4 commits into from
Feb 5, 2024
Merged

[Instrumentation.EntityFrameworkCore] Stop emitting db.statement_type attribute #1559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d006a82
[Instrumentation.EntityFrameworkCore] Stop emitting db.statement_type…
Kielek Feb 1, 2024
e0c6f93
Merge branch 'main' into instrumentation-efcore-drop-db.statement_type
Kielek Feb 5, 2024
3301721
Changelog - mark as breaking change
Kielek Feb 5, 2024
443cf42
Merge branch 'main' into instrumentation-efcore-drop-db.statement_type
Kielek Feb 5, 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
3 changes: 3 additions & 0 deletions src/OpenTelemetry.Instrumentation.EntityFrameworkCore/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## Unreleased

* **Breaking Change**: Stop emitting `db.statement_type` attribute.
([#1559](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1559))

## 1.0.0-beta.9

Released 2024-Jan-03
Expand Down
3 changes: 0 additions & 3 deletions ...y.Instrumentation.EntityFrameworkCore/Implementation/EntityFrameworkDiagnosticListener.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,6 @@ public override void OnCustom(string name, Activity? activity, object? payload)
switch (commandType)
{
case CommandType.StoredProcedure:
activity.AddTag(SpanAttributeConstants.DatabaseStatementTypeKey, nameof(CommandType.StoredProcedure));
if (this.options.SetDbStatementForStoredProcedure)
{
activity.AddTag(AttributeDbStatement, commandText);
Expand All @@ -203,7 +202,6 @@ public override void OnCustom(string name, Activity? activity, object? payload)
break;

case CommandType.Text:
activity.AddTag(SpanAttributeConstants.DatabaseStatementTypeKey, nameof(CommandType.Text));
if (this.options.SetDbStatementForText)
{
activity.AddTag(AttributeDbStatement, commandText);
Expand All @@ -212,7 +210,6 @@ public override void OnCustom(string name, Activity? activity, object? payload)
break;

case CommandType.TableDirect:
activity.AddTag(SpanAttributeConstants.DatabaseStatementTypeKey, nameof(CommandType.TableDirect));
break;
}
}
Expand Down
1 change: 0 additions & 1 deletion src/Shared/SpanAttributeConstants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ internal static class SpanAttributeConstants
#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
public const string StatusCodeKey = "otel.status_code";
public const string StatusDescriptionKey = "otel.status_description";
public const string DatabaseStatementTypeKey = "db.statement_type";

#pragma warning restore CS1591 // Missing XML comment for publicly visible type or member
}
1 change: 0 additions & 1 deletion ...metry.Instrumentation.EntityFrameworkCore.Tests/EntityFrameworkDiagnosticListenerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,6 @@ private static void VerifyActivityData(Activity activity, bool isError = false,
Assert.DoesNotContain(activity.Tags, t => t.Key == EntityFrameworkDiagnosticListener.AttributePeerService);

Assert.Equal(altDisplayName ?? "main", activity.Tags.FirstOrDefault(t => t.Key == EntityFrameworkDiagnosticListener.AttributeDbName).Value);
Assert.Equal(CommandType.Text.ToString(), activity.Tags.FirstOrDefault(t => t.Key == SpanAttributeConstants.DatabaseStatementTypeKey).Value);

if (!isError)
{
Expand Down