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

Validate javaagent suppression keys #12955

Merged
merged 5 commits into from
Dec 30, 2024
Merged

Conversation

trask
Copy link
Member

@trask trask commented Dec 23, 2024

Most of #5790, still some TODOs check-javaagent-instrumentation-suppression-keys.sh that need follow-ups.

@trask trask marked this pull request as ready for review December 23, 2024 03:39
@trask trask requested a review from a team as a code owner December 23, 2024 03:39
@github-actions github-actions bot requested a review from theletterf December 23, 2024 03:39
CHANGELOG.md Outdated
@@ -26,6 +26,12 @@ In preparation for stabilizing HTTP library instrumentation soon:
- `*KtorClientTracing*` and `*KtorServerTracing*` have been deprecated and renamed to
`*KtorClientTelemetry*` and `*KtorServerTelemetry*`
([#12855](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/12855))
- Some Java agent instrumentation suppression keys have been renamed to match their module names:
- `elasticsearch-rest-6.0` --> `elasticsearch-rest-6.4`
- `twitter-util-core` --> `finagle-http`
Copy link
Contributor

Choose a reason for hiding this comment

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

https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/instrumentation/finagle-http-23.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/finaglehttp/v23_11/TwitterUtilCoreInstrumentationModule.java
Instruments classes in com.twitter:util-core that finagle depends on, finatra also uses the same dependency but the tests don't seem to require this instrumentation. Maybe the instrumentation should be moved to a separate module? Though this could still be a bit weird as it is tested in the finagle module.

Copy link
Member Author

Choose a reason for hiding this comment

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

Instruments classes in com.twitter:util-core that finagle depends on

Thanks, I missed this, I kept the twitter-util-core suppression key (and just added the normal finagle suppression keys)

@laurit laurit enabled auto-merge (squash) December 30, 2024 10:42
@laurit laurit merged commit bd97110 into open-telemetry:main Dec 30, 2024
58 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants