[connector/datadog] Support obfuscating sql queries in APM stats #35401
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
songy23
commented
Sep 24, 2024
|
This PR was marked stale due to lack of activity. It will be closed in 14 days. |
songy23
added
on hold
|
cc @jackgopack4 for context |
jackgopack4
reviewed
Dec 11, 2024
| @@ -158,3 +176,20 @@ func (c *traceToMetricConnectorNative) run() { | |||
| } | |||
| } | |||
| } | |||
|
|
|||
| // fork of https://github.com/DataDog/datadog-agent/blob/7642cf1aa659f82744038602044a8a00aa1a0dfb/pkg/trace/agent/obfuscate.go#L109 | |||
There was a problem hiding this comment.
is this sustainable long-term? Is it possible we could add this as a function to pkg/obfuscate instead so that it doesn't get forgotten when obfuscate folks make changes to their obfuscateStatsGroup calculations?
There was a problem hiding this comment.
we are already having to import pkg/obfuscate; I feel like we could add a function there that takes the c.obfuscator as a parameter instead
There was a problem hiding this comment.
submitted a PR to modify the signature of this function in trace agent: DataDog/datadog-agent#32064
|
closing in favor of DataDog/datadog-agent#32750 |
songy23
pushed a commit
that referenced
this pull request
Jan 24, 2025
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description Support obfuscating SQL and Redis queries in APM stats in Datadog Connector. replace statement in otelcontribcol was necessary due to failing build in pipeline. It doesn't appear that any modules use any affected functions, but building otelcontribcol with ocb failed due to an API change. Also opened an issue to bump the `receiver/awscontainerinsight` dependency so that this replace can be removed in the future: #37486 <!-- Issue number (e.g. #1234) or full URL to issue, if applicable. --> #### Link to tracking issue Replaces #35401 <!--Describe what testing was performed and which tests were added.--> #### Testing Added TestObfuscate in connector_native_test.go <!--Describe the documentation added.--> #### Documentation added release note and link to semantics on Datadog vendor website <!--Please delete paragraphs that you did not use before submitting.-->
chengchuanpeng
pushed a commit
to chengchuanpeng/opentelemetry-collector-contrib
that referenced
this pull request
Jan 26, 2025
…emetry#37457) <!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description Support obfuscating SQL and Redis queries in APM stats in Datadog Connector. replace statement in otelcontribcol was necessary due to failing build in pipeline. It doesn't appear that any modules use any affected functions, but building otelcontribcol with ocb failed due to an API change. Also opened an issue to bump the `receiver/awscontainerinsight` dependency so that this replace can be removed in the future: open-telemetry#37486 <!-- Issue number (e.g. open-telemetry#1234) or full URL to issue, if applicable. --> #### Link to tracking issue Replaces open-telemetry#35401 <!--Describe what testing was performed and which tests were added.--> #### Testing Added TestObfuscate in connector_native_test.go <!--Describe the documentation added.--> #### Documentation added release note and link to semantics on Datadog vendor website <!--Please delete paragraphs that you did not use before submitting.-->
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description:
Support obfuscating sql queries in APM stats in DD connector
This simulates the same in trace agent: https://github.com/DataDog/datadog-agent/blob/7642cf1aa659f82744038602044a8a00aa1a0dfb/pkg/trace/agent/obfuscate.go#L109