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.

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

Jump to bottom

Respect transaction_ignore_urls and transaction_ignore_user_agents when creating transactions in the spring webflux instrumentation #2515

Merged
merged 5 commits into from Mar 18, 2022
Merged

Respect transaction_ignore_urls and transaction_ignore_user_agents when creating transactions in the spring webflux instrumentation #2515

merged 5 commits into from Mar 18, 2022

Conversation

tobiasstadler
Copy link
Contributor

@tobiasstadler tobiasstadler commented Mar 15, 2022 •
edited by zube bot

What does this PR do?

Fixes #2514

Checklist

  • This is a bugfix

@github-actions github-actions bot added agent-java community Issues and PRs created by the community triage labels Mar 15, 2022
@github-actions
Copy link

👋 @tobiasstadler Thanks a lot for your contribution!

It may take some time before we review a PR, so even if you don’t see activity for some time, it does not mean that we have forgotten about it.

Every once in a while we go through a process of prioritization, after which we are focussing on the tasks that were planned for the upcoming milestone. The prioritization status is typically reflected through the PR labels. It could be pending triage, a candidate for a future milestone, or have a target milestone set to it.

@apmmachine
Copy link
Collaborator

apmmachine commented Mar 15, 2022 •
edited

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2022-03-18T11:21:49.370+0000

  • Duration: 54 min 35 sec

Test stats 🧪

Test Results
Failed 0
Passed 2749
Skipped 20
Total 2769

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • run benchmark tests : Run the benchmark tests.

  • run jdk compatibility tests : Run the JDK Compatibility tests.

  • run integration tests : Run the Agent Integration tests.

  • run end-to-end tests : Run the APM-ITs.

  • run windows tests : Build & tests on windows.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

tobiasstadler
tobiasstadler commented Mar 15, 2022
View reviewed changes
...pm-spring-webflux-plugin/src/main/java/co/elastic/apm/agent/springwebflux/WebfluxHelper.java
@@ -110,6 +112,22 @@ public static boolean isServletTransaction(ServerWebExchange exchange) {
return Boolean.TRUE == exchange.getAttributes().get(SERVLET_TRANSACTION);
}

public static boolean isExcluded(WebConfiguration webConfiguration, RequestPath requestPath, @Nullable String userAgentHeader) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

You/We should probably consolidate the isExcluded variants in a follow up PR

Copy link
Member

Choose a reason for hiding this comment

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

I have just opened #2524 for that, once this is merged I'll remove the duplication.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thank You!

@SylvainJuge SylvainJuge mentioned this pull request Mar 18, 2022
Merged
2 tasks
@SylvainJuge SylvainJuge enabled auto-merge (squash) March 18, 2022 10:02
@SylvainJuge
Copy link
Member

@elasticmachine run elasticsearch-ci/docs

@SylvainJuge SylvainJuge merged commit decd5c5 into elastic:main Mar 18, 2022
@tobiasstadler
Copy link
Contributor Author

Thank You!

@tobiasstadler tobiasstadler deleted the fix-2514 branch March 18, 2022 12:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SylvainJuge SylvainJuge SylvainJuge approved these changes

Assignees
No one assigned
Labels
agent-java community Issues and PRs created by the community triage
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Propertie transaction_ignore_urls not working springboot version 2.3.6.RELEASE
3 participants
@tobiasstadler @apmmachine @SylvainJuge