fix: Update instrumentation pg to support merge statements #1317
+5
−2
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.
Summary
In postgres15+, the MERGE statement was added
https://www.postgresql.org/docs/current/sql-commands.html
https://www.postgresql.org/docs/current/sql-merge.html
we don't support it currently in our hard coded list of pg sql command constants(which was contributed before
MERGE
was added, iiuc), which results in missingdb.operation
attributes anddb.statement
attributes that look like;
on pg spans formerge
statements, which isn't very useful.This PR adds
MERGE
to our constants list, and also cleans up some duplicate entries :)Notes
This was surfaced in cncf slack, i think my tests should pass but letting the ci do the work.
Hope everyone is doing well.