Skip to content

Added Instrumentation for ServletContainerInitializer#onStartup#2449

Merged
felixbarny merged 5 commits intoelastic:mainfrom
tobiasstadler:instrument-servletcontainerinitializer-onstartup
Feb 10, 2022
Merged

Added Instrumentation for ServletContainerInitializer#onStartup#2449
felixbarny merged 5 commits intoelastic:mainfrom
tobiasstadler:instrument-servletcontainerinitializer-onstartup

Conversation

@tobiasstadler
Copy link
Contributor

What does this PR do?

Improves service name and version auto detection

Checklist

  • This is an enhancement of existing features, or a new feature in existing plugins
    • I have updated CHANGELOG.asciidoc
    • I have added tests that prove my fix is effective or that my feature works
    • Added an API method or config option? Document in which version this will be introduced
    • I have made corresponding changes to the documentation

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

github-actions bot commented Feb 5, 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 Feb 5, 2022

💚 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-02-10T08:45:06.860+0000

  • Duration: 53 min 5 sec

Test stats 🧪

Test Results
Failed 0
Passed 2495
Skipped 16
Total 2511

💚 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!)

@eyalkoren eyalkoren requested a review from felixbarny February 7, 2022 08:40
@eyalkoren
Copy link
Contributor

@felixbarny asking for your review as there seem to be quite a lot of prior context leading to this

@tobiasstadler
Copy link
Contributor Author

@felixbarny It might makes sense to include this in 1.29.0 release, toghter with the other service name/version auto detection.

* Determines the service name based on the webapp's {@code META-INF/MANIFEST.MF} file early in the startup process.
* As this doesn't work with runtime attachment, the service name is also determined when the first request comes in.
*/
public abstract class InitServiceNameInstrumentation2 extends AbstractServletInstrumentation {
Copy link
Member

Choose a reason for hiding this comment

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

Maybe you could find a better name for this. Don't hesitate to renaming InitServiceNameInstrumentation or creating a dedicated package for both.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done, I hope it is ok now.

Copy link
Member

@felixbarny felixbarny left a comment

Choose a reason for hiding this comment

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

Sorry for all the nitpicks.

@felixbarny
Copy link
Member

/run elasticsearch-ci/docs

@felixbarny felixbarny merged commit f61ed28 into elastic:main Feb 10, 2022
@tobiasstadler tobiasstadler deleted the instrument-servletcontainerinitializer-onstartup branch February 10, 2022 11:42
@tobiasstadler
Copy link
Contributor Author

Thank You!

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants