[Instrumentation.EntityFrameworkCore] Fix db.statement tag for Devart Oracle #2466
Conversation
This file contains 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
the
comp:instrumentation.entityframeworkcore
Kielek
reviewed
Jan 16, 2025
Comment on lines
203
to
216
| if (command.GetType().FullName?.Contains("Devart.Data.Oracle") == true) | ||
| { | ||
| string payloadString = payload?.ToString() ?? string.Empty; | ||
| if ((payloadString.Contains("CommandType='Text'") && this.options.SetDbStatementForText) || | ||
| (payloadString.Contains("CommandType='StoredProcedure'") && this.options.SetDbStatementForStoredProcedure)) | ||
| { | ||
| string[] result = payloadString.Split(['\n'], 2); | ||
| if (result.Length > 1) | ||
| { | ||
| activity.AddTag(AttributeDbStatement, result[1]); | ||
| } | ||
| } | ||
| } | ||
| else if (this.commandTypeFetcher.Fetch(command) is CommandType commandType) |
There was a problem hiding this comment.
There is couple things you should consider here:
- Support both for emitting old and new attributes. See lese if statement for details:
if (this.options.SetDbStatementForStoredProcedure)
{
if (this.options.EmitOldAttributes)
{
activity.AddTag(AttributeDbStatement, commandText);
}
if (this.options.EmitNewAttributes)
{
activity.AddTag(AttributeDbQueryText, commandText);
}
}- payloadString split, is it always '\n' or it can be vary based on the environment settings?
- Consider adding stub/mocked tests for this case.
There was a problem hiding this comment.
-
I was writing this code based on an older version (1.0.0-beta.10) that didn't have
this.options.EmitOldAttributesandthis.options.EmitNewAttributes. So, I will update the code structure to follow the convention of the switch statement. -
Updated the line as follows:
string[] result = payloadString.Split([Environment.NewLine], 2, StringSplitOptions.None);
There was a problem hiding this comment.
- I am unable to write mock tests because Devart requires a license in order to connect to Oracle database. 😞
src/OpenTelemetry.Instrumentation.EntityFrameworkCore/CHANGELOG.md
Outdated
Show resolved
Hide resolved
Co-authored-by: Piotr Kiełkowicz <[email protected]>
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.
Fixes #2462
Changes
Added code to fix exception thrown when Devart Oracle is used (
this.commandTypeFetcher.Fetch(command)).If Devart Oracle is used, the SQL statement will be extracted from the payload.
Merge requirement checklist
CHANGELOG.mdfiles updated for non-trivial changes