From f04878e6125fbc9467341c433b9faabab502f709 Mon Sep 17 00:00:00 2001 From: sreenathv Date: Wed, 1 Oct 2025 10:49:47 +0100 Subject: [PATCH 1/4] Fix for obfuscate memory leak --- receiver/oracledbreceiver/obfuscate.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/receiver/oracledbreceiver/obfuscate.go b/receiver/oracledbreceiver/obfuscate.go index 9e71feabe81f9..997c6aa688f2d 100644 --- a/receiver/oracledbreceiver/obfuscate.go +++ b/receiver/oracledbreceiver/obfuscate.go @@ -12,11 +12,15 @@ var obfuscateSQLConfig = obfuscate.SQLConfig{DBMS: "oracle"} type obfuscator obfuscate.Obfuscator func newObfuscator() *obfuscator { - return (*obfuscator)(obfuscate.NewObfuscator(obfuscate.Config{})) + return (*obfuscator)(obfuscate.NewObfuscator(obfuscate.Config{ + SQL: obfuscate.SQLConfig{ + DBMS: "oracle", + }, + })) } func (o *obfuscator) obfuscateSQLString(sql string) (string, error) { - obfuscatedQuery, err := (*obfuscate.Obfuscator)(o).ObfuscateSQLStringWithOptions(sql, &obfuscateSQLConfig, "") + obfuscatedQuery, err := (*obfuscate.Obfuscator)(o).ObfuscateSQLString(sql) if err != nil { return "", err } From d688eeaef2e4bfe68afd6021a35e9e943699aa23 Mon Sep 17 00:00:00 2001 From: sreenathv Date: Wed, 1 Oct 2025 11:40:20 +0100 Subject: [PATCH 2/4] chlog --- .chloggen/postgresql_memoryleak_fix.yaml | 27 ++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .chloggen/postgresql_memoryleak_fix.yaml diff --git a/.chloggen/postgresql_memoryleak_fix.yaml b/.chloggen/postgresql_memoryleak_fix.yaml new file mode 100644 index 0000000000000..a4dc07170f4ed --- /dev/null +++ b/.chloggen/postgresql_memoryleak_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: bug_fix + +# 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: Fix for memory leak in top queries and query samples collection. + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [43074] + +# (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] From 2444f9f1c083d1a367ff8da4c89e7141524784cf Mon Sep 17 00:00:00 2001 From: sreenathv Date: Wed, 1 Oct 2025 11:42:01 +0100 Subject: [PATCH 3/4] fix cleanup --- receiver/oracledbreceiver/obfuscate.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/receiver/oracledbreceiver/obfuscate.go b/receiver/oracledbreceiver/obfuscate.go index 997c6aa688f2d..2e8d0108467a4 100644 --- a/receiver/oracledbreceiver/obfuscate.go +++ b/receiver/oracledbreceiver/obfuscate.go @@ -7,8 +7,6 @@ import ( "github.com/DataDog/datadog-agent/pkg/obfuscate" ) -var obfuscateSQLConfig = obfuscate.SQLConfig{DBMS: "oracle"} - type obfuscator obfuscate.Obfuscator func newObfuscator() *obfuscator { From 0b8e0ef96aa7050a158a90ed231c207296e51671 Mon Sep 17 00:00:00 2001 From: sreenathv Date: Wed, 1 Oct 2025 11:56:28 +0100 Subject: [PATCH 4/4] fix name --- ...l_memoryleak_fix.yaml => oracledbreceiver_memoryleak_fix.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .chloggen/{postgresql_memoryleak_fix.yaml => oracledbreceiver_memoryleak_fix.yaml} (100%) diff --git a/.chloggen/postgresql_memoryleak_fix.yaml b/.chloggen/oracledbreceiver_memoryleak_fix.yaml similarity index 100% rename from .chloggen/postgresql_memoryleak_fix.yaml rename to .chloggen/oracledbreceiver_memoryleak_fix.yaml