feature: Add .NET 8+ support for System.Data.Odbc #2948
+706
−143
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
* SqlWrapperHelper unit tests * Working integration tests for ODBC instrumentation * Remove commented-out copy-pasted code * PR feedback
Also fix bug where server/hostname string with port included (e.g. "myservername:1234") wasn't handled correctly
nrcventura
reviewed
Jan 15, 2025
tippmar-nr
reviewed
Jan 16, 2025
.../Agent/IntegrationTests/SharedApplications/Common/MFALatestPackages/MFALatestPackages.csproj
Show resolved
Hide resolved
tippmar-nr
reviewed
Jan 17, 2025
| if (host == null) return null; | ||
|
|
||
| // Example of want we would need to process: win-database.pdx.vm.datanerd.us,1433\SQLEXPRESS | ||
| try |
There was a problem hiding this comment.
This try/catch block seems unnecessary. Looks like the code is already handling all the edge cases that are possible.
tippmar-nr
reviewed
Jan 17, 2025
| portPathOrId = ConnectionStringParserHelper.GetKeyValuePair(_connectionStringBuilder, _hostKeys)?.Value; | ||
| if (portPathOrId == null) return null; | ||
|
|
||
| try |
There was a problem hiding this comment.
Same thing here. I'm not seeing any execution path where an exception could be thrown.
tippmar-nr
reviewed
Jan 17, 2025
| var endOfValue = portPathOrId.Contains(StringSeparators.BackslashChar) | ||
| ? portPathOrId.IndexOf(StringSeparators.BackslashChar) | ||
| : portPathOrId.Length; | ||
| return (startOfValue > 0) ? portPathOrId.Substring(startOfValue, endOfValue - startOfValue) : null; |
There was a problem hiding this comment.
The ternary here (and on line 74 above) isn't necessary -- startOfValue will always be > 0.
tippmar-nr
reviewed
Jan 17, 2025
| var instanceName = ConnectionStringParserHelper.GetKeyValuePair(_connectionStringBuilder, _hostKeys)?.Value; | ||
| if (instanceName == null) return null; | ||
|
|
||
| try |
There was a problem hiding this comment.
Unnecessary try/catch here also
tippmar-nr
reviewed
Jan 17, 2025
| { | ||
| var startOfValue = instanceName.IndexOf(StringSeparators.BackslashChar) + 1; | ||
| var endOfValue = instanceName.Length; | ||
| return (startOfValue > 0) ? instanceName.Substring(startOfValue, endOfValue - startOfValue) : null; |
There was a problem hiding this comment.
Ternary here is also unnecessary.
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.
Description
This PR adds datastore instrumentation for
System.Data.Odbc, which is Microsoft's implementation of ODBC access for modern .NET. This resolves #2922.Note that the instrumentation is less complete than for ODBC operations in .NET Framework applications. In particular, the following things that are instrumented in .NET Framework are not instrumented for .NET 8+:
Connect/ConnectAsynccallsAuthor Checklist
Performance testing completed with satisfactory results (if required)N/AReviewer Checklist