Skip to content
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.

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

[connector/datadog] support obfuscation in datadogconnector #37457

Merged

Conversation

jackgopack4
Copy link
Contributor

@jackgopack4 jackgopack4 commented Jan 23, 2025

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

Link to tracking issue

Replaces #35401

Testing

Added TestObfuscate in connector_native_test.go

Documentation

added release note and link to semantics on Datadog vendor website

@jackgopack4 jackgopack4 changed the title support obfuscation in datadogconnector [connector/datadog] support obfuscation in datadogconnector Jan 23, 2025
@jackgopack4 jackgopack4 requested a review from songy23 January 23, 2025 21:53
@jackgopack4 jackgopack4 marked this pull request as ready for review January 23, 2025 21:53
@jackgopack4 jackgopack4 requested a review from a team as a code owner January 23, 2025 21:53
Copy link
Member

@songy23 songy23 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

needs make gotidy

exporter/datadogexporter/go.mod Show resolved Hide resolved
@jackgopack4 jackgopack4 force-pushed the jackgopack4/datadogconnector-obfuscate branch 2 times, most recently from 89a1c0e to 187eb6f Compare January 24, 2025 15:21
@jackgopack4 jackgopack4 marked this pull request as draft January 24, 2025 15:43
@github-actions github-actions bot requested review from Aneurysm9 and pxaws January 24, 2025 15:47
@jackgopack4
Copy link
Contributor Author

looks like replacing the dependency in otelcontribcol fixes it; going to see if I can remove the replace in awscontainerinsight and still pass checks

@jackgopack4 jackgopack4 force-pushed the jackgopack4/datadogconnector-obfuscate branch 2 times, most recently from ab3d832 to 881f253 Compare January 24, 2025 17:46
@jackgopack4
Copy link
Contributor Author

@songy23 if these checks pass, can you remove the receiver/awscontainerinsight label?

@songy23 songy23 removed request for Aneurysm9 and pxaws January 24, 2025 18:14
@jackgopack4 jackgopack4 force-pushed the jackgopack4/datadogconnector-obfuscate branch from bfbcde5 to 98616a2 Compare January 24, 2025 18:49
@jackgopack4 jackgopack4 marked this pull request as ready for review January 24, 2025 18:52
@songy23 songy23 merged commit 8459bea into open-telemetry:main Jan 24, 2025
167 checks passed
@github-actions github-actions bot added this to the next release milestone Jan 24, 2025
@jackgopack4
Copy link
Contributor Author

thanks, @songy23!

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
Labels
cmd/otelcontribcol otelcontribcol command connector/datadog exporter/datadog Datadog components
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants