[oracledb/receiver] Removing the toLowercase on sql_text in topN & adding child_address into samples payload (#42164)

<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->
#### Description
Removing the toLowercase conversion on sql text in top_query payload.
Also, adding child_address into the query_samples payload.

<!-- Issue number (e.g. #1234) or full URL to issue, if applicable. -->
#### Link to tracking issue
Fixes
#37478

<!--Describe what testing was performed and which tests were added.-->
#### Testing unit tests updated

<!--Describe the documentation added.-->
#### Documentation updated

<!--Please delete paragraphs that you did not use before submitting.-->

Author: sv-splunk

.chloggen/oracle_sql_case_fix.yaml

@@ -0,0 +1,27 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+
+# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
+component: oracledbreceiver
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Removing the toLowercase conversion on sql text in top_query payload. Also, adding child_address into the query_samples payload.
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+issues: [37478]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:
+
+# If your change doesn't affect end users or the exported elements of any package,
+# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
+# Optional: The change log or logs in which this entry should be included.
+# e.g. '[user]' or '[user, api]'
+# Include 'user' if the change is relevant to end users.
+# Include 'api' if there is a change to a library API.
+# Default: '[user]'
+change_logs: [user]

receiver/oracledbreceiver/documentation.md

@@ -416,6 +416,7 @@ sample query
 | oracledb.plan_hash_value | Binary hash value calculated on the query execution plan and used to identify similar query execution plans, reported in the HEX format. | Any Str |
 | oracledb.sql_id | The SQL ID of the query. | Any Str |
 | oracledb.child_number | The child number of the query. | Any Str |
+| oracledb.child_address | Address of the child cursor. | Any Str |
 | oracledb.sid | ID of the Oracle Server session. | Any Str |
 | oracledb.serial | Serial number associated with a session. | Any Str |
 | oracledb.process | The operating system process ID (PID) associated with a session. | Any Str |

receiver/oracledbreceiver/internal/metadata/generated_logs.go

@@ -207,6 +207,7 @@ events:
       - oracledb.plan_hash_value
       - oracledb.sql_id
       - oracledb.child_number
+      - oracledb.child_address
       - oracledb.sid
       - oracledb.serial
       - oracledb.process

receiver/oracledbreceiver/internal/metadata/generated_logs_test.go

@@ -695,6 +695,7 @@ func (s *oracleScraper) collectQuerySamples(ctx context.Context, logs plog.Logs)
 	const sqlID = "SQL_ID"
 	const schemaName = "SCHEMANAME"
 	const sqlChildNumber = "SQL_CHILD_NUMBER"
+	const childAddress = "CHILD_ADDRESS"
 	const sid = "SID"
 	const serialNumber = "SERIAL#"
 	const status = "STATUS"
@@ -748,7 +749,7 @@ func (s *oracleScraper) collectQuerySamples(ctx context.Context, logs plog.Logs)
 		})
 
 		s.lb.RecordDbServerQuerySampleEvent(queryContext, timestamp, obfuscatedSQL, dbSystemNameVal, row[username], row[serviceName], row[hostName],
-			clientPort, row[hostName], clientPort, queryPlanHashVal, row[sqlID], row[sqlChildNumber], row[sid], row[serialNumber], row[process],
+			clientPort, row[hostName], clientPort, queryPlanHashVal, row[sqlID], row[sqlChildNumber], row[childAddress], row[sid], row[serialNumber], row[process],
 			row[schemaName], row[program], row[module], row[status], row[state], row[waitclass], row[event], row[objectName], row[objectType],
 			row[osUser], queryDuration)
 	}
@@ -770,8 +771,7 @@ func (s *oracleScraper) obfuscateCacheHits(hits []queryMetricCacheHit) []queryMe
 		if err != nil {
 			s.logger.Error("oracleScraper failed getting metric rows", zap.Error(err))
 		} else {
-			obfuscatedSQLLowerCase := strings.ToLower(obfuscatedSQL)
-			hit.queryText = obfuscatedSQLLowerCase
+			hit.queryText = obfuscatedSQL
 			obfuscatedHits = append(obfuscatedHits, hit)
 		}
 	}

receiver/oracledbreceiver/metadata.yaml

@@ -310,7 +310,7 @@ func TestScraper_ScrapeTopNLogs(t *testing.T) {
 
 var samplesQueryResponses = map[string][]metricRow{
 	samplesQuery: {{
-		"ACTION": "00-0af7651916cd43dd8448eb211c80319c-a7ad6b7169203331-01", "MACHINE": "TEST-MACHINE", "USERNAME": "ADMIN", "SCHEMANAME": "ADMIN", "SQL_ID": "48bc50b6fuz4y", "WAIT_CLASS": "ONE", "OBJECT_NAME": "BLAH",
+		"ACTION": "00-0af7651916cd43dd8448eb211c80319c-a7ad6b7169203331-01", "MACHINE": "TEST-MACHINE", "USERNAME": "ADMIN", "SCHEMANAME": "ADMIN", "SQL_ID": "48bc50b6fuz4y", "WAIT_CLASS": "ONE", "OBJECT_NAME": "BLAH", "CHILD_ADDRESS": "SDF3SDF1234D",
 		"SQL_CHILD_NUMBER": "0", "SID": "675", "SERIAL#": "51295", "SQL_FULLTEXT": "test_query", "OSUSER": "test-user", "PROCESS": "1115", "OBJECT_TYPE": "OBJECT_TYPE-A",
 		"PORT": "54440", "PROGRAM": "Oracle SQL Developer for VS Code", "MODULE": "Oracle SQL Developer for VS Code", "STATUS": "ACTIVE", "STATE": "WAITED KNOWN TIME", "PLAN_HASH_VALUE": "4199919568", "DURATION_SEC": "1",
 	}},

receiver/oracledbreceiver/scraper.go

@@ -5,6 +5,7 @@ S.USERNAME,
 S.SCHEMANAME,
 S.SQL_ID,
 S.SQL_CHILD_NUMBER,
+RAWTOHEX(Q.CHILD_ADDRESS) AS CHILD_ADDRESS,
 S.SID,
 S.SERIAL#,
 Q.SQL_FULLTEXT,
@@ -29,6 +30,6 @@ CASE WHEN S.PLSQL_ENTRY_OBJECT_ID IS NOT NULL
       END AS OBJECT_NAME, P.OBJECT_TYPE
 FROM V$SESSION S LEFT JOIN DBA_PROCEDURES P ON S.PLSQL_ENTRY_OBJECT_ID = P.OBJECT_ID
       AND S.PLSQL_ENTRY_SUBPROGRAM_ID = P.SUBPROGRAM_ID
-      LEFT JOIN V$SQL Q ON S.SQL_ID = Q.SQL_ID
+      JOIN V$SQL Q ON S.SQL_ID = Q.SQL_ID AND S.SQL_CHILD_NUMBER = Q.CHILD_NUMBER
       WHERE S.SQL_ID IS NOT NULL AND S.STATUS = 'ACTIVE'
 FETCH FIRST :1 ROWS ONLY

receiver/oracledbreceiver/scraper_test.go

@@ -18,7 +18,7 @@ resourceLogs:
                   stringValue: oracle-host-sample-1
               - key: db.query.text
                 value:
-                  stringValue: select count ( * ) from admin. employee e join admin. person p on e. businessentityid = ? join admin. employeepayhistory eph on e. businessentityid = eph. businessentityid where eph. rate > ( select avg ( rate ) from admin. employeepayhistory )
+                  stringValue: SELECT COUNT ( * ) FROM ADMIN. Employee e JOIN ADMIN. Person p ON e. BusinessEntityID = ? JOIN ADMIN. EmployeePayHistory eph ON e. BusinessEntityID = eph. BusinessEntityID WHERE eph. Rate > ( SELECT AVG ( Rate ) FROM ADMIN. EmployeePayHistory )
               - key: oracledb.query_plan
                 value:
                   stringValue: '[{"ACCESS_PREDICATES":"","BYTES":"","CARDINALITY":"","COST":"1","CPU_COST":"","DEPTH":"0","ID":"0","IO_COST":"","OPERATION":"SELECT STATEMENT","OPTIONS":"FULL","PARENT_ID":"","POSITION":"1","PROJECTION":""}]'

receiver/oracledbreceiver/templates/oracleQuerySampleSql.tmpl

@@ -43,6 +43,9 @@ resourceLogs:
               - key: oracledb.child_number
                 value:
                   stringValue: "0"
+              - key: oracledb.child_address
+                value:
+                  stringValue: "SDF3SDF1234D"
               - key: oracledb.sid
                 value:
                   stringValue: "675"