Skip to content

Fix sqlserver memory leaking #42303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 27, 2025
Merged

Fix sqlserver memory leaking #42303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8bf65c1
Fix memory leaking by using ObfuscateSQLString
XSAM Aug 26, 2025
6db02d9
Add changelog
XSAM Aug 27, 2025
0be5c4e
Fix typo
XSAM Aug 27, 2025
21ad167
Fix lint
XSAM Aug 27, 2025
6d762eb
Update changelog to mention the scope of the memory leak
XSAM Aug 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .chloggen/sqlserver-memory-leak.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
change_type: bug_fix
component: sqlserverreceiver
note: Fix memory leak from top queries and query samples features
issues: [42302]
subtext: |
The issue was caused by the misuse of the obfuscate library.
change_logs: [user]
23 changes: 12 additions & 11 deletions receiver/sqlserverreceiver/obfuscate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,25 @@ import (
"github.com/DataDog/datadog-agent/pkg/obfuscate"
)

var (
xmlPlanObfuscationAttrs = []string{
"StatementText",
"ConstValue",
"ScalarString",
"ParameterCompiledValue",
}
obfuscateSQLConfig = obfuscate.SQLConfig{DBMS: "mssql"}
)
var xmlPlanObfuscationAttrs = []string{
"StatementText",
"ConstValue",
"ScalarString",
"ParameterCompiledValue",
}

type obfuscator obfuscate.Obfuscator

func newObfuscator() *obfuscator {
return (*obfuscator)(obfuscate.NewObfuscator(obfuscate.Config{}))
return (*obfuscator)(obfuscate.NewObfuscator(obfuscate.Config{
SQL: obfuscate.SQLConfig{
DBMS: "mssql",
},
}))
}

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
}
Expand Down
Loading