Skip to content

Commit 7689cc8

Browse files
authored
[oracledbreceiver] Fix for memory leak when using ObfuscateSQLStringWithOptions() in obfuscate library (#43096)
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description Fix for memory leak when using ObfuscateSQLStringWithOptions() in obfuscate library Similar fix done in sqlserver receiver: https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/42303/files <!-- Issue number (e.g. #1234) or full URL to issue, if applicable. --> #### Link to tracking issue Fixes #43074 <!--Describe what testing was performed and which tests were added.--> #### Reference issue #42302 <!--Describe the documentation added.--> #### Documentation <!--Please delete paragraphs that you did not use before submitting.-->
1 parent 9266926 commit 7689cc8

File tree

2 files changed

+33
-4
lines changed

2 files changed

+33
-4
lines changed
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: bug_fix
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: oracledbreceiver
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Fix for memory leak in top queries and query samples collection.
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [43074]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: [user]

receiver/oracledbreceiver/obfuscate.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,18 @@ import (
77
"github.com/DataDog/datadog-agent/pkg/obfuscate"
88
)
99

10-
var obfuscateSQLConfig = obfuscate.SQLConfig{DBMS: "oracle"}
11-
1210
type obfuscator obfuscate.Obfuscator
1311

1412
func newObfuscator() *obfuscator {
15-
return (*obfuscator)(obfuscate.NewObfuscator(obfuscate.Config{}))
13+
return (*obfuscator)(obfuscate.NewObfuscator(obfuscate.Config{
14+
SQL: obfuscate.SQLConfig{
15+
DBMS: "oracle",
16+
},
17+
}))
1618
}
1719

1820
func (o *obfuscator) obfuscateSQLString(sql string) (string, error) {
19-
obfuscatedQuery, err := (*obfuscate.Obfuscator)(o).ObfuscateSQLStringWithOptions(sql, &obfuscateSQLConfig, "")
21+
obfuscatedQuery, err := (*obfuscate.Obfuscator)(o).ObfuscateSQLString(sql)
2022
if err != nil {
2123
return "", err
2224
}

0 commit comments

Comments
 (0)