Skip to content

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

Merged
SylvainJuge merged 5 commits intoelastic:mainfrom
tobiasstadler:fix-2514
Mar 18, 2022
Merged

Respect transaction_ignore_urls and transaction_ignore_user_agents when creating transactions in the spring webflux instrumentation#2515
SylvainJuge merged 5 commits intoelastic:mainfrom
tobiasstadler:fix-2514

Conversation

@tobiasstadler
Copy link
Contributor

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

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

github-actions bot commented Mar 15, 2022

👋 @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.
@ghost
Copy link

ghost commented Mar 15, 2022 •
edited by ghost
Loading

💚 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
return Boolean.TRUE == exchange.getAttributes().get(SERVLET_TRANSACTION);
}

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

@tobiasstadler tobiasstadler Mar 15, 2022

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

@SylvainJuge SylvainJuge Mar 18, 2022

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

@tobiasstadler tobiasstadler Mar 18, 2022

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

SylvainJuge commented Mar 18, 2022

@elasticmachine run elasticsearch-ci/docs
@SylvainJuge SylvainJuge merged commit decd5c5 into elastic:main Mar 18, 2022
@tobiasstadler
Copy link
Contributor Author

tobiasstadler commented Mar 18, 2022

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

Labels

agent-java community Issues and PRs created by the community triage

2 participants

@tobiasstadler @SylvainJuge